wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Bug 901289] Remove nsIDOMLinkStyle r=Ms2ger

Browse Source
This commit is contained in:
David Zbarsky 2013-08-09 21:17:52 -04:00
parent 0e2f11839b
commit 34dcd56bd5
11 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/base/src/nsStyleLinkElement.cpp
View File

@ -91,13 +91,6 @@ nsStyleLinkElement::InitStyleLinkElement(bool aDontLoadStyle)
return NS_OK;
}
NS_IMETHODIMP
nsStyleLinkElement::GetSheet(nsIDOMStyleSheet** aSheet)
{
NS_IF_ADDREF(*aSheet = mStyleSheet);
return NS_OK;
}
NS_IMETHODIMP
nsStyleLinkElement::SetEnableUpdates(bool aEnableUpdates)
{

7
content/base/src/nsStyleLinkElement.h
View File

@ -15,7 +15,6 @@
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIDOMLinkStyle.h"
#include "nsIStyleSheetLinkingElement.h"
#include "nsCSSStyleSheet.h"
#include "nsTArray.h"
@ -30,8 +29,7 @@
class nsIDocument;
class nsIURI;
class nsStyleLinkElement : public nsIDOMLinkStyle,
public nsIStyleSheetLinkingElement
class nsStyleLinkElement : public nsIStyleSheetLinkingElement
{
public:
nsStyleLinkElement();
@ -39,9 +37,6 @@ public:
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) MOZ_OVERRIDE = 0;
// nsIDOMLinkStyle
NS_DECL_NSIDOMLINKSTYLE
nsCSSStyleSheet* GetSheet() const { return mStyleSheet; }
// nsIStyleSheetLinkingElement

3
content/html/content/src/HTMLLinkElement.cpp
View File

@ -57,9 +57,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLLinkElement, Element)
// QueryInterface implementation for HTMLLinkElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement)
NS_INTERFACE_TABLE_INHERITED4(HTMLLinkElement,
NS_INTERFACE_TABLE_INHERITED3(HTMLLinkElement,
nsIDOMHTMLLinkElement,
nsIDOMLinkStyle,
nsIStyleSheetLinkingElement,
Link)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement)

4
content/html/content/src/HTMLStyleElement.cpp
View File

@ -4,7 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/dom/HTMLStyleElement.h"
#include "mozilla/dom/HTMLStyleElementBinding.h"
#include "nsIDOMLinkStyle.h"
#include "nsGkAtoms.h"
#include "nsStyleConsts.h"
#include "nsIDOMStyleSheet.h"
@ -49,9 +48,8 @@ NS_IMPL_RELEASE_INHERITED(HTMLStyleElement, Element)
// QueryInterface implementation for HTMLStyleElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLStyleElement)
NS_INTERFACE_TABLE_INHERITED4(HTMLStyleElement,
NS_INTERFACE_TABLE_INHERITED3(HTMLStyleElement,
nsIDOMHTMLStyleElement,
nsIDOMLinkStyle,
nsIStyleSheetLinkingElement,
nsIMutationObserver)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement)

4
content/html/content/test/test_bug389797.html
View File

@ -165,7 +165,7 @@ HTML_TAG("keygen", "Span");
HTML_TAG("label", "Label");
HTML_TAG("legend", "Legend");
HTML_TAG("li", "LI");
HTML_TAG("link", "Link", [ "nsIDOMLinkStyle" ]);
HTML_TAG("link", "Link");
HTML_TAG("listing", "");
HTML_TAG("main", "");
HTML_TAG("map", "Map");
@ -199,7 +199,7 @@ HTML_TAG("small", "");
HTML_TAG("span", "Span");
HTML_TAG("strike", "");
HTML_TAG("strong", "");
HTML_TAG("style", "Style", [ "nsIDOMLinkStyle" ]);
HTML_TAG("style", "Style");
HTML_TAG("sub", "");
HTML_TAG("sup", "");
HTML_TAG("table", "Table");

2
content/svg/content/src/SVGStyleElement.cpp
View File

@ -26,7 +26,7 @@ NS_IMPL_ADDREF_INHERITED(SVGStyleElement, SVGStyleElementBase)
NS_IMPL_RELEASE_INHERITED(SVGStyleElement, SVGStyleElementBase)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGStyleElement)
NS_INTERFACE_TABLE_INHERITED3(SVGStyleElement, nsIDOMLinkStyle,
NS_INTERFACE_TABLE_INHERITED2(SVGStyleElement,
nsIStyleSheetLinkingElement,
nsIMutationObserver)
NS_INTERFACE_TABLE_TAIL_INHERITING(SVGStyleElementBase)

4
content/xml/content/src/XMLStylesheetProcessingInstruction.cpp
View File

@ -13,8 +13,8 @@ namespace dom {
// nsISupports implementation
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XMLStylesheetProcessingInstruction)
NS_INTERFACE_TABLE_INHERITED4(XMLStylesheetProcessingInstruction, nsIDOMNode,
nsIDOMProcessingInstruction, nsIDOMLinkStyle,
NS_INTERFACE_TABLE_INHERITED3(XMLStylesheetProcessingInstruction, nsIDOMNode,
nsIDOMProcessingInstruction,
nsIStyleSheetLinkingElement)
NS_INTERFACE_TABLE_TAIL_INHERITING(ProcessingInstruction)

1
dom/base/nsDOMClassInfo.cpp
View File

@ -142,7 +142,6 @@
// includes needed for the prototype chain interfaces
#include "nsIDOMDocumentXBL.h"
#include "nsIDOMElementCSSInlineStyle.h"
#include "nsIDOMLinkStyle.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMCSSCharsetRule.h"
#include "nsIDOMCSSImportRule.h"

1
dom/interfaces/base/domstubs.idl
View File

@ -37,7 +37,6 @@ interface DOMException;
// Style Sheets
interface nsIDOMStyleSheetList;
interface nsIDOMLinkStyle;
interface nsIDOMStyleSheet;
interface nsIDOMMediaList;

1
dom/interfaces/stylesheets/moz.build
View File

@ -5,7 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPIDL_SOURCES += [
'nsIDOMLinkStyle.idl',
'nsIDOMMediaList.idl',
'nsIDOMStyleSheet.idl',
'nsIDOMStyleSheetList.idl',

12
dom/interfaces/stylesheets/nsIDOMLinkStyle.idl
View File

@ -1,12 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "domstubs.idl"
[scriptable, uuid(24d89a65-f598-481e-a297-23cc02599bbd)]
interface nsIDOMLinkStyle : nsISupports
{
readonly attribute nsIDOMStyleSheet sheet;
};