Bug 1119260 - Mark virtual overridden functions as MOZ_OVERRIDE in XPConnect; r=bholley

js/xpconnect/loader/mozJSComponentLoader.h

@@ -44,7 +44,7 @@ class mozJSComponentLoader : public mozilla::ModuleLoader,
     mozJSComponentLoader();
 
     // ModuleLoader
-    const mozilla::Module* LoadModule(mozilla::FileLocation &aFile);
+    const mozilla::Module* LoadModule(mozilla::FileLocation &aFile) MOZ_OVERRIDE;
 
     nsresult FindTargetObject(JSContext* aCx,
                               JS::MutableHandleObject aTargetObject);

js/xpconnect/public/SandboxPrivate.h

@@ -35,12 +35,12 @@ public:
     NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(SandboxPrivate,
                                                            nsIGlobalObject)
 
-    nsIPrincipal *GetPrincipal()
+    nsIPrincipal *GetPrincipal() MOZ_OVERRIDE
     {
         return mPrincipal;
     }
 
-    JSObject *GetGlobalJSObject()
+    JSObject *GetGlobalJSObject() MOZ_OVERRIDE
     {
         return GetWrapper();
     }

js/xpconnect/src/BackstagePass.h

@@ -28,17 +28,17 @@ public:
   NS_DECL_NSIXPCSCRIPTABLE
   NS_DECL_NSICLASSINFO
 
-  virtual nsIPrincipal* GetPrincipal() {
+  virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE {
     return mPrincipal;
   }
 
-  virtual JSObject* GetGlobalJSObject();
+  virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE;
 
-  virtual void ForgetGlobalObject() {
+  void ForgetGlobalObject() {
     mWrapper = nullptr;
   }
 
-  virtual void SetGlobalObject(JSObject* global);
+  void SetGlobalObject(JSObject* global);
 
   explicit BackstagePass(nsIPrincipal *prin) :
     mPrincipal(prin)

js/xpconnect/src/XPCJSRuntime.cpp

@@ -1156,7 +1156,7 @@ class WatchdogManager : public nsIObserver
   public:
 
     NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
-                       const char16_t* aData)
+                       const char16_t* aData) MOZ_OVERRIDE
     {
         RefreshWatchdog();
         return NS_OK;
@@ -1792,7 +1792,7 @@ class JSMainRuntimeTemporaryPeakReporter MOZ_FINAL : public nsIMemoryReporter
     NS_DECL_ISUPPORTS
 
     NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
-                              nsISupports* aData, bool aAnonymize)
+                              nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE
     {
         return MOZ_COLLECT_REPORT("js-main-runtime-temporary-peak",
             KIND_OTHER, UNITS_BYTES,
@@ -2630,7 +2630,7 @@ class JSMainRuntimeCompartmentsReporter MOZ_FINAL : public nsIMemoryReporter
     }
 
     NS_IMETHOD CollectReports(nsIMemoryReporterCallback *cb,
-                              nsISupports *closure, bool anonymize)
+                              nsISupports *closure, bool anonymize) MOZ_OVERRIDE
     {
         // First we collect the compartment paths.  Then we report them.  Doing
         // the two steps interleaved is a bad idea, because calling |cb|

js/xpconnect/src/xpcprivate.h

@@ -305,12 +305,12 @@ public:
     nsresult GetInfoForName(const char * name, nsIInterfaceInfo** info);
 
     virtual nsIPrincipal* GetPrincipal(JSObject* obj,
-                                       bool allowShortCircuit) const;
+                                       bool allowShortCircuit) const MOZ_OVERRIDE;
 
     void RecordTraversal(void *p, nsISupports *s);
     virtual char* DebugPrintJSStack(bool showArgs,
                                     bool showLocals,
-                                    bool showThisProps);
+                                    bool showThisProps) MOZ_OVERRIDE;
 
 
     static bool ReportAllJSExceptions()
@@ -2324,7 +2324,7 @@ class nsXPCWrappedJSClass : public nsIXPCWrappedJSClass
 {
     // all the interface method declarations...
     NS_DECL_ISUPPORTS
-    NS_IMETHOD DebugDump(int16_t depth);
+    NS_IMETHOD DebugDump(int16_t depth) MOZ_OVERRIDE;
 public:
 
     static already_AddRefed<nsXPCWrappedJSClass>
@@ -2430,7 +2430,7 @@ public:
 
     NS_IMETHOD CallMethod(uint16_t methodIndex,
                           const XPTMethodDescriptor *info,
-                          nsXPTCMiniVariant* params);
+                          nsXPTCMiniVariant* params) MOZ_OVERRIDE;
 
     /*
     * This is rarely called directly. Instead one usually calls