Bug 1119261 - Mark virtual overridden functions as MOZ_OVERRIDE in embedding; r=bsmedberg
☠☠ backed out by fdb407e3ab06 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 08 Jan 2015 10:15:16 -0500
changeset 223428 58cb6ed025530ae5a808d1b9d40e04cb78781534
parent 223400 6485d16e2d7985f8c05ab9c7d51757c663d93c55
child 223429 3a5fe7c44ce4223afd05e0d5135b00f219922664
push id28095
push usercbook@mozilla.com
push dateTue, 13 Jan 2015 13:24:48 +0000
treeherdermozilla-central@a5700bec72e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1119261
milestone38.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 1119261 - Mark virtual overridden functions as MOZ_OVERRIDE in embedding; r=bsmedberg
embedding/browser/nsDocShellTreeOwner.h
embedding/components/find/nsFind.cpp
embedding/components/printingui/ipc/PrintProgressDialogChild.h
embedding/components/printingui/ipc/PrintProgressDialogParent.h
embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h
embedding/components/webbrowserpersist/nsWebBrowserPersist.h
embedding/components/windowwatcher/nsWindowWatcher.cpp
--- a/embedding/browser/nsDocShellTreeOwner.h
+++ b/embedding/browser/nsDocShellTreeOwner.h
@@ -150,17 +150,17 @@ class ChromeTooltipListener MOZ_FINAL : 
 protected:
   virtual ~ChromeTooltipListener();
 
 public:
   NS_DECL_ISUPPORTS
 
   ChromeTooltipListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome);
 
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE;
   NS_IMETHOD MouseMove(nsIDOMEvent* aMouseEvent);
 
     // Add/remove the relevant listeners, based on what interfaces
     // the embedding chrome implements.
   NS_IMETHOD AddChromeListeners();
   NS_IMETHOD RemoveChromeListeners();
 
 private:
@@ -222,17 +222,17 @@ protected:
   virtual ~ChromeContextMenuListener();
 
 public:
   NS_DECL_ISUPPORTS
 
   ChromeContextMenuListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome);
 
   // nsIDOMContextMenuListener
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE;
 
   // Add/remove the relevant listeners, based on what interfaces
   // the embedding chrome implements.
   NS_IMETHOD AddChromeListeners();
   NS_IMETHOD RemoveChromeListeners();
 
 private:
 
--- a/embedding/components/find/nsFind.cpp
+++ b/embedding/components/find/nsFind.cpp
@@ -89,36 +89,36 @@ public:
   {
   }
 
   // nsISupports
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
     NS_DECL_CYCLE_COLLECTION_CLASS(nsFindContentIterator)
 
   // nsIContentIterator
-  virtual nsresult Init(nsINode* aRoot)
+  virtual nsresult Init(nsINode* aRoot) MOZ_OVERRIDE
   {
     NS_NOTREACHED("internal error");
     return NS_ERROR_NOT_IMPLEMENTED;
   }
-  virtual nsresult Init(nsIDOMRange* aRange)
+  virtual nsresult Init(nsIDOMRange* aRange) MOZ_OVERRIDE
   {
     NS_NOTREACHED("internal error");
     return NS_ERROR_NOT_IMPLEMENTED;
   }
   // Not a range because one of the endpoints may be anonymous.
   nsresult Init(nsIDOMNode* aStartNode, int32_t aStartOffset,
                 nsIDOMNode* aEndNode, int32_t aEndOffset);
-  virtual void First();
-  virtual void Last();
-  virtual void Next();
-  virtual void Prev();
-  virtual nsINode* GetCurrentNode();
-  virtual bool IsDone();
-  virtual nsresult PositionAt(nsINode* aCurNode);
+  virtual void First() MOZ_OVERRIDE;
+  virtual void Last() MOZ_OVERRIDE;
+  virtual void Next() MOZ_OVERRIDE;
+  virtual void Prev() MOZ_OVERRIDE;
+  virtual nsINode* GetCurrentNode() MOZ_OVERRIDE;
+  virtual bool IsDone() MOZ_OVERRIDE;
+  virtual nsresult PositionAt(nsINode* aCurNode) MOZ_OVERRIDE;
 
 protected:
   virtual ~nsFindContentIterator()
   {
   }
 
 private:
   nsCOMPtr<nsIContentIterator> mOuterIterator;
--- a/embedding/components/printingui/ipc/PrintProgressDialogChild.h
+++ b/embedding/components/printingui/ipc/PrintProgressDialogChild.h
@@ -20,21 +20,21 @@ class PrintProgressDialogChild MOZ_FINAL
 {
   NS_DECL_ISUPPORTS
   NS_DECL_NSIWEBPROGRESSLISTENER
   NS_DECL_NSIPRINTPROGRESSPARAMS
 
 public:
   MOZ_IMPLICIT PrintProgressDialogChild(nsIObserver* aOpenObserver);
 
-  virtual bool RecvDialogOpened();
+  virtual bool RecvDialogOpened() MOZ_OVERRIDE;
 
 private:
   virtual ~PrintProgressDialogChild();
   nsCOMPtr<nsIObserver> mOpenObserver;
   nsString mDocTitle;
   nsString mDocURL;
 };
 
 } // namespace embedding
 } // namespace mozilla
 
-#endif
\ No newline at end of file
+#endif
--- a/embedding/components/printingui/ipc/PrintProgressDialogParent.h
+++ b/embedding/components/printingui/ipc/PrintProgressDialogParent.h
@@ -24,36 +24,36 @@ public:
 
   void SetWebProgressListener(nsIWebProgressListener* aListener);
 
   void SetPrintProgressParams(nsIPrintProgressParams* aParams);
 
   virtual bool
   RecvStateChange(
           const long& stateFlags,
-          const nsresult& status);
+          const nsresult& status) MOZ_OVERRIDE;
 
   virtual bool
   RecvProgressChange(
           const long& curSelfProgress,
           const long& maxSelfProgress,
           const long& curTotalProgress,
-          const long& maxTotalProgress);
+          const long& maxTotalProgress) MOZ_OVERRIDE;
 
   virtual bool
-  RecvDocTitleChange(const nsString& newTitle);
+  RecvDocTitleChange(const nsString& newTitle) MOZ_OVERRIDE;
 
   virtual bool
-  RecvDocURLChange(const nsString& newURL);
+  RecvDocURLChange(const nsString& newURL) MOZ_OVERRIDE;
 
   virtual void
-  ActorDestroy(ActorDestroyReason aWhy);
+  ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 
   virtual bool
-  Recv__delete__();
+  Recv__delete__() MOZ_OVERRIDE;
 
 private:
   virtual ~PrintProgressDialogParent();
 
   nsCOMPtr<nsIWebProgressListener> mWebProgressListener;
   nsCOMPtr<nsIPrintProgressParams> mPrintProgressParams;
   bool mActive;
 };
--- a/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h
+++ b/embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h
@@ -18,16 +18,16 @@ public:
     nsPrintingPromptServiceProxy();
 
     nsresult Init();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIPRINTINGPROMPTSERVICE
 
     virtual PPrintProgressDialogChild*
-    AllocPPrintProgressDialogChild();
+    AllocPPrintProgressDialogChild() MOZ_OVERRIDE;
 
     virtual bool
-    DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor);
+    DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor) MOZ_OVERRIDE;
 };
 
 #endif
 
--- a/embedding/components/webbrowserpersist/nsWebBrowserPersist.h
+++ b/embedding/components/webbrowserpersist/nsWebBrowserPersist.h
@@ -216,17 +216,17 @@ private:
 
 // Helper class does node fixup during persistence
 class nsEncoderNodeFixup : public nsIDocumentEncoderNodeFixup
 {
 public:
     nsEncoderNodeFixup();
 
     NS_DECL_ISUPPORTS
-    NS_IMETHOD FixupNode(nsIDOMNode *aNode, bool *aSerializeCloneKids, nsIDOMNode **aOutNode);
+    NS_IMETHOD FixupNode(nsIDOMNode *aNode, bool *aSerializeCloneKids, nsIDOMNode **aOutNode) MOZ_OVERRIDE;
 
     nsWebBrowserPersist *mWebBrowserPersist;
 
 protected:
     virtual ~nsEncoderNodeFixup();
 };
 
 #endif
--- a/embedding/components/windowwatcher/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/nsWindowWatcher.cpp
@@ -138,18 +138,18 @@ void nsWatcherWindowEntry::ReferenceSelf
 /****************************************************************
  ****************** nsWatcherWindowEnumerator *******************
  ****************************************************************/
 
 class nsWatcherWindowEnumerator : public nsISimpleEnumerator {
 
 public:
   explicit nsWatcherWindowEnumerator(nsWindowWatcher *inWatcher);
-  NS_IMETHOD HasMoreElements(bool *retval);
-  NS_IMETHOD GetNext(nsISupports **retval);
+  NS_IMETHOD HasMoreElements(bool *retval) MOZ_OVERRIDE;
+  NS_IMETHOD GetNext(nsISupports **retval) MOZ_OVERRIDE;
 
   NS_DECL_ISUPPORTS
 
 protected:
   virtual ~nsWatcherWindowEnumerator();
 
 private:
   friend class nsWindowWatcher;