diff --git a/content/base/public/Element.h b/content/base/public/Element.h index c764c73b19fd..2367f3b012a0 100644 --- a/content/base/public/Element.h +++ b/content/base/public/Element.h @@ -25,7 +25,6 @@ #include "nsDOMAttributeMap.h" #include "nsIDOMXPathNSResolver.h" #include "nsPresContext.h" -#include "nsDOMClassInfoID.h" // DOMCI_DATA #include "mozilla/CORSMode.h" #include "mozilla/Attributes.h" #include "nsIScrollableFrame.h" diff --git a/content/xul/document/src/nsXULCommandDispatcher.cpp b/content/xul/document/src/nsXULCommandDispatcher.cpp index 9d86d816532a..d6b3d81aaeb4 100644 --- a/content/xul/document/src/nsXULCommandDispatcher.cpp +++ b/content/xul/document/src/nsXULCommandDispatcher.cpp @@ -60,8 +60,6 @@ nsXULCommandDispatcher::~nsXULCommandDispatcher() // QueryInterface implementation for nsXULCommandDispatcher -DOMCI_DATA(XULCommandDispatcher, nsXULCommandDispatcher) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULCommandDispatcher) NS_INTERFACE_MAP_ENTRY(nsIDOMXULCommandDispatcher) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) diff --git a/content/xul/document/src/nsXULControllers.cpp b/content/xul/document/src/nsXULControllers.cpp index 0da6e3fda7ab..11b61d38427f 100644 --- a/content/xul/document/src/nsXULControllers.cpp +++ b/content/xul/document/src/nsXULControllers.cpp @@ -79,8 +79,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULControllers) } NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -DOMCI_DATA(XULControllers, nsXULControllers) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULControllers) NS_INTERFACE_MAP_ENTRY(nsIControllers) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIControllers) diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index 3ed6cb45db58..32877199221c 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -295,8 +295,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXULTemplateBuilder) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXULTemplateBuilder) -DOMCI_DATA(XULTemplateBuilder, nsXULTemplateBuilder) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULTemplateBuilder) NS_INTERFACE_MAP_ENTRY(nsIXULTemplateBuilder) NS_INTERFACE_MAP_ENTRY(nsIDocumentObserver) diff --git a/content/xul/templates/src/nsXULTreeBuilder.cpp b/content/xul/templates/src/nsXULTreeBuilder.cpp index c2f929092cdf..9581efeedc87 100644 --- a/content/xul/templates/src/nsXULTreeBuilder.cpp +++ b/content/xul/templates/src/nsXULTreeBuilder.cpp @@ -286,8 +286,6 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(nsXULTreeBuilder, nsXULTemplateBuilder, mLocalStore, mObservers) -DOMCI_DATA(XULTreeBuilder, nsXULTreeBuilder) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXULTreeBuilder) NS_INTERFACE_MAP_ENTRY(nsIXULTreeBuilder) NS_INTERFACE_MAP_ENTRY(nsITreeView) diff --git a/dom/base/nsDOMClassInfoID.h b/dom/base/nsDOMClassInfoID.h index be2792d44488..c5e954cbd6e2 100644 --- a/dom/base/nsDOMClassInfoID.h +++ b/dom/base/nsDOMClassInfoID.h @@ -32,8 +32,6 @@ enum nsDOMClassInfoID { #ifdef MOZILLA_INTERNAL_API -#define DOMCI_DATA(_dom_class, _class) /* nothing */ - class nsIClassInfo; class nsXPCClassInfo; diff --git a/dom/bluetooth/BluetoothDevice.cpp b/dom/bluetooth/BluetoothDevice.cpp index f0e71a1e0073..d1070b6f8f81 100644 --- a/dom/bluetooth/BluetoothDevice.cpp +++ b/dom/bluetooth/BluetoothDevice.cpp @@ -10,7 +10,6 @@ #include "BluetoothService.h" #include "BluetoothUtils.h" -#include "nsDOMClassInfo.h" #include "nsTArrayHelpers.h" #include "mozilla/dom/bluetooth/BluetoothTypes.h" @@ -19,8 +18,6 @@ USING_BLUETOOTH_NAMESPACE -DOMCI_DATA(BluetoothDevice, BluetoothDevice) - NS_IMPL_CYCLE_COLLECTION_CLASS(BluetoothDevice) NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(BluetoothDevice, diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 99f3f74dfb0c..b1a56d4bc574 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -81,6 +81,7 @@ #include "ClientLayerManager.h" #include "LayersLogging.h" #include "nsIOService.h" +#include "nsDOMClassInfoID.h" #include "nsColorPickerProxy.h" diff --git a/dom/mobilemessage/MmsMessage.cpp b/dom/mobilemessage/MmsMessage.cpp index 9636e282f5cd..15a77bd77d96 100644 --- a/dom/mobilemessage/MmsMessage.cpp +++ b/dom/mobilemessage/MmsMessage.cpp @@ -21,8 +21,6 @@ using namespace mozilla::dom::mobilemessage; -DOMCI_DATA(MozMmsMessage, mozilla::dom::MmsMessage) - namespace mozilla { namespace dom { diff --git a/dom/mobilemessage/MobileMessageThread.cpp b/dom/mobilemessage/MobileMessageThread.cpp index 8d9041892111..ac54bfee1771 100644 --- a/dom/mobilemessage/MobileMessageThread.cpp +++ b/dom/mobilemessage/MobileMessageThread.cpp @@ -13,8 +13,6 @@ using namespace mozilla::dom::mobilemessage; -DOMCI_DATA(MozMobileMessageThread, mozilla::dom::MobileMessageThread) - namespace mozilla { namespace dom { diff --git a/dom/mobilemessage/SmsMessage.cpp b/dom/mobilemessage/SmsMessage.cpp index 1e79e97cc789..523175e3f7b1 100644 --- a/dom/mobilemessage/SmsMessage.cpp +++ b/dom/mobilemessage/SmsMessage.cpp @@ -11,8 +11,6 @@ using namespace mozilla::dom::mobilemessage; -DOMCI_DATA(MozSmsMessage, mozilla::dom::SmsMessage) - namespace mozilla { namespace dom { diff --git a/dom/xslt/xpath/nsXPathNSResolver.cpp b/dom/xslt/xpath/nsXPathNSResolver.cpp index b2cc522c6c69..1eb01a507c03 100644 --- a/dom/xslt/xpath/nsXPathNSResolver.cpp +++ b/dom/xslt/xpath/nsXPathNSResolver.cpp @@ -12,8 +12,6 @@ NS_IMPL_CYCLE_COLLECTION(nsXPathNSResolver, mNode) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXPathNSResolver) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXPathNSResolver) -DOMCI_DATA(XPathNSResolver, nsXPathNSResolver) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXPathNSResolver) NS_INTERFACE_MAP_ENTRY(nsIDOMXPathNSResolver) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMXPathNSResolver) diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp index 58986650c1c1..43b620782c83 100644 --- a/layout/style/StyleRule.cpp +++ b/layout/style/StyleRule.cpp @@ -1177,9 +1177,6 @@ DOMCSSDeclarationImpl::DocToUpdate() return nullptr; } -// needs to be outside the namespace -DOMCI_DATA(CSSStyleRule, css::DOMCSSStyleRule) - namespace mozilla { namespace css { diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp index 6d77a169e94e..c63809266141 100644 --- a/layout/style/nsCSSRules.cpp +++ b/layout/style/nsCSSRules.cpp @@ -204,19 +204,10 @@ GroupRuleRuleList::IndexedGetter(uint32_t aIndex, bool& aFound) return nullptr; } -} // namespace css -} // namespace mozilla - // ------------------------------------------- // CharsetRule // -// Must be outside namespace -DOMCI_DATA(CSSCharsetRule, css::CharsetRule) - -namespace mozilla { -namespace css { - CharsetRule::CharsetRule(const nsAString& aEncoding, uint32_t aLineNumber, uint32_t aColumnNumber) : Rule(aLineNumber, aColumnNumber), @@ -520,15 +511,6 @@ ImportRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const // - mChildSheet, because it is measured via CSSStyleSheetInner::mSheets } -} // namespace css -} // namespace mozilla - -// must be outside the namespace -DOMCI_DATA(CSSImportRule, css::ImportRule) - -namespace mozilla { -namespace css { - GroupRule::GroupRule(uint32_t aLineNumber, uint32_t aColumnNumber) : Rule(aLineNumber, aColumnNumber) { @@ -993,15 +975,6 @@ MediaRule::AppendConditionText(nsAString& aOutput) } } -} // namespace css -} // namespace mozilla - -// Must be outside namespace -DOMCI_DATA(CSSMediaRule, css::MediaRule) - -namespace mozilla { -namespace css { - DocumentRule::DocumentRule(uint32_t aLineNumber, uint32_t aColumnNumber) : GroupRule(aLineNumber, aColumnNumber) { @@ -1246,19 +1219,10 @@ DocumentRule::AppendConditionText(nsAString& aCssText) aCssText.Truncate(aCssText.Length() - 2); // remove last ", " } -} // namespace css -} // namespace mozilla - -// Must be outside namespace -DOMCI_DATA(CSSMozDocumentRule, css::DocumentRule) - // ------------------------------------------- // NameSpaceRule // -namespace mozilla { -namespace css { - NameSpaceRule::NameSpaceRule(nsIAtom* aPrefix, const nsString& aURLSpec, uint32_t aLineNumber, uint32_t aColumnNumber) : Rule(aLineNumber, aColumnNumber), @@ -1391,9 +1355,6 @@ NameSpaceRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const } // namespace css } // namespace mozilla -// Must be outside namespace -DOMCI_DATA(CSSNameSpaceRule, css::NameSpaceRule) - // ------------------------------------------- // nsCSSFontFaceStyleDecl and related routines // @@ -1728,8 +1689,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsCSSFontFaceRule) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -DOMCI_DATA(CSSFontFaceRule, nsCSSFontFaceRule) - // QueryInterface implementation for nsCSSFontFaceRule NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSFontFaceRule) NS_INTERFACE_MAP_ENTRY(nsIStyleRule) @@ -1875,8 +1834,6 @@ nsCSSFontFeatureValuesRule::Clone() const NS_IMPL_ADDREF(nsCSSFontFeatureValuesRule) NS_IMPL_RELEASE(nsCSSFontFeatureValuesRule) -DOMCI_DATA(CSSFontFeatureValuesRule, nsCSSFontFeatureValuesRule) - // QueryInterface implementation for nsCSSFontFeatureValuesRule NS_INTERFACE_MAP_BEGIN(nsCSSFontFeatureValuesRule) NS_INTERFACE_MAP_ENTRY(nsIStyleRule) @@ -2209,8 +2166,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsCSSKeyframeRule) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDOMDeclaration) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -DOMCI_DATA(MozCSSKeyframeRule, nsCSSKeyframeRule) - // QueryInterface implementation for nsCSSKeyframeRule NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSKeyframeRule) NS_INTERFACE_MAP_ENTRY(nsIStyleRule) @@ -2428,8 +2383,6 @@ nsCSSKeyframesRule::Clone() const NS_IMPL_ADDREF_INHERITED(nsCSSKeyframesRule, css::GroupRule) NS_IMPL_RELEASE_INHERITED(nsCSSKeyframesRule, css::GroupRule) -DOMCI_DATA(MozCSSKeyframesRule, nsCSSKeyframesRule) - // QueryInterface implementation for nsCSSKeyframesRule NS_INTERFACE_MAP_BEGIN(nsCSSKeyframesRule) NS_INTERFACE_MAP_ENTRY(nsIStyleRule) @@ -2761,8 +2714,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsCSSPageRule) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDOMDeclaration) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -DOMCI_DATA(CSSPageRule, nsCSSPageRule) - // QueryInterface implementation for nsCSSPageRule NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSPageRule) NS_INTERFACE_MAP_ENTRY(nsIStyleRule) @@ -3038,9 +2989,6 @@ CSSSupportsRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const } // namespace mozilla -// Must be outside namespace -DOMCI_DATA(CSSSupportsRule, mozilla::CSSSupportsRule) - // ------------------------------------------- // nsCSSCounterStyleRule // @@ -3076,8 +3024,6 @@ nsCSSCounterStyleRule::kGetters[] = { NS_IMPL_ADDREF(nsCSSCounterStyleRule) NS_IMPL_RELEASE(nsCSSCounterStyleRule) -DOMCI_DATA(CSSCounterStyleRule, nsCSSCounterStyleRule) - // QueryInterface implementation for nsCSSCounterStyleRule NS_INTERFACE_MAP_BEGIN(nsCSSCounterStyleRule) NS_INTERFACE_MAP_ENTRY(nsIStyleRule) diff --git a/layout/xul/tree/nsTreeContentView.cpp b/layout/xul/tree/nsTreeContentView.cpp index 702333691435..09c92b1424ab 100644 --- a/layout/xul/tree/nsTreeContentView.cpp +++ b/layout/xul/tree/nsTreeContentView.cpp @@ -119,8 +119,6 @@ NS_IMPL_CYCLE_COLLECTION(nsTreeContentView, NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTreeContentView) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTreeContentView) -DOMCI_DATA(TreeContentView, nsTreeContentView) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTreeContentView) NS_INTERFACE_MAP_ENTRY(nsITreeView) NS_INTERFACE_MAP_ENTRY(nsITreeContentView) diff --git a/layout/xul/tree/nsTreeSelection.cpp b/layout/xul/tree/nsTreeSelection.cpp index 0d4015fd0b28..10ffa06e6b16 100644 --- a/layout/xul/tree/nsTreeSelection.cpp +++ b/layout/xul/tree/nsTreeSelection.cpp @@ -263,8 +263,6 @@ NS_IMPL_CYCLE_COLLECTION(nsTreeSelection, mTree, mCurrentColumn) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTreeSelection) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTreeSelection) -DOMCI_DATA(TreeSelection, nsTreeSelection) - NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTreeSelection) NS_INTERFACE_MAP_ENTRY(nsITreeSelection) NS_INTERFACE_MAP_ENTRY(nsINativeTreeSelection)