Bug 1118428 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/workers; r=baku
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 06 Jan 2015 15:15:42 -0500
changeset 222286 95fe92605dd426362c3b22a8f0153dfca05e2f00
parent 222285 556105cad7a7997e014baae5a7359020b35d752a
child 222287 bb194bedf519024d7969c3f8b4f1b33e41889129
push id28061
push userkwierso@gmail.com
push dateWed, 07 Jan 2015 03:24:49 +0000
treeherdermozilla-central@33781a3a5201 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1118428
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1118428 - Mark virtual overridden functions as MOZ_OVERRIDE in dom/workers; r=baku
dom/workers/ServiceWorkerContainer.h
dom/workers/ServiceWorkerRegistration.cpp
dom/workers/ServiceWorkerRegistration.h
dom/workers/WorkerPrivate.cpp
--- a/dom/workers/ServiceWorkerContainer.h
+++ b/dom/workers/ServiceWorkerContainer.h
@@ -29,18 +29,18 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServiceWorkerContainer, DOMEventTargetHelper)
 
   IMPL_EVENT_HANDLER(controllerchange)
   IMPL_EVENT_HANDLER(reloadpage)
   IMPL_EVENT_HANDLER(error)
 
   explicit ServiceWorkerContainer(nsPIDOMWindow* aWindow);
 
-  JSObject*
-  WrapObject(JSContext* aCx);
+  virtual JSObject*
+  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
   already_AddRefed<Promise>
   Register(const nsAString& aScriptURL,
            const RegistrationOptionList& aOptions,
            ErrorResult& aRv);
 
   already_AddRefed<workers::ServiceWorker>
   GetController();
--- a/dom/workers/ServiceWorkerRegistration.cpp
+++ b/dom/workers/ServiceWorkerRegistration.cpp
@@ -110,25 +110,25 @@ public:
 
   explicit UnregisterCallback(Promise* aPromise)
     : mPromise(aPromise)
   {
     MOZ_ASSERT(mPromise);
   }
 
   NS_IMETHODIMP
-  UnregisterSucceeded(bool aState)
+  UnregisterSucceeded(bool aState) MOZ_OVERRIDE
   {
     AssertIsOnMainThread();
     mPromise->MaybeResolve(aState);
     return NS_OK;
   }
 
   NS_IMETHODIMP
-  UnregisterFailed()
+  UnregisterFailed() MOZ_OVERRIDE
   {
     AssertIsOnMainThread();
 
     AutoJSAPI api;
     api.Init(mPromise->GetParentObject());
     mPromise->MaybeReject(api.cx(), JS::UndefinedHandleValue);
     return NS_OK;
   }
--- a/dom/workers/ServiceWorkerRegistration.h
+++ b/dom/workers/ServiceWorkerRegistration.h
@@ -29,17 +29,17 @@ public:
                                            DOMEventTargetHelper)
 
   IMPL_EVENT_HANDLER(updatefound)
 
   ServiceWorkerRegistration(nsPIDOMWindow* aWindow,
                             const nsAString& aScope);
 
   JSObject*
-  WrapObject(JSContext* aCx);
+  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
   already_AddRefed<workers::ServiceWorker>
   GetInstalling();
 
   already_AddRefed<workers::ServiceWorker>
   GetWaiting();
 
   already_AddRefed<workers::ServiceWorker>
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -2020,17 +2020,17 @@ public:
     mAlreadyMappedToAddon(false)
   {
     aWorkerPrivate->AssertIsOnWorkerThread();
 
   }
 
   NS_IMETHOD
   CollectReports(nsIMemoryReporterCallback* aCallback,
-                 nsISupports* aClosure, bool aAnonymize)
+                 nsISupports* aClosure, bool aAnonymize) MOZ_OVERRIDE
   {
     AssertIsOnMainThread();
 
     // Assumes that WorkerJSRuntimeStats will hold a reference to |path|, and
     // not a copy, as TryToMapAddon() may later modify if.
     nsCString path;
     WorkerJSRuntimeStats rtStats(path);