Backout 58cb6ed02553 (bug 1120622, bug 1120620, bug 1119068, bug 1119268, bug 1119264, bug 1119261) for b2g build bustage on a CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Mon, 12 Jan 2015 14:48:13 -0800
changeset 252216 fdb407e3ab06284ddb3bfff43b662d8b87c546f9
parent 252215 ee5ea7b0bb8611fb1de80da318e59465b8b74a3c
child 252217 4568af6d76d3dcf124dceb7e7c9610cc152b9e1e
push id721
push userjlund@mozilla.com
push dateTue, 21 Apr 2015 23:03:33 +0000
treeherdermozilla-release@d27c9211ebb3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1120622, 1120620, 1119068, 1119268, 1119264, 1119261
milestone38.0a1
backs out58cb6ed025530ae5a808d1b9d40e04cb78781534
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
Backout 58cb6ed02553 (bug 1120622, bug 1120620, bug 1119068, bug 1119268, bug 1119264, bug 1119261) for b2g build bustage on a CLOSED TREE
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) MOZ_OVERRIDE;
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
   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) MOZ_OVERRIDE;
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
 
   // 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) MOZ_OVERRIDE
+  virtual nsresult Init(nsINode* aRoot)
   {
     NS_NOTREACHED("internal error");
     return NS_ERROR_NOT_IMPLEMENTED;
   }
-  virtual nsresult Init(nsIDOMRange* aRange) MOZ_OVERRIDE
+  virtual nsresult Init(nsIDOMRange* aRange)
   {
     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() 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;
+  virtual void First();
+  virtual void Last();
+  virtual void Next();
+  virtual void Prev();
+  virtual nsINode* GetCurrentNode();
+  virtual bool IsDone();
+  virtual nsresult PositionAt(nsINode* aCurNode);
 
 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() MOZ_OVERRIDE;
+  virtual bool RecvDialogOpened();
 
 private:
   virtual ~PrintProgressDialogChild();
   nsCOMPtr<nsIObserver> mOpenObserver;
   nsString mDocTitle;
   nsString mDocURL;
 };
 
 } // namespace embedding
 } // namespace mozilla
 
-#endif
+#endif
\ No newline at end of file
--- 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) MOZ_OVERRIDE;
+          const nsresult& status);
 
   virtual bool
   RecvProgressChange(
           const long& curSelfProgress,
           const long& maxSelfProgress,
           const long& curTotalProgress,
-          const long& maxTotalProgress) MOZ_OVERRIDE;
+          const long& maxTotalProgress);
 
   virtual bool
-  RecvDocTitleChange(const nsString& newTitle) MOZ_OVERRIDE;
+  RecvDocTitleChange(const nsString& newTitle);
 
   virtual bool
-  RecvDocURLChange(const nsString& newURL) MOZ_OVERRIDE;
+  RecvDocURLChange(const nsString& newURL);
 
   virtual void
-  ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
+  ActorDestroy(ActorDestroyReason aWhy);
 
   virtual bool
-  Recv__delete__() MOZ_OVERRIDE;
+  Recv__delete__();
 
 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() MOZ_OVERRIDE;
+    AllocPPrintProgressDialogChild();
 
     virtual bool
-    DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor) MOZ_OVERRIDE;
+    DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor);
 };
 
 #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) MOZ_OVERRIDE;
+    NS_IMETHOD FixupNode(nsIDOMNode *aNode, bool *aSerializeCloneKids, nsIDOMNode **aOutNode);
 
     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) MOZ_OVERRIDE;
-  NS_IMETHOD GetNext(nsISupports **retval) MOZ_OVERRIDE;
+  NS_IMETHOD HasMoreElements(bool *retval);
+  NS_IMETHOD GetNext(nsISupports **retval);
 
   NS_DECL_ISUPPORTS
 
 protected:
   virtual ~nsWatcherWindowEnumerator();
 
 private:
   friend class nsWindowWatcher;