From d1f63c87ff34f06af90ae8642360fbcad89d36e2 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 30 May 2014 09:36:51 +0200 Subject: [PATCH] Bug 995780 - Remove CSSStyleSheet classinfo; r=bz --- dom/base/nsDOMClassInfo.cpp | 7 ------- dom/base/nsDOMClassInfoClasses.h | 1 - layout/style/nsCSSStyleSheet.cpp | 3 --- 3 files changed, 11 deletions(-) diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index efec18b50e9f..9b7bf7943aa9 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -102,7 +102,6 @@ #include "nsIDOMMozCSSKeyframesRule.h" #include "nsIDOMCSSPageRule.h" #include "nsIDOMCSSStyleRule.h" -#include "nsIDOMCSSStyleSheet.h" #include "nsIDOMXULCommandDispatcher.h" #include "nsIControllers.h" #include "nsIBoxObject.h" @@ -306,8 +305,6 @@ static nsDOMClassInfoData sClassInfoData[] = { DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(CSSNameSpaceRule, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(CSSStyleSheet, nsDOMGenericSH, - DOM_DEFAULT_SCRIPTABLE_FLAGS) // XUL classes #ifdef MOZ_XUL @@ -899,10 +896,6 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSRule) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(CSSStyleSheet, nsIDOMCSSStyleSheet) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSStyleSheet) - DOM_CLASSINFO_MAP_END - #ifdef MOZ_XUL DOM_CLASSINFO_MAP_BEGIN(XULCommandDispatcher, nsIDOMXULCommandDispatcher) DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULCommandDispatcher) diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index 157200ee589e..7e52129db069 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -15,7 +15,6 @@ DOMCI_CLASS(CSSCharsetRule) DOMCI_CLASS(CSSImportRule) DOMCI_CLASS(CSSMediaRule) DOMCI_CLASS(CSSNameSpaceRule) -DOMCI_CLASS(CSSStyleSheet) // XUL classes #ifdef MOZ_XUL diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp index 041594f62fbc..6fffd8e6ab2e 100644 --- a/layout/style/nsCSSStyleSheet.cpp +++ b/layout/style/nsCSSStyleSheet.cpp @@ -1120,8 +1120,6 @@ nsCSSStyleSheet::TraverseInner(nsCycleCollectionTraversalCallback &cb) } } -DOMCI_DATA(CSSStyleSheet, nsCSSStyleSheet) - // QueryInterface implementation for nsCSSStyleSheet NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSStyleSheet) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY @@ -1130,7 +1128,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSStyleSheet) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSStyleSheet) NS_INTERFACE_MAP_ENTRY(nsICSSLoaderObserver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleSheet) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSStyleSheet) if (aIID.Equals(NS_GET_IID(nsCSSStyleSheet))) foundInterface = reinterpret_cast(this); else