Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj

This commit is contained in:
Birunthan Mohanathas 2014-04-27 03:06:00 -04:00
parent 72915c4688
commit ff8ce9bd42
1104 changed files with 2667 additions and 2673 deletions

View File

@ -118,7 +118,7 @@ DocManager::Shutdown()
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_ISUPPORTS3(DocManager,
NS_IMPL_ISUPPORTS(DocManager,
nsIWebProgressListener,
nsIDOMEventListener,
nsISupportsWeakReference)

View File

@ -152,7 +152,7 @@ nsAccessibilityService::~nsAccessibilityService()
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_ISUPPORTS_INHERITED4(nsAccessibilityService,
NS_IMPL_ISUPPORTS_INHERITED(nsAccessibilityService,
DocManager,
nsIAccessibilityService,
nsIAccessibleRetrieval,
@ -256,7 +256,7 @@ private:
nsCOMPtr<nsIContent> mContent;
};
NS_IMPL_ISUPPORTS1(PluginTimerCallBack, nsITimerCallback)
NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback)
#endif
already_AddRefed<Accessible>

View File

@ -35,7 +35,7 @@ ARIAGridAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridAccessible,
NS_IMPL_ISUPPORTS_INHERITED(ARIAGridAccessible,
Accessible,
nsIAccessibleTable)
@ -540,7 +540,7 @@ ARIAGridCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible,
NS_IMPL_ISUPPORTS_INHERITED(ARIAGridCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)

View File

@ -33,7 +33,7 @@ ApplicationAccessible::ApplicationAccessible() :
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(ApplicationAccessible, Accessible,
NS_IMPL_ISUPPORTS_INHERITED(ApplicationAccessible, Accessible,
nsIAccessibleApplication)
////////////////////////////////////////////////////////////////////////////////

View File

@ -32,7 +32,7 @@ template<int Max>
NS_IMPL_RELEASE_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible)
template<int Max>
NS_IMPL_QUERY_INTERFACE_INHERITED1(ProgressMeterAccessible<Max>,
NS_IMPL_QUERY_INTERFACE_INHERITED(ProgressMeterAccessible<Max>,
LeafAccessible,
nsIAccessibleValue)

View File

@ -35,7 +35,7 @@ ImageAccessible::
mType = eImageType;
}
NS_IMPL_ISUPPORTS_INHERITED1(ImageAccessible, Accessible,
NS_IMPL_ISUPPORTS_INHERITED(ImageAccessible, Accessible,
nsIAccessibleImage)
////////////////////////////////////////////////////////////////////////////////

View File

@ -53,7 +53,7 @@ using namespace mozilla::dom;
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(RootAccessible, DocAccessible, nsIAccessibleDocument)
NS_IMPL_ISUPPORTS_INHERITED(RootAccessible, DocAccessible, nsIAccessibleDocument)
////////////////////////////////////////////////////////////////////////////////
// Constructor/destructor

View File

@ -292,7 +292,7 @@ HTMLTextFieldAccessible::
mType = eHTMLTextFieldType;
}
NS_IMPL_ISUPPORTS_INHERITED2(HTMLTextFieldAccessible,
NS_IMPL_ISUPPORTS_INHERITED(HTMLTextFieldAccessible,
Accessible,
nsIAccessibleText,
nsIAccessibleEditableText)

View File

@ -28,7 +28,7 @@ HTMLLinkAccessible::
}
// Expose nsIAccessibleHyperLink unconditionally
NS_IMPL_ISUPPORTS_INHERITED1(HTMLLinkAccessible, HyperTextAccessibleWrap,
NS_IMPL_ISUPPORTS_INHERITED(HTMLLinkAccessible, HyperTextAccessibleWrap,
nsIAccessibleHyperLink)
////////////////////////////////////////////////////////////////////////////////

View File

@ -54,7 +54,7 @@ HTMLTableCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// HTMLTableCellAccessible: nsISupports implementation
NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellAccessible,
NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)
@ -360,7 +360,7 @@ HTMLTableRowAccessible::NativeRole()
// HTMLTableAccessible
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableAccessible, Accessible,
NS_IMPL_ISUPPORTS_INHERITED(HTMLTableAccessible, Accessible,
nsIAccessibleTable)
////////////////////////////////////////////////////////////////////////////////

View File

@ -24,7 +24,7 @@ nsAccessibleRelation::nsAccessibleRelation(uint32_t aType,
}
// nsISupports
NS_IMPL_ISUPPORTS1(nsAccessibleRelation, nsIAccessibleRelation)
NS_IMPL_ISUPPORTS(nsAccessibleRelation, nsIAccessibleRelation)
// nsIAccessibleRelation
NS_IMETHODIMP

View File

@ -185,7 +185,7 @@ XULLinkAccessible::
}
// Expose nsIAccessibleHyperLink unconditionally
NS_IMPL_ISUPPORTS_INHERITED1(XULLinkAccessible, XULLabelAccessible,
NS_IMPL_ISUPPORTS_INHERITED(XULLinkAccessible, XULLabelAccessible,
nsIAccessibleHyperLink)
////////////////////////////////////////////////////////////////////////////////

View File

@ -739,7 +739,7 @@ XULListCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(XULListCellAccessible,
NS_IMPL_ISUPPORTS_INHERITED(XULListCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)

View File

@ -710,7 +710,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase, Accessible,
mTree)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase)
NS_INTERFACE_TABLE_INHERITED1(XULTreeItemAccessibleBase,
NS_INTERFACE_TABLE_INHERITED(XULTreeItemAccessibleBase,
XULTreeItemAccessibleBase)
NS_INTERFACE_TABLE_TAIL_INHERITING(Accessible)
NS_IMPL_ADDREF_INHERITED(XULTreeItemAccessibleBase, Accessible)

View File

@ -25,7 +25,7 @@ using namespace mozilla::a11y;
////////////////////////////////////////////////////////////////////////////////
// XULTreeGridAccessible: nsISupports implementation
NS_IMPL_ISUPPORTS_INHERITED1(XULTreeGridAccessible,
NS_IMPL_ISUPPORTS_INHERITED(XULTreeGridAccessible,
XULTreeAccessible,
nsIAccessibleTable)
@ -457,7 +457,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible, LeafAccessible,
mTree, mColumn)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible)
NS_INTERFACE_TABLE_INHERITED2(XULTreeGridCellAccessible,
NS_INTERFACE_TABLE_INHERITED(XULTreeGridCellAccessible,
nsIAccessibleTableCell,
XULTreeGridCellAccessible)
NS_INTERFACE_TABLE_TAIL_INHERITING(LeafAccessible)

View File

@ -13,7 +13,7 @@
namespace mozilla {
namespace browser {
NS_IMPL_ISUPPORTS1(AboutRedirector, nsIAboutModule)
NS_IMPL_ISUPPORTS(AboutRedirector, nsIAboutModule)
struct RedirEntry {
const char* id;

View File

@ -27,7 +27,7 @@
namespace mozilla {
namespace browser {
NS_IMPL_ISUPPORTS2(DirectoryProvider,
NS_IMPL_ISUPPORTS(DirectoryProvider,
nsIDirectoryServiceProvider,
nsIDirectoryServiceProvider2)
@ -254,7 +254,7 @@ DirectoryProvider::GetFiles(const char *aKey, nsISimpleEnumerator* *aResult)
return NS_ERROR_FAILURE;
}
NS_IMPL_ISUPPORTS1(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator)
NS_IMPL_ISUPPORTS(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator)
NS_IMETHODIMP
DirectoryProvider::AppendingEnumerator::HasMoreElements(bool *aResult)

View File

@ -39,7 +39,7 @@
#define MAX_BYTES 512u
NS_IMPL_ISUPPORTS3(nsFeedSniffer,
NS_IMPL_ISUPPORTS(nsFeedSniffer,
nsIContentSniffer,
nsIStreamListener,
nsIRequestObserver)

View File

@ -41,7 +41,7 @@ namespace {
////////////////////////////////////////////////////////////////////////////////
//// nsIEHistoryEnumerator
NS_IMPL_ISUPPORTS1(nsIEHistoryEnumerator, nsISimpleEnumerator)
NS_IMPL_ISUPPORTS(nsIEHistoryEnumerator, nsISimpleEnumerator)
nsIEHistoryEnumerator::nsIEHistoryEnumerator()
{

View File

@ -116,7 +116,7 @@ nsGNOMEShellService::Init()
return appPath->GetNativePath(mAppPath);
}
NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
NS_IMPL_ISUPPORTS(nsGNOMEShellService, nsIShellService)
bool
nsGNOMEShellService::GetAppPathFromLauncher()

View File

@ -31,7 +31,7 @@
#define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari"
NS_IMPL_ISUPPORTS3(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener)
NS_IMPL_ISUPPORTS(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener)
NS_IMETHODIMP
nsMacShellService::IsDefaultBrowser(bool aStartupCheck,

View File

@ -60,7 +60,7 @@ using mozilla::IsWin8OrLater;
using namespace mozilla;
using namespace mozilla::gfx;
NS_IMPL_ISUPPORTS2(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
NS_IMPL_ISUPPORTS(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
static nsresult
OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)

View File

@ -9,7 +9,7 @@
namespace mozilla {
NS_IMPL_ISUPPORTS1(DomainPolicy, nsIDomainPolicy)
NS_IMPL_ISUPPORTS(DomainPolicy, nsIDomainPolicy)
DomainPolicy::DomainPolicy() : mBlacklist(new DomainSet())
, mSuperBlacklist(new DomainSet())
@ -92,7 +92,7 @@ GetCanonicalClone(nsIURI* aURI)
return clone.forget();
}
NS_IMPL_ISUPPORTS1(DomainSet, nsIDomainSet)
NS_IMPL_ISUPPORTS(DomainSet, nsIDomainSet)
NS_IMETHODIMP
DomainSet::Add(nsIURI* aDomain)

View File

@ -29,10 +29,10 @@ using namespace mozilla;
NS_IMPL_CLASSINFO(nsNullPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
NS_NULLPRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsNullPrincipal,
NS_IMPL_QUERY_INTERFACE_CI(nsNullPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_CI_INTERFACE_GETTER2(nsNullPrincipal,
NS_IMPL_CI_INTERFACE_GETTER(nsNullPrincipal,
nsIPrincipal,
nsISerializable)

View File

@ -116,10 +116,10 @@ void nsPrincipal::dumpImpl()
NS_IMPL_CLASSINFO(nsPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
NS_PRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsPrincipal,
NS_IMPL_QUERY_INTERFACE_CI(nsPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_CI_INTERFACE_GETTER2(nsPrincipal,
NS_IMPL_CI_INTERFACE_GETTER(nsPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_ADDREF_INHERITED(nsPrincipal, nsBasePrincipal)
@ -627,10 +627,10 @@ static const char EXPANDED_PRINCIPAL_SPEC[] = "[Expanded Principal]";
NS_IMPL_CLASSINFO(nsExpandedPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
NS_EXPANDEDPRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsExpandedPrincipal,
NS_IMPL_QUERY_INTERFACE_CI(nsExpandedPrincipal,
nsIPrincipal,
nsIExpandedPrincipal)
NS_IMPL_CI_INTERFACE_GETTER2(nsExpandedPrincipal,
NS_IMPL_CI_INTERFACE_GETTER(nsExpandedPrincipal,
nsIPrincipal,
nsIExpandedPrincipal)
NS_IMPL_ADDREF_INHERITED(nsExpandedPrincipal, nsBasePrincipal)

View File

@ -339,7 +339,7 @@ nsScriptSecurityManager::GetCxSubjectPrincipal(JSContext *cx)
////////////////////////////////////
// Methods implementing ISupports //
////////////////////////////////////
NS_IMPL_ISUPPORTS4(nsScriptSecurityManager,
NS_IMPL_ISUPPORTS(nsScriptSecurityManager,
nsIScriptSecurityManager,
nsIXPCSecurityManager,
nsIChannelEventSink,

View File

@ -44,7 +44,7 @@ nsSecurityNameSet::~nsSecurityNameSet()
{
}
NS_IMPL_ISUPPORTS1(nsSecurityNameSet, nsIScriptExternalNameSet)
NS_IMPL_ISUPPORTS(nsSecurityNameSet, nsIScriptExternalNameSet)
static bool
netscape_security_enablePrivilege(JSContext *cx, unsigned argc, JS::Value *vp)

View File

@ -22,10 +22,10 @@
NS_IMPL_CLASSINFO(nsSystemPrincipal, nullptr,
nsIClassInfo::SINGLETON | nsIClassInfo::MAIN_THREAD_ONLY,
NS_SYSTEMPRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsSystemPrincipal,
NS_IMPL_QUERY_INTERFACE_CI(nsSystemPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_CI_INTERFACE_GETTER2(nsSystemPrincipal,
NS_IMPL_CI_INTERFACE_GETTER(nsSystemPrincipal,
nsIPrincipal,
nsISerializable)

View File

@ -27,7 +27,7 @@
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS2(nsChromeProtocolHandler,
NS_IMPL_ISUPPORTS(nsChromeProtocolHandler,
nsIProtocolHandler,
nsISupportsWeakReference)

View File

@ -104,7 +104,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
// QueryInterface implementation for Attr
NS_INTERFACE_TABLE_HEAD(Attr)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE6(Attr, nsINode, nsIDOMAttr, nsIAttribute, nsIDOMNode,
NS_INTERFACE_TABLE(Attr, nsINode, nsIDOMAttr, nsIAttribute, nsIDOMNode,
nsIDOMEventTarget, EventTarget)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(Attr)
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference,

View File

@ -22,7 +22,7 @@ Comment::~Comment()
{
}
NS_IMPL_ISUPPORTS_INHERITED3(Comment, nsGenericDOMDataNode, nsIDOMNode,
NS_IMPL_ISUPPORTS_INHERITED(Comment, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMCharacterData, nsIDOMComment)
bool

View File

@ -29,7 +29,7 @@ DOMRectReadOnly::WrapObject(JSContext* aCx)
// -----------------------------------------------------------------------------
NS_IMPL_ISUPPORTS_INHERITED1(DOMRect, DOMRectReadOnly, nsIDOMClientRect)
NS_IMPL_ISUPPORTS_INHERITED(DOMRect, DOMRectReadOnly, nsIDOMClientRect)
#define FORWARD_GETTER(_name) \
NS_IMETHODIMP \
@ -76,7 +76,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(DOMRectList, mParent, mArray)
NS_INTERFACE_TABLE_HEAD(DOMRectList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE1(DOMRectList, nsIDOMClientRectList)
NS_INTERFACE_TABLE(DOMRectList, nsIDOMClientRectList)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(DOMRectList)
NS_INTERFACE_MAP_END

View File

@ -82,7 +82,7 @@ DocumentType::~DocumentType()
{
}
NS_IMPL_ISUPPORTS_INHERITED2(DocumentType, nsGenericDOMDataNode, nsIDOMNode,
NS_IMPL_ISUPPORTS_INHERITED(DocumentType, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMDocumentType)
bool

View File

@ -375,7 +375,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
NS_INTERFACE_TABLE_HEAD(nsChildContentList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE2(nsChildContentList, nsINodeList, nsIDOMNodeList)
NS_INTERFACE_TABLE(nsChildContentList, nsINodeList, nsIDOMNodeList)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsChildContentList)
NS_INTERFACE_MAP_END
@ -463,7 +463,7 @@ FragmentOrElement::Children()
//----------------------------------------------------------------------
NS_IMPL_ISUPPORTS1(nsNodeWeakReference,
NS_IMPL_ISUPPORTS(nsNodeWeakReference,
nsIWeakReference)
nsNodeWeakReference::~nsNodeWeakReference()

View File

@ -12,7 +12,7 @@
#include "nsIScriptObjectPrincipal.h"
#include "nsThreadUtils.h"
NS_IMPL_ISUPPORTS1(ThirdPartyUtil, mozIThirdPartyUtil)
NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil)
nsresult
ThirdPartyUtil::Init()

View File

@ -41,7 +41,7 @@ uint32_t nsCCUncollectableMarker::sGeneration = 0;
#include "nsXULPrototypeCache.h"
#endif
NS_IMPL_ISUPPORTS1(nsCCUncollectableMarker, nsIObserver)
NS_IMPL_ISUPPORTS(nsCCUncollectableMarker, nsIObserver)
/* static */
nsresult

View File

@ -48,7 +48,7 @@ CSPService::~CSPService()
mAppStatusCache.Clear();
}
NS_IMPL_ISUPPORTS2(CSPService, nsIContentPolicy, nsIChannelEventSink)
NS_IMPL_ISUPPORTS(CSPService, nsIContentPolicy, nsIChannelEventSink)
/* nsIContentPolicy implementation */
NS_IMETHODIMP

View File

@ -14,7 +14,7 @@ nsChannelPolicy::~nsChannelPolicy()
{
}
NS_IMPL_ISUPPORTS1(nsChannelPolicy, nsIChannelPolicy)
NS_IMPL_ISUPPORTS(nsChannelPolicy, nsIChannelPolicy)
NS_IMETHODIMP
nsChannelPolicy::GetLoadType(uint32_t *aLoadType)

View File

@ -127,7 +127,7 @@ nsContentAreaDragDrop::GetDragData(nsPIDOMWindow* aWindow,
}
NS_IMPL_ISUPPORTS1(nsContentAreaDragDropDataProvider, nsIFlavorDataProvider)
NS_IMPL_ISUPPORTS(nsContentAreaDragDropDataProvider, nsIFlavorDataProvider)
// SaveURIToFile
// used on platforms where it's possible to drag items (e.g. images)

View File

@ -85,7 +85,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
// QueryInterface implementation for nsBaseContentList
NS_INTERFACE_TABLE_HEAD(nsBaseContentList)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE2(nsBaseContentList, nsINodeList, nsIDOMNodeList)
NS_INTERFACE_TABLE(nsBaseContentList, nsINodeList, nsIDOMNodeList)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsBaseContentList)
NS_INTERFACE_MAP_END
@ -493,7 +493,7 @@ nsContentList::WrapObject(JSContext *cx)
return HTMLCollectionBinding::Wrap(cx, this);
}
NS_IMPL_ISUPPORTS_INHERITED3(nsContentList, nsBaseContentList,
NS_IMPL_ISUPPORTS_INHERITED(nsContentList, nsBaseContentList,
nsIHTMLCollection, nsIDOMHTMLCollection,
nsIMutationObserver)

View File

@ -20,7 +20,7 @@
#include "nsIContent.h"
#include "nsCOMArray.h"
NS_IMPL_ISUPPORTS1(nsContentPolicy, nsIContentPolicy)
NS_IMPL_ISUPPORTS(nsContentPolicy, nsIContentPolicy)
#ifdef PR_LOGGING
static PRLogModuleInfo* gConPolLog;

View File

@ -278,7 +278,7 @@ public:
}
};
NS_IMPL_ISUPPORTS1(DOMEventListenerManagersHashReporter, nsIMemoryReporter)
NS_IMPL_ISUPPORTS(DOMEventListenerManagersHashReporter, nsIMemoryReporter)
class EventListenerManagerMapEntry : public PLDHashEntryHdr
{
@ -5390,7 +5390,7 @@ nsContentUtils::CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel
return rv;
}
NS_IMPL_ISUPPORTS2(SameOriginChecker,
NS_IMPL_ISUPPORTS(SameOriginChecker,
nsIChannelEventSink,
nsIInterfaceRequestor)

View File

@ -397,7 +397,7 @@ nsPreflightCache::GetCacheKey(nsIURI* aURI,
//////////////////////////////////////////////////////////////////////////
// nsCORSListenerProxy
NS_IMPL_ISUPPORTS5(nsCORSListenerProxy, nsIStreamListener,
NS_IMPL_ISUPPORTS(nsCORSListenerProxy, nsIStreamListener,
nsIRequestObserver, nsIChannelEventSink,
nsIInterfaceRequestor, nsIAsyncVerifyRedirectCallback)
@ -931,7 +931,7 @@ private:
bool mWithCredentials;
};
NS_IMPL_ISUPPORTS4(nsCORSPreflightListener, nsIStreamListener,
NS_IMPL_ISUPPORTS(nsCORSPreflightListener, nsIStreamListener,
nsIRequestObserver, nsIInterfaceRequestor,
nsIChannelEventSink)

View File

@ -114,7 +114,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
// QueryInterface implementation for nsDOMAttributeMap
NS_INTERFACE_TABLE_HEAD(nsDOMAttributeMap)
NS_INTERFACE_TABLE1(nsDOMAttributeMap, nsIDOMMozNamedAttrMap)
NS_INTERFACE_TABLE(nsDOMAttributeMap, nsIDOMMozNamedAttrMap)
NS_INTERFACE_TABLE_TO_MAP_SEGUE
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMAttributeMap)

View File

@ -21,7 +21,7 @@
using namespace mozilla;
using namespace mozilla::dom;
NS_IMPL_ISUPPORTS_INHERITED1(nsDOMMultipartFile, nsDOMFile,
NS_IMPL_ISUPPORTS_INHERITED(nsDOMMultipartFile, nsDOMFile,
nsIJSNativeInitializer)
NS_IMETHODIMP

View File

@ -710,7 +710,7 @@ public:
}
};
NS_IMPL_ISUPPORTS1(nsDOMMemoryFileDataOwnerMemoryReporter, nsIMemoryReporter)
NS_IMPL_ISUPPORTS(nsDOMMemoryFileDataOwnerMemoryReporter, nsIMemoryReporter)
/* static */ void
nsDOMMemoryFile::DataOwner::EnsureMemoryReporterRegistered()

View File

@ -16,7 +16,7 @@
#include "nsINode.h"
#include "nsIDOMWindow.h"
NS_IMPL_ISUPPORTS1(nsDataDocumentContentPolicy, nsIContentPolicy)
NS_IMPL_ISUPPORTS(nsDataDocumentContentPolicy, nsIContentPolicy)
// Helper method for ShouldLoad()
// Checks a URI for the given flags. Returns true if the URI has the flags,

View File

@ -723,7 +723,7 @@ nsDOMStyleSheetList::~nsDOMStyleSheetList()
}
}
NS_IMPL_ISUPPORTS_INHERITED2(nsDOMStyleSheetList, StyleSheetList,
NS_IMPL_ISUPPORTS_INHERITED(nsDOMStyleSheetList, StyleSheetList,
nsIDocumentObserver,
nsIMutationObserver)
@ -800,7 +800,7 @@ nsDOMStyleSheetList::StyleSheetRemoved(nsIDocument *aDocument,
}
// nsOnloadBlocker implementation
NS_IMPL_ISUPPORTS1(nsOnloadBlocker, nsIRequest)
NS_IMPL_ISUPPORTS(nsOnloadBlocker, nsIRequest)
NS_IMETHODIMP
nsOnloadBlocker::GetName(nsACString &aResult)
@ -1120,7 +1120,7 @@ nsExternalResourceMap::AddExternalResource(nsIURI* aURI,
return rv;
}
NS_IMPL_ISUPPORTS2(nsExternalResourceMap::PendingLoad,
NS_IMPL_ISUPPORTS(nsExternalResourceMap::PendingLoad,
nsIStreamListener,
nsIRequestObserver)
@ -1317,11 +1317,11 @@ nsExternalResourceMap::PendingLoad::StartLoad(nsIURI* aURI,
return channel->AsyncOpen(this, nullptr);
}
NS_IMPL_ISUPPORTS1(nsExternalResourceMap::LoadgroupCallbacks,
NS_IMPL_ISUPPORTS(nsExternalResourceMap::LoadgroupCallbacks,
nsIInterfaceRequestor)
#define IMPL_SHIM(_i) \
NS_IMPL_ISUPPORTS1(nsExternalResourceMap::LoadgroupCallbacks::_i##Shim, _i)
NS_IMPL_ISUPPORTS(nsExternalResourceMap::LoadgroupCallbacks::_i##Shim, _i)
IMPL_SHIM(nsILoadContext)
IMPL_SHIM(nsIProgressEventSink)
@ -5565,7 +5565,7 @@ class ProcessStackRunner MOZ_FINAL : public nsIRunnable
bool mIsBaseQueue;
};
NS_IMPL_ISUPPORTS1(ProcessStackRunner, nsIRunnable);
NS_IMPL_ISUPPORTS(ProcessStackRunner, nsIRunnable);
} // anonymous namespace
@ -9326,7 +9326,7 @@ public:
}
NS_DECL_ISUPPORTS
};
NS_IMPL_ISUPPORTS1(StubCSSLoaderObserver, nsICSSLoaderObserver)
NS_IMPL_ISUPPORTS(StubCSSLoaderObserver, nsICSSLoaderObserver)
}
@ -11437,7 +11437,7 @@ public:
bool mUserInputOrChromeCaller;
};
NS_IMPL_ISUPPORTS_INHERITED1(nsPointerLockPermissionRequest,
NS_IMPL_ISUPPORTS_INHERITED(nsPointerLockPermissionRequest,
nsRunnable,
nsIContentPermissionRequest)

View File

@ -122,7 +122,7 @@ public:
nsRefPtr<nsIDocShell> mDocShell;
};
NS_IMPL_ISUPPORTS1(nsContentView, nsIContentView)
NS_IMPL_ISUPPORTS(nsContentView, nsIContentView)
nsresult
nsContentView::Update(const ViewConfig& aConfig)

View File

@ -1210,7 +1210,7 @@ protected:
MessageManagerReferentCount* aReferentCount);
};
NS_IMPL_ISUPPORTS1(MessageManagerReporter, nsIMemoryReporter)
NS_IMPL_ISUPPORTS(MessageManagerReporter, nsIMemoryReporter)
static PLDHashOperator
CollectMessageListenerData(const nsAString& aKey,
@ -1611,7 +1611,7 @@ nsFrameScriptExecutor::InitTabChildGlobalInternal(nsISupports* aScope,
return true;
}
NS_IMPL_ISUPPORTS1(nsScriptCacheCleaner, nsIObserver)
NS_IMPL_ISUPPORTS(nsScriptCacheCleaner, nsIObserver)
nsFrameMessageManager* nsFrameMessageManager::sChildProcessManager = nullptr;
nsFrameMessageManager* nsFrameMessageManager::sParentProcessManager = nullptr;

View File

@ -63,7 +63,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
};
NS_IMPL_ISUPPORTS_INHERITED3(nsGenConImageContent,
NS_IMPL_ISUPPORTS_INHERITED(nsGenConImageContent,
nsXMLElement,
nsIImageLoadingContent,
imgINotificationObserver,

View File

@ -47,7 +47,7 @@ class HostObjectURLsReporter MOZ_FINAL : public nsIMemoryReporter
}
};
NS_IMPL_ISUPPORTS1(HostObjectURLsReporter, nsIMemoryReporter)
NS_IMPL_ISUPPORTS(HostObjectURLsReporter, nsIMemoryReporter)
class BlobURLsReporter MOZ_FINAL : public nsIMemoryReporter
{
@ -250,7 +250,7 @@ class BlobURLsReporter MOZ_FINAL : public nsIMemoryReporter
}
};
NS_IMPL_ISUPPORTS1(BlobURLsReporter, nsIMemoryReporter)
NS_IMPL_ISUPPORTS(BlobURLsReporter, nsIMemoryReporter)
}
@ -407,7 +407,7 @@ GetDataObject(nsIURI* aURI)
// -----------------------------------------------------------------------
// Protocol handler
NS_IMPL_ISUPPORTS1(nsHostObjectProtocolHandler, nsIProtocolHandler)
NS_IMPL_ISUPPORTS(nsHostObjectProtocolHandler, nsIProtocolHandler)
NS_IMETHODIMP
nsHostObjectProtocolHandler::GetDefaultPort(int32_t *result)

View File

@ -74,7 +74,7 @@ void* nsMappedAttributes::operator new(size_t aSize, uint32_t aAttrCount) CPP_TH
return newAttrs;
}
NS_IMPL_ISUPPORTS1(nsMappedAttributes,
NS_IMPL_ISUPPORTS(nsMappedAttributes,
nsIStyleRule)
void

View File

@ -150,7 +150,7 @@ nsMixedContentBlocker::~nsMixedContentBlocker()
{
}
NS_IMPL_ISUPPORTS1(nsMixedContentBlocker, nsIContentPolicy)
NS_IMPL_ISUPPORTS(nsMixedContentBlocker, nsIContentPolicy)
static void
LogMixedContentMessage(MixedContentTypes aClassification,

View File

@ -17,7 +17,7 @@
#include "nsIExternalProtocolHandler.h"
#include "nsNetUtil.h"
NS_IMPL_ISUPPORTS1(nsNoDataProtocolContentPolicy, nsIContentPolicy)
NS_IMPL_ISUPPORTS(nsNoDataProtocolContentPolicy, nsIContentPolicy)
NS_IMETHODIMP
nsNoDataProtocolContentPolicy::ShouldLoad(uint32_t aContentType,

View File

@ -165,7 +165,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNodeInfo)
NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsNodeInfo, LastRelease())
NS_INTERFACE_TABLE_HEAD(nsNodeInfo)
NS_INTERFACE_TABLE1(nsNodeInfo, nsINodeInfo)
NS_INTERFACE_TABLE(nsNodeInfo, nsINodeInfo)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsNodeInfo)
NS_INTERFACE_MAP_END

View File

@ -395,7 +395,7 @@ private:
nsCOMPtr<nsIObjectLoadingContent> mContent;
};
NS_IMPL_ISUPPORTS_INHERITED1(nsStopPluginRunnable, nsRunnable, nsITimerCallback)
NS_IMPL_ISUPPORTS_INHERITED(nsStopPluginRunnable, nsRunnable, nsITimerCallback)
NS_IMETHODIMP
nsStopPluginRunnable::Notify(nsITimer *aTimer)
@ -3514,5 +3514,5 @@ nsObjectLoadingContent::SetupProtoChainRunner::Run()
return NS_OK;
}
NS_IMPL_ISUPPORTS1(nsObjectLoadingContent::SetupProtoChainRunner, nsIRunnable)
NS_IMPL_ISUPPORTS(nsObjectLoadingContent::SetupProtoChainRunner, nsIRunnable)

View File

@ -112,7 +112,7 @@ nsPlainTextSerializer::~nsPlainTextSerializer()
NS_WARN_IF_FALSE(mHeadLevel == 0, "Wrong head level!");
}
NS_IMPL_ISUPPORTS1(nsPlainTextSerializer,
NS_IMPL_ISUPPORTS(nsPlainTextSerializer,
nsIContentSerializer)

View File

@ -217,7 +217,7 @@ nsReferencedElement::Observe(Element* aOldElement,
NS_IMPL_ISUPPORTS_INHERITED0(nsReferencedElement::ChangeNotification,
nsRunnable)
NS_IMPL_ISUPPORTS1(nsReferencedElement::DocumentLoadNotification,
NS_IMPL_ISUPPORTS(nsReferencedElement::DocumentLoadNotification,
nsIObserver)
NS_IMETHODIMP

View File

@ -177,7 +177,7 @@ nsScriptLoader::~nsScriptLoader()
}
}
NS_IMPL_ISUPPORTS1(nsScriptLoader, nsIStreamLoaderObserver)
NS_IMPL_ISUPPORTS(nsScriptLoader, nsIStreamLoaderObserver)
// Helper method for checking if the script element is an event-handler
// This means that it has both a for-attribute and a event-attribute.

View File

@ -85,7 +85,7 @@ nsForceXMLListener::~nsForceXMLListener()
{
}
NS_IMPL_ISUPPORTS2(nsForceXMLListener,
NS_IMPL_ISUPPORTS(nsForceXMLListener,
nsIStreamListener,
nsIRequestObserver)
@ -116,7 +116,7 @@ nsSyncLoader::~nsSyncLoader()
}
}
NS_IMPL_ISUPPORTS5(nsSyncLoader,
NS_IMPL_ISUPPORTS(nsSyncLoader,
nsIStreamListener,
nsIRequestObserver,
nsIChannelEventSink,

View File

@ -96,7 +96,7 @@ nsTextNode::~nsTextNode()
{
}
NS_IMPL_ISUPPORTS_INHERITED3(nsTextNode, nsGenericDOMDataNode, nsIDOMNode,
NS_IMPL_ISUPPORTS_INHERITED(nsTextNode, nsGenericDOMDataNode, nsIDOMNode,
nsIDOMText, nsIDOMCharacterData)
JSObject*
@ -222,7 +222,7 @@ NS_NewAttributeContent(nsNodeInfoManager *aNodeInfoManager,
return NS_OK;
}
NS_IMPL_ISUPPORTS_INHERITED1(nsAttributeTextNode, nsTextNode,
NS_IMPL_ISUPPORTS_INHERITED(nsAttributeTextNode, nsTextNode,
nsIMutationObserver)
nsresult

View File

@ -71,7 +71,7 @@ nsXMLContentSerializer::~nsXMLContentSerializer()
{
}
NS_IMPL_ISUPPORTS1(nsXMLContentSerializer, nsIContentSerializer)
NS_IMPL_ISUPPORTS(nsXMLContentSerializer, nsIContentSerializer)
NS_IMETHODIMP
nsXMLContentSerializer::Init(uint32_t aFlags, uint32_t aWrapColumn,

View File

@ -138,7 +138,7 @@ using namespace mozilla::dom;
return NS_OK; \
}
NS_IMPL_ISUPPORTS1(nsXHRParseEndListener, nsIDOMEventListener)
NS_IMPL_ISUPPORTS(nsXHRParseEndListener, nsIDOMEventListener)
class nsResumeTimeoutsEvent : public nsRunnable
{
@ -180,7 +180,7 @@ public:
virtual ~XMLHttpRequestAuthPrompt();
};
NS_IMPL_ISUPPORTS1(XMLHttpRequestAuthPrompt, nsIAuthPrompt)
NS_IMPL_ISUPPORTS(XMLHttpRequestAuthPrompt, nsIAuthPrompt)
XMLHttpRequestAuthPrompt::XMLHttpRequestAuthPrompt()
{
@ -3781,7 +3781,7 @@ nsXMLHttpRequest::EnsureXPCOMifier()
return newRef.forget();
}
NS_IMPL_ISUPPORTS1(nsXMLHttpRequest::nsHeaderVisitor, nsIHttpHeaderVisitor)
NS_IMPL_ISUPPORTS(nsXMLHttpRequest::nsHeaderVisitor, nsIHttpHeaderVisitor)
NS_IMETHODIMP nsXMLHttpRequest::
nsHeaderVisitor::VisitHeader(const nsACString &header, const nsACString &value)

View File

@ -187,7 +187,7 @@ CanvasImageCache::Lookup(Element* aImage,
return entry->mData->mSourceSurface;
}
NS_IMPL_ISUPPORTS1(CanvasImageCacheShutdownObserver, nsIObserver)
NS_IMPL_ISUPPORTS(CanvasImageCacheShutdownObserver, nsIObserver)
NS_IMETHODIMP
CanvasImageCacheShutdownObserver::Observe(nsISupports *aSubject,

View File

@ -158,7 +158,7 @@ public:
}
};
NS_IMPL_ISUPPORTS1(Canvas2dPixelsReporter, nsIMemoryReporter)
NS_IMPL_ISUPPORTS(Canvas2dPixelsReporter, nsIMemoryReporter)
class CanvasRadialGradient : public CanvasGradient
{

View File

@ -81,7 +81,7 @@ private:
bool mFailed;
};
NS_IMPL_ISUPPORTS1(EncodingCompleteEvent, nsIRunnable);
NS_IMPL_ISUPPORTS(EncodingCompleteEvent, nsIRunnable);
class EncodingRunnable : public nsRunnable
{
@ -175,7 +175,7 @@ private:
bool mUsingCustomOptions;
};
NS_IMPL_ISUPPORTS1(EncodingRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS(EncodingRunnable, nsIRunnable)
/* static */
nsresult

View File

@ -8,7 +8,7 @@
using namespace mozilla;
NS_IMPL_ISUPPORTS1(WebGLMemoryPressureObserver, nsIObserver)
NS_IMPL_ISUPPORTS(WebGLMemoryPressureObserver, nsIObserver)
NS_IMETHODIMP
WebGLMemoryTracker::CollectReports(nsIHandleReportCallback* aHandleReport,
@ -85,7 +85,7 @@ WebGLMemoryTracker::CollectReports(nsIHandleReportCallback* aHandleReport,
return NS_OK;
}
NS_IMPL_ISUPPORTS1(WebGLMemoryTracker, nsIMemoryReporter)
NS_IMPL_ISUPPORTS(WebGLMemoryTracker, nsIMemoryReporter)
StaticRefPtr<WebGLMemoryTracker> WebGLMemoryTracker::sUniqueInstance;

View File

@ -44,7 +44,7 @@ HTMLAnchorElement::~HTMLAnchorElement()
}
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLAnchorElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLAnchorElement,
NS_INTERFACE_TABLE_INHERITED(HTMLAnchorElement,
nsIDOMHTMLAnchorElement,
Link)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement)

View File

@ -28,7 +28,7 @@ HTMLAreaElement::~HTMLAreaElement()
}
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLAreaElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLAreaElement,
NS_INTERFACE_TABLE_INHERITED(HTMLAreaElement,
nsIDOMHTMLAreaElement,
Link)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement)

View File

@ -29,7 +29,7 @@ namespace dom {
extern bool IsAudioAPIEnabled();
NS_IMPL_ISUPPORTS_INHERITED2(HTMLAudioElement, HTMLMediaElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLAudioElement, HTMLMediaElement,
nsIDOMHTMLMediaElement, nsIDOMHTMLAudioElement)
NS_IMPL_ELEMENT_CLONE(HTMLAudioElement)

View File

@ -26,7 +26,7 @@ HTMLBRElement::~HTMLBRElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLBRElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLBRElement, nsGenericHTMLElement,
nsIDOMHTMLBRElement)
NS_IMPL_ELEMENT_CLONE(HTMLBRElement)

View File

@ -36,7 +36,7 @@ BodyRule::~BodyRule()
{
}
NS_IMPL_ISUPPORTS1(BodyRule, nsIStyleRule)
NS_IMPL_ISUPPORTS(BodyRule, nsIStyleRule)
/* virtual */ void
BodyRule::MapRuleInfoInto(nsRuleData* aData)
@ -194,7 +194,7 @@ HTMLBodyElement::WrapNode(JSContext *aCx)
return HTMLBodyElementBinding::Wrap(aCx, this);
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLBodyElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLBodyElement, nsGenericHTMLElement,
nsIDOMHTMLBodyElement)
NS_IMPL_ELEMENT_CLONE(HTMLBodyElement)

View File

@ -86,7 +86,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLButtonElement, Element)
// QueryInterface implementation for HTMLButtonElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLButtonElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLButtonElement,
NS_INTERFACE_TABLE_INHERITED(HTMLButtonElement,
nsIDOMHTMLButtonElement,
nsIConstraintValidation)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElementWithState)

View File

@ -131,7 +131,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLCanvasElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLCanvasElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLCanvasElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLCanvasElement, nsIDOMHTMLCanvasElement)
NS_INTERFACE_TABLE_INHERITED(HTMLCanvasElement, nsIDOMHTMLCanvasElement)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement)
NS_IMPL_ELEMENT_CLONE(HTMLCanvasElement)

View File

@ -245,7 +245,7 @@ HTMLContentElement::GetDistributedNodes()
NS_IMPL_CYCLE_COLLECTION(DistributedContentList, mParent, mDistributedNodes)
NS_INTERFACE_TABLE_HEAD(DistributedContentList)
NS_INTERFACE_TABLE1(DistributedContentList, nsINodeList)
NS_INTERFACE_TABLE(DistributedContentList, nsINodeList)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(DistributedContentList)
NS_INTERFACE_MAP_END

View File

@ -18,7 +18,7 @@ HTMLDivElement::~HTMLDivElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLDivElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLDivElement, nsGenericHTMLElement,
nsIDOMHTMLDivElement)
NS_IMPL_ELEMENT_CLONE(HTMLDivElement)

View File

@ -46,7 +46,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLFieldSetElement, Element)
// QueryInterface implementation for HTMLFieldSetElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLFieldSetElement,
NS_INTERFACE_TABLE_INHERITED(HTMLFieldSetElement,
nsIDOMHTMLFieldSetElement,
nsIConstraintValidation)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElement)

View File

@ -136,7 +136,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END
// XPConnect interface list for HTMLFormControlsCollection
NS_INTERFACE_TABLE_HEAD(HTMLFormControlsCollection)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE2(HTMLFormControlsCollection,
NS_INTERFACE_TABLE(HTMLFormControlsCollection,
nsIHTMLCollection,
nsIDOMHTMLCollection)
NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(HTMLFormControlsCollection)

View File

@ -177,7 +177,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLFormElement, Element)
// QueryInterface implementation for HTMLFormElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFormElement)
NS_INTERFACE_TABLE_INHERITED4(HTMLFormElement,
NS_INTERFACE_TABLE_INHERITED(HTMLFormElement,
nsIDOMHTMLFormElement,
nsIForm,
nsIWebProgressListener,

View File

@ -24,7 +24,7 @@ HTMLFrameElement::~HTMLFrameElement()
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLFrameElement, nsGenericHTMLFrameElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLFrameElement, nsGenericHTMLFrameElement,
nsIDOMHTMLFrameElement)
NS_IMPL_ELEMENT_CLONE(HTMLFrameElement)

View File

@ -23,7 +23,7 @@ HTMLFrameSetElement::WrapNode(JSContext *aCx)
return HTMLFrameSetElementBinding::Wrap(aCx, this);
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLFrameSetElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLFrameSetElement, nsGenericHTMLElement,
nsIDOMHTMLFrameSetElement)
NS_IMPL_ELEMENT_CLONE(HTMLFrameSetElement)

View File

@ -20,7 +20,7 @@ HTMLHRElement::~HTMLHRElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLHRElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLHRElement, nsGenericHTMLElement,
nsIDOMHTMLHRElement)
NS_IMPL_ELEMENT_CLONE(HTMLHRElement)

View File

@ -21,7 +21,7 @@ HTMLHeadingElement::~HTMLHeadingElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLHeadingElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLHeadingElement, nsGenericHTMLElement,
nsIDOMHTMLHeadingElement)
NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement)

View File

@ -27,7 +27,7 @@ HTMLIFrameElement::~HTMLIFrameElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLIFrameElement, nsGenericHTMLFrameElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLIFrameElement, nsGenericHTMLFrameElement,
nsIDOMHTMLIFrameElement)
NS_IMPL_ELEMENT_CLONE(HTMLIFrameElement)

View File

@ -66,7 +66,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLImageElement, Element)
// QueryInterface implementation for HTMLImageElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLImageElement)
NS_INTERFACE_TABLE_INHERITED4(HTMLImageElement,
NS_INTERFACE_TABLE_INHERITED(HTMLImageElement,
nsIDOMHTMLImageElement,
nsIImageLoadingContent,
imgIOnloadBlocker,

View File

@ -274,7 +274,7 @@ class HTMLInputElementState MOZ_FINAL : public nsISupports
NS_DEFINE_STATIC_IID_ACCESSOR(HTMLInputElementState, NS_INPUT_ELEMENT_STATE_IID)
NS_IMPL_ISUPPORTS1(HTMLInputElementState, HTMLInputElementState)
NS_IMPL_ISUPPORTS(HTMLInputElementState, HTMLInputElementState)
HTMLInputElement::nsFilePickerShownCallback::nsFilePickerShownCallback(
HTMLInputElement* aInput, nsIFilePicker* aFilePicker)
@ -283,7 +283,7 @@ HTMLInputElement::nsFilePickerShownCallback::nsFilePickerShownCallback(
{
}
NS_IMPL_ISUPPORTS1(UploadLastDir::ContentPrefCallback, nsIContentPrefCallback2)
NS_IMPL_ISUPPORTS(UploadLastDir::ContentPrefCallback, nsIContentPrefCallback2)
NS_IMETHODIMP
UploadLastDir::ContentPrefCallback::HandleCompletion(uint16_t aReason)
@ -478,7 +478,7 @@ private:
nsTArray<nsCOMPtr<nsISimpleEnumerator> > mDirEnumeratorStack;
};
NS_IMPL_ISUPPORTS1(DirPickerRecursiveFileEnumerator, nsISimpleEnumerator)
NS_IMPL_ISUPPORTS(DirPickerRecursiveFileEnumerator, nsISimpleEnumerator)
/**
* This may return nullptr if aDomFile's implementation of
@ -714,7 +714,7 @@ HTMLInputElement::nsFilePickerShownCallback::Done(int16_t aResult)
false);
}
NS_IMPL_ISUPPORTS1(HTMLInputElement::nsFilePickerShownCallback,
NS_IMPL_ISUPPORTS(HTMLInputElement::nsFilePickerShownCallback,
nsIFilePickerShownCallback)
class nsColorPickerShownCallback MOZ_FINAL
@ -814,7 +814,7 @@ nsColorPickerShownCallback::Done(const nsAString& aColor)
return rv;
}
NS_IMPL_ISUPPORTS1(nsColorPickerShownCallback, nsIColorPickerShownCallback)
NS_IMPL_ISUPPORTS(nsColorPickerShownCallback, nsIColorPickerShownCallback)
bool
HTMLInputElement::IsPopupBlocked() const
@ -989,7 +989,7 @@ HTMLInputElement::InitFilePicker(FilePickerType aType)
#define CPS_PREF_NAME NS_LITERAL_STRING("browser.upload.lastDir")
NS_IMPL_ISUPPORTS2(UploadLastDir, nsIObserver, nsISupportsWeakReference)
NS_IMPL_ISUPPORTS(UploadLastDir, nsIObserver, nsISupportsWeakReference)
void
HTMLInputElement::InitUploadLastDir() {
@ -1223,7 +1223,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLInputElement, Element)
// QueryInterface implementation for HTMLInputElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLInputElement)
NS_INTERFACE_TABLE_INHERITED9(HTMLInputElement,
NS_INTERFACE_TABLE_INHERITED(HTMLInputElement,
nsIDOMHTMLInputElement,
nsITextControlElement,
nsIPhonetic,

View File

@ -21,7 +21,7 @@ HTMLLIElement::~HTMLLIElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLLIElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLLIElement, nsGenericHTMLElement,
nsIDOMHTMLLIElement)
NS_IMPL_ELEMENT_CLONE(HTMLLIElement)

View File

@ -32,7 +32,7 @@ HTMLLabelElement::WrapNode(JSContext *aCx)
// nsISupports
NS_IMPL_ISUPPORTS_INHERITED1(HTMLLabelElement, nsGenericHTMLFormElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLLabelElement, nsGenericHTMLFormElement,
nsIDOMHTMLLabelElement)
// nsIDOMHTMLLabelElement

View File

@ -65,7 +65,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLLinkElement, Element)
// QueryInterface implementation for HTMLLinkElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement)
NS_INTERFACE_TABLE_INHERITED3(HTMLLinkElement,
NS_INTERFACE_TABLE_INHERITED(HTMLLinkElement,
nsIDOMHTMLLinkElement,
nsIStyleSheetLinkingElement,
Link)

View File

@ -33,7 +33,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLMapElement, Element)
// QueryInterface implementation for HTMLMapElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLMapElement)
NS_INTERFACE_TABLE_INHERITED1(HTMLMapElement, nsIDOMHTMLMapElement)
NS_INTERFACE_TABLE_INHERITED(HTMLMapElement, nsIDOMHTMLMapElement)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement)
NS_IMPL_ELEMENT_CLONE(HTMLMapElement)

View File

@ -262,7 +262,7 @@ private:
uint32_t mLoadID;
};
NS_IMPL_ISUPPORTS5(HTMLMediaElement::MediaLoadListener, nsIRequestObserver,
NS_IMPL_ISUPPORTS(HTMLMediaElement::MediaLoadListener, nsIRequestObserver,
nsIStreamListener, nsIChannelEventSink,
nsIInterfaceRequestor, nsIObserver)

View File

@ -54,7 +54,7 @@ HTMLMenuElement::~HTMLMenuElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED2(HTMLMenuElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLMenuElement, nsGenericHTMLElement,
nsIDOMHTMLMenuElement, nsIHTMLMenu)
NS_IMPL_ELEMENT_CLONE(HTMLMenuElement)

View File

@ -172,7 +172,7 @@ HTMLMenuItemElement::~HTMLMenuItemElement()
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLMenuItemElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLMenuItemElement, nsGenericHTMLElement,
nsIDOMHTMLMenuItemElement)
//NS_IMPL_ELEMENT_CLONE(HTMLMenuItemElement)

View File

@ -24,7 +24,7 @@ HTMLMetaElement::~HTMLMetaElement()
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLMetaElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLMetaElement, nsGenericHTMLElement,
nsIDOMHTMLMetaElement)
NS_IMPL_ELEMENT_CLONE(HTMLMetaElement)

View File

@ -80,7 +80,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLObjectElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLObjectElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement)
NS_INTERFACE_TABLE_INHERITED10(HTMLObjectElement,
NS_INTERFACE_TABLE_INHERITED(HTMLObjectElement,
nsIDOMHTMLObjectElement,
imgINotificationObserver,
nsIRequestObserver,

View File

@ -36,7 +36,7 @@ HTMLOptGroupElement::~HTMLOptGroupElement()
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLOptGroupElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLOptGroupElement, nsGenericHTMLElement,
nsIDOMHTMLOptGroupElement)
NS_IMPL_ELEMENT_CLONE(HTMLOptGroupElement)

View File

@ -51,7 +51,7 @@ HTMLOptionElement::~HTMLOptionElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED1(HTMLOptionElement, nsGenericHTMLElement,
NS_IMPL_ISUPPORTS_INHERITED(HTMLOptionElement, nsGenericHTMLElement,
nsIDOMHTMLOptionElement)
NS_IMPL_ELEMENT_CLONE(HTMLOptionElement)

View File

@ -96,7 +96,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(HTMLOptionsCollection, mElements)
// QueryInterface implementation for HTMLOptionsCollection
NS_INTERFACE_TABLE_HEAD(HTMLOptionsCollection)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_TABLE3(HTMLOptionsCollection,
NS_INTERFACE_TABLE(HTMLOptionsCollection,
nsIHTMLCollection,
nsIDOMHTMLOptionsCollection,
nsIDOMHTMLCollection)

View File

@ -49,7 +49,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLOutputElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLOutputElement, Element)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLOutputElement)
NS_INTERFACE_TABLE_INHERITED2(HTMLOutputElement,
NS_INTERFACE_TABLE_INHERITED(HTMLOutputElement,
nsIMutationObserver,
nsIConstraintValidation)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElement)

Some files were not shown because too many files have changed in this diff Show More