Bug 1293117 (part 4) - Change many NS_IMETHODIMP occurrences to NS_IM…

…ETHOD. r=froydnj. This patch makes the following changes on many in-class methods. - NS_IMETHODIMP F() override; --> NS_IMETHOD F() override; - NS_IMETHODIMP F() override {...} --> NS_IMETHOD F() override {...} - NS_IMETHODIMP F() final; --> NS_IMETHOD F() final; - NS_IMETHODIMP F() final {...} --> NS_IMETHOD F() final {...} Using NS_IMETHOD is the preferred way of marking in-class virtual methods. Although these transformations add an explicit |virtual|, they are safe -- there's an implicit |virtual| anyway because |override| and |final| only work with virtual methods.
iaxat · Aug 8, 2016 · 990f482 · 990f482
1 parent e27511f
commit 990f482
Show file tree

Hide file tree

Showing 73 changed files with 238 additions and 238 deletions.
diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp
@@ -410,7 +410,7 @@ class PluginTimerCallBack final : public nsITimerCallback
 
   NS_DECL_ISUPPORTS
 
-  NS_IMETHODIMP Notify(nsITimer* aTimer) final
+  NS_IMETHOD Notify(nsITimer* aTimer) final
   {
     if (!mContent->IsInUncomposedDoc())
       return NS_OK;

diff --git a/caps/nsPrincipal.h b/caps/nsPrincipal.h
@@ -71,8 +71,8 @@ class nsExpandedPrincipal : public nsIExpandedPrincipal, public mozilla::BasePri
 
   NS_DECL_NSIEXPANDEDPRINCIPAL
   NS_DECL_NSISERIALIZABLE
-  NS_IMETHODIMP_(MozExternalRefCountType) AddRef() override { return nsJSPrincipals::AddRef(); };
-  NS_IMETHODIMP_(MozExternalRefCountType) Release() override { return nsJSPrincipals::Release(); };
+  NS_IMETHOD_(MozExternalRefCountType) AddRef() override { return nsJSPrincipals::AddRef(); };
+  NS_IMETHOD_(MozExternalRefCountType) Release() override { return nsJSPrincipals::Release(); };
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
   NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
   NS_IMETHOD GetURI(nsIURI** aURI) override;

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
@@ -9503,7 +9503,7 @@ class nsCopyFaviconCallback final : public nsIFaviconDataCallback
   {
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   OnComplete(nsIURI* aFaviconURI, uint32_t aDataLen,
              const uint8_t* aData, const nsACString& aMimeType) override
   {

diff --git a/dom/base/ImageEncoder.cpp b/dom/base/ImageEncoder.cpp
@@ -496,7 +496,7 @@ class EncoderThreadPoolTerminator final : public nsIObserver
   public:
     NS_DECL_ISUPPORTS
 
-    NS_IMETHODIMP Observe(nsISupports *, const char *topic, const char16_t *) override
+    NS_IMETHOD Observe(nsISupports *, const char *topic, const char16_t *) override
     {
       NS_ASSERTION(!strcmp(topic, "xpcom-shutdown-threads"),
                    "Unexpected topic");

diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
@@ -1535,7 +1535,7 @@ class nsFrameLoaderDestroyRunnable : public Runnable
   explicit nsFrameLoaderDestroyRunnable(nsFrameLoader* aFrameLoader)
    : mFrameLoader(aFrameLoader), mPhase(eDestroyDocShell) {}
 
-  NS_IMETHODIMP Run() override;
+  NS_IMETHOD Run() override;
 };
 
 void

diff --git a/dom/base/nsFrameMessageManager.h b/dom/base/nsFrameMessageManager.h
@@ -425,9 +425,9 @@ class nsScriptCacheCleaner final : public nsIObserver
     }
   }
 
-  NS_IMETHODIMP Observe(nsISupports *aSubject,
-                        const char *aTopic,
-                        const char16_t *aData) override
+  NS_IMETHOD Observe(nsISupports *aSubject,
+                     const char *aTopic,
+                     const char16_t *aData) override
   {
     if (strcmp("message-manager-flush-caches", aTopic) == 0) {
       nsMessageManagerScriptExecutor::PurgeCache();

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
@@ -480,7 +480,7 @@ class nsGlobalWindowObserver final : public nsIObserver,
     return mWindow->Observe(aSubject, aTopic, aData);
   }
   void Forget() { mWindow = nullptr; }
-  NS_IMETHODIMP GetInterface(const nsIID& aIID, void** aResult) override
+  NS_IMETHOD GetInterface(const nsIID& aIID, void** aResult) override
   {
     if (mWindow && aIID.Equals(NS_GET_IID(nsIDOMWindow)) && mWindow) {
       return mWindow->QueryInterface(aIID, aResult);

diff --git a/dom/broadcastchannel/BroadcastChannel.cpp b/dom/broadcastchannel/BroadcastChannel.cpp
@@ -149,7 +149,7 @@ class BCPostMessageRunnable final : public nsIRunnable,
     MOZ_ASSERT(mActor);
   }
 
-  NS_IMETHODIMP Run() override
+  NS_IMETHOD Run() override
   {
     MOZ_ASSERT(mActor);
     if (mActor->IsActorDestroyed()) {
@@ -211,7 +211,7 @@ class CloseRunnable final : public nsIRunnable,
     MOZ_ASSERT(mBC);
   }
 
-  NS_IMETHODIMP Run() override
+  NS_IMETHOD Run() override
   {
     mBC->Shutdown();
     return NS_OK;
@@ -243,7 +243,7 @@ class TeardownRunnable final : public nsIRunnable,
     MOZ_ASSERT(mActor);
   }
 
-  NS_IMETHODIMP Run() override
+  NS_IMETHOD Run() override
   {
     MOZ_ASSERT(mActor);
     if (!mActor->IsActorDestroyed()) {

diff --git a/dom/browser-element/BrowserElementAudioChannel.cpp b/dom/browser-element/BrowserElementAudioChannel.cpp
@@ -181,7 +181,7 @@ class BaseRunnable : public Runnable
     , mAudioChannel(aAudioChannel)
   {}
 
-  NS_IMETHODIMP Run() override
+  NS_IMETHOD Run() override
   {
     RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
     if (!service) {

diff --git a/dom/camera/DOMCameraCapabilities.cpp b/dom/camera/DOMCameraCapabilities.cpp
@@ -31,7 +31,7 @@ class CameraClosedMessage : public Runnable
     DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   Run() override
   {
     MOZ_ASSERT(NS_IsMainThread());

diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp
@@ -978,7 +978,7 @@ nsGonkCameraControl::SetThumbnailSize(const Size& aSize)
     }
     ~SetThumbnailSize() { MOZ_COUNT_DTOR(SetThumbnailSize); }
 
-    NS_IMETHODIMP
+    NS_IMETHOD
     Run() override
     {
       nsresult rv = mCameraControl->SetThumbnailSizeImpl(mSize);
@@ -1096,7 +1096,7 @@ nsGonkCameraControl::SetPictureSize(const Size& aSize)
     }
     ~SetPictureSize() { MOZ_COUNT_DTOR(SetPictureSize); }
 
-    NS_IMETHODIMP
+    NS_IMETHOD
     Run() override
     {
       nsresult rv = mCameraControl->SetPictureSizeImpl(mSize);
@@ -1480,7 +1480,7 @@ nsGonkCameraControl::OnAutoFocusComplete(bool aSuccess, bool aExpired)
       , mExpired(aExpired)
     { }
 
-    NS_IMETHODIMP
+    NS_IMETHOD
     Run() override
     {
       mCameraControl->OnAutoFocusComplete(mSuccess, mExpired);
@@ -2264,7 +2264,7 @@ nsGonkCameraControl::CreatePoster(Image* aImage, uint32_t aWidth, uint32_t aHeig
       mTarget->OnPoster(mDst, mDstLength);
     }
 
-    NS_IMETHODIMP Run() override
+    NS_IMETHOD Run() override
     {
 #ifdef MOZ_WIDGET_GONK
       // NV21 (yuv420sp) is 12 bits / pixel

diff --git a/dom/canvas/CanvasImageCache.cpp b/dom/canvas/CanvasImageCache.cpp
@@ -204,9 +204,9 @@ class ImageCacheObserver final : public nsIObserver
     mImageCache = nullptr;
   }
 
-  NS_IMETHODIMP Observe(nsISupports* aSubject,
-                        const char* aTopic,
-                        const char16_t* aSomeData) override
+  NS_IMETHOD Observe(nsISupports* aSubject,
+                     const char* aTopic,
+                     const char16_t* aSomeData) override
   {
     if (!mImageCache || strcmp(aTopic, "memory-pressure")) {
       return NS_OK;

diff --git a/dom/crypto/WebCryptoThreadPool.h b/dom/crypto/WebCryptoThreadPool.h
@@ -40,9 +40,9 @@ class WebCryptoThreadPool final : nsIObserver {
   void
   Shutdown();
 
-  NS_IMETHODIMP Observe(nsISupports* aSubject,
-                        const char* aTopic,
-                        const char16_t* aData) override;
+  NS_IMETHOD Observe(nsISupports* aSubject,
+                     const char* aTopic,
+                     const char16_t* aData) override;
 
   mozilla::Mutex mMutex;
   nsCOMPtr<nsIThreadPool> mPool;

diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
@@ -2486,7 +2486,7 @@ class DeviceStoragePermissionCheck final
     return Resolve(true);
   }
 
-  NS_IMETHODIMP GetTypes(nsIArray** aTypes) override
+  NS_IMETHOD GetTypes(nsIArray** aTypes) override
   {
     nsString storageType;
     mRequest->GetStorageType(storageType);

diff --git a/dom/html/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h
@@ -73,7 +73,7 @@ class nsGenericHTMLElement : public nsGenericHTMLElementBase,
   {
     GetHTMLAttr(nsGkAtoms::title, aTitle);
   }
-  NS_IMETHODIMP SetTitle(const nsAString& aTitle) override
+  NS_IMETHOD SetTitle(const nsAString& aTitle) override
   {
     SetHTMLAttr(nsGkAtoms::title, aTitle);
     return NS_OK;
@@ -82,7 +82,7 @@ class nsGenericHTMLElement : public nsGenericHTMLElementBase,
   {
     GetHTMLAttr(nsGkAtoms::lang, aLang);
   }
-  NS_IMETHODIMP SetLang(const nsAString& aLang) override
+  NS_IMETHOD SetLang(const nsAString& aLang) override
   {
     SetHTMLAttr(nsGkAtoms::lang, aLang);
     return NS_OK;

diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
@@ -1419,9 +1419,9 @@ class SynthesizedEventObserver : public nsIObserver
     MOZ_ASSERT(mTabParent);
   }
 
-  NS_IMETHODIMP Observe(nsISupports* aSubject,
-                        const char* aTopic,
-                        const char16_t* aData) override
+  NS_IMETHOD Observe(nsISupports* aSubject,
+                     const char* aTopic,
+                     const char16_t* aData) override
   {
     if (!mTabParent) {
       // We already sent the notification

diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
@@ -898,7 +898,7 @@ class MediaRecorder::Session: public nsIObserver,
     mMediaStreamTracks.Clear();
   }
 
-  NS_IMETHODIMP Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) override
+  NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) override
   {
     MOZ_ASSERT(NS_IsMainThread());
     LOG(LogLevel::Debug, ("Session.Observe XPCOM_SHUTDOWN %p", this));

diff --git a/dom/media/webaudio/AudioBufferSourceNode.cpp b/dom/media/webaudio/AudioBufferSourceNode.cpp
@@ -781,7 +781,7 @@ AudioBufferSourceNode::NotifyMainThreadStreamFinished()
   public:
     explicit EndedEventDispatcher(AudioBufferSourceNode* aNode)
       : mNode(aNode) {}
-    NS_IMETHODIMP Run() override
+    NS_IMETHOD Run() override
     {
       // If it's not safe to run scripts right now, schedule this to run later
       if (!nsContentUtils::IsSafeToRunScript()) {

diff --git a/dom/media/webaudio/AudioNode.cpp b/dom/media/webaudio/AudioNode.cpp
@@ -308,7 +308,7 @@ AudioNode::DisconnectFromOutputIfConnected(AudioNode& aDestination, uint32_t aOu
     explicit RunnableRelease(already_AddRefed<AudioNode> aNode)
       : mNode(aNode) {}
 
-    NS_IMETHODIMP Run() override
+    NS_IMETHOD Run() override
     {
       mNode = nullptr;
       return NS_OK;

diff --git a/dom/notification/DesktopNotification.h b/dom/notification/DesktopNotification.h
@@ -151,7 +151,7 @@ class AlertServiceObserver: public nsIObserver
 
   void Disconnect() { mNotification = nullptr; }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   Observe(nsISupports* aSubject,
           const char* aTopic,
           const char16_t* aData) override

diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -1344,7 +1344,7 @@ class ChannelRedirectProxyCallback : public nsIAsyncVerifyRedirectCallback
 
   NS_DECL_ISUPPORTS
 
-  NS_IMETHODIMP OnRedirectVerifyCallback(nsresult aResult) override
+  NS_IMETHOD OnRedirectVerifyCallback(nsresult aResult) override
   {
     if (NS_SUCCEEDED(aResult)) {
       nsCOMPtr<nsIStreamListener> listener = do_QueryReferent(mWeakListener);

diff --git a/dom/storage/DOMStorageCache.cpp b/dom/storage/DOMStorageCache.cpp
@@ -254,7 +254,7 @@ class DOMStorageCacheHolder : public nsITimerCallback
 
   NS_DECL_ISUPPORTS
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   Notify(nsITimer* aTimer) override
   {
     mCache = nullptr;

diff --git a/dom/svg/SVGFEImageElement.h b/dom/svg/SVGFEImageElement.h
@@ -62,7 +62,7 @@ class SVGFEImageElement final : public SVGFEImageElementBase,
   virtual void UnbindFromTree(bool aDeep, bool aNullParent) override;
   virtual EventStates IntrinsicState() const override;
 
-  NS_IMETHODIMP Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData) override;
+  NS_IMETHOD Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData) override;
 
   void MaybeLoadSVGImage();
 

diff --git a/dom/system/gonk/mozstumbler/WriteStumbleOnThread.cpp b/dom/system/gonk/mozstumbler/WriteStumbleOnThread.cpp
@@ -30,7 +30,7 @@ class DeleteRunnable : public Runnable
   public:
     DeleteRunnable() {}
 
-    NS_IMETHODIMP
+    NS_IMETHOD
     Run() override
     {
       nsCOMPtr<nsIFile> tmpFile;

diff --git a/dom/system/gonk/mozstumbler/WriteStumbleOnThread.h b/dom/system/gonk/mozstumbler/WriteStumbleOnThread.h
@@ -42,7 +42,7 @@ class WriteStumbleOnThread : public mozilla::Runnable
   : mDesc(aDesc)
   {}
 
-  NS_IMETHODIMP Run() override;
+  NS_IMETHOD Run() override;
 
   static void UploadEnded(bool deleteUploadFile);
 

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
@@ -201,7 +201,7 @@ class TeardownRunnable final : public Runnable
     MOZ_ASSERT(mActor);
   }
 
-  NS_IMETHODIMP Run() override
+  NS_IMETHOD Run() override
   {
     MOZ_ASSERT(mActor);
     mActor->SendShutdown();

diff --git a/dom/workers/ServiceWorkerManagerService.cpp b/dom/workers/ServiceWorkerManagerService.cpp
@@ -54,7 +54,7 @@ class NotifySoftUpdateIfPrincipalOkRunnable final : public Runnable
     MOZ_ASSERT(mBackgroundThread);
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   Run() override
   {
     if (NS_IsMainThread()) {

diff --git a/dom/workers/ServiceWorkerRegistration.cpp b/dom/workers/ServiceWorkerRegistration.cpp
@@ -529,15 +529,15 @@ class UnregisterCallback final : public nsIServiceWorkerUnregisterCallback
     MOZ_ASSERT(mPromise);
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   UnregisterSucceeded(bool aState) override
   {
     AssertIsOnMainThread();
     mPromise->MaybeResolve(aState);
     return NS_OK;
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   UnregisterFailed() override
   {
     AssertIsOnMainThread();
@@ -595,15 +595,15 @@ class WorkerUnregisterCallback final : public nsIServiceWorkerUnregisterCallback
     MOZ_ASSERT(aProxy);
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   UnregisterSucceeded(bool aState) override
   {
     AssertIsOnMainThread();
     Finish(Some(aState));
     return NS_OK;
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   UnregisterFailed() override
   {
     AssertIsOnMainThread();

diff --git a/dom/workers/ServiceWorkerUnregisterJob.cpp b/dom/workers/ServiceWorkerUnregisterJob.cpp
@@ -24,7 +24,7 @@ class ServiceWorkerUnregisterJob::PushUnsubscribeCallback final :
     AssertIsOnMainThread();
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   OnUnsubscribe(nsresult aStatus, bool) override
   {
     // Warn if unsubscribing fails, but don't prevent the worker from

diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
@@ -621,7 +621,7 @@ class WorkerScopeSkipWaitingRunnable final : public Runnable
     MOZ_ASSERT(aPromiseProxy);
   }
 
-  NS_IMETHODIMP
+  NS_IMETHOD
   Run() override
   {
     AssertIsOnMainThread();

diff --git a/dom/xslt/xpath/txXPathObjectAdaptor.h b/dom/xslt/xpath/txXPathObjectAdaptor.h
@@ -27,7 +27,7 @@ class txXPathObjectAdaptor : public txIXPathObject
 
     NS_DECL_ISUPPORTS
 
-    NS_IMETHODIMP_(txAExprResult*) GetResult() override
+    NS_IMETHOD_(txAExprResult*) GetResult() override
     {
         return mValue;
     }

diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
@@ -203,7 +203,7 @@ class ClearOriginDataObserver final : public nsIObserver {
   NS_DECL_ISUPPORTS
 
   // nsIObserver implementation.
-  NS_IMETHODIMP
+  NS_IMETHOD
   Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData) override
   {
     MOZ_ASSERT(!nsCRT::strcmp(aTopic, "clear-origin-data"));