| author | Birunthan Mohanathas <birunthan@mohanathas.com> |
| Sun, 27 Apr 2014 03:06:00 -0400 | |
| changeset 180485 | 6c1c7e45c90289a0875b74f82f39e7ecf6a65af3 |
| parent 180484 | 2d59f550103f36528eb4664c9846cba2705a6481 |
| child 180486 | bb248db2c54c458c3e4e5f1cb9e3a1d8c3187f4f |
| push id | 1 |
| push user | root |
| push date | Mon, 20 Oct 2014 17:29:22 +0000 |
| reviewers | froydnj |
| bugs | 900908 |
| milestone | 31.0a1 |
--- a/accessible/src/base/DocManager.cpp +++ b/accessible/src/base/DocManager.cpp @@ -113,20 +113,20 @@ DocManager::Shutdown() progress->RemoveProgressListener(static_cast<nsIWebProgressListener*>(this)); ClearDocCache(); } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS3(DocManager, - nsIWebProgressListener, - nsIDOMEventListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(DocManager, + nsIWebProgressListener, + nsIDOMEventListener, + nsISupportsWeakReference) //////////////////////////////////////////////////////////////////////////////// // nsIWebProgressListener NS_IMETHODIMP DocManager::OnStateChange(nsIWebProgress* aWebProgress, nsIRequest* aRequest, uint32_t aStateFlags, nsresult aStatus)
--- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -147,22 +147,22 @@ nsAccessibilityService::~nsAccessibility { NS_ASSERTION(gIsShutdown, "Accessibility wasn't shutdown!"); gAccessibilityService = nullptr; } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED4(nsAccessibilityService, - DocManager, - nsIAccessibilityService, - nsIAccessibleRetrieval, - nsIObserver, - nsISelectionListener) // from SelectionManager +NS_IMPL_ISUPPORTS_INHERITED(nsAccessibilityService, + DocManager, + nsIAccessibilityService, + nsIAccessibleRetrieval, + nsIObserver, + nsISelectionListener) // from SelectionManager //////////////////////////////////////////////////////////////////////////////// // nsIObserver NS_IMETHODIMP nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) { @@ -251,17 +251,17 @@ public: sPluginTimers->RemoveElement(aTimer); return NS_OK; } private: nsCOMPtr<nsIContent> mContent; }; -NS_IMPL_ISUPPORTS1(PluginTimerCallBack, nsITimerCallback) +NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback) #endif already_AddRefed<Accessible> nsAccessibilityService::CreatePluginAccessible(nsObjectFrame* aFrame, nsIContent* aContent, Accessible* aContext) { // nsObjectFrame means a plugin, so we need to use the accessibility support
--- a/accessible/src/generic/ARIAGridAccessible.cpp +++ b/accessible/src/generic/ARIAGridAccessible.cpp @@ -30,19 +30,19 @@ ARIAGridAccessible:: ARIAGridAccessible(nsIContent* aContent, DocAccessible* aDoc) : AccessibleWrap(aContent, aDoc), xpcAccessibleTable(this) { } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridAccessible, - Accessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(ARIAGridAccessible, + Accessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // Accessible void ARIAGridAccessible::Shutdown() { mTable = nullptr; @@ -535,19 +535,19 @@ ARIAGridCellAccessible:: HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this) { mGenericTypes |= eTableCell; } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(ARIAGridCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // nsIAccessibleTableCell TableAccessible* ARIAGridCellAccessible::Table() const { Accessible* table = TableFor(Row());
--- a/accessible/src/generic/ApplicationAccessible.cpp +++ b/accessible/src/generic/ApplicationAccessible.cpp @@ -28,18 +28,18 @@ ApplicationAccessible::ApplicationAccess { mType = eApplicationType; mAppInfo = do_GetService("@mozilla.org/xre/app-info;1"); } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ApplicationAccessible, Accessible, - nsIAccessibleApplication) +NS_IMPL_ISUPPORTS_INHERITED(ApplicationAccessible, Accessible, + nsIAccessibleApplication) //////////////////////////////////////////////////////////////////////////////// // nsIAccessible NS_IMETHODIMP ApplicationAccessible::GetParent(nsIAccessible** aAccessible) { NS_ENSURE_ARG_POINTER(aAccessible);
--- a/accessible/src/generic/FormControlAccessible.cpp +++ b/accessible/src/generic/FormControlAccessible.cpp @@ -27,19 +27,19 @@ template class mozilla::a11y::ProgressMe template<int Max> NS_IMPL_ADDREF_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible) template<int Max> NS_IMPL_RELEASE_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible) template<int Max> -NS_IMPL_QUERY_INTERFACE_INHERITED1(ProgressMeterAccessible<Max>, - LeafAccessible, - nsIAccessibleValue) +NS_IMPL_QUERY_INTERFACE_INHERITED(ProgressMeterAccessible<Max>, + LeafAccessible, + nsIAccessibleValue) //////////////////////////////////////////////////////////////////////////////// // Accessible template<int Max> role ProgressMeterAccessible<Max>::NativeRole() {
--- a/accessible/src/generic/ImageAccessible.cpp +++ b/accessible/src/generic/ImageAccessible.cpp @@ -30,18 +30,18 @@ using namespace mozilla::a11y; ImageAccessible:: ImageAccessible(nsIContent* aContent, DocAccessible* aDoc) : LinkableAccessible(aContent, aDoc) { mType = eImageType; } -NS_IMPL_ISUPPORTS_INHERITED1(ImageAccessible, Accessible, - nsIAccessibleImage) +NS_IMPL_ISUPPORTS_INHERITED(ImageAccessible, Accessible, + nsIAccessibleImage) //////////////////////////////////////////////////////////////////////////////// // Accessible public uint64_t ImageAccessible::NativeState() { // The state is a bitfield, get our inherited state, then logically OR it with
--- a/accessible/src/generic/RootAccessible.cpp +++ b/accessible/src/generic/RootAccessible.cpp @@ -48,17 +48,17 @@ using namespace mozilla; using namespace mozilla::a11y; using namespace mozilla::dom; //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(RootAccessible, DocAccessible, nsIAccessibleDocument) +NS_IMPL_ISUPPORTS_INHERITED(RootAccessible, DocAccessible, nsIAccessibleDocument) //////////////////////////////////////////////////////////////////////////////// // Constructor/destructor RootAccessible:: RootAccessible(nsIDocument* aDocument, nsIContent* aRootContent, nsIPresShell* aPresShell) : DocAccessibleWrap(aDocument, aRootContent, aPresShell)
--- a/accessible/src/html/HTMLFormControlAccessible.cpp +++ b/accessible/src/html/HTMLFormControlAccessible.cpp @@ -287,20 +287,20 @@ HTMLButtonAccessible::IsWidget() const HTMLTextFieldAccessible:: HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) : HyperTextAccessibleWrap(aContent, aDoc) { mType = eHTMLTextFieldType; } -NS_IMPL_ISUPPORTS_INHERITED2(HTMLTextFieldAccessible, - Accessible, - nsIAccessibleText, - nsIAccessibleEditableText) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTextFieldAccessible, + Accessible, + nsIAccessibleText, + nsIAccessibleEditableText) role HTMLTextFieldAccessible::NativeRole() { if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type, nsGkAtoms::password, eIgnoreCase)) { return roles::PASSWORD_TEXT; }
--- a/accessible/src/html/HTMLLinkAccessible.cpp +++ b/accessible/src/html/HTMLLinkAccessible.cpp @@ -23,18 +23,18 @@ using namespace mozilla::a11y; HTMLLinkAccessible:: HTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) : HyperTextAccessibleWrap(aContent, aDoc) { } // Expose nsIAccessibleHyperLink unconditionally -NS_IMPL_ISUPPORTS_INHERITED1(HTMLLinkAccessible, HyperTextAccessibleWrap, - nsIAccessibleHyperLink) +NS_IMPL_ISUPPORTS_INHERITED(HTMLLinkAccessible, HyperTextAccessibleWrap, + nsIAccessibleHyperLink) //////////////////////////////////////////////////////////////////////////////// // nsIAccessible role HTMLLinkAccessible::NativeRole() { return roles::LINK;
--- a/accessible/src/html/HTMLTableAccessible.cpp +++ b/accessible/src/html/HTMLTableAccessible.cpp @@ -49,19 +49,19 @@ HTMLTableCellAccessible:: HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this) { mGenericTypes |= eTableCell; } //////////////////////////////////////////////////////////////////////////////// // HTMLTableCellAccessible: nsISupports implementation -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // HTMLTableCellAccessible: Accessible implementation void HTMLTableCellAccessible::Shutdown() { mTableCell = nullptr; @@ -355,18 +355,18 @@ HTMLTableRowAccessible::NativeRole() { return roles::ROW; } //////////////////////////////////////////////////////////////////////////////// // HTMLTableAccessible //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableAccessible, Accessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableAccessible, Accessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // HTMLTableAccessible: Accessible void HTMLTableAccessible::Shutdown() { mTable = nullptr;
--- a/accessible/src/xpcom/nsAccessibleRelation.cpp +++ b/accessible/src/xpcom/nsAccessibleRelation.cpp @@ -19,17 +19,17 @@ nsAccessibleRelation::nsAccessibleRelati { mTargets = do_CreateInstance(NS_ARRAY_CONTRACTID); nsIAccessible* targetAcc = nullptr; while ((targetAcc = aRel->Next())) mTargets->AppendElement(targetAcc, false); } // nsISupports -NS_IMPL_ISUPPORTS1(nsAccessibleRelation, nsIAccessibleRelation) +NS_IMPL_ISUPPORTS(nsAccessibleRelation, nsIAccessibleRelation) // nsIAccessibleRelation NS_IMETHODIMP nsAccessibleRelation::GetRelationType(uint32_t *aType) { NS_ENSURE_ARG_POINTER(aType); *aType = mType; return NS_OK;
--- a/accessible/src/xul/XULElementAccessibles.cpp +++ b/accessible/src/xul/XULElementAccessibles.cpp @@ -180,18 +180,18 @@ XULTooltipAccessible::NativeRole() XULLinkAccessible:: XULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) : XULLabelAccessible(aContent, aDoc) { } // Expose nsIAccessibleHyperLink unconditionally -NS_IMPL_ISUPPORTS_INHERITED1(XULLinkAccessible, XULLabelAccessible, - nsIAccessibleHyperLink) +NS_IMPL_ISUPPORTS_INHERITED(XULLinkAccessible, XULLabelAccessible, + nsIAccessibleHyperLink) //////////////////////////////////////////////////////////////////////////////// // XULLinkAccessible. nsIAccessible void XULLinkAccessible::Value(nsString& aValue) { aValue.Truncate();
--- a/accessible/src/xul/XULListboxAccessible.cpp +++ b/accessible/src/xul/XULListboxAccessible.cpp @@ -734,19 +734,19 @@ XULListCellAccessible:: HyperTextAccessibleWrap(aContent, aDoc), xpcAccessibleTableCell(this) { mGenericTypes |= eTableCell; } //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(XULListCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(XULListCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // XULListCellAccessible: nsIAccessibleTableCell implementation TableAccessible* XULListCellAccessible::Table() const { Accessible* thisRow = Parent();
--- a/accessible/src/xul/XULTreeAccessible.cpp +++ b/accessible/src/xul/XULTreeAccessible.cpp @@ -705,18 +705,18 @@ XULTreeItemAccessibleBase:: //////////////////////////////////////////////////////////////////////////////// // XULTreeItemAccessibleBase: nsISupports implementation NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase, Accessible, mTree) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase) - NS_INTERFACE_TABLE_INHERITED1(XULTreeItemAccessibleBase, - XULTreeItemAccessibleBase) + NS_INTERFACE_TABLE_INHERITED(XULTreeItemAccessibleBase, + XULTreeItemAccessibleBase) NS_INTERFACE_TABLE_TAIL_INHERITING(Accessible) NS_IMPL_ADDREF_INHERITED(XULTreeItemAccessibleBase, Accessible) NS_IMPL_RELEASE_INHERITED(XULTreeItemAccessibleBase, Accessible) //////////////////////////////////////////////////////////////////////////////// // XULTreeItemAccessibleBase: nsIAccessible implementation Accessible*
--- a/accessible/src/xul/XULTreeGridAccessible.cpp +++ b/accessible/src/xul/XULTreeGridAccessible.cpp @@ -20,19 +20,19 @@ #include "nsITreeSelection.h" #include "nsComponentManagerUtils.h" using namespace mozilla::a11y; //////////////////////////////////////////////////////////////////////////////// // XULTreeGridAccessible: nsISupports implementation -NS_IMPL_ISUPPORTS_INHERITED1(XULTreeGridAccessible, - XULTreeAccessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(XULTreeGridAccessible, + XULTreeAccessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // XULTreeGridAccessible: nsIAccessibleTable implementation uint32_t XULTreeGridAccessible::ColCount() { return nsCoreUtils::GetSensibleColumnCount(mTree); @@ -452,19 +452,19 @@ XULTreeGridCellAccessible:: //////////////////////////////////////////////////////////////////////////////// // XULTreeGridCellAccessible: nsISupports implementation NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible, LeafAccessible, mTree, mColumn) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible) - NS_INTERFACE_TABLE_INHERITED2(XULTreeGridCellAccessible, - nsIAccessibleTableCell, - XULTreeGridCellAccessible) + NS_INTERFACE_TABLE_INHERITED(XULTreeGridCellAccessible, + nsIAccessibleTableCell, + XULTreeGridCellAccessible) NS_INTERFACE_TABLE_TAIL_INHERITING(LeafAccessible) NS_IMPL_ADDREF_INHERITED(XULTreeGridCellAccessible, LeafAccessible) NS_IMPL_RELEASE_INHERITED(XULTreeGridCellAccessible, LeafAccessible) //////////////////////////////////////////////////////////////////////////////// // XULTreeGridCellAccessible: nsIAccessible implementation void
--- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -8,17 +8,17 @@ #include "AboutRedirector.h" #include "nsNetUtil.h" #include "nsIScriptSecurityManager.h" #include "mozilla/ArrayUtils.h" namespace mozilla { namespace browser { -NS_IMPL_ISUPPORTS1(AboutRedirector, nsIAboutModule) +NS_IMPL_ISUPPORTS(AboutRedirector, nsIAboutModule) struct RedirEntry { const char* id; const char* url; uint32_t flags; }; /*
--- a/browser/components/dirprovider/DirectoryProvider.cpp +++ b/browser/components/dirprovider/DirectoryProvider.cpp @@ -22,19 +22,19 @@ #include "nsServiceManagerUtils.h" #include "nsStringAPI.h" #include "nsXULAppAPI.h" #include "nsIPrefLocalizedString.h" namespace mozilla { namespace browser { -NS_IMPL_ISUPPORTS2(DirectoryProvider, - nsIDirectoryServiceProvider, - nsIDirectoryServiceProvider2) +NS_IMPL_ISUPPORTS(DirectoryProvider, + nsIDirectoryServiceProvider, + nsIDirectoryServiceProvider2) NS_IMETHODIMP DirectoryProvider::GetFile(const char *aKey, bool *aPersist, nsIFile* *aResult) { nsresult rv; *aResult = nullptr; @@ -249,17 +249,17 @@ DirectoryProvider::GetFiles(const char * return NS_ERROR_OUT_OF_MEMORY; return NS_NewUnionEnumerator(aResult, extEnum, baseEnum); } return NS_ERROR_FAILURE; } -NS_IMPL_ISUPPORTS1(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator) NS_IMETHODIMP DirectoryProvider::AppendingEnumerator::HasMoreElements(bool *aResult) { *aResult = mNext ? true : false; return NS_OK; }
--- a/browser/components/feeds/src/nsFeedSniffer.cpp +++ b/browser/components/feeds/src/nsFeedSniffer.cpp @@ -34,20 +34,20 @@ #define TYPE_RSS "application/rss+xml" #define TYPE_MAYBE_FEED "application/vnd.mozilla.maybe.feed" #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define NS_RSS "http://purl.org/rss/1.0/" #define MAX_BYTES 512u -NS_IMPL_ISUPPORTS3(nsFeedSniffer, - nsIContentSniffer, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsFeedSniffer, + nsIContentSniffer, + nsIStreamListener, + nsIRequestObserver) nsresult nsFeedSniffer::ConvertEncodedData(nsIRequest* request, const uint8_t* data, uint32_t length) { nsresult rv = NS_OK;
--- a/browser/components/migration/src/nsIEHistoryEnumerator.cpp +++ b/browser/components/migration/src/nsIEHistoryEnumerator.cpp @@ -36,17 +36,17 @@ namespace { return PR_ImplodeTime(&prt); } } // Anonymous namespace. //////////////////////////////////////////////////////////////////////////////// //// nsIEHistoryEnumerator -NS_IMPL_ISUPPORTS1(nsIEHistoryEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsIEHistoryEnumerator, nsISimpleEnumerator) nsIEHistoryEnumerator::nsIEHistoryEnumerator() { ::CoInitialize(nullptr); } nsIEHistoryEnumerator::~nsIEHistoryEnumerator() {
--- a/browser/components/shell/src/nsGNOMEShellService.cpp +++ b/browser/components/shell/src/nsGNOMEShellService.cpp @@ -111,17 +111,17 @@ nsGNOMEShellService::Init() nsCOMPtr<nsIFile> appPath; rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), getter_AddRefs(appPath)); NS_ENSURE_SUCCESS(rv, rv); return appPath->GetNativePath(mAppPath); } -NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) +NS_IMPL_ISUPPORTS(nsGNOMEShellService, nsIShellService) bool nsGNOMEShellService::GetAppPathFromLauncher() { gchar *tmp; const char *launcher = PR_GetEnv("MOZ_APP_LAUNCHER"); if (!launcher)
--- a/browser/components/shell/src/nsMacShellService.cpp +++ b/browser/components/shell/src/nsMacShellService.cpp @@ -26,17 +26,17 @@ #include <CoreFoundation/CoreFoundation.h> #include <ApplicationServices/ApplicationServices.h> #define NETWORK_PREFPANE NS_LITERAL_CSTRING("/System/Library/PreferencePanes/Network.prefPane") #define DESKTOP_PREFPANE NS_LITERAL_CSTRING("/System/Library/PreferencePanes/DesktopScreenEffectsPref.prefPane") #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, bool aForAllTypes, bool* aIsDefaultBrowser) { *aIsDefaultBrowser = false;
--- a/browser/components/shell/src/nsWindowsShellService.cpp +++ b/browser/components/shell/src/nsWindowsShellService.cpp @@ -55,17 +55,17 @@ (val != ERROR_SUCCESS) #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1" 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) { const nsString &flatName = PromiseFlatString(aKeyName); DWORD res = ::RegOpenKeyExW(aKeyRoot, flatName.get(), 0, KEY_READ, aKey); switch (res) {
--- a/caps/src/DomainPolicy.cpp +++ b/caps/src/DomainPolicy.cpp @@ -4,17 +4,17 @@ * 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 "DomainPolicy.h" #include "nsScriptSecurityManager.h" namespace mozilla { -NS_IMPL_ISUPPORTS1(DomainPolicy, nsIDomainPolicy) +NS_IMPL_ISUPPORTS(DomainPolicy, nsIDomainPolicy) DomainPolicy::DomainPolicy() : mBlacklist(new DomainSet()) , mSuperBlacklist(new DomainSet()) , mWhitelist(new DomainSet()) , mSuperWhitelist(new DomainSet()) {} DomainPolicy::~DomainPolicy() @@ -87,17 +87,17 @@ GetCanonicalClone(nsIURI* aURI) NS_ENSURE_SUCCESS(rv, nullptr); rv = clone->SetUserPass(EmptyCString()); NS_ENSURE_SUCCESS(rv, nullptr); rv = clone->SetPath(EmptyCString()); NS_ENSURE_SUCCESS(rv, nullptr); return clone.forget(); } -NS_IMPL_ISUPPORTS1(DomainSet, nsIDomainSet) +NS_IMPL_ISUPPORTS(DomainSet, nsIDomainSet) NS_IMETHODIMP DomainSet::Add(nsIURI* aDomain) { nsCOMPtr<nsIURI> clone = GetCanonicalClone(aDomain); NS_ENSURE_TRUE(clone, NS_ERROR_FAILURE); mHashTable.PutEntry(clone); return NS_OK;
--- a/caps/src/nsNullPrincipal.cpp +++ b/caps/src/nsNullPrincipal.cpp @@ -24,22 +24,22 @@ #include "nsPrincipal.h" #include "nsScriptSecurityManager.h" #include "pratom.h" 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_GETTER(nsNullPrincipal, nsIPrincipal, nsISerializable) -NS_IMPL_CI_INTERFACE_GETTER2(nsNullPrincipal, - nsIPrincipal, - nsISerializable) NS_IMETHODIMP_(MozExternalRefCountType) nsNullPrincipal::AddRef() { NS_PRECONDITION(int32_t(refcount) >= 0, "illegal refcnt"); nsrefcnt count = ++refcount; NS_LOG_ADDREF(this, count, "nsNullPrincipal", sizeof(*this)); return count;
--- a/caps/src/nsPrincipal.cpp +++ b/caps/src/nsPrincipal.cpp @@ -111,22 +111,22 @@ void nsPrincipal::dumpImpl() nsAutoCString str; GetScriptLocation(str); fprintf(stderr, "nsPrincipal (%p) = %s\n", static_cast<void*>(this), str.get()); } #endif 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_GETTER(nsPrincipal, nsIPrincipal, nsISerializable) -NS_IMPL_CI_INTERFACE_GETTER2(nsPrincipal, - nsIPrincipal, - nsISerializable) NS_IMPL_ADDREF_INHERITED(nsPrincipal, nsBasePrincipal) NS_IMPL_RELEASE_INHERITED(nsPrincipal, nsBasePrincipal) nsPrincipal::nsPrincipal() : mAppId(nsIScriptSecurityManager::UNKNOWN_APP_ID) , mInMozBrowser(false) , mCodebaseImmutable(false) , mDomainImmutable(false) @@ -622,20 +622,20 @@ nsPrincipal::GetAppStatus() } /************************************************************************************************************************/ 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, - nsIPrincipal, - nsIExpandedPrincipal) -NS_IMPL_CI_INTERFACE_GETTER2(nsExpandedPrincipal, +NS_IMPL_QUERY_INTERFACE_CI(nsExpandedPrincipal, + nsIPrincipal, + nsIExpandedPrincipal) +NS_IMPL_CI_INTERFACE_GETTER(nsExpandedPrincipal, nsIPrincipal, nsIExpandedPrincipal) NS_IMPL_ADDREF_INHERITED(nsExpandedPrincipal, nsBasePrincipal) NS_IMPL_RELEASE_INHERITED(nsExpandedPrincipal, nsBasePrincipal) nsExpandedPrincipal::nsExpandedPrincipal(nsTArray<nsCOMPtr <nsIPrincipal> > &aWhiteList) { mPrincipals.AppendElements(aWhiteList);
--- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -334,21 +334,21 @@ nsScriptSecurityManager::GetCxSubjectPri ///////////////////////////// // nsScriptSecurityManager // ///////////////////////////// //////////////////////////////////// // Methods implementing ISupports // //////////////////////////////////// -NS_IMPL_ISUPPORTS4(nsScriptSecurityManager, - nsIScriptSecurityManager, - nsIXPCSecurityManager, - nsIChannelEventSink, - nsIObserver) +NS_IMPL_ISUPPORTS(nsScriptSecurityManager, + nsIScriptSecurityManager, + nsIXPCSecurityManager, + nsIChannelEventSink, + nsIObserver) /////////////////////////////////////////////////// // Methods implementing nsIScriptSecurityManager // /////////////////////////////////////////////////// ///////////////// Security Checks ///////////////// bool
--- a/caps/src/nsSecurityManagerFactory.cpp +++ b/caps/src/nsSecurityManagerFactory.cpp @@ -39,17 +39,17 @@ using namespace mozilla; nsSecurityNameSet::nsSecurityNameSet() { } nsSecurityNameSet::~nsSecurityNameSet() { } -NS_IMPL_ISUPPORTS1(nsSecurityNameSet, nsIScriptExternalNameSet) +NS_IMPL_ISUPPORTS(nsSecurityNameSet, nsIScriptExternalNameSet) static bool netscape_security_enablePrivilege(JSContext *cx, unsigned argc, JS::Value *vp) { Telemetry::Accumulate(Telemetry::ENABLE_PRIVILEGE_EVER_CALLED, true); return xpc::EnableUniversalXPConnect(cx); }
--- a/caps/src/nsSystemPrincipal.cpp +++ b/caps/src/nsSystemPrincipal.cpp @@ -17,22 +17,22 @@ #include "nsString.h" #include "nsIClassInfoImpl.h" #include "nsIScriptSecurityManager.h" #include "pratom.h" 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_GETTER(nsSystemPrincipal, nsIPrincipal, nsISerializable) -NS_IMPL_CI_INTERFACE_GETTER2(nsSystemPrincipal,