Bug 650505 - Get rid of ComputedCSSStyleDeclaration. r=dbaron,jst,peterv

This commit is contained in:
Masatoshi Kimura 2011-05-04 09:26:41 +02:00
parent 42df24b2c8
commit 2839a37fa0
3 changed files with 2 additions and 19 deletions

View File

@ -908,8 +908,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
DOM_DEFAULT_SCRIPTABLE_FLAGS) DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(CSSStyleDeclaration, nsCSSStyleDeclSH, NS_DEFINE_CLASSINFO_DATA(CSSStyleDeclaration, nsCSSStyleDeclSH,
ARRAY_SCRIPTABLE_FLAGS) ARRAY_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(ComputedCSSStyleDeclaration, nsCSSStyleDeclSH,
ARRAY_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(ROCSSPrimitiveValue, nsDOMGenericSH, NS_DEFINE_CLASSINFO_DATA(ROCSSPrimitiveValue, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS) DOM_DEFAULT_SCRIPTABLE_FLAGS)
@ -3004,12 +3002,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSS2Properties) DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSS2Properties)
DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ComputedCSSStyleDeclaration,
nsIDOMCSSStyleDeclaration)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSStyleDeclaration)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSS2Properties)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ROCSSPrimitiveValue, DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ROCSSPrimitiveValue,
nsIDOMCSSPrimitiveValue) nsIDOMCSSPrimitiveValue)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSPrimitiveValue) DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSPrimitiveValue)

View File

@ -156,7 +156,6 @@ DOMCI_CLASS(MediaList)
DOMCI_CLASS(StyleSheetList) DOMCI_CLASS(StyleSheetList)
DOMCI_CLASS(CSSStyleSheet) DOMCI_CLASS(CSSStyleSheet)
DOMCI_CLASS(CSSStyleDeclaration) DOMCI_CLASS(CSSStyleDeclaration)
DOMCI_CLASS(ComputedCSSStyleDeclaration)
DOMCI_CLASS(ROCSSPrimitiveValue) DOMCI_CLASS(ROCSSPrimitiveValue)
// Range classes // Range classes

View File

@ -161,19 +161,11 @@ nsComputedDOMStyle::Shutdown()
NS_IMPL_CYCLE_COLLECTION_1(nsComputedDOMStyle, mContent) NS_IMPL_CYCLE_COLLECTION_1(nsComputedDOMStyle, mContent)
DOMCI_DATA(ComputedCSSStyleDeclaration, nsComputedDOMStyle)
// QueryInterface implementation for nsComputedDOMStyle // QueryInterface implementation for nsComputedDOMStyle
NS_INTERFACE_TABLE_HEAD(nsComputedDOMStyle) NS_INTERFACE_MAP_BEGIN(nsComputedDOMStyle)
NS_INTERFACE_TABLE3(nsComputedDOMStyle,
nsICSSDeclaration,
nsIDOMCSSStyleDeclaration,
nsIDOMCSS2Properties)
NS_INTERFACE_TABLE_TO_MAP_SEGUE
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsComputedDOMStyle) NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsComputedDOMStyle)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ComputedCSSStyleDeclaration) NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
NS_INTERFACE_MAP_END
static void doDestroyComputedDOMStyle(nsComputedDOMStyle *aComputedStyle) static void doDestroyComputedDOMStyle(nsComputedDOMStyle *aComputedStyle)