diff --git a/accessible/base/EventQueue.cpp b/accessible/base/EventQueue.cpp
index a62f24b201be..bfa2c4833a33 100644
--- a/accessible/base/EventQueue.cpp
+++ b/accessible/base/EventQueue.cpp
@@ -480,44 +480,6 @@ EventQueue::CreateTextChangeEventFor(AccMutationEvent* aEvent)
                            aEvent->mIsFromUserInput ? eFromUserInput : eNoUserInput);
 }
 
-void
-EventQueue::SendIPCEvent(AccEvent* aEvent) const
-{
-  DocAccessibleChild* ipcDoc = mDocument->IPCDoc();
-  uint64_t id = aEvent->GetAccessible()->IsDoc() ? 0 :
-    reinterpret_cast<uintptr_t>(aEvent->GetAccessible());
-
-  switch(aEvent->GetEventType()) {
-    case nsIAccessibleEvent::EVENT_SHOW:
-      ipcDoc->ShowEvent(downcast_accEvent(aEvent));
-      break;
-
-    case nsIAccessibleEvent::EVENT_HIDE:
-      ipcDoc->SendHideEvent(id);
-      break;
-
-    case nsIAccessibleEvent::EVENT_REORDER:
-      // reorder events on the application acc aren't necessary to tell the parent
-      // about new top level documents.
-      if (!aEvent->GetAccessible()->IsApplication())
-        ipcDoc->SendEvent(id, aEvent->GetEventType());
-      break;
-    case nsIAccessibleEvent::EVENT_STATE_CHANGE: {
-      AccStateChangeEvent* event = downcast_accEvent(aEvent);
-      ipcDoc->SendStateChangeEvent(id, event->GetState(),
-                                   event->IsStateEnabled());
-      break;
-    }
-    case nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED: {
-                                                       AccCaretMoveEvent* event = downcast_accEvent(aEvent);
-                                                       ipcDoc->SendEvent(id, event->GetCaretOffset());
-                                                       break;
-                                                     }
-    default:
-      ipcDoc->SendEvent(id, aEvent->GetEventType());
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // EventQueue: event queue
 
@@ -594,8 +556,5 @@ EventQueue::ProcessEventQueue()
 
     if (!mDocument)
       return;
-
-    if (IPCAccessibilityActive())
-      SendIPCEvent(event);
   }
 }
diff --git a/accessible/base/EventQueue.h b/accessible/base/EventQueue.h
index 482407cc4fc5..31082f293bc4 100644
--- a/accessible/base/EventQueue.h
+++ b/accessible/base/EventQueue.h
@@ -53,11 +53,6 @@ private:
                                AccSelChangeEvent* aThisEvent,
                                uint32_t aThisIndex);
 
-  /**
-   * Notify the parent process of events being fired by this event queue.
-   */
-  void SendIPCEvent(AccEvent* aEvent) const;
-
   /**
    * Coalesce text change events caused by sibling hide events.
    */
diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp
index 00781b9e3529..f3a18320a890 100644
--- a/accessible/generic/Accessible.cpp
+++ b/accessible/generic/Accessible.cpp
@@ -15,6 +15,7 @@
 #include "ApplicationAccessible.h"
 #include "nsEventShell.h"
 #include "nsTextEquivUtils.h"
+#include "DocAccessibleChild.h"
 #include "Relation.h"
 #include "Role.h"
 #include "RootAccessible.h"
@@ -832,6 +833,42 @@ Accessible::HandleAccEvent(AccEvent* aEvent)
 {
   NS_ENSURE_ARG_POINTER(aEvent);
 
+  if (IPCAccessibilityActive() && Document()) {
+    DocAccessibleChild* ipcDoc = mDoc->IPCDoc();
+    uint64_t id = aEvent->GetAccessible()->IsDoc() ? 0 :
+      reinterpret_cast<uintptr_t>(aEvent->GetAccessible());
+
+    switch(aEvent->GetEventType()) {
+      case nsIAccessibleEvent::EVENT_SHOW:
+        ipcDoc->ShowEvent(downcast_accEvent(aEvent));
+        break;
+
+      case nsIAccessibleEvent::EVENT_HIDE:
+        ipcDoc->SendHideEvent(id);
+        break;
+
+      case nsIAccessibleEvent::EVENT_REORDER:
+        // reorder events on the application acc aren't necessary to tell the parent
+        // about new top level documents.
+        if (!aEvent->GetAccessible()->IsApplication())
+          ipcDoc->SendEvent(id, aEvent->GetEventType());
+        break;
+      case nsIAccessibleEvent::EVENT_STATE_CHANGE: {
+                                                     AccStateChangeEvent* event = downcast_accEvent(aEvent);
+                                                     ipcDoc->SendStateChangeEvent(id, event->GetState(),
+                                                                                  event->IsStateEnabled());
+                                                     break;
+                                                   }
+      case nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED: {
+                                                         AccCaretMoveEvent* event = downcast_accEvent(aEvent);
+                                                         ipcDoc->SendEvent(id, event->GetCaretOffset());
+                                                         break;
+                                                       }
+      default:
+                                                       ipcDoc->SendEvent(id, aEvent->GetEventType());
+    }
+  }
+
   nsCOMPtr<nsIObserverService> obsService = services::GetObserverService();
   NS_ENSURE_TRUE(obsService, NS_ERROR_FAILURE);
 
diff --git a/accessible/generic/DocAccessible.h b/accessible/generic/DocAccessible.h
index 243fbde0f52f..e48b56a81661 100644
--- a/accessible/generic/DocAccessible.h
+++ b/accessible/generic/DocAccessible.h
@@ -336,6 +336,12 @@ public:
    */
   void RecreateAccessible(nsIContent* aContent);
 
+  /**
+   * If this document is in a content process return the object responsible for
+   * communicating with the main process for it.
+   */
+  DocAccessibleChild* IPCDoc() const { return mIPCDoc; }
+
 protected:
   virtual ~DocAccessible();
 
@@ -519,12 +525,6 @@ protected:
    */
   bool IsLoadEventTarget() const;
 
-  /**
-   * If this document is in a content process return the object responsible for
-   * communicating with the main process for it.
-   */
-  DocAccessibleChild* IPCDoc() const { return mIPCDoc; }
-
   /*
    * Set the object responsible for communicating with the main process on
    * behalf of this document.
diff --git a/accessible/generic/OuterDocAccessible.h b/accessible/generic/OuterDocAccessible.h
index 02b455941378..5d0489a1be9e 100644
--- a/accessible/generic/OuterDocAccessible.h
+++ b/accessible/generic/OuterDocAccessible.h
@@ -52,6 +52,7 @@ Accessible::AsOuterDoc()
 {
   return IsOuterDoc() ? static_cast<OuterDocAccessible*>(this) : nullptr;
 }
+
 } // namespace a11y
 } // namespace mozilla
 
diff --git a/accessible/windows/msaa/AccessibleWrap.h b/accessible/windows/msaa/AccessibleWrap.h
index a3d730f927d8..05ce578910a3 100644
--- a/accessible/windows/msaa/AccessibleWrap.h
+++ b/accessible/windows/msaa/AccessibleWrap.h
@@ -223,6 +223,7 @@ WrapperFor(ProxyAccessible* aProxy)
 {
   return reinterpret_cast<AccessibleWrap*>(aProxy->GetWrapper());
 }
+
 } // namespace a11y
 } // namespace mozilla
 
diff --git a/browser/base/content/browser-fullScreen.js b/browser/base/content/browser-fullScreen.js
index 8dea4a869824..fb3f776aac10 100644
--- a/browser/base/content/browser-fullScreen.js
+++ b/browser/base/content/browser-fullScreen.js
@@ -8,6 +8,7 @@ var FullScreen = {
     "DOMFullscreen:Request",
     "DOMFullscreen:NewOrigin",
     "DOMFullscreen:Exit",
+    "DOMFullscreen:Painted",
   ],
 
   init: function() {
@@ -166,6 +167,10 @@ var FullScreen = {
         this._windowUtils.remoteFrameFullscreenReverted();
         break;
       }
+      case "DOMFullscreen:Painted": {
+        Services.obs.notifyObservers(window, "fullscreen-painted", "");
+        break;
+      }
     }
   },
 
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 50e4dfffd257..2167b253b529 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -82,7 +82,6 @@
     <command id="Browser:PrevTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(-1, true);" reserved="true"/>
     <command id="Browser:ShowAllTabs" oncommand="allTabs.open();"/>
     <command id="Browser:ToggleTabView" oncommand="TabView.toggle();"/>
-    <command id="Browser:FocusNextFrame" oncommand="focusNextFrame(event);"/>
     <command id="cmd_fullZoomReduce"  oncommand="FullZoom.reduce()"/>
     <command id="cmd_fullZoomEnlarge" oncommand="FullZoom.enlarge()"/>
     <command id="cmd_fullZoomReset"   oncommand="FullZoom.reset()"/>
@@ -357,8 +356,6 @@
 #endif
     <key id="goHome" keycode="VK_HOME" command="Browser:Home" modifiers="alt"/>
     <key keycode="VK_F5" command="Browser:Reload"/>
-    <key keycode="VK_F6" command="Browser:FocusNextFrame"/>
-    <key keycode="VK_F6" command="Browser:FocusNextFrame" modifiers="shift"/>
 #ifndef XP_MACOSX
     <key id="showAllHistoryKb" key="&showAllHistoryCmd.commandkey;" command="Browser:ShowAllHistory" modifiers="accel,shift"/>
     <key keycode="VK_F5" command="Browser:ReloadSkipCache" modifiers="accel"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e1a66e64160a..52edda1bc977 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7648,16 +7648,6 @@ var MousePosTracker = {
   }
 };
 
-function focusNextFrame(event) {
-  let fm = Services.focus;
-  let dir = event.shiftKey ? fm.MOVEFOCUS_BACKWARDDOC : fm.MOVEFOCUS_FORWARDDOC;
-  let element = fm.moveFocus(window, null, dir, fm.FLAG_BYKEY);
-  let panelOrNotificationSelector = "popupnotification " + element.localName + ", " +
-                                    "panel " + element.localName;
-  if (element.ownerDocument == document && !element.matches(panelOrNotificationSelector))
-    focusAndSelectUrlBar();
-}
-
 function BrowserOpenNewTabOrWindow(event) {
   if (event.shiftKey) {
     OpenBrowserWindow();
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 521b2d9e1282..de1a32947204 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -58,6 +58,7 @@
         screenX="4" screenY="4"
         fullscreenbutton="true"
         sizemode="normal"
+        retargetdocumentfocus="urlbar"
         persist="screenX screenY width height sizemode">
 
 # All JS files which are not content (only) dependent that browser.xul
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
index 2316b34b4a1e..2249aaa001d2 100644
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -624,8 +624,10 @@ let DOMFullscreenHandler = {
     addMessageListener("DOMFullscreen:Approved", this);
     addMessageListener("DOMFullscreen:CleanUp", this);
     addEventListener("MozDOMFullscreen:Request", this);
+    addEventListener("MozDOMFullscreen:Entered", this);
     addEventListener("MozDOMFullscreen:NewOrigin", this);
     addEventListener("MozDOMFullscreen:Exit", this);
+    addEventListener("MozDOMFullscreen:Exited", this);
   },
 
   get _windowUtils() {
@@ -678,6 +680,16 @@ let DOMFullscreenHandler = {
         sendAsyncMessage("DOMFullscreen:Exit");
         break;
       }
+      case "MozDOMFullscreen:Entered":
+      case "MozDOMFullscreen:Exited": {
+        addEventListener("MozAfterPaint", this);
+        break;
+      }
+      case "MozAfterPaint": {
+        removeEventListener("MozAfterPaint", this);
+        sendAsyncMessage("DOMFullscreen:Painted");
+        break;
+      }
     }
   }
 };
diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 4937e8944762..d642c943e7e7 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -57,6 +57,7 @@ support-files =
   file_bug970276_popup2.html
   file_bug970276_favicon1.ico
   file_bug970276_favicon2.ico
+  file_documentnavigation_frameset.html
   file_dom_notifications.html
   file_double_close_tab.html
   file_favicon_change.html
@@ -287,6 +288,7 @@ skip-if = e10s # Bug 1071623
 [browser_discovery.js]
 [browser_double_close_tab.js]
 skip-if = e10s
+[browser_documentnavigation.js]
 [browser_duplicateIDs.js]
 [browser_drag.js]
 skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
diff --git a/browser/base/content/test/general/browser_documentnavigation.js b/browser/base/content/test/general/browser_documentnavigation.js
new file mode 100644
index 000000000000..7f72affe120c
--- /dev/null
+++ b/browser/base/content/test/general/browser_documentnavigation.js
@@ -0,0 +1,266 @@
+/*
+ * This test checks that focus is adjusted properly in a browser when pressing F6 and Shift+F6.
+ * There are additional tests in dom/tests/mochitest/chrome/test_focus_docnav.xul which test
+ * non-browser cases.
+ */
+
+let testPage1 = "data:text/html,<html id='html1'><body id='body1'><button id='button1'>Tab 1</button></body></html>";
+let testPage2 = "data:text/html,<html id='html2'><body id='body2'><button id='button2'>Tab 2</button></body></html>";
+let testPage3 = "data:text/html,<html id='html3'><body id='body3' contenteditable='true'><button id='button3'>Tab 3</button></body></html>";
+
+let fm = Services.focus;
+
+function* expectFocusOnF6(backward, expectedDocument, expectedElement, onContent, desc)
+{
+  let focusChangedInChildResolver = null;
+  let focusPromise = onContent ? new Promise(resolve => focusChangedInChildResolver = resolve) :
+                                 BrowserTestUtils.waitForEvent(window, "focus", true);
+
+  function focusChangedListener(msg) {
+    let expected = expectedDocument;
+    if (!expectedElement.startsWith("html")) {
+      expected += "," + expectedElement;
+    }
+
+    is(msg.data.details, expected, desc + " child focus matches");
+    focusChangedInChildResolver();
+  }
+
+  if (onContent) {
+    messageManager.addMessageListener("BrowserTest:FocusChanged", focusChangedListener);
+
+    yield ContentTask.spawn(gBrowser.selectedBrowser, { expectedElementId: expectedElement }, function* (arg) {
+      let expectedElement = content.document.getElementById(arg.expectedElementId);
+      if (!expectedElement) {
+        // Element not found, so look in the child frames.
+        for (let f = 0; f < content.frames.length; f++) {
+          if (content.frames[f].document.getElementById(arg.expectedElementId)) {
+            expectedElement = content.frames[f].document;
+            break;
+          }
+        }
+      }
+      else if (expectedElement.localName == "html") {
+        expectedElement = expectedElement.ownerDocument;
+      }
+
+      if (!expectedElement) {
+        sendSyncMessage("BrowserTest:FocusChanged",
+                        { details : "expected element " + arg.expectedElementId + " not found" });
+        return;
+      }
+
+      expectedElement.addEventListener("focus", function focusReceived() {
+        expectedElement.removeEventListener("focus", focusReceived, true);
+
+        const fm = Components.classes["@mozilla.org/focus-manager;1"].
+                              getService(Components.interfaces.nsIFocusManager);
+        let details = fm.focusedWindow.document.documentElement.id;
+        if (fm.focusedElement) {
+          details += "," + fm.focusedElement.id;
+        }
+
+        sendSyncMessage("BrowserTest:FocusChanged", { details : details });
+      }, true);
+    });
+  }
+
+  EventUtils.synthesizeKey("VK_F6", { shiftKey: backward });
+  yield focusPromise;
+
+  if (typeof expectedElement == "string") {
+    expectedElement = fm.focusedWindow.document.getElementById(expectedElement);
+  }
+
+  if (gMultiProcessBrowser && onContent) {
+    expectedDocument = "main-window";
+    expectedElement = gBrowser.selectedBrowser;
+  }
+
+  is(fm.focusedWindow.document.documentElement.id, expectedDocument, desc + " document matches");
+  is(fm.focusedElement, expectedElement, desc + " element matches");
+
+  if (onContent) {
+    messageManager.removeMessageListener("BrowserTest:FocusChanged", focusChangedListener);
+  }
+}
+
+// Load a page and navigate between it and the chrome window. 
+add_task(function* ()
+{
+  let page1Promise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  gBrowser.selectedBrowser.loadURI(testPage1);
+  yield page1Promise;
+
+  // When the urlbar is focused, pressing F6 should focus the root of the content page.
+  gURLBar.focus();
+  yield* expectFocusOnF6(false, "html1", "html1",
+                                true, "basic focus content page");
+
+  // When the content is focused, pressing F6 should focus the urlbar.
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "basic focus content page urlbar");
+
+  // When a button in content is focused, pressing F6 should focus the urlbar.
+  yield* expectFocusOnF6(false, "html1", "html1",
+                                true, "basic focus content page with button focused");
+
+  return ContentTask.spawn(gBrowser.selectedBrowser, { }, function* () {
+    return content.document.getElementById("button1").focus();
+  });
+
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "basic focus content page with button focused urlbar");
+
+  // The document root should be focused, not the button
+  yield* expectFocusOnF6(false, "html1", "html1",
+                                true, "basic focus again content page with button focused");
+
+  // Check to ensure that the root element is focused
+  let match = yield ContentTask.spawn(gBrowser.selectedBrowser, { }, function* () {
+    return content.document.activeElement == content.document.documentElement;
+  });
+  ok(match, "basic focus again content page with button focused child root is focused");
+});
+
+// Open a second tab. Document focus should skip the background tab.
+add_task(function* ()
+{
+  yield BrowserTestUtils.openNewForegroundTab(gBrowser, testPage2);
+
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "basic focus content page and second tab urlbar");
+  yield* expectFocusOnF6(false, "html2", "html2",
+                                true, "basic focus content page with second tab");
+
+  yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
+
+// Shift+F6 should navigate backwards. There's only one document here so the effect
+// is the same.
+add_task(function* ()
+{
+  gURLBar.focus();
+  yield* expectFocusOnF6(true, "html1", "html1",
+                               true, "back focus content page");
+  yield* expectFocusOnF6(true, "main-window", gURLBar.inputField,
+                               false, "back focus content page urlbar");
+});
+
+// Open the sidebar and navigate between the sidebar, content and top-level window
+add_task(function* ()
+{
+  let sidebar = document.getElementById("sidebar");
+
+  let loadPromise = BrowserTestUtils.waitForEvent(sidebar, "load", true);
+  SidebarUI.toggle('viewBookmarksSidebar');
+  yield loadPromise;
+
+  
+  gURLBar.focus();
+  yield* expectFocusOnF6(false, "bookmarksPanel",
+                                sidebar.contentDocument.getElementById("search-box").inputField,
+                                false, "focus with sidebar open sidebar");
+  yield* expectFocusOnF6(false, "html1", "html1",
+                                true, "focus with sidebar open content");
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "focus with sidebar urlbar");
+
+  // Now go backwards
+  yield* expectFocusOnF6(true, "html1", "html1",
+                               true, "back focus with sidebar open content");
+  yield* expectFocusOnF6(true, "bookmarksPanel",
+                               sidebar.contentDocument.getElementById("search-box").inputField,
+                               false, "back focus with sidebar open sidebar");
+  yield* expectFocusOnF6(true, "main-window", gURLBar.inputField,
+                               false, "back focus with sidebar urlbar");
+
+  SidebarUI.toggle('viewBookmarksSidebar');
+});
+
+// Navigate when the downloads panel is open
+add_task(function* ()
+{
+  yield pushPrefs(["accessibility.tabfocus", 7]);
+
+  let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown", true);
+  EventUtils.synthesizeMouseAtCenter(document.getElementById("downloads-button"), { });
+  yield popupShownPromise;
+
+  gURLBar.focus();
+  yield* expectFocusOnF6(false, "main-window", document.getElementById("downloadsHistory"),
+                                false, "focus with downloads panel open panel");
+  yield* expectFocusOnF6(false, "html1", "html1",
+                                true, "focus with downloads panel open");
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "focus downloads panel open urlbar");
+
+  // Now go backwards
+  yield* expectFocusOnF6(true, "html1", "html1",
+                               true, "back focus with downloads panel open");
+  yield* expectFocusOnF6(true, "main-window", document.getElementById("downloadsHistory"),
+                               false, "back focus with downloads panel open");
+  yield* expectFocusOnF6(true, "main-window", gURLBar.inputField,
+                               false, "back focus downloads panel open urlbar");
+
+  let downloadsPopup = document.getElementById("downloadsPanel");
+  let popupHiddenPromise = BrowserTestUtils.waitForEvent(downloadsPopup, "popuphidden", true);
+  downloadsPopup.hidePopup();
+  yield popupHiddenPromise;
+});
+
+// Navigation with a contenteditable body
+add_task(function* ()
+{
+  yield BrowserTestUtils.openNewForegroundTab(gBrowser, testPage3);
+
+  // The body should be focused when it is editable, not the root.
+  gURLBar.focus();
+  yield* expectFocusOnF6(false, "html3", "body3",
+                                true, "focus with contenteditable body");
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "focus with contenteditable body urlbar");
+
+  // Now go backwards
+
+  yield* expectFocusOnF6(false, "html3", "body3",
+                                true, "back focus with contenteditable body");
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "back focus with contenteditable body urlbar");
+
+  yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
+
+// Navigation with a frameset loaded
+add_task(function* ()
+{
+  yield BrowserTestUtils.openNewForegroundTab(gBrowser,
+    "http://mochi.test:8888/browser/browser/base/content/test/general/file_documentnavigation_frameset.html");
+
+  gURLBar.focus();
+  yield* expectFocusOnF6(false, "htmlframe1", "htmlframe1",
+                                true, "focus on frameset frame 0");
+  yield* expectFocusOnF6(false, "htmlframe2", "htmlframe2",
+                                true, "focus on frameset frame 1");
+  yield* expectFocusOnF6(false, "htmlframe3", "htmlframe3",
+                                true, "focus on frameset frame 2");
+  yield* expectFocusOnF6(false, "htmlframe4", "htmlframe4",
+                                true, "focus on frameset frame 3");
+  yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
+                                false, "focus on frameset frame urlbar");
+
+  yield* expectFocusOnF6(true, "htmlframe4", "htmlframe4",
+                               true, "back focus on frameset frame 3");
+  yield* expectFocusOnF6(true, "htmlframe3", "htmlframe3",
+                               true, "back focus on frameset frame 2");
+  yield* expectFocusOnF6(true, "htmlframe2", "htmlframe2",
+                               true, "back focus on frameset frame 1");
+  yield* expectFocusOnF6(true, "htmlframe1", "htmlframe1",
+                               true, "back focus on frameset frame 0");
+  yield* expectFocusOnF6(true, "main-window", gURLBar.inputField,
+                               false, "back focus on frameset frame urlbar");
+
+  yield BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
+
+// XXXndeakin add tests for browsers inside of panels
diff --git a/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js b/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js
index 7ca92c8c3abd..24e8a0570b89 100644
--- a/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js
+++ b/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js
@@ -121,6 +121,10 @@ let gTests = [
 ];
 
 add_task(function* () {
+  yield pushPrefs(
+    ["full-screen-api.transition-duration.enter", "0 0"],
+    ["full-screen-api.transition-duration.leave", "0 0"]);
+
   let tab = gBrowser.addTab("about:robots");
   let browser = tab.linkedBrowser;
   gBrowser.selectedTab = tab;
diff --git a/browser/base/content/test/general/file_documentnavigation_frameset.html b/browser/base/content/test/general/file_documentnavigation_frameset.html
new file mode 100644
index 000000000000..beb01addfc56
--- /dev/null
+++ b/browser/base/content/test/general/file_documentnavigation_frameset.html
@@ -0,0 +1,12 @@
+<html id="outer">
+
+<frameset rows="30%, 70%">
+  <frame src="data:text/html,&lt;html id='htmlframe1' &gt;&lt;body id='framebody1'&gt;&lt;input id='i1'&gt;&lt;body&gt;&lt;/html&gt;">
+  <frameset cols="30%, 33%, 34%">
+    <frame src="data:text/html,&lt;html id='htmlframe2'&gt;&lt;body id='framebody2'&gt;&lt;input id='i2'&gt;&lt;body&gt;&lt;/html&gt;">
+    <frame src="data:text/html,&lt;html id='htmlframe3'&gt;&lt;body id='framebody3'&gt;&lt;input id='i3'&gt;&lt;body&gt;&lt;/html&gt;">
+    <frame src="data:text/html,&lt;html id='htmlframe4'&gt;&lt;body id='framebody4'&gt;&lt;input id='i4'&gt;&lt;body&gt;&lt;/html&gt;">
+  </frameset>
+</frameset>
+
+</html>
diff --git a/browser/base/content/test/general/test_contextmenu.html b/browser/base/content/test/general/test_contextmenu.html
index 450231af4016..5e9dd35f7092 100644
--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -507,6 +507,8 @@ function runTest(testNum) {
         subwindow.addEventListener("mozfullscreenchange", openDomFullScreen, false);
         SpecialPowers.setBoolPref("full-screen-api.approval-required", false);
         SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false);
+        SpecialPowers.setCharPref("full-screen-api.transition-duration.enter", "0 0");
+        SpecialPowers.setCharPref("full-screen-api.transition-duration.leave", "0 0");
         full_screen_element.mozRequestFullScreen();
     },
 
diff --git a/browser/components/downloads/content/downloadsOverlay.xul b/browser/components/downloads/content/downloadsOverlay.xul
index 56eec0d4dd7e..c3146d5e0353 100644
--- a/browser/components/downloads/content/downloadsOverlay.xul
+++ b/browser/components/downloads/content/downloadsOverlay.xul
@@ -39,7 +39,7 @@
              oncommand="goDoCommand('downloadsCmd_clearList')"/>
   </commandset>
 
-  <popupset>
+  <popupset id="mainPopupSet">
     <!-- The panel has level="top" to ensure that it is never hidden by the
          taskbar on Windows.  See bug 672365.  For accessibility to screen
          readers, we use a label on the panel instead of the anchor because the
diff --git a/browser/components/migration/nsIEHistoryEnumerator.cpp b/browser/components/migration/nsIEHistoryEnumerator.cpp
index 8cdc6e15cd3d..87d48319cef7 100644
--- a/browser/components/migration/nsIEHistoryEnumerator.cpp
+++ b/browser/components/migration/nsIEHistoryEnumerator.cpp
@@ -37,7 +37,7 @@ namespace {
     return PR_ImplodeTime(&prt);
   }
 
-} // Anonymous namespace.
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// nsIEHistoryEnumerator
diff --git a/browser/devtools/debugger/test/browser.ini b/browser/devtools/debugger/test/browser.ini
index c05a4d28f519..858996f5ca35 100644
--- a/browser/devtools/debugger/test/browser.ini
+++ b/browser/devtools/debugger/test/browser.ini
@@ -353,7 +353,7 @@ skip-if = e10s && debug
 [browser_dbg_promises-allocation-stack.js]
 skip-if = e10s && debug
 [browser_dbg_promises-chrome-allocation-stack.js]
-skip-if = (e10s || os == "linux") && debug
+skip-if = (e10s && debug) || os == "linux" # Bug 1177730
 [browser_dbg_reload-preferred-script-01.js]
 skip-if = e10s && debug
 [browser_dbg_reload-preferred-script-02.js]
diff --git a/build/clang-plugin/clang-plugin.cpp b/build/clang-plugin/clang-plugin.cpp
index f7c7637c7d8a..17c74e723b82 100644
--- a/build/clang-plugin/clang-plugin.cpp
+++ b/build/clang-plugin/clang-plugin.cpp
@@ -235,6 +235,25 @@ public:
     return attr->getAnnotation() == spelling;
   }
 
+  void HandleUnusedExprResult(const Stmt *stmt) {
+    const Expr* E = dyn_cast_or_null<Expr>(stmt);
+    if (E) {
+      // XXX It would be nice if we could use getAsTagDecl,
+      // but our version of clang is too old.
+      // (getAsTagDecl would also cover enums etc.)
+      QualType T = E->getType();
+      CXXRecordDecl *decl = T->getAsCXXRecordDecl();
+      if (decl) {
+        decl = decl->getDefinition();
+        if (decl && hasCustomAnnotation(decl, "moz_must_use")) {
+          unsigned errorID = Diag.getDiagnosticIDs()->getCustomDiagID(
+            DiagnosticIDs::Error, "Unused MOZ_MUST_USE value of type %0");
+          Diag.Report(E->getLocStart(), errorID) << T;
+        }
+      }
+    }
+  }
+
   bool VisitCXXRecordDecl(CXXRecordDecl *d) {
     // We need definitions, not declarations
     if (!d->isThisDeclarationADefinition()) return true;
@@ -317,6 +336,41 @@ public:
 
     return true;
   }
+
+  bool VisitSwitchCase(SwitchCase* stmt) {
+    HandleUnusedExprResult(stmt->getSubStmt());
+    return true;
+  }
+  bool VisitCompoundStmt(CompoundStmt* stmt) {
+    for (CompoundStmt::body_iterator it = stmt->body_begin(), e = stmt->body_end();
+         it != e; ++it) {
+      HandleUnusedExprResult(*it);
+    }
+    return true;
+  }
+  bool VisitIfStmt(IfStmt* Stmt) {
+    HandleUnusedExprResult(Stmt->getThen());
+    HandleUnusedExprResult(Stmt->getElse());
+    return true;
+  }
+  bool VisitWhileStmt(WhileStmt* Stmt) {
+    HandleUnusedExprResult(Stmt->getBody());
+    return true;
+  }
+  bool VisitDoStmt(DoStmt* Stmt) {
+    HandleUnusedExprResult(Stmt->getBody());
+    return true;
+  }
+  bool VisitForStmt(ForStmt* Stmt) {
+    HandleUnusedExprResult(Stmt->getBody());
+    HandleUnusedExprResult(Stmt->getInit());
+    HandleUnusedExprResult(Stmt->getInc());
+    return true;
+  }
+  bool VisitBinComma(BinaryOperator* Op) {
+    HandleUnusedExprResult(Op->getLHS());
+    return true;
+  }
 };
 
 /**
diff --git a/build/clang-plugin/tests/TestMustUse.cpp b/build/clang-plugin/tests/TestMustUse.cpp
new file mode 100644
index 000000000000..edcdb1a508cb
--- /dev/null
+++ b/build/clang-plugin/tests/TestMustUse.cpp
@@ -0,0 +1,156 @@
+#define MOZ_MUST_USE __attribute__((annotate("moz_must_use")))
+
+class MOZ_MUST_USE MustUse {};
+class MayUse {};
+
+MustUse producesMustUse();
+MustUse *producesMustUsePointer();
+MustUse &producesMustUseRef();
+
+MayUse producesMayUse();
+MayUse *producesMayUsePointer();
+MayUse &producesMayUseRef();
+
+void use(MustUse*);
+void use(MustUse&);
+void use(MustUse&&);
+void use(MayUse*);
+void use(MayUse&);
+void use(MayUse&&);
+void use(bool);
+
+void foo() {
+  producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  producesMustUsePointer();
+  producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  producesMayUse();
+  producesMayUsePointer();
+  producesMayUseRef();
+  {
+    producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMustUsePointer();
+    producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMayUse();
+    producesMayUsePointer();
+    producesMayUseRef();
+  }
+  if (true) {
+    producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMustUsePointer();
+    producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMayUse();
+    producesMayUsePointer();
+    producesMayUseRef();
+  } else {
+    producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMustUsePointer();
+    producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMayUse();
+    producesMayUsePointer();
+    producesMayUseRef();
+  }
+
+  if(true) producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  else producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  if(true) producesMustUsePointer();
+  else producesMustUsePointer();
+  if(true) producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  else producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  if(true) producesMayUse();
+  else producesMayUse();
+  if(true) producesMayUsePointer();
+  else producesMayUsePointer();
+  if(true) producesMayUseRef();
+  else producesMayUseRef();
+
+  while (true) producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  while (true) producesMustUsePointer();
+  while (true) producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  while (true) producesMayUse();
+  while (true) producesMayUsePointer();
+  while (true) producesMayUseRef();
+
+  do producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  while (true);
+  do producesMustUsePointer();
+  while (true);
+  do producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  while (true);
+  do producesMayUse();
+  while (true);
+  do producesMayUsePointer();
+  while (true);
+  do producesMayUseRef();
+  while (true);
+
+  for (;;) producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  for (;;) producesMustUsePointer();
+  for (;;) producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  for (;;) producesMayUse();
+  for (;;) producesMayUsePointer();
+  for (;;) producesMayUseRef();
+
+  for (producesMustUse();;); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  for (producesMustUsePointer();;);
+  for (producesMustUseRef();;); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  for (producesMayUse();;);
+  for (producesMayUsePointer();;);
+  for (producesMayUseRef();;);
+
+  for (;;producesMustUse()); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  for (;;producesMustUsePointer());
+  for (;;producesMustUseRef()); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  for (;;producesMayUse());
+  for (;;producesMayUsePointer());
+  for (;;producesMayUseRef());
+
+  use((producesMustUse(), false)); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  use((producesMustUsePointer(), false));
+  use((producesMustUseRef(), false)); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  use((producesMayUse(), false));
+  use((producesMayUsePointer(), false));
+  use((producesMayUseRef(), false));
+
+  switch (1) {
+  case 1:
+    producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMustUsePointer();
+    producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMayUse();
+    producesMayUsePointer();
+    producesMayUseRef();
+  case 2:
+    producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  case 3:
+    producesMustUsePointer();
+  case 4:
+    producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+  case 5:
+    producesMayUse();
+  case 6:
+    producesMayUsePointer();
+  case 7:
+    producesMayUseRef();
+  default:
+    producesMustUse(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMustUsePointer();
+    producesMustUseRef(); // expected-error {{Unused MOZ_MUST_USE value of type 'MustUse'}}
+    producesMayUse();
+    producesMayUsePointer();
+    producesMayUseRef();
+  }
+
+  use(producesMustUse());
+  use(producesMustUsePointer());
+  use(producesMustUseRef());
+  use(producesMayUse());
+  use(producesMayUsePointer());
+  use(producesMayUseRef());
+
+  MustUse a = producesMustUse();
+  MustUse *b = producesMustUsePointer();
+  MustUse &c = producesMustUseRef();
+  MayUse d = producesMayUse();
+  MayUse *e = producesMayUsePointer();
+  MayUse &f = producesMayUseRef();
+}
diff --git a/build/clang-plugin/tests/moz.build b/build/clang-plugin/tests/moz.build
index 0894046e1125..6dc1ec982786 100644
--- a/build/clang-plugin/tests/moz.build
+++ b/build/clang-plugin/tests/moz.build
@@ -10,6 +10,7 @@ SOURCES += [
     'TestExplicitOperatorBool.cpp',
     'TestGlobalClass.cpp',
     'TestMustOverride.cpp',
+    'TestMustUse.cpp',
     'TestNANTestingExpr.cpp',
     'TestNANTestingExprC.c',
     'TestNoAddRefReleaseOnReturn.cpp',
diff --git a/caps/BasePrincipal.cpp b/caps/BasePrincipal.cpp
index eaf70867fd3e..3cf84fa26913 100644
--- a/caps/BasePrincipal.cpp
+++ b/caps/BasePrincipal.cpp
@@ -108,7 +108,7 @@ private:
   OriginAttributes* mOriginAttributes;
 };
 
-} // anonymous namespace
+} // namespace
 
 bool
 OriginAttributes::PopulateFromSuffix(const nsACString& aStr)
diff --git a/caps/DomainPolicy.h b/caps/DomainPolicy.h
index b0b2a9f8783c..321771b968c3 100644
--- a/caps/DomainPolicy.h
+++ b/caps/DomainPolicy.h
@@ -15,7 +15,7 @@ namespace mozilla {
 
 namespace ipc {
 class URIParams;
-};
+} // namespace ipc
 
 enum DomainSetChangeType{
     ACTIVATE_POLICY,
diff --git a/caps/nsScriptSecurityManager.h b/caps/nsScriptSecurityManager.h
index 342e9b84aca3..e141b6089a7b 100644
--- a/caps/nsScriptSecurityManager.h
+++ b/caps/nsScriptSecurityManager.h
@@ -24,7 +24,7 @@ class nsSystemPrincipal;
 
 namespace mozilla {
 class OriginAttributes;
-}
+} // namespace mozilla
 
 /////////////////////////////
 // nsScriptSecurityManager //
diff --git a/chrome/RegistryMessageUtils.h b/chrome/RegistryMessageUtils.h
index 72b3243dbb95..1f8879cdbf7c 100644
--- a/chrome/RegistryMessageUtils.h
+++ b/chrome/RegistryMessageUtils.h
@@ -197,6 +197,6 @@ struct ParamTraits<OverrideMapping>
   }
 };
 
-}
+} // namespace IPC
 
 #endif // RegistryMessageUtils_h
diff --git a/chrome/nsChromeRegistryChrome.h b/chrome/nsChromeRegistryChrome.h
index b10e50416cbc..553c4e29174d 100644
--- a/chrome/nsChromeRegistryChrome.h
+++ b/chrome/nsChromeRegistryChrome.h
@@ -15,8 +15,8 @@
 namespace mozilla {
 namespace dom {
 class PContentParent;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsIPrefBranch;
 struct ChromePackage;
diff --git a/docshell/base/IHistory.h b/docshell/base/IHistory.h
index b913bed37e44..b1f5bb983166 100644
--- a/docshell/base/IHistory.h
+++ b/docshell/base/IHistory.h
@@ -15,7 +15,7 @@ namespace mozilla {
 
 namespace dom {
 class Link;
-}
+} // namespace dom
 
 // 0057c9d3-b98e-4933-bdc5-0275d06705e1
 #define IHISTORY_IID \
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index aa3eaeaa51dc..305857dc3230 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -2804,16 +2804,16 @@ nsDocShell::GetBusyFlags(uint32_t* aBusyFlags)
 }
 
 NS_IMETHODIMP
-nsDocShell::TabToTreeOwner(bool aForward, bool* aTookFocus)
+nsDocShell::TabToTreeOwner(bool aForward, bool aForDocumentNavigation, bool* aTookFocus)
 {
   NS_ENSURE_ARG_POINTER(aTookFocus);
 
   nsCOMPtr<nsIWebBrowserChromeFocus> chromeFocus = do_GetInterface(mTreeOwner);
   if (chromeFocus) {
     if (aForward) {
-      *aTookFocus = NS_SUCCEEDED(chromeFocus->FocusNextElement());
+      *aTookFocus = NS_SUCCEEDED(chromeFocus->FocusNextElement(aForDocumentNavigation));
     } else {
-      *aTookFocus = NS_SUCCEEDED(chromeFocus->FocusPrevElement());
+      *aTookFocus = NS_SUCCEEDED(chromeFocus->FocusPrevElement(aForDocumentNavigation));
     }
   } else {
     *aTookFocus = false;
@@ -8420,7 +8420,8 @@ private:
     mRestorePresentationEvent;
   nsRefPtr<nsDocShell::RestorePresentationEvent> mEvent;
 };
-}
+
+} // namespace
 
 nsresult
 nsDocShell::RestoreFromHistory()
@@ -9448,7 +9449,7 @@ private:
 NS_IMPL_ISUPPORTS(nsCopyFaviconCallback, nsIFaviconDataCallback)
 #endif
 
-} // anonymous namespace
+} // namespace
 
 void
 nsDocShell::CopyFavicon(nsIURI* aOldURI,
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index cff4437a3fb6..48e4e2295543 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -60,8 +60,8 @@
 namespace mozilla {
 namespace dom {
 class EventTarget;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsDocShell;
 class nsDOMNavigationTiming;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index 32369dcfe4e4..b216c13c0f38 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -46,7 +46,7 @@ interface nsITabParent;
  
 typedef unsigned long nsLoadFlags;
 
-[scriptable, builtinclass, uuid(b3137b7c-d589-48aa-b89b-e02aa451d42c)]
+[scriptable, builtinclass, uuid(97471054-0BC8-4A57-BBFE-6C255BCBBB67)]
 interface nsIDocShell : nsIDocShellTreeItem
 {
   /**
@@ -347,9 +347,12 @@ interface nsIDocShell : nsIDocShellTreeItem
   /*
    * Tells the docshell to offer focus to its tree owner.
    * This is currently only necessary for embedding chrome.
+   * If forDocumentNavigation is true, then document navigation should be
+   * performed, where only the root of documents are selected. Otherwise, the
+   * next element in the parent should be returned. Returns true if focus was
+   * successfully taken by the tree owner.
    */
-  void tabToTreeOwner(in boolean forward,
-                      out boolean tookFocus);
+  bool tabToTreeOwner(in boolean forward, in boolean forDocumentNavigation);
 
   /**
    * Current busy state for DocShell
diff --git a/docshell/shistory/nsSHEntryShared.cpp b/docshell/shistory/nsSHEntryShared.cpp
index fce019b79134..bc527b0fdb76 100644
--- a/docshell/shistory/nsSHEntryShared.cpp
+++ b/docshell/shistory/nsSHEntryShared.cpp
@@ -27,7 +27,7 @@ namespace {
 
 uint64_t gSHEntrySharedID = 0;
 
-} // anonymous namespace
+} // namespace
 
 #define CONTENT_VIEWER_TIMEOUT_SECONDS "browser.sessionhistory.contentViewerTimeout"
 // Default this to time out unused content viewers after 30 minutes
diff --git a/docshell/shistory/nsSHistory.cpp b/docshell/shistory/nsSHistory.cpp
index 90f7b128fdeb..ea5c8255f21b 100644
--- a/docshell/shistory/nsSHistory.cpp
+++ b/docshell/shistory/nsSHistory.cpp
@@ -227,7 +227,7 @@ EvictContentViewerForTransaction(nsISHTransaction* aTrans)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 nsSHistory::nsSHistory()
   : mIndex(-1)
@@ -1046,7 +1046,7 @@ public:
   int32_t mDistance;
 };
 
-} // anonymous namespace
+} // namespace
 
 // static
 void
diff --git a/dom/alarm/AlarmHalService.cpp b/dom/alarm/AlarmHalService.cpp
index d8d7127c9bc3..1724f4d09ddd 100644
--- a/dom/alarm/AlarmHalService.cpp
+++ b/dom/alarm/AlarmHalService.cpp
@@ -116,6 +116,6 @@ AlarmHalService::Notify(const int64_t& aClockDeltaMS)
   mSystemClockChangedCb->OnSystemClockChanged(aClockDeltaMS);
 }
 
-} // alarm
-} // dom
-} // mozilla
+} // namespace alarm
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/animation/AnimationTimeline.cpp b/dom/animation/AnimationTimeline.cpp
index 46a2fa132a48..e1f552816791 100644
--- a/dom/animation/AnimationTimeline.cpp
+++ b/dom/animation/AnimationTimeline.cpp
@@ -28,7 +28,7 @@ namespace {
     AnimationTimeline* mTimeline;
 #endif
   };
-}
+} // namespace
 
 static PLDHashOperator
 AppendAnimationToSequence(nsRefPtrHashKey<dom::Animation>* aKey,
diff --git a/dom/animation/test/testcommon.js b/dom/animation/test/testcommon.js
index 78561c63a57a..185c0de581c2 100644
--- a/dom/animation/test/testcommon.js
+++ b/dom/animation/test/testcommon.js
@@ -81,7 +81,8 @@ for (var funcName of ["async_test", "assert_not_equals", "assert_equals",
                       "assert_approx_equals", "assert_less_than",
                       "assert_less_than_equal", "assert_between_inclusive",
                       "assert_true", "assert_false",
-                      "assert_class_string", "assert_throws", "test"]) {
+                      "assert_class_string", "assert_throws",
+                      "assert_unreached", "test"]) {
   window[funcName] = opener[funcName].bind(opener);
 }
 
diff --git a/dom/asmjscache/AsmJSCache.cpp b/dom/asmjscache/AsmJSCache.cpp
index 73cd24bfe063..e61b3feaeb20 100644
--- a/dom/asmjscache/AsmJSCache.cpp
+++ b/dom/asmjscache/AsmJSCache.cpp
@@ -1618,7 +1618,7 @@ OpenFile(nsIPrincipal* aPrincipal,
   return JS::AsmJSCache_Success;
 }
 
-} // anonymous namespace
+} // namespace
 
 typedef uint32_t AsmJSCookieType;
 static const uint32_t sAsmJSCookie = 0x600d600d;
diff --git a/dom/asmjscache/AsmJSCache.h b/dom/asmjscache/AsmJSCache.h
index 69be5972ecab..46394839e260 100644
--- a/dom/asmjscache/AsmJSCache.h
+++ b/dom/asmjscache/AsmJSCache.h
@@ -19,7 +19,7 @@ namespace dom {
 
 namespace quota {
 class Client;
-}
+} // namespace quota
 
 namespace asmjscache {
 
diff --git a/dom/audiochannel/AudioChannelAgent.h b/dom/audiochannel/AudioChannelAgent.h
index 3033ed44f83d..10f731808dd4 100644
--- a/dom/audiochannel/AudioChannelAgent.h
+++ b/dom/audiochannel/AudioChannelAgent.h
@@ -65,4 +65,5 @@ private:
 } // namespace dom
 } // namespace mozilla
 
+
 #endif
diff --git a/dom/base/AnonymousContent.cpp b/dom/base/AnonymousContent.cpp
index cd97e3c34a33..6ef54a809624 100644
--- a/dom/base/AnonymousContent.cpp
+++ b/dom/base/AnonymousContent.cpp
@@ -138,5 +138,5 @@ AnonymousContent::WrapObject(JSContext* aCx,
   return AnonymousContentBinding::Wrap(aCx, this, aGivenProto, aReflector);
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/base/AnonymousContent.h b/dom/base/AnonymousContent.h
index 214a866cad21..38b50f042437 100644
--- a/dom/base/AnonymousContent.h
+++ b/dom/base/AnonymousContent.h
@@ -58,7 +58,7 @@ private:
   nsCOMPtr<Element> mContentNode;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_AnonymousContent_h
diff --git a/dom/base/BlobSet.h b/dom/base/BlobSet.h
index 7a295e781653..0287f20ef07a 100644
--- a/dom/base/BlobSet.h
+++ b/dom/base/BlobSet.h
@@ -83,7 +83,7 @@ protected:
   uint64_t mDataBufferLen;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_BlobSet_h
diff --git a/dom/base/ChildIterator.cpp b/dom/base/ChildIterator.cpp
index 1c34857eb979..fef7f582d481 100644
--- a/dom/base/ChildIterator.cpp
+++ b/dom/base/ChildIterator.cpp
@@ -345,5 +345,6 @@ AllChildrenIterator::GetNextChild()
 
   return nullptr;
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/base/ChromeUtils.cpp b/dom/base/ChromeUtils.cpp
index a9c2b907d4d5..a9d6e80aa2a2 100644
--- a/dom/base/ChromeUtils.cpp
+++ b/dom/base/ChromeUtils.cpp
@@ -28,5 +28,6 @@ ChromeUtils::OriginAttributesToSuffix(dom::GlobalObject& aGlobal,
   OriginAttributes attrs(aAttrs);
   attrs.CreateSuffix(aSuffix);
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/base/ChromeUtils.h b/dom/base/ChromeUtils.h
index fcd02f379998..66e191fa0311 100644
--- a/dom/base/ChromeUtils.h
+++ b/dom/base/ChromeUtils.h
@@ -16,7 +16,7 @@ namespace mozilla {
 
 namespace devtools {
 class HeapSnapshot;
-}
+} // namespace devtools
 
 namespace dom {
 
diff --git a/dom/base/Console.cpp b/dom/base/Console.cpp
index 6ead4e1d8a7c..6b665e152467 100644
--- a/dom/base/Console.cpp
+++ b/dom/base/Console.cpp
@@ -1469,7 +1469,7 @@ FlushOutput(JSContext* aCx, Sequence<JS::Value>& aSequence, nsString &aOutput)
   return true;
 }
 
-} // anonymous namespace
+} // namespace
 
 bool
 Console::ProcessArguments(JSContext* aCx,
diff --git a/dom/base/Console.h b/dom/base/Console.h
index 73c93bf30f40..ed1ecc309105 100644
--- a/dom/base/Console.h
+++ b/dom/base/Console.h
@@ -221,7 +221,7 @@ private:
   friend class ConsoleProfileRunnable;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif /* mozilla_dom_Console_h */
diff --git a/dom/base/DOMMatrix.h b/dom/base/DOMMatrix.h
index cf5353686d79..f7ec1ddba7ce 100644
--- a/dom/base/DOMMatrix.h
+++ b/dom/base/DOMMatrix.h
@@ -248,7 +248,7 @@ private:
   void Ensure3DMatrix();
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /*MOZILLA_DOM_DOMMATRIX_H_*/
diff --git a/dom/base/DOMPoint.h b/dom/base/DOMPoint.h
index 7331197264e1..d9a429be55a0 100644
--- a/dom/base/DOMPoint.h
+++ b/dom/base/DOMPoint.h
@@ -73,7 +73,7 @@ public:
   void SetW(double aW) { mW = aW; }
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /*MOZILLA_DOMPOINT_H_*/
diff --git a/dom/base/DOMQuad.h b/dom/base/DOMQuad.h
index 53e3dca98d18..9178d46e857c 100644
--- a/dom/base/DOMQuad.h
+++ b/dom/base/DOMQuad.h
@@ -65,7 +65,7 @@ protected:
   mutable nsRefPtr<QuadBounds> mBounds; // allocated lazily
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /*MOZILLA_DOMRECT_H_*/
diff --git a/dom/base/DOMRect.h b/dom/base/DOMRect.h
index 58c22fe453cb..6a0de2b0cdff 100644
--- a/dom/base/DOMRect.h
+++ b/dom/base/DOMRect.h
@@ -210,8 +210,7 @@ protected:
   nsCOMPtr<nsISupports> mParent;
 };
 
-}
-
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /*MOZILLA_DOMRECT_H_*/
diff --git a/dom/base/ElementInlines.h b/dom/base/ElementInlines.h
index 6eb5251bfb19..c68bd012ebfb 100644
--- a/dom/base/ElementInlines.h
+++ b/dom/base/ElementInlines.h
@@ -25,7 +25,7 @@ Element::UnregisterActivityObserver()
   OwnerDoc()->UnregisterActivityObserver(this);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_ElementInlines_h
diff --git a/dom/base/File.cpp b/dom/base/File.cpp
index 8b9f4cbe4e93..f2e9bb6396fb 100644
--- a/dom/base/File.cpp
+++ b/dom/base/File.cpp
@@ -1333,5 +1333,5 @@ BlobSet::AppendBlobImpls(const nsTArray<nsRefPtr<BlobImpl>>& aBlobImpls)
   return NS_OK;
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/base/File.h b/dom/base/File.h
index 154bcabbf1e4..44c8fb43f7e4 100644
--- a/dom/base/File.h
+++ b/dom/base/File.h
@@ -42,7 +42,7 @@ namespace dom {
 
 namespace indexedDB {
 class FileInfo;
-};
+} // namespace indexedDB
 
 struct BlobPropertyBag;
 struct ChromeFilePropertyBag;
@@ -1038,7 +1038,7 @@ private:
   nsCOMPtr<nsISupports> mParent;
 };
 
-} // dom namespace
-} // file namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_File_h
diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp
index 85249aec01f7..378616a0c926 100644
--- a/dom/base/FragmentOrElement.cpp
+++ b/dom/base/FragmentOrElement.cpp
@@ -2335,7 +2335,7 @@ private:
   uint32_t                                mLength;
 };
 
-} // anonymous namespace
+} // namespace
 
 static void
 AppendEncodedCharacters(const nsTextFragment* aText, StringBuilder& aBuilder)
diff --git a/dom/base/FragmentOrElement.h b/dom/base/FragmentOrElement.h
index 83d5fc2f80c8..b92d0456721f 100644
--- a/dom/base/FragmentOrElement.h
+++ b/dom/base/FragmentOrElement.h
@@ -35,8 +35,8 @@ class nsIURI;
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * A class that implements nsIWeakReference
diff --git a/dom/base/ImageEncoder.cpp b/dom/base/ImageEncoder.cpp
index c25345f500ac..366d26ef117d 100644
--- a/dom/base/ImageEncoder.cpp
+++ b/dom/base/ImageEncoder.cpp
@@ -10,6 +10,7 @@
 #include "mozilla/gfx/DataSurfaceHelpers.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SyncRunnable.h"
+#include "mozilla/unused.h"
 #include "gfxUtils.h"
 #include "nsNetUtil.h"
 
@@ -206,7 +207,7 @@ public:
     rv = NS_DispatchToMainThread(mEncodingCompleteEvent);
     if (NS_FAILED(rv)) {
       // Better to leak than to crash.
-      mEncodingCompleteEvent.forget();
+      unused << mEncodingCompleteEvent.forget();
       return rv;
     }
 
diff --git a/dom/base/ImageEncoder.h b/dom/base/ImageEncoder.h
index 12a4a8c5cb89..fe3522daff55 100644
--- a/dom/base/ImageEncoder.h
+++ b/dom/base/ImageEncoder.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace layers {
 class Image;
-}
+} // namespace layers
 
 namespace dom {
 
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index 902c3e2ad7d1..b40138b67cb7 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -778,7 +778,7 @@ VibrateWindowListener::RemoveListener()
                                     true /* use capture */);
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 Navigator::AddIdleObserver(MozIdleObserver& aIdleObserver, ErrorResult& aRv)
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
index 2cf82718db2e..015a72c6326c 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -41,8 +41,8 @@ class WakeLock;
 class ArrayBufferViewOrBlobOrStringOrFormData;
 struct MobileIdOptions;
 class ServiceWorkerContainer;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //*****************************************************************************
 // Navigator: Script "navigator" object
@@ -75,7 +75,7 @@ class MozGetUserMediaDevicesSuccessCallback;
 
 namespace network {
 class Connection;
-} // namespace Connection;
+} // namespace network
 
 #ifdef MOZ_B2G_BT
 namespace bluetooth {
diff --git a/dom/base/PostMessageEvent.cpp b/dom/base/PostMessageEvent.cpp
index 4547c0c870b0..de292e2cc1ba 100644
--- a/dom/base/PostMessageEvent.cpp
+++ b/dom/base/PostMessageEvent.cpp
@@ -36,7 +36,7 @@ struct StructuredCloneInfo
   nsTArray<nsRefPtr<MessagePortBase>> clonedPorts;
 };
 
-} // anonymous namespace
+} // namespace
 
 const JSStructuredCloneCallbacks PostMessageEvent::sPostMessageCallbacks = {
   PostMessageEvent::ReadStructuredClone,
@@ -393,5 +393,5 @@ PostMessageEvent::Write(JSContext* aCx, JS::Handle<JS::Value> aMessage,
                        &scInfo);
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/base/PostMessageEvent.h b/dom/base/PostMessageEvent.h
index bcad8f0930d5..5323ca85d462 100644
--- a/dom/base/PostMessageEvent.h
+++ b/dom/base/PostMessageEvent.h
@@ -104,7 +104,7 @@ private:
   nsTArray<MessagePortIdentifier> mPortIdentifiers;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_PostMessageEvent_h
diff --git a/dom/base/URL.cpp b/dom/base/URL.cpp
index e00582234cbb..03141b95011a 100644
--- a/dom/base/URL.cpp
+++ b/dom/base/URL.cpp
@@ -540,5 +540,5 @@ URL::CreateSearchParamsIfNeeded()
   }
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/base/URL.h b/dom/base/URL.h
index 2f6613df604d..667018bdc5c3 100644
--- a/dom/base/URL.h
+++ b/dom/base/URL.h
@@ -30,7 +30,7 @@ struct objectURLOptions;
 
 namespace workers {
 class URLProxy;
-}
+} // namespace workers
 
 class URL final : public URLSearchParamsObserver
                 , public nsWrapperCache
@@ -168,7 +168,7 @@ private:
 
 bool IsChromeURI(nsIURI* aURI);
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /* URL_h___ */
diff --git a/dom/base/URLSearchParams.cpp b/dom/base/URLSearchParams.cpp
index 9c8991067448..4191fc59aa71 100644
--- a/dom/base/URLSearchParams.cpp
+++ b/dom/base/URLSearchParams.cpp
@@ -272,7 +272,7 @@ void SerializeString(const nsCString& aInput, nsAString& aValue)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 URLParams::Serialize(nsAString& aValue) const
diff --git a/dom/base/WebSocket.cpp b/dom/base/WebSocket.cpp
index 9535fd85deea..b41b25e35cc1 100644
--- a/dom/base/WebSocket.cpp
+++ b/dom/base/WebSocket.cpp
@@ -319,7 +319,7 @@ private:
   nsresult mRv;
 };
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 WebSocketImpl::PrintErrorOnConsole(const char *aBundleURI,
@@ -461,7 +461,7 @@ private:
   const nsCString mReasonString;
 };
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 WebSocketImpl::CloseConnection(uint16_t aReasonCode,
@@ -592,7 +592,7 @@ private:
   WebSocketImpl* mImpl;
 };
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 WebSocketImpl::Disconnect()
@@ -1149,7 +1149,7 @@ private:
   ErrorResult& mRv;
 };
 
-} // anonymous namespace
+} // namespace
 
 already_AddRefed<WebSocket>
 WebSocket::Constructor(const GlobalObject& aGlobal,
@@ -2063,7 +2063,7 @@ private:
   WebSocketImpl* mWebSocketImpl;
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 WebSocketImpl::AddRefObject()
@@ -2484,7 +2484,7 @@ private:
   nsRefPtr<WebSocketImpl> mImpl;
 };
 
-} // anonymous namespace
+} // namespace
 
 // Window closed, stop/reload button pressed, user navigated away from page, etc.
 NS_IMETHODIMP
@@ -2657,7 +2657,7 @@ private:
   nsCOMPtr<nsIRunnable> mEvent;
 };
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 WebSocketImpl::DispatchFromScript(nsIRunnable* aEvent, uint32_t aFlags)
@@ -2717,5 +2717,5 @@ WebSocket::AssertIsOnTargetThread() const
   MOZ_ASSERT(NS_IsMainThread() == mIsMainThread);
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/base/mozFlushType.h b/dom/base/mozFlushType.h
index 0d162d8bf5c4..0a5680176aba 100644
--- a/dom/base/mozFlushType.h
+++ b/dom/base/mozFlushType.h
@@ -41,5 +41,6 @@ struct ChangesToFlush {
   bool mFlushAnimations;
 };
 
-}
+} // namespace mozilla
+
 #endif /* mozFlushType_h___ */
diff --git a/dom/base/nsAttrValue.h b/dom/base/nsAttrValue.h
index 83ec5947ca21..84c0f7aacbb0 100644
--- a/dom/base/nsAttrValue.h
+++ b/dom/base/nsAttrValue.h
@@ -35,8 +35,8 @@ namespace css {
 class StyleRule;
 struct URLValue;
 struct ImageValue;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 #define NS_ATTRVALUE_MAX_STRINGLENGTH_ATOM 12
 
diff --git a/dom/base/nsCCUncollectableMarker.h b/dom/base/nsCCUncollectableMarker.h
index a81303348e5a..98959efa8c42 100644
--- a/dom/base/nsCCUncollectableMarker.h
+++ b/dom/base/nsCCUncollectableMarker.h
@@ -45,7 +45,7 @@ private:
 namespace mozilla {
 namespace dom {
 void TraceBlackJS(JSTracer* aTrc, uint32_t aGCNumber, bool aIsShutdownGC);
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/base/nsContentAreaDragDrop.h b/dom/base/nsContentAreaDragDrop.h
index d94c11bde9b9..a8c0583ba790 100644
--- a/dom/base/nsContentAreaDragDrop.h
+++ b/dom/base/nsContentAreaDragDrop.h
@@ -23,8 +23,8 @@ class nsIFile;
 namespace mozilla {
 namespace dom {
 class DataTransfer;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //
 // class nsContentAreaDragDrop, used to generate the dragdata
diff --git a/dom/base/nsContentList.h b/dom/base/nsContentList.h
index 80fa9a8aa365..cbaa573969fc 100644
--- a/dom/base/nsContentList.h
+++ b/dom/base/nsContentList.h
@@ -33,8 +33,8 @@
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 
 class nsBaseContentList : public nsINodeList
diff --git a/dom/base/nsContentPermissionHelper.h b/dom/base/nsContentPermissionHelper.h
index e4f162f452f7..b8785ab05d04 100644
--- a/dom/base/nsContentPermissionHelper.h
+++ b/dom/base/nsContentPermissionHelper.h
@@ -30,7 +30,7 @@ class nsContentPermissionRequestProxy;
 // That will mess up windows build.
 namespace IPC {
 class Principal;
-}
+} // namespace IPC
 
 class VisibilityChangeListener final : public nsIDOMEventListener
 {
diff --git a/dom/base/nsContentSink.h b/dom/base/nsContentSink.h
index 21b63e29b4fa..f66359065b7a 100644
--- a/dom/base/nsContentSink.h
+++ b/dom/base/nsContentSink.h
@@ -42,8 +42,8 @@ class nsIApplicationCache;
 namespace mozilla {
 namespace css {
 class Loader;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 #ifdef DEBUG
 
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index 4eec861d99bc..7203b51ea452 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -26,6 +26,7 @@
 #include "MediaDecoder.h"
 // nsNPAPIPluginInstance must be included before nsIDocument.h, which is included in mozAutoDocUpdate.h.
 #include "nsNPAPIPluginInstance.h"
+#include "gfxPrefs.h"
 #include "mozAutoDocUpdate.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
@@ -442,7 +443,7 @@ private:
   nsCString mCharset;
 };
 
-} // anonymous namespace
+} // namespace
 
 /* static */
 TimeDuration
@@ -2026,9 +2027,9 @@ namespace dom {
 namespace workers {
 extern bool IsCurrentThreadRunningChromeWorker();
 extern JSContext* GetCurrentThreadJSContext();
-}
-}
-}
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
 
 bool
 nsContentUtils::ThreadsafeIsCallerChrome()
diff --git a/dom/base/nsDOMCaretPosition.h b/dom/base/nsDOMCaretPosition.h
index b70fdfbbd721..f11768b2d84a 100644
--- a/dom/base/nsDOMCaretPosition.h
+++ b/dom/base/nsDOMCaretPosition.h
@@ -15,8 +15,8 @@
 namespace mozilla {
 namespace dom {
 class DOMRect;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * Implementation of a DOM Caret Position, which is a node and offset within
diff --git a/dom/base/nsDOMFileReader.h b/dom/base/nsDOMFileReader.h
index 2f61fd24366b..ae9e81631789 100644
--- a/dom/base/nsDOMFileReader.h
+++ b/dom/base/nsDOMFileReader.h
@@ -28,8 +28,8 @@
 namespace mozilla {
 namespace dom {
 class Blob;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsDOMFileReader final : public mozilla::dom::FileIOObject,
                               public nsIDOMFileReader,
diff --git a/dom/base/nsDOMNavigationTiming.h b/dom/base/nsDOMNavigationTiming.h
index 296b3b6ab8b8..e8173403428a 100644
--- a/dom/base/nsDOMNavigationTiming.h
+++ b/dom/base/nsDOMNavigationTiming.h
@@ -24,9 +24,9 @@ static const nsDOMPerformanceNavigationType TYPE_NAVIGATE = 0;
 static const nsDOMPerformanceNavigationType TYPE_RELOAD = 1;
 static const nsDOMPerformanceNavigationType TYPE_BACK_FORWARD = 2;
 static const nsDOMPerformanceNavigationType TYPE_RESERVED = 255;
-}
-}
-}
+} // namespace PerformanceNavigation
+} // namespace dom
+} // namespace mozilla
 
 class nsDOMNavigationTiming final
 {
diff --git a/dom/base/nsDOMWindowUtils.h b/dom/base/nsDOMWindowUtils.h
index 4490a89c094f..c4393e328c8c 100644
--- a/dom/base/nsDOMWindowUtils.h
+++ b/dom/base/nsDOMWindowUtils.h
@@ -24,8 +24,8 @@ struct nsPoint;
 namespace mozilla {
   namespace layers {
     class LayerTransactionChild;
-  }
-}
+  } // namespace layers
+} // namespace mozilla
 
 class nsTranslationNodeList final : public nsITranslationNodeList
 {
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
index 308b74bbf315..db711f13afcf 100644
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -591,6 +591,7 @@ struct PositionComparator
     return 1;
   }
 };
+
 } // namespace
 
 bool
@@ -5933,7 +5934,7 @@ public:
 
 NS_IMPL_ISUPPORTS(ProcessStackRunner, nsIRunnable);
 
-} // anonymous namespace
+} // namespace
 
 void
 nsDocument::EnqueueLifecycleCallback(nsIDocument::ElementCallbackType aType,
@@ -9635,7 +9636,7 @@ struct SuppressArgs
   uint32_t mIncrease;
 };
 
-}
+} // namespace
 
 static bool
 SuppressEventHandlingInDocument(nsIDocument* aDocument, void* aData)
@@ -9912,7 +9913,7 @@ public:
 };
 NS_IMPL_ISUPPORTS(StubCSSLoaderObserver, nsICSSLoaderObserver)
 
-}
+} // namespace
 
 void
 nsDocument::PreloadStyle(nsIURI* uri, const nsAString& charset,
@@ -9969,7 +9970,7 @@ struct UnsuppressArgs
   nsTArray<nsCOMPtr<nsIDocument>> mDocs;
 };
 
-}
+} // namespace
 
 static bool
 GetAndUnsuppressSubDocuments(nsIDocument* aDocument,
diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h
index 9b65fae68484..98969c54c532 100644
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@@ -122,6 +122,7 @@ public:
   // need to send some notification itself with the real origin.
   bool mShouldNotifyNewOrigin = true;
 };
+
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 7360ce1c38e9..668787fe4d16 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -16,6 +16,7 @@
 #include "nsIDOMWindow.h"
 #include "nsIEditor.h"
 #include "nsPIDOMWindow.h"
+#include "nsIDOMChromeWindow.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMRange.h"
@@ -33,6 +34,7 @@
 #include "nsFrameSelection.h"
 #include "mozilla/dom/Selection.h"
 #include "nsXULPopupManager.h"
+#include "nsMenuPopupFrame.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIPrincipal.h"
 #include "nsIObserverService.h"
@@ -41,6 +43,7 @@
 #include "nsStyleCoord.h"
 #include "SelectionCarets.h"
 #include "TabChild.h"
+#include "nsFrameLoader.h"
 
 #include "mozilla/ContentEvents.h"
 #include "mozilla/dom/Element.h"
@@ -521,6 +524,10 @@ nsFocusManager::MoveFocus(nsIDOMWindow* aWindow, nsIDOMElement* aStartElement,
   nsCOMPtr<nsIContent> newFocus;
   nsresult rv = DetermineElementToMoveFocus(window, startContent, aType, noParentTraversal,
                                             getter_AddRefs(newFocus));
+  if (rv == NS_SUCCESS_DOM_NO_OPERATION) {
+    return NS_OK;
+  }
+
   NS_ENSURE_SUCCESS(rv, rv);
 
   LOGCONTENTNAVIGATION("Element to be focused: %s", newFocus.get());
@@ -2361,7 +2368,8 @@ nsFocusManager::GetSelectionLocation(nsIDocument* aDocument,
                                              eLeaf,
                                              false, // aVisual
                                              false, // aLockInScrollView
-                                             true      // aFollowOOFs
+                                             true,  // aFollowOOFs
+                                             false  // aSkipPopupChecks
                                              );
           NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2421,9 +2429,19 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
 {
   *aNextContent = nullptr;
 
-  nsCOMPtr<nsIDocShell> docShell = aWindow->GetDocShell();
-  if (!docShell)
-    return NS_OK;
+  // True if we are navigating by document (F6/Shift+F6) or false if we are
+  // navigating by element (Tab/Shift+Tab).
+  bool forDocumentNavigation = false;
+
+  // This is used for document navigation only. It will be set to true if we
+  // start navigating from a starting point. If this starting point is near the
+  // end of the document (for example, an element on a statusbar), and there
+  // are no child documents or panels before the end of the document, then we
+  // will need to ensure that we don't consider the root chrome window when we
+  // loop around and instead find the next child document/panel, as focus is
+  // already in that window. This flag will be cleared once we navigate into
+  // another document.
+  bool mayFocusRoot = (aStartContent != nullptr);
 
   nsCOMPtr<nsIContent> startContent = aStartContent;
   if (!startContent && aType != MOVEFOCUS_CARET) {
@@ -2449,19 +2467,24 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
   LookAndFeel::GetInt(LookAndFeel::eIntID_TabFocusModel,
                       &nsIContent::sTabFocusModel);
 
-  if (aType == MOVEFOCUS_ROOT) {
+  // These types are for document navigation using F6.
+  if (aType == MOVEFOCUS_FORWARDDOC || aType == MOVEFOCUS_BACKWARDDOC ||
+      aType == MOVEFOCUS_FIRSTDOC || aType == MOVEFOCUS_LASTDOC) {
+    forDocumentNavigation = true;
+  }
+
+  // If moving to the root or first document, find the root element and return.
+  if (aType == MOVEFOCUS_ROOT || aType == MOVEFOCUS_FIRSTDOC) {
     NS_IF_ADDREF(*aNextContent = GetRootForFocus(aWindow, doc, false, false));
-    return NS_OK;
+    if (!*aNextContent && aType == MOVEFOCUS_FIRSTDOC) {
+      // When looking for the first document, if the root wasn't focusable,
+      // find the next focusable document.
+      aType = MOVEFOCUS_FORWARDDOC;
+    } else {
+      return NS_OK;
+    }
   }
-  if (aType == MOVEFOCUS_FORWARDDOC) {
-    NS_IF_ADDREF(*aNextContent = GetNextTabbableDocument(startContent, true));
-    return NS_OK;
-  }
-  if (aType == MOVEFOCUS_BACKWARDDOC) {
-    NS_IF_ADDREF(*aNextContent = GetNextTabbableDocument(startContent, false));
-    return NS_OK;
-  }
-  
+
   nsIContent* rootContent = doc->GetRootElement();
   NS_ENSURE_TRUE(rootContent, NS_OK);
 
@@ -2473,17 +2496,19 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
       startContent = rootContent;
     return GetNextTabbableContent(presShell, startContent,
                                   nullptr, startContent,
-                                  true, 1, false, aNextContent);
+                                  true, 1, false, false, aNextContent);
   }
   if (aType == MOVEFOCUS_LAST) {
     if (!aStartContent)
       startContent = rootContent;
     return GetNextTabbableContent(presShell, startContent,
                                   nullptr, startContent,
-                                  false, 0, false, aNextContent);
+                                  false, 0, false, false, aNextContent);
   }
 
-  bool forward = (aType == MOVEFOCUS_FORWARD || aType == MOVEFOCUS_CARET);
+  bool forward = (aType == MOVEFOCUS_FORWARD ||
+                  aType == MOVEFOCUS_FORWARDDOC ||
+                  aType == MOVEFOCUS_CARET);
   bool doNavigation = true;
   bool ignoreTabIndex = false;
   // when a popup is open, we want to ensure that tab navigation occurs only
@@ -2518,7 +2543,7 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
                                                         nsGkAtoms::menuPopupFrame);
     }
 
-    if (popupFrame) {
+    if (popupFrame && !forDocumentNavigation) {
       // Don't navigate outside of a popup, so pretend that the
       // root content is the popup itself
       rootContent = popupFrame->GetContent();
@@ -2550,13 +2575,24 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
     }
 #endif
     if (popupFrame) {
-      rootContent = popupFrame->GetContent();
-      NS_ASSERTION(rootContent, "Popup frame doesn't have a content node");
-      startContent = rootContent;
+      // When there is a popup open, and no starting content, start the search
+      // at the topmost popup.
+      startContent = popupFrame->GetContent();
+      NS_ASSERTION(startContent, "Popup frame doesn't have a content node");
+      // Unless we are searching for documents, set the root content to the
+      // popup as well, so that we don't tab-navigate outside the popup.
+      // When navigating by documents, we start at the popup but can navigate
+      // outside of it to look for other panels and documents.
+      if (!forDocumentNavigation) {
+        rootContent = startContent;
+      }
+
+      doc = startContent ? startContent->GetComposedDoc() : nullptr;
     }
     else {
       // Otherwise, for content shells, start from the location of the caret.
-      if (docShell->ItemType() != nsIDocShellTreeItem::typeChrome) {
+      nsCOMPtr<nsIDocShell> docShell = aWindow->GetDocShell();
+      if (docShell && docShell->ItemType() != nsIDocShellTreeItem::typeChrome) {
         nsCOMPtr<nsIContent> endSelectionContent;
         GetSelectionLocation(doc, presShell,
                              getter_AddRefs(startContent),
@@ -2593,6 +2629,29 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
     }
   }
 
+  // Check if the starting content is the same as the content assigned to the
+  // retargetdocumentfocus attribute. Is so, we don't want to start searching
+  // from there but instead from the beginning of the document. Otherwise, the
+  // content that appears before the retargetdocumentfocus element will never
+  // get checked as it will be skipped when the focus is retargetted to it.
+  if (forDocumentNavigation && doc->IsXULDocument()) {
+    nsAutoString retarget;
+
+    if (rootContent->GetAttr(kNameSpaceID_None,
+                             nsGkAtoms::retargetdocumentfocus, retarget)) {
+      nsIContent* retargetElement = doc->GetElementById(retarget);
+      // The common case here is the urlbar where focus is on the anonymous
+      // input inside the textbox, but the retargetdocumentfocus attribute
+      // refers to the textbox. The Contains check will return false and the
+      // ContentIsDescendantOf check will return true in this case.
+      if (retargetElement && (retargetElement == startContent ||
+                              (!retargetElement->Contains(startContent) &&
+                              nsContentUtils::ContentIsDescendantOf(startContent, retargetElement)))) {
+        startContent = rootContent;
+      }
+    }
+  }
+
   NS_ASSERTION(startContent, "starting content not set");
 
   // keep a reference to the starting content. If we find that again, it means
@@ -2610,7 +2669,8 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
   nsIContent* originalStartContent = startContent;
 
   LOGCONTENTNAVIGATION("Focus Navigation Start Content %s", startContent.get());
-  LOGFOCUSNAVIGATION(("  Tabindex: %d Ignore: %d", tabIndex, ignoreTabIndex));
+  LOGFOCUSNAVIGATION(("  Forward: %d Tabindex: %d Ignore: %d DocNav: %d",
+                      forward, tabIndex, ignoreTabIndex, forDocumentNavigation));
 
   while (doc) {
     if (doNavigation) {
@@ -2619,22 +2679,29 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
                                            skipOriginalContentCheck ? nullptr : originalStartContent,
                                            startContent, forward,
                                            tabIndex, ignoreTabIndex,
+                                           forDocumentNavigation,
                                            getter_AddRefs(nextFocus));
       NS_ENSURE_SUCCESS(rv, rv);
+      if (rv == NS_SUCCESS_DOM_NO_OPERATION) {
+        // Navigation was redirected to a child process, so just return.
+        return NS_OK;
+      }
 
       // found a content node to focus.
       if (nextFocus) {
         LOGCONTENTNAVIGATION("Next Content: %s", nextFocus.get());
 
         // as long as the found node was not the same as the starting node,
-        // set it as the return value.
-        if (nextFocus != originalStartContent) {
+        // set it as the return value. For document navigation, we can return
+        // the same element in case there is only one content node that could
+        // be returned, for example, in a child process document. 
+        if (nextFocus != originalStartContent || forDocumentNavigation) {
           nextFocus.forget(aNextContent);
         }
         return NS_OK;
       }
 
-      if (popupFrame) {
+      if (popupFrame && !forDocumentNavigation) {
         // in a popup, so start again from the beginning of the popup. However,
         // if we already started at the beginning, then there isn't anything to
         // focus, so just return
@@ -2648,7 +2715,7 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
     }
 
     doNavigation = true;
-    skipOriginalContentCheck = false;
+    skipOriginalContentCheck = forDocumentNavigation;
     ignoreTabIndex = false;
 
     if (aNoParentTraversal) {
@@ -2660,46 +2727,45 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
       continue;
     }
 
-    // reached the beginning or end of the document. Traverse up to the parent
-    // document and try again.
-    nsCOMPtr<nsIDocShellTreeItem> docShellParent;
-    docShell->GetParent(getter_AddRefs(docShellParent));
-    if (docShellParent) {
-      // move up to the parent shell and try again from there.
+    // Reached the beginning or end of the document. Next, navigate up to the
+    // parent document and try again.
+    nsCOMPtr<nsPIDOMWindow> piWindow = doc->GetWindow();
+    NS_ENSURE_TRUE(piWindow, NS_ERROR_FAILURE);
 
-      // first, get the frame element this window is inside.
-      nsCOMPtr<nsPIDOMWindow> piWindow = docShell->GetWindow();
-      NS_ENSURE_TRUE(piWindow, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIDocShell> docShell = piWindow->GetDocShell();
+    NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
 
-      // Next, retrieve the parent docshell, document and presshell.
-      docShell = do_QueryInterface(docShellParent);
-      NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
-
-      nsCOMPtr<nsPIDOMWindow> piParentWindow = docShellParent->GetWindow();
-      NS_ENSURE_TRUE(piParentWindow, NS_ERROR_FAILURE);
-      doc = piParentWindow->GetExtantDoc();
+    // Get the frame element this window is inside and, from that, get the
+    // parent document and presshell. If there is no enclosing frame element,
+    // then this is a top-level, embedded or remote window.
+    startContent = piWindow->GetFrameElementInternal();
+    if (startContent) {
+      doc = startContent->GetComposedDoc();
       NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
+      rootContent = doc->GetRootElement();
       presShell = doc->GetShell();
 
-      rootContent = doc->GetRootElement();
-      startContent = piWindow->GetFrameElementInternal();
-      if (startContent) {
-        nsIFrame* frame = startContent->GetPrimaryFrame();
-        if (!frame)
-          return NS_OK;
+      // We can focus the root element now that we have moved to another document.
+      mayFocusRoot = true;
 
-        frame->IsFocusable(&tabIndex, 0);
-        if (tabIndex < 0) {
-          tabIndex = 1;
-          ignoreTabIndex = true;
-        }
+      nsIFrame* frame = startContent->GetPrimaryFrame();
+      if (!frame) {
+        return NS_OK;
+      }
 
-        // if the frame is inside a popup, make sure to scan only within the
-        // popup. This handles the situation of tabbing amongst elements
-        // inside an iframe which is itself inside a popup. Otherwise,
-        // navigation would move outside the popup when tabbing outside the
-        // iframe.
+      frame->IsFocusable(&tabIndex, 0);
+      if (tabIndex < 0) {
+        tabIndex = 1;
+        ignoreTabIndex = true;
+      }
+
+      // if the frame is inside a popup, make sure to scan only within the
+      // popup. This handles the situation of tabbing amongst elements
+      // inside an iframe which is itself inside a popup. Otherwise,
+      // navigation would move outside the popup when tabbing outside the
+      // iframe.
+      if (!forDocumentNavigation) {
         popupFrame = nsLayoutUtils::GetClosestFrameOfType(frame,
                                                           nsGkAtoms::menuPopupFrame);
         if (popupFrame) {
@@ -2707,17 +2773,13 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
           NS_ASSERTION(rootContent, "Popup frame doesn't have a content node");
         }
       }
-      else {
-        startContent = rootContent;
-        tabIndex = forward ? 1 : 0;
-      }
     }
     else {
-      // no parent, so call the tree owner. This will tell the embedder that
-      // it should take the focus.
+      // There is no parent, so call the tree owner. This will tell the
+      // embedder or parent process that it should take the focus.
       bool tookFocus;
-      docShell->TabToTreeOwner(forward, &tookFocus);
-      // if the tree owner, took the focus, blur the current content
+      docShell->TabToTreeOwner(forward, forDocumentNavigation, &tookFocus);
+      // If the tree owner took the focus, blur the current content.
       if (tookFocus) {
         nsCOMPtr<nsPIDOMWindow> window = docShell->GetWindow();
         if (window->GetFocusedNode() == mFocusedContent)
@@ -2727,6 +2789,23 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
         return NS_OK;
       }
 
+      // If we have reached the end of the top-level document, focus the
+      // first element in the top-level document. This should always happen
+      // when navigating by document forwards but when navigating backwards,
+      // only do this if we started in another document or within a popup frame.
+      // If the focus started in this window outside a popup however, we should
+      // continue by looping around to the end again.
+      if (forDocumentNavigation && (forward || mayFocusRoot || popupFrame)) {
+        // HTML content documents can have their root element focused (a focus
+        // ring appears around the entire content area frame). This root
+        // appears in the tab order before all of the elements in the document.
+        // Chrome documents however cannot be focused directly, so instead we
+        // focus the first focusable element within the window.
+        // For example, the urlbar.
+        nsIContent* root = GetRootForFocus(piWindow, doc, true, true);
+        return FocusFirst(root, aNextContent);
+      }
+
       // reset the tab index and start again from the beginning or end
       startContent = rootContent;
       tabIndex = forward ? 1 : 0;
@@ -2749,6 +2828,7 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
                                        bool aForward,
                                        int32_t aCurrentTabIndex,
                                        bool aIgnoreTabIndex,
+                                       bool aForDocumentNavigation,
                                        nsIContent** aResultContent)
 {
   *aResultContent = nullptr;
@@ -2785,13 +2865,17 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
       continue;
     }
 
+    // For tab navigation, pass false for aSkipPopupChecks so that we don't
+    // iterate into or out of a popup. For document naviation pass true to
+    // ignore these boundaries.
     nsCOMPtr<nsIFrameEnumerator> frameTraversal;
     nsresult rv = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
                                        presContext, startFrame,
                                        ePreOrder,
                                        false, // aVisual
                                        false, // aLockInScrollView
-                                       true      // aFollowOOFs
+                                       true,  // aFollowOOFs
+                                       aForDocumentNavigation  // aSkipPopupChecks
                                        );
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2816,6 +2900,51 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
     // Walk frames to find something tabbable matching mCurrentTabIndex
     nsIFrame* frame = static_cast<nsIFrame*>(frameTraversal->CurrentItem());
     while (frame) {
+      nsIContent* currentContent = frame->GetContent();
+
+      // For document navigation, check if this element is an open panel. Since
+      // panels aren't focusable (tabIndex would be -1), we'll just assume that
+      // for document navigation, the tabIndex is 0.
+      if (aForDocumentNavigation && currentContent && (aCurrentTabIndex == 0) &&
+          currentContent->IsXULElement(nsGkAtoms::panel)) {
+        nsMenuPopupFrame* popupFrame = do_QueryFrame(frame);
+        // Check if the panel is open. Closed panels are ignored since you can't
+        // focus anything in them.
+        if (popupFrame && popupFrame->IsOpen()) {
+          // When moving backward, skip the popup we started in otherwise it
+          // will be selected again.
+          bool validPopup = true;
+          if (!aForward) {
+            nsIContent* content = aStartContent;
+            while (content) {
+              if (content == currentContent) {
+                validPopup = false;
+                break;
+              }
+
+              content = content->GetParent();
+            }
+          }
+
+          if (validPopup) {
+            // Since a panel isn't focusable itself, find the first focusable
+            // content within the popup. If there isn't any focusable content
+            // in the popup, skip this popup and continue iterating through the
+            // frames. We pass the panel itself (currentContent) as the starting
+            // and root content, so that we only find content within the panel.
+            // Note also that we pass false for aForDocumentNavigation since we
+            // want to locate the first content, not the first document.
+            rv = GetNextTabbableContent(aPresShell, currentContent,
+                                        nullptr, currentContent,
+                                        true, 1, false, false,
+                                        aResultContent);
+            if (NS_SUCCEEDED(rv) && *aResultContent) {
+              return rv;
+            }
+          }
+        }
+      }
+
       // TabIndex not set defaults to 0 for form elements, anchors and other
       // elements that are normally focusable. Tabindex defaults to -1
       // for elements that are not normally focusable.
@@ -2823,17 +2952,16 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
       //          < 0 not tabbable at all
       //          == 0 in normal tab order (last after positive tabindexed items)
       //          > 0 can be tabbed to in the order specified by this value
-
       int32_t tabIndex;
       frame->IsFocusable(&tabIndex, 0);
 
       LOGCONTENTNAVIGATION("Next Tabbable %s:", frame->GetContent());
       LOGFOCUSNAVIGATION(("  with tabindex: %d expected: %d", tabIndex, aCurrentTabIndex));
 
-      nsIContent* currentContent = frame->GetContent();
       if (tabIndex >= 0) {
         NS_ASSERTION(currentContent, "IsFocusable set a tabindex for a frame with no content");
-        if (currentContent->IsHTMLElement(nsGkAtoms::img) &&
+        if (!aForDocumentNavigation &&
+            currentContent->IsHTMLElement(nsGkAtoms::img) &&
             currentContent->HasAttr(kNameSpaceID_None, nsGkAtoms::usemap)) {
           // This is an image with a map. Image map areas are not traversed by
           // nsIFrameTraversal so look for the next or previous area element.
@@ -2852,29 +2980,50 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
             return NS_OK;
           }
 
-          // found a node with a matching tab index. Check if it is a child
-          // frame. If so, navigate into the child frame instead.
-          nsIDocument* doc = currentContent->GetComposedDoc();
-          NS_ASSERTION(doc, "content not in document");
-          nsIDocument* subdoc = doc->GetSubDocumentFor(currentContent);
-          if (subdoc) {
-            if (!subdoc->EventHandlingSuppressed()) {
+          bool checkSubDocument = true;
+          if (aForDocumentNavigation) {
+            // If this is a remote child browser, call NavigateDocument to have
+            // the child process continue the navigation. Return a special error
+            // code to have the caller return early. If the child ends up not
+            // being focusable in some way, the child process will call back
+            // into document navigation again by calling MoveFocus.
+            TabParent* remote = TabParent::GetFrom(currentContent);
+            if (remote) {
+              remote->NavigateDocument(aForward);
+              return NS_SUCCESS_DOM_NO_OPERATION;
+            }
+
+            // Next, check if this a non-remote child document.
+            nsIContent* docRoot = GetRootForChildDocument(currentContent);
+            if (docRoot) {
+              // If GetRootForChildDocument returned something then call
+              // FocusFirst to find the root or first element to focus within
+              // the child document. If this is a frameset though, skip this and
+              // fall through to the checkSubDocument block below to iterate into
+              // the frameset's frames and locate the first focusable frame.
+              if (!docRoot->IsHTMLElement(nsGkAtoms::frameset)) {
+                return FocusFirst(docRoot, aResultContent);
+              }
+            } else {
+              // Set checkSubDocument to false, as this was neither a frame
+              // type element or a child document that was focusable.
+              checkSubDocument = false;
+            }
+          }
+
+          if (checkSubDocument) {
+            // found a node with a matching tab index. Check if it is a child
+            // frame. If so, navigate into the child frame instead.
+            nsIDocument* doc = currentContent->GetComposedDoc();
+            NS_ASSERTION(doc, "content not in document");
+            nsIDocument* subdoc = doc->GetSubDocumentFor(currentContent);
+            if (subdoc && !subdoc->EventHandlingSuppressed()) {
               if (aForward) {
                 // when tabbing forward into a frame, return the root
                 // frame so that the canvas becomes focused.
                 nsCOMPtr<nsPIDOMWindow> subframe = subdoc->GetWindow();
                 if (subframe) {
-                  // If the subframe body is editable by contenteditable,
-                  // we should set the editor's root element rather than the
-                  // actual root element.  Otherwise, we should set the focus
-                  // to the root content.
-                  *aResultContent =
-                    nsLayoutUtils::GetEditableRootContentByContentEditable(subdoc);
-                  if (!*aResultContent ||
-                      !((*aResultContent)->GetPrimaryFrame())) {
-                    *aResultContent =
-                      GetRootForFocus(subframe, subdoc, false, true);
-                  }
+                  *aResultContent = GetRootForFocus(subframe, subdoc, false, true);
                   if (*aResultContent) {
                     NS_ADDREF(*aResultContent);
                     return NS_OK;
@@ -2887,29 +3036,29 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
                 rv = GetNextTabbableContent(subShell, rootElement,
                                             aOriginalStartContent, rootElement,
                                             aForward, (aForward ? 1 : 0),
-                                            false, aResultContent);
+                                            false, aForDocumentNavigation, aResultContent);
                 NS_ENSURE_SUCCESS(rv, rv);
                 if (*aResultContent)
                   return NS_OK;
               }
             }
-          }
-          // otherwise, use this as the next content node to tab to, unless
-          // this was the element we started on. This would happen for
-          // instance on an element with child frames, where frame navigation
-          // could return the original element again. In that case, just skip
-          // it. Also, if the next content node is the root content, then
-          // return it. This latter case would happen only if someone made a
-          // popup focusable.
-          // Also, when going backwards, check to ensure that the focus
-          // wouldn't be redirected. Otherwise, for example, when an input in
-          // a textbox is focused, the enclosing textbox would be found and
-          // the same inner input would be returned again.
-          else if (currentContent == aRootContent ||
-                   (currentContent != startContent &&
-                    (aForward || !GetRedirectedFocus(currentContent)))) {
-            NS_ADDREF(*aResultContent = currentContent);
-            return NS_OK;
+            // otherwise, use this as the next content node to tab to, unless
+            // this was the element we started on. This would happen for
+            // instance on an element with child frames, where frame navigation
+            // could return the original element again. In that case, just skip
+            // it. Also, if the next content node is the root content, then
+            // return it. This latter case would happen only if someone made a
+            // popup focusable.
+            // Also, when going backwards, check to ensure that the focus
+            // wouldn't be redirected. Otherwise, for example, when an input in
+            // a textbox is focused, the enclosing textbox would be found and
+            // the same inner input would be returned again.
+            else if (currentContent == aRootContent ||
+                     (currentContent != startContent &&
+                      (aForward || !GetRedirectedFocus(currentContent)))) {
+              NS_ADDREF(*aResultContent = currentContent);
+              return NS_OK;
+            }
           }
         }
       }
@@ -2942,13 +3091,14 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
     // A bit counterintuitive but true, tabindex order goes 1, 2, ... 32767, 0
     if (aCurrentTabIndex == (aForward ? 0 : 1)) {
       // if going backwards, the canvas should be focused once the beginning
-      // has been reached.
+      // has been reached, so get the root element.
       if (!aForward) {
         nsCOMPtr<nsPIDOMWindow> window = GetCurrentWindow(aRootContent);
         NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
-        NS_IF_ADDREF(*aResultContent =
-                     GetRootForFocus(window, aRootContent->GetComposedDoc(),
-                                     false, true));
+
+        nsCOMPtr<nsIContent> docRoot =
+          GetRootForFocus(window, aRootContent->GetComposedDoc(), false, true);
+        FocusFirst(docRoot, aResultContent);
       }
       break;
     }
@@ -3054,26 +3204,58 @@ nsFocusManager::GetNextTabIndex(nsIContent* aParent,
   return tabIndex;
 }
 
+nsresult
+nsFocusManager::FocusFirst(nsIContent* aRootContent, nsIContent** aNextContent)
+{
+  if (!aRootContent) {
+    return NS_OK;
+  }
+
+  nsIDocument* doc = aRootContent->GetComposedDoc();
+  if (doc) {
+    if (doc->IsXULDocument()) {
+      // If the redirectdocumentfocus attribute is set, redirect the focus to a
+      // specific element. This is primarily used to retarget the focus to the
+      // urlbar during document navigation.
+      nsAutoString retarget;
+
+      if (aRootContent->GetAttr(kNameSpaceID_None,
+                               nsGkAtoms::retargetdocumentfocus, retarget)) {
+        nsCOMPtr<nsIContent> retargetElement =
+          CheckIfFocusable(doc->GetElementById(retarget), 0);
+        if (retargetElement) {
+          retargetElement.forget(aNextContent);
+          return NS_OK;
+        }
+      }
+    }
+
+    nsCOMPtr<nsIDocShell> docShell = doc->GetDocShell();
+    if (docShell->ItemType() == nsIDocShellTreeItem::typeChrome) {
+      // If the found content is in a chrome shell, navigate forward one
+      // tabbable item so that the first item is focused. Note that we
+      // always go forward and not back here.
+      nsIPresShell* presShell = doc->GetShell();
+      if (presShell) {
+        return GetNextTabbableContent(presShell, aRootContent,
+                                      nullptr, aRootContent,
+                                      true, 1, false, false,
+                                      aNextContent);
+      }
+    }
+  }
+
+  NS_ADDREF(*aNextContent = aRootContent);
+  return NS_OK;
+}
+
 nsIContent*
 nsFocusManager::GetRootForFocus(nsPIDOMWindow* aWindow,
                                 nsIDocument* aDocument,
-                                bool aIsForDocNavigation,
+                                bool aForDocumentNavigation,
                                 bool aCheckVisibility)
 {
-  // the root element's canvas may be focused as long as the document is in a
-  // a non-chrome shell and does not contain a frameset.
-  if (aIsForDocNavigation) {
-    nsCOMPtr<Element> docElement = aWindow->GetFrameElementInternal();
-    // document navigation skips iframes and frames that are specifically non-focusable
-    if (docElement) {
-      if (docElement->NodeInfo()->NameAtom() == nsGkAtoms::iframe)
-        return nullptr;
-
-      nsIFrame* frame = docElement->GetPrimaryFrame();
-      if (!frame || !frame->IsFocusable(nullptr, 0))
-        return nullptr;
-    }
-  } else {
+  if (!aForDocumentNavigation) {
     nsCOMPtr<nsIDocShell> docShell = aWindow->GetDocShell();
     if (docShell->ItemType() == nsIDocShellTreeItem::typeChrome) {
       return nullptr;
@@ -3083,9 +3265,15 @@ nsFocusManager::GetRootForFocus(nsPIDOMWindow* aWindow,
   if (aCheckVisibility && !IsWindowVisible(aWindow))
     return nullptr;
 
-  Element *rootElement = aDocument->GetRootElement();
-  if (!rootElement) {
-    return nullptr;
+  // If the body is contenteditable, use the editor's root element rather than
+  // the actual root element.
+  nsCOMPtr<nsIContent> rootElement =
+    nsLayoutUtils::GetEditableRootContentByContentEditable(aDocument);
+  if (!rootElement || !rootElement->GetPrimaryFrame()) {
+    rootElement = aDocument->GetRootElement();
+    if (!rootElement) {
+      return nullptr;
+    }
   }
 
   if (aCheckVisibility && !rootElement->GetPrimaryFrame()) {
@@ -3094,291 +3282,43 @@ nsFocusManager::GetRootForFocus(nsPIDOMWindow* aWindow,
 
   // Finally, check if this is a frameset
   nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(aDocument);
-  if (htmlDoc && aDocument->GetHtmlChildElement(nsGkAtoms::frameset)) {
-    return nullptr;
+  if (htmlDoc) {
+    nsIContent* htmlChild = aDocument->GetHtmlChildElement(nsGkAtoms::frameset);
+    if (htmlChild) {
+      // In document navigation mode, return the frameset so that navigation
+      // descends into the child frames.
+      return aForDocumentNavigation ? htmlChild : nullptr;
+    }
   }
 
   return rootElement;
 }
 
-void
-nsFocusManager::GetLastDocShell(nsIDocShellTreeItem* aItem,
-                                nsIDocShellTreeItem** aResult)
-{
-  *aResult = nullptr;
-
-  nsCOMPtr<nsIDocShellTreeItem> curItem = aItem;
-  while (curItem) {
-    int32_t childCount = 0;
-    curItem->GetChildCount(&childCount);
-    if (!childCount) {
-      curItem.forget(aResult);
-      return;
-    }
-
-    
-    curItem->GetChildAt(childCount - 1, getter_AddRefs(curItem));
-  }
-}
-
-void
-nsFocusManager::GetNextDocShell(nsIDocShellTreeItem* aItem,
-                                nsIDocShellTreeItem** aResult)
-{
-  *aResult = nullptr;
-
-  int32_t childCount = 0;
-  aItem->GetChildCount(&childCount);
-  if (childCount) {
-    aItem->GetChildAt(0, aResult);
-    if (*aResult)
-      return;
-  }
-
-  nsCOMPtr<nsIDocShellTreeItem> curItem = aItem;
-  while (curItem) {
-    nsCOMPtr<nsIDocShellTreeItem> parentItem;
-    curItem->GetParent(getter_AddRefs(parentItem));
-    if (!parentItem)
-      return;
-
-    // Note that we avoid using GetChildOffset() here because docshell
-    // child offsets can't be trusted to be correct. bug 162283.
-    nsCOMPtr<nsIDocShellTreeItem> iterItem;
-    childCount = 0;
-    parentItem->GetChildCount(&childCount);
-    for (int32_t index = 0; index < childCount; ++index) {
-      parentItem->GetChildAt(index, getter_AddRefs(iterItem));
-      if (iterItem == curItem) {
-        ++index;
-        if (index < childCount) {
-          parentItem->GetChildAt(index, aResult);
-          if (*aResult)
-            return;
-        }
-        break;
-      }
-    }
-
-    curItem = parentItem;
-  }
-}
-
-void
-nsFocusManager::GetPreviousDocShell(nsIDocShellTreeItem* aItem,
-                                    nsIDocShellTreeItem** aResult)
-{
-  *aResult = nullptr;
-
-  nsCOMPtr<nsIDocShellTreeItem> parentItem;
-  aItem->GetParent(getter_AddRefs(parentItem));
-  if (!parentItem)
-    return;
-
-  // Note that we avoid using GetChildOffset() here because docshell
-  // child offsets can't be trusted to be correct. bug 162283.
-  int32_t childCount = 0;
-  parentItem->GetChildCount(&childCount);
-  nsCOMPtr<nsIDocShellTreeItem> prevItem, iterItem;
-  for (int32_t index = 0; index < childCount; ++index) {
-    parentItem->GetChildAt(index, getter_AddRefs(iterItem));
-    if (iterItem == aItem)
-      break;
-    prevItem = iterItem;
-  }
-
-  if (prevItem)
-    GetLastDocShell(prevItem, aResult);
-  else
-    parentItem.forget(aResult);
-}
-
 nsIContent*
-nsFocusManager::GetNextTabbablePanel(nsIDocument* aDocument, nsIFrame* aCurrentPopup, bool aForward)
+nsFocusManager::GetRootForChildDocument(nsIContent* aContent)
 {
-  nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
-  if (!pm)
+  // Check for elements that represent child documents, that is, browsers,
+  // editors or frames from a frameset. We don't include iframes since we
+  // consider them to be an integral part of the same window or page.
+  if (!aContent ||
+      !(aContent->IsXULElement(nsGkAtoms::browser) ||
+        aContent->IsXULElement(nsGkAtoms::editor) ||
+        aContent->IsHTMLElement(nsGkAtoms::frame))) {
     return nullptr;
-
-  // Iterate through the array backwards if aForward is false.
-  nsTArray<nsIFrame *> popups;
-  pm->GetVisiblePopups(popups);
-  int32_t i = aForward ? 0 : popups.Length() - 1;
-  int32_t end = aForward ? popups.Length() : -1;
-
-  for (; i != end; aForward ? i++ : i--) {
-    nsIFrame* popupFrame = popups[i];
-    if (aCurrentPopup) {
-      // If the current popup is set, then we need to skip over this popup and
-      // wait until the currently focused popup is found. Once found, the
-      // current popup will be cleared so that the next popup is used.
-      if (aCurrentPopup == popupFrame)
-        aCurrentPopup = nullptr;
-      continue;
-    }
-
-    // Skip over non-panels
-    if (!popupFrame->GetContent()->IsXULElement(nsGkAtoms::panel) ||
-        (aDocument && popupFrame->GetContent()->GetComposedDoc() != aDocument)) {
-      continue;
-    }
-
-    // Find the first focusable content within the popup. If there isn't any
-    // focusable content in the popup, skip to the next popup.
-    nsIPresShell* presShell = popupFrame->PresContext()->GetPresShell();
-    if (presShell) {
-      nsCOMPtr<nsIContent> nextFocus;
-      nsIContent* popup = popupFrame->GetContent();
-      nsresult rv = GetNextTabbableContent(presShell, popup,
-                                           nullptr, popup,
-                                           true, 1, false,
-                                           getter_AddRefs(nextFocus));
-      if (NS_SUCCEEDED(rv) && nextFocus) {
-        return nextFocus.get();
-      }
-    }
   }
 
-  return nullptr;
-}
-
-nsIContent*
-nsFocusManager::GetNextTabbableDocument(nsIContent* aStartContent, bool aForward)
-{
-  // If currentPopup is set, then the starting content is in a panel.
-  nsIFrame* currentPopup = nullptr;
-  nsCOMPtr<nsIDocument> doc;
-  nsCOMPtr<nsIDocShell> startDocShell;
-
-  if (aStartContent) {
-    doc = aStartContent->GetComposedDoc();
-    if (doc) {
-      startDocShell = doc->GetWindow()->GetDocShell();
-    }
-
-    // Check if the starting content is inside a panel. Document navigation
-    // must start from this panel instead of the document root.
-    nsIContent* content = aStartContent;
-    while (content) {
-      if (content->NodeInfo()->Equals(nsGkAtoms::panel, kNameSpaceID_XUL)) {
-        currentPopup = content->GetPrimaryFrame();
-        break;
-      }
-      content = content->GetParent();
-    }
-  }
-  else if (mFocusedWindow) {
-    startDocShell = mFocusedWindow->GetDocShell();
-    doc = mFocusedWindow->GetExtantDoc();
-  } else if (mActiveWindow) {
-    startDocShell = mActiveWindow->GetDocShell();
-    doc = mActiveWindow->GetExtantDoc();
-  }
-
-  if (!startDocShell)
+  nsIDocument* doc = aContent->GetComposedDoc();
+  if (!doc) {
     return nullptr;
+  }
 
-  // perform a depth first search (preorder) of the docshell tree
-  // looking for an HTML Frame or a chrome document
-  nsIContent* content = aStartContent;
-  nsCOMPtr<nsIDocShellTreeItem> curItem = startDocShell.get();
-  nsCOMPtr<nsIDocShellTreeItem> nextItem;
-  do {
-    // If moving forward, check for a panel in the starting document. If one
-    // exists with focusable content, return that content instead of the next
-    // document. If currentPopup is set, then, another panel may exist. If no
-    // such panel exists, then continue on to check the next document.
-    // When moving backwards, and the starting content is in a panel, then
-    // check for additional panels in the starting document. If the starting
-    // content is not in a panel, move back to the previous document and check
-    // for panels there.
+  nsIDocument* subdoc = doc->GetSubDocumentFor(aContent);
+  if (!subdoc || subdoc->EventHandlingSuppressed()) {
+    return nullptr;
+  }
 
-    bool checkPopups = false;
-    nsCOMPtr<nsPIDOMWindow> nextFrame = nullptr;
-
-    if (doc && (aForward || currentPopup)) {
-      nsIContent* popupContent = GetNextTabbablePanel(doc, currentPopup, aForward);
-      if (popupContent)
-        return popupContent;
-
-      if (!aForward && currentPopup) {
-        // The starting content was in a popup, yet no other popups were
-        // found. Move onto the starting content's document.
-        nextFrame = doc->GetWindow();
-      }
-    }
-
-    // Look for the next or previous document.
-    if (!nextFrame) {
-      if (aForward) {
-        GetNextDocShell(curItem, getter_AddRefs(nextItem));
-        if (!nextItem) {
-          // wrap around to the beginning, which is the top of the tree
-          startDocShell->GetRootTreeItem(getter_AddRefs(nextItem));
-        }
-      }
-      else {
-        GetPreviousDocShell(curItem, getter_AddRefs(nextItem));
-        if (!nextItem) {
-          // wrap around to the end, which is the last item in the tree
-          nsCOMPtr<nsIDocShellTreeItem> rootItem;
-          startDocShell->GetRootTreeItem(getter_AddRefs(rootItem));
-          GetLastDocShell(rootItem, getter_AddRefs(nextItem));
-        }
-
-        // When going back to the previous document, check for any focusable
-        // popups in that previous document first.
-        checkPopups = true;
-      }
-
-      curItem = nextItem;
-      nextFrame = nextItem ? nextItem->GetWindow() : nullptr;
-    }
-
-    if (!nextFrame)
-      return nullptr;
-
-    // Clear currentPopup for the next iteration
-    currentPopup = nullptr;
-
-    // If event handling is suppressed, move on to the next document. Set
-    // content to null so that the popup check will be skipped on the next
-    // loop iteration.
-    doc = nextFrame->GetExtantDoc();
-    if (!doc || doc->EventHandlingSuppressed()) {
-      content = nullptr;
-      continue;
-    }
-
-    if (checkPopups) {
-      // When iterating backwards, check the panels of the previous document
-      // first. If a panel exists that has focusable content, focus that.
-      // Otherwise, continue on to focus the document.
-      nsIContent* popupContent = GetNextTabbablePanel(doc, nullptr, false);
-      if (popupContent)
-        return popupContent;
-    }
-
-    content = GetRootForFocus(nextFrame, doc, true, true);
-    if (content && !GetRootForFocus(nextFrame, doc, false, false)) {
-      // if the found content is in a chrome shell or a frameset, navigate
-      // forward one tabbable item so that the first item is focused. Note
-      // that we always go forward and not back here.
-      nsCOMPtr<nsIContent> nextFocus;
-      Element* rootElement = doc->GetRootElement();
-      nsIPresShell* presShell = doc->GetShell();
-      if (presShell) {
-        nsresult rv = GetNextTabbableContent(presShell, rootElement,
-                                             nullptr, rootElement,
-                                             true, 1, false,
-                                             getter_AddRefs(nextFocus));
-        return NS_SUCCEEDED(rv) ? nextFocus.get() : nullptr;
-      }
-    }
-
-  } while (!content);
-
-  return content;
+  nsCOMPtr<nsPIDOMWindow> window = subdoc->GetWindow();
+  return GetRootForFocus(window, subdoc, true, true);
 }
 
 void
diff --git a/dom/base/nsFocusManager.h b/dom/base/nsFocusManager.h
index 3886cd1fdd1a..e0e9fb1f00dc 100644
--- a/dom/base/nsFocusManager.h
+++ b/dom/base/nsFocusManager.h
@@ -25,6 +25,12 @@ class nsIDocShellTreeItem;
 class nsPIDOMWindow;
 class nsIMessageBroadcaster;
 
+namespace mozilla {
+namespace dom {
+class TabParent;
+}
+}
+
 struct nsDelayedBlurOrFocusEvent;
 
 /**
@@ -387,6 +393,7 @@ protected:
                                   bool aForward,
                                   int32_t aCurrentTabIndex,
                                   bool aIgnoreTabIndex,
+                                  bool aForDocumentNavigation,
                                   nsIContent** aResultContent);
 
   /**
@@ -415,65 +422,32 @@ protected:
                           int32_t aCurrentTabIndex,
                           bool aForward);
 
+  /**
+   * Focus the first focusable content within the document with a root node of
+   * aRootContent. For content documents, this will be aRootContent itself, but
+   * for chrome documents, this will locate the next focusable content.
+   */
+  nsresult FocusFirst(nsIContent* aRootContent, nsIContent** aNextContent);
+
   /**
    * Retrieves and returns the root node from aDocument to be focused. Will
    * return null if the root node cannot be focused. There are several reasons
    * for this:
    *
-   * - if aIsForDocNavigation is true, and aWindow is in an <iframe>.
-   * - if aIsForDocNavigation is false, and aWindow is a chrome shell.
+   * - if aForDocumentNavigation is false and aWindow is a chrome shell.
    * - if aCheckVisibility is true and the aWindow is not visible.
    * - if aDocument is a frameset document.
    */
   nsIContent* GetRootForFocus(nsPIDOMWindow* aWindow,
                               nsIDocument* aDocument,
-                              bool aIsForDocNavigation,
+                              bool aForDocumentNavigation,
                               bool aCheckVisibility);
 
   /**
-   * Get the last docshell child of aItem and return it in aResult.
+   * Retrieves and returns the root node as with GetRootForFocus but only if
+   * aContent is a frame with a valid child document.
    */
-  void GetLastDocShell(nsIDocShellTreeItem* aItem,
-                       nsIDocShellTreeItem** aResult);
-
-  /**
-   * Get the next docshell child of aItem and return it in aResult.
-   */
-  void GetNextDocShell(nsIDocShellTreeItem* aItem,
-                       nsIDocShellTreeItem** aResult);
-
-  /**
-   * Get the previous docshell child of aItem and return it in aResult.
-   */
-  void GetPreviousDocShell(nsIDocShellTreeItem* aItem,
-                           nsIDocShellTreeItem** aResult);
-
-  /**
-   * Determine the first panel with focusable content in document tab order
-   * from the given document. aForward indicates the direction to scan. If
-   * aCurrentPopup is set to a panel, the next or previous popup after
-   * aCurrentPopup after it is used. If aCurrentPopup is null, then the first
-   * or last popup is used. If a panel has no focusable content, it is skipped.
-   * Null is returned if no panel is open or no open panel contains a focusable
-   * element.
-   */
-  nsIContent* GetNextTabbablePanel(nsIDocument* aDocument, nsIFrame* aCurrentPopup, bool aForward);
-
-  /**
-   * Get the tabbable next document from aStartContent or, if null, the
-   * currently focused frame if aForward is true, or the previously tabbable
-   * document if aForward is false. If this document is a chrome or frameset
-   * document, returns the first focusable element within this document,
-   * otherwise, returns the root node of the document.
-   *
-   *
-   * Panels with focusable content are also placed in the cycling order, just
-   * after the document containing that panel.
-   *
-   * This method would be used for document navigation, which is typically
-   * invoked by pressing F6.
-   */
-  nsIContent* GetNextTabbableDocument(nsIContent* aStartContent, bool aForward);
+  nsIContent* GetRootForChildDocument(nsIContent* aContent);
 
   /**
    * Retreives a focusable element within the current selection of aWindow.
diff --git a/dom/base/nsFormData.cpp b/dom/base/nsFormData.cpp
index 903a6cff9079..a82d2e498122 100644
--- a/dom/base/nsFormData.cpp
+++ b/dom/base/nsFormData.cpp
@@ -50,7 +50,7 @@ CreateNewFileInstance(Blob& aBlob, const Optional<nsAString>& aFilename)
   return aBlob.ToFile(filename);
 }
 
-} // anonymous namespace
+} // namespace
 
 // -------------------------------------------------------------------------
 // nsISupports
diff --git a/dom/base/nsFrameLoader.h b/dom/base/nsFrameLoader.h
index 1fae7cb1acb7..9f5d14573aa6 100644
--- a/dom/base/nsFrameLoader.h
+++ b/dom/base/nsFrameLoader.h
@@ -41,12 +41,12 @@ class ContentParent;
 class PBrowserParent;
 class TabParent;
 struct StructuredCloneData;
-}
+} // namespace dom
 
 namespace layout {
 class RenderFrameParent;
-}
-}
+} // namespace layout
+} // namespace mozilla
 
 #if defined(MOZ_WIDGET_GTK)
 typedef struct _GtkWidget GtkWidget;
diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp
index 2bf5bf6d7498..c5641a68eefe 100644
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@@ -1444,7 +1444,7 @@ struct MessageManagerReferentCount
   nsDataHashtable<nsStringHashKey, uint32_t> mMessageCounter;
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/base/nsGkAtomList.h b/dom/base/nsGkAtomList.h
index 30de73cac692..f1fe11578fb3 100644
--- a/dom/base/nsGkAtomList.h
+++ b/dom/base/nsGkAtomList.h
@@ -1013,6 +1013,7 @@ GK_ATOM(resource, "resource")
 GK_ATOM(resources, "resources")
 GK_ATOM(result, "result")
 GK_ATOM(resultPrefix, "result-prefix")
+GK_ATOM(retargetdocumentfocus, "retargetdocumentfocus")
 GK_ATOM(rev, "rev")
 GK_ATOM(reverse, "reverse")
 GK_ATOM(reversed, "reversed")
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 25679f0e7965..760842656bfb 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -566,8 +566,8 @@ namespace mozilla {
 namespace dom {
 extern uint64_t
 NextWindowID();
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 nsPIDOMWindow::nsPIDOMWindow(nsPIDOMWindow *aOuterWindow)
 : mFrameElement(nullptr), mDocShell(nullptr), mModalStateDepth(0),
@@ -6030,6 +6030,211 @@ FinishDOMFullscreenChange(nsIDocument* aDoc, bool aInDOMFullscreen)
   }
 }
 
+struct FullscreenTransitionDuration
+{
+  // The unit of the durations is millisecond
+  uint16_t mFadeIn = 0;
+  uint16_t mFadeOut = 0;
+  bool IsSuppressed() const
+  {
+    return mFadeIn == 0 && mFadeOut == 0;
+  }
+};
+
+static void
+GetFullscreenTransitionDuration(bool aEnterFullscreen,
+                                FullscreenTransitionDuration* aDuration)
+{
+  const char* pref = aEnterFullscreen ?
+    "full-screen-api.transition-duration.enter" :
+    "full-screen-api.transition-duration.leave";
+  nsAdoptingCString prefValue = Preferences::GetCString(pref);
+  if (!prefValue.IsEmpty()) {
+    sscanf(prefValue.get(), "%hu%hu",
+           &aDuration->mFadeIn, &aDuration->mFadeOut);
+  }
+}
+
+class FullscreenTransitionTask : public nsRunnable
+{
+public:
+  FullscreenTransitionTask(const FullscreenTransitionDuration& aDuration,
+                           nsGlobalWindow* aWindow, bool aFullscreen,
+                           nsIWidget* aWidget, nsIScreen* aScreen,
+                           nsISupports* aTransitionData)
+    : mWindow(aWindow)
+    , mWidget(aWidget)
+    , mScreen(aScreen)
+    , mTransitionData(aTransitionData)
+    , mDuration(aDuration)
+    , mStage(eBeforeToggle)
+    , mFullscreen(aFullscreen)
+  {}
+
+  NS_IMETHOD Run() override;
+
+private:
+  enum Stage {
+    // BeforeToggle stage happens before we enter or leave fullscreen
+    // state. In this stage, the task triggers the pre-toggle fullscreen
+    // transition on the widget.
+    eBeforeToggle,
+    // ToggleFullscreen stage actually executes the fullscreen toggle,
+    // and wait for the next paint on the content to continue.
+    eToggleFullscreen,
+    // AfterToggle stage happens after we toggle the fullscreen state.
+    // In this stage, the task triggers the post-toggle fullscreen
+    // transition on the widget.
+    eAfterToggle
+  };
+
+  class Observer final : public nsIObserver
+  {
+  public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIOBSERVER
+
+    explicit Observer(FullscreenTransitionTask* aTask)
+      : mTask(aTask) { }
+
+  private:
+    ~Observer() {}
+
+    nsRefPtr<FullscreenTransitionTask> mTask;
+  };
+
+  static const uint32_t kNextPaintTimeout = 1000; // ms
+  static const char* const kPaintedTopic;
+
+  nsRefPtr<nsGlobalWindow> mWindow;
+  nsCOMPtr<nsIWidget> mWidget;
+  nsCOMPtr<nsIScreen> mScreen;
+  nsCOMPtr<nsITimer> mTimer;
+  nsCOMPtr<nsISupports> mTransitionData;
+
+  FullscreenTransitionDuration mDuration;
+  Stage mStage;
+  bool mFullscreen;
+};
+
+const char* const
+FullscreenTransitionTask::kPaintedTopic = "fullscreen-painted";
+
+NS_IMETHODIMP
+FullscreenTransitionTask::Run()
+{
+  Stage stage = mStage;
+  mStage = Stage(mStage + 1);
+  if (stage == eBeforeToggle) {
+    mWidget->PerformFullscreenTransition(nsIWidget::eBeforeFullscreenToggle,
+                                         mDuration.mFadeIn, mTransitionData,
+                                         this);
+  } else if (stage == eToggleFullscreen) {
+    if (MOZ_UNLIKELY(mWindow->mFullScreen != mFullscreen)) {
+      // This could happen in theory if several fullscreen requests in
+      // different direction happen continuously in a short time. We
+      // need to ensure the fullscreen state matches our target here,
+      // otherwise the widget would change the window state as if we
+      // toggle for Fullscreen Mode instead of Fullscreen API.
+      NS_WARNING("The fullscreen state of the window does not match");
+      mWindow->mFullScreen = mFullscreen;
+    }
+    // Toggle the fullscreen state on the widget
+    mWidget->MakeFullScreen(mFullscreen, mScreen);
+    // Set observer for the next content paint.
+    nsCOMPtr<nsIObserver> observer = new Observer(this);
+    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+    obs->AddObserver(observer, kPaintedTopic, false);
+    // There are several edge cases where we may never get the paint
+    // notification, including:
+    // 1. the window/tab is closed before the next paint;
+    // 2. the user has switched to another tab before we get here.
+    // Completely fixing those cases seems to be tricky, and since they
+    // should rarely happen, it probably isn't worth to fix. Hence we
+    // simply add a timeout here to ensure we never hang forever.
+    mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
+    mTimer->Init(observer, kNextPaintTimeout, nsITimer::TYPE_ONE_SHOT);
+  } else if (stage == eAfterToggle) {
+    mWidget->PerformFullscreenTransition(nsIWidget::eAfterFullscreenToggle,
+                                         mDuration.mFadeOut, mTransitionData,
+                                         this);
+  }
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(FullscreenTransitionTask::Observer, nsIObserver)
+
+NS_IMETHODIMP
+FullscreenTransitionTask::Observer::Observe(nsISupports* aSubject,
+                                            const char* aTopic,
+                                            const char16_t* aData)
+{
+  bool shouldContinue = false;
+  if (strcmp(aTopic, FullscreenTransitionTask::kPaintedTopic) == 0) {
+    nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(aSubject));
+    nsCOMPtr<nsIWidget> widget = win ?
+      static_cast<nsGlobalWindow*>(win.get())->GetMainWidget() : nullptr;
+    if (widget == mTask->mWidget) {
+      // The paint notification arrives first. Cancel the timer.
+      mTask->mTimer->Cancel();
+      shouldContinue = true;
+    }
+  } else {
+#ifdef DEBUG
+    MOZ_ASSERT(strcmp(aTopic, NS_TIMER_CALLBACK_TOPIC) == 0,
+               "Should only get fullscreen-painted or timer-callback");
+    nsCOMPtr<nsITimer> timer(do_QueryInterface(aSubject));
+    MOZ_ASSERT(timer && timer == mTask->mTimer,
+               "Should only trigger this with the timer the task created");
+#endif
+    shouldContinue = true;
+  }
+  if (shouldContinue) {
+    nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+    obs->RemoveObserver(this, kPaintedTopic);
+    mTask->mTimer = nullptr;
+    mTask->Run();
+  }
+  return NS_OK;
+}
+
+static bool
+MakeWidgetFullscreen(nsGlobalWindow* aWindow, gfx::VRHMDInfo* aHMD,
+                     nsPIDOMWindow::FullscreenReason aReason, bool aFullscreen)
+{
+  nsCOMPtr<nsIWidget> widget = aWindow->GetMainWidget();
+  if (!widget) {
+    return false;
+  }
+
+  FullscreenTransitionDuration duration;
+  bool performTransition = false;
+  nsCOMPtr<nsISupports> transitionData;
+  if (aReason == nsPIDOMWindow::eForFullscreenAPI) {
+    GetFullscreenTransitionDuration(aFullscreen, &duration);
+    if (!duration.IsSuppressed()) {
+      performTransition = widget->
+        PrepareForFullscreenTransition(getter_AddRefs(transitionData));
+    }
+  }
+  nsCOMPtr<nsIScreen> screen = aHMD ? aHMD->GetScreen() : nullptr;
+  if (!performTransition) {
+    if (aReason == nsPIDOMWindow::eForFullscreenMode) {
+      // If we enter fullscreen for fullscreen mode, we want
+      // the native system behavior.
+      widget->MakeFullScreenWithNativeTransition(aFullscreen, screen);
+    } else {
+      widget->MakeFullScreen(aFullscreen, screen);
+    }
+  } else {
+    nsCOMPtr<nsIRunnable> task =
+      new FullscreenTransitionTask(duration, aWindow, aFullscreen,
+                                   widget, screen, transitionData);
+    task->Run();
+  }
+  return true;
+}
+
 nsresult
 nsGlobalWindow::SetFullscreenInternal(FullscreenReason aReason,
                                       bool aFullScreen,
@@ -6041,8 +6246,7 @@ nsGlobalWindow::SetFullscreenInternal(FullscreenReason aReason,
 
   // Only chrome can change our fullscreen mode. Otherwise, the state
   // can only be changed for DOM fullscreen.
-  if (aFullScreen == FullScreen() ||
-      (aReason == eForFullscreenMode && !nsContentUtils::IsCallerChrome())) {
+  if (aReason == eForFullscreenMode && !nsContentUtils::IsCallerChrome()) {
     return NS_OK;
   }
 
@@ -6098,16 +6302,7 @@ nsGlobalWindow::SetFullscreenInternal(FullscreenReason aReason,
   // dimensions to appear to increase when entering fullscreen mode; we just
   // want the content to fill the entire client area of the emulator window.
   if (!Preferences::GetBool("full-screen-api.ignore-widgets", false)) {
-    nsCOMPtr<nsIWidget> widget = GetMainWidget();
-    if (widget) {
-      nsCOMPtr<nsIScreen> screen;
-      if (aHMD) {
-        screen = aHMD->GetScreen();
-      }
-      if (aReason == eForFullscreenAPI) {
-        widget->PrepareForDOMFullscreenTransition();
-      }
-      widget->MakeFullScreen(aFullScreen, screen);
+    if (MakeWidgetFullscreen(this, aHMD, aReason, aFullScreen)) {
       // The rest of code for switching fullscreen is in nsGlobalWindow::
       // FinishFullscreenChange() which will be called after sizemodechange
       // event is dispatched.
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 5b2ecde0addb..9840bc830787 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -484,6 +484,9 @@ public:
   // Inner windows only.
   virtual void RefreshCompartmentPrincipal() override;
 
+  // For accessing protected field mFullScreen
+  friend class FullscreenTransitionTask;
+
   // Outer windows only.
   virtual nsresult SetFullscreenInternal(
     FullscreenReason aReason, bool aIsFullscreen,
diff --git a/dom/base/nsHostObjectProtocolHandler.cpp b/dom/base/nsHostObjectProtocolHandler.cpp
index bbf7541b9a50..5bf823cbb573 100644
--- a/dom/base/nsHostObjectProtocolHandler.cpp
+++ b/dom/base/nsHostObjectProtocolHandler.cpp
@@ -309,7 +309,7 @@ class BlobURLsReporter final : public nsIMemoryReporter
 
 NS_IMPL_ISUPPORTS(BlobURLsReporter, nsIMemoryReporter)
 
-}
+} // namespace mozilla
 
 void
 nsHostObjectProtocolHandler::Init(void)
diff --git a/dom/base/nsHostObjectProtocolHandler.h b/dom/base/nsHostObjectProtocolHandler.h
index 441d95001614..909631f37e2e 100644
--- a/dom/base/nsHostObjectProtocolHandler.h
+++ b/dom/base/nsHostObjectProtocolHandler.h
@@ -26,8 +26,8 @@ class DOMMediaStream;
 namespace dom {
 class BlobImpl;
 class MediaSource;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsHostObjectProtocolHandler : public nsIProtocolHandler
 {
diff --git a/dom/base/nsIAnimationObserver.h b/dom/base/nsIAnimationObserver.h
index 67a9837e834e..e39616b11c28 100644
--- a/dom/base/nsIAnimationObserver.h
+++ b/dom/base/nsIAnimationObserver.h
@@ -11,8 +11,8 @@
 namespace mozilla {
 namespace dom {
 class Animation;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #define NS_IANIMATION_OBSERVER_IID \
 { 0xed025fc7, 0xdeda, 0x48b9, \
diff --git a/dom/base/nsIGlobalObject.cpp b/dom/base/nsIGlobalObject.cpp
index e7ee71cf3b3a..be92ff84d01f 100644
--- a/dom/base/nsIGlobalObject.cpp
+++ b/dom/base/nsIGlobalObject.cpp
@@ -64,7 +64,7 @@ private:
   nsTArray<nsCString> mURIs;
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 nsIGlobalObject::UnlinkHostObjectURIs()
diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
index 6d12a7e7208a..d60ada2ec73e 100644
--- a/dom/base/nsINode.cpp
+++ b/dom/base/nsINode.cpp
@@ -2501,7 +2501,7 @@ struct SelectorMatchInfo {
   nsCSSSelectorList* const mSelectorList;
   TreeMatchContext& mMatchContext;
 };
-}
+} // namespace
 
 // Given an id, find elements with that id under aRoot that match aMatchInfo if
 // any is provided.  If no SelectorMatchInfo is provided, just find the ones
diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp
index ef6130614425..5db21a16237e 100644
--- a/dom/base/nsImageLoadingContent.cpp
+++ b/dom/base/nsImageLoadingContent.cpp
@@ -41,6 +41,8 @@
 #include "nsIContentPolicy.h"
 #include "nsSVGEffects.h"
 
+#include "gfxPrefs.h"
+
 #include "mozAutoDocUpdate.h"
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/EventStates.h"
@@ -1359,7 +1361,7 @@ private:
   nsCOMPtr<imgIRequest> mRequest;
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 nsImageLoadingContent::MakePendingRequestCurrent()
diff --git a/dom/base/nsJSEnvironment.h b/dom/base/nsJSEnvironment.h
index 6a4429b7a8cf..fb61583f1fb3 100644
--- a/dom/base/nsJSEnvironment.h
+++ b/dom/base/nsJSEnvironment.h
@@ -26,12 +26,12 @@ namespace JS {
 template <typename T>
 class AutoVectorRooter;
 typedef AutoVectorRooter<Value> AutoValueVector;
-}
+} // namespace JS
 
 namespace mozilla {
 template <class> class Maybe;
 struct CycleCollectorResults;
-}
+} // namespace mozilla
 
 // The amount of time we wait between a request to GC (due to leaving
 // a page) and doing the actual GC.
diff --git a/dom/base/nsJSUtils.h b/dom/base/nsJSUtils.h
index afe73f2cbec3..42b3ec7b48b9 100644
--- a/dom/base/nsJSUtils.h
+++ b/dom/base/nsJSUtils.h
@@ -28,8 +28,8 @@ namespace mozilla {
 namespace dom {
 class AutoJSAPI;
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsJSUtils
 {
diff --git a/dom/base/nsNodeInfoManager.h b/dom/base/nsNodeInfoManager.h
index 13a8bb33ccba..49c371af930a 100644
--- a/dom/base/nsNodeInfoManager.h
+++ b/dom/base/nsNodeInfoManager.h
@@ -30,8 +30,8 @@ template<class T> struct already_AddRefed;
 namespace mozilla {
 namespace dom {
 class NodeInfo;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsNodeInfoManager final
 {
diff --git a/dom/base/nsNodeUtils.h b/dom/base/nsNodeUtils.h
index 00f420a0cf68..1d0f9451df10 100644
--- a/dom/base/nsNodeUtils.h
+++ b/dom/base/nsNodeUtils.h
@@ -18,8 +18,8 @@ class nsCycleCollectionTraversalCallback;
 namespace mozilla {
 namespace dom {
 class Animation;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsNodeUtils
 {
diff --git a/dom/base/nsObjectLoadingContent.h b/dom/base/nsObjectLoadingContent.h
index be1175b3fe76..8a9de6380848 100644
--- a/dom/base/nsObjectLoadingContent.h
+++ b/dom/base/nsObjectLoadingContent.h
@@ -35,8 +35,8 @@ namespace mozilla {
 namespace dom {
 template<typename T> class Sequence;
 struct MozPluginParameter;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsObjectLoadingContent : public nsImageLoadingContent
                              , public nsIStreamListener
diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
index 3f7b1b220fd2..b9f17bb801a4 100644
--- a/dom/base/nsPIDOMWindow.h
+++ b/dom/base/nsPIDOMWindow.h
@@ -36,11 +36,11 @@ namespace mozilla {
 namespace dom {
 class AudioContext;
 class Element;
-}
+} // namespace dom
 namespace gfx {
 class VRHMDInfo;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 // Popup control state enum. The values in this enum must go from most
 // permissive to least permissive so that it's safe to push state in
diff --git a/dom/base/nsPIWindowRoot.h b/dom/base/nsPIWindowRoot.h
index f040318384e0..541ee6e77ed9 100644
--- a/dom/base/nsPIWindowRoot.h
+++ b/dom/base/nsPIWindowRoot.h
@@ -18,8 +18,8 @@ class nsIController;
 namespace mozilla {
 namespace dom {
 class TabParent;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #define NS_IWINDOWROOT_IID \
 { 0x238edca0, 0xb30d, 0x46d3, \
diff --git a/dom/base/nsPerformance.cpp b/dom/base/nsPerformance.cpp
index 9b2d7b985e4a..35e3c930b5c1 100644
--- a/dom/base/nsPerformance.cpp
+++ b/dom/base/nsPerformance.cpp
@@ -712,7 +712,7 @@ private:
   bool mEnabled;
 };
 
-} // anonymous namespace
+} // namespace
 
 /* static */ bool
 nsPerformance::IsEnabled(JSContext* aCx, JSObject* aGlobal)
diff --git a/dom/base/nsPerformance.h b/dom/base/nsPerformance.h
index a4c2a5415a08..aeb242ce5385 100644
--- a/dom/base/nsPerformance.h
+++ b/dom/base/nsPerformance.h
@@ -26,8 +26,8 @@ namespace mozilla {
 class ErrorResult;
 namespace dom {
   class PerformanceEntry;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 // Script "performance.timing" object
 class nsPerformanceTiming final : public nsWrapperCache
diff --git a/dom/base/nsRange.h b/dom/base/nsRange.h
index 214de4e5aeb6..dde3299843bc 100644
--- a/dom/base/nsRange.h
+++ b/dom/base/nsRange.h
@@ -28,8 +28,8 @@ namespace dom {
 class DocumentFragment;
 class DOMRect;
 class DOMRectList;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsRange final : public nsIDOMRange,
                       public nsStubMutationObserver,
diff --git a/dom/base/nsScriptLoader.h b/dom/base/nsScriptLoader.h
index 7b469d733226..b951d8e0c6fe 100644
--- a/dom/base/nsScriptLoader.h
+++ b/dom/base/nsScriptLoader.h
@@ -27,13 +27,13 @@ class nsIURI;
 
 namespace JS {
   class SourceBufferHolder;
-}
+} // namespace JS
 
 namespace mozilla {
 namespace dom {
 class AutoJSAPI;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //////////////////////////////////////////////////////////////
 // Per-request data structure
diff --git a/dom/base/nsStyledElement.h b/dom/base/nsStyledElement.h
index 25146d21d7d0..b850d2d6335b 100644
--- a/dom/base/nsStyledElement.h
+++ b/dom/base/nsStyledElement.h
@@ -20,8 +20,8 @@
 namespace mozilla {
 namespace css {
 class StyleRule;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 typedef mozilla::dom::Element nsStyledElementBase;
 
diff --git a/dom/base/nsTextFragment.cpp b/dom/base/nsTextFragment.cpp
index 68150a43e534..6458e54c0108 100644
--- a/dom/base/nsTextFragment.cpp
+++ b/dom/base/nsTextFragment.cpp
@@ -174,8 +174,8 @@ FirstNon8BitUnvectorized(const char16_t *str, const char16_t *end)
 namespace mozilla {
   namespace SSE2 {
     int32_t FirstNon8Bit(const char16_t *str, const char16_t *end);
-  }
-}
+  } // namespace SSE2
+} // namespace mozilla
 #endif
 
 /*
diff --git a/dom/base/nsXMLHttpRequest.h b/dom/base/nsXMLHttpRequest.h
index b4a3c2895768..080c423a7c5a 100644
--- a/dom/base/nsXMLHttpRequest.h
+++ b/dom/base/nsXMLHttpRequest.h
@@ -53,7 +53,7 @@ namespace mozilla {
 namespace dom {
 class Blob;
 class BlobSet;
-}
+} // namespace dom
 
 // A helper for building up an ArrayBuffer object's data
 // before creating the ArrayBuffer itself.  Will do doubling
diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index 52420ee21726..987a83ed7ee5 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -2911,5 +2911,6 @@ ForEachHandler(JSContext* aCx, unsigned aArgc, JS::Value* aVp)
   // Now actually call the user specified callback
   return JS::Call(aCx, args.thisv(), callbackFn, newArgs, &rval);
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index d2e8b95b1180..90fb1a4758e4 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -941,6 +941,7 @@ DoGetOrCreateDOMReflector(JSContext* cx, T* value,
 
   return JS_WrapValue(cx, rval);
 }
+
 } // namespace binding_detail
 
 // Create a JSObject wrapping "value", if there isn't one already, and store it
diff --git a/dom/bindings/ErrorIPCUtils.h b/dom/bindings/ErrorIPCUtils.h
index 1a147afdd15c..8db3bc3ca181 100644
--- a/dom/bindings/ErrorIPCUtils.h
+++ b/dom/bindings/ErrorIPCUtils.h
@@ -65,6 +65,6 @@ struct ParamTraits<mozilla::ErrorResult>
   }
 };
 
-}
+} // namespace IPC
 
 #endif
diff --git a/dom/bindings/ErrorResult.h b/dom/bindings/ErrorResult.h
index b06db640978f..0d57672552fc 100644
--- a/dom/bindings/ErrorResult.h
+++ b/dom/bindings/ErrorResult.h
@@ -22,7 +22,7 @@
 namespace IPC {
 class Message;
 template <typename> struct ParamTraits;
-}
+} // namespace IPC
 
 namespace mozilla {
 
diff --git a/dom/bindings/MozMap.h b/dom/bindings/MozMap.h
index b772b03a48bb..6a6b81c3924b 100644
--- a/dom/bindings/MozMap.h
+++ b/dom/bindings/MozMap.h
@@ -42,6 +42,7 @@ public:
 
   DataType mData;
 };
+
 } // namespace binding_detail
 
 template<typename DataType>
diff --git a/dom/bindings/test/TestInterfaceMaplike.cpp b/dom/bindings/test/TestInterfaceMaplike.cpp
index 934867c1aa91..66fb41f7876c 100644
--- a/dom/bindings/test/TestInterfaceMaplike.cpp
+++ b/dom/bindings/test/TestInterfaceMaplike.cpp
@@ -80,5 +80,5 @@ TestInterfaceMaplike::HasInternal(const nsAString& aKey)
   return TestInterfaceMaplikeBinding::MaplikeHelpers::Has(this, aKey, rv);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/bindings/test/TestInterfaceMaplikeObject.cpp b/dom/bindings/test/TestInterfaceMaplikeObject.cpp
index 564c99f9e43a..98b1e98ec9ae 100644
--- a/dom/bindings/test/TestInterfaceMaplikeObject.cpp
+++ b/dom/bindings/test/TestInterfaceMaplikeObject.cpp
@@ -84,5 +84,5 @@ TestInterfaceMaplikeObject::HasInternal(const nsAString& aKey)
   return TestInterfaceMaplikeObjectBinding::MaplikeHelpers::Has(this, aKey, rv);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/bindings/test/TestInterfaceSetlike.cpp b/dom/bindings/test/TestInterfaceSetlike.cpp
index abd3ab3fa129..56677e3b5156 100644
--- a/dom/bindings/test/TestInterfaceSetlike.cpp
+++ b/dom/bindings/test/TestInterfaceSetlike.cpp
@@ -54,5 +54,5 @@ TestInterfaceSetlike::GetParentObject() const
   return mParent;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/bindings/test/TestInterfaceSetlikeNode.cpp b/dom/bindings/test/TestInterfaceSetlikeNode.cpp
index d57a883339b3..f5676e6e19a6 100644
--- a/dom/bindings/test/TestInterfaceSetlikeNode.cpp
+++ b/dom/bindings/test/TestInterfaceSetlikeNode.cpp
@@ -54,5 +54,5 @@ TestInterfaceSetlikeNode::GetParentObject() const
   return mParent;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/bluetooth/BluetoothHidManager.cpp b/dom/bluetooth/BluetoothHidManager.cpp
index 9067e02319fd..b5e9a1ad9115 100644
--- a/dom/bluetooth/BluetoothHidManager.cpp
+++ b/dom/bluetooth/BluetoothHidManager.cpp
@@ -24,7 +24,7 @@ USING_BLUETOOTH_NAMESPACE
 namespace {
   StaticRefPtr<BluetoothHidManager> sBluetoothHidManager;
   bool sInShutdown = false;
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 BluetoothHidManager::Observe(nsISupports* aSubject,
diff --git a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
index 07c692873f27..57fee1c0ed1a 100644
--- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
@@ -34,7 +34,7 @@ namespace {
   bool sInShutdown = false;
   static BluetoothA2dpInterface* sBtA2dpInterface;
   static BluetoothAvrcpInterface* sBtAvrcpInterface;
-} // anonymous namespace
+} // namespace
 
 /*
  * This function maps attribute id and returns corresponding values
diff --git a/dom/bluetooth/bluedroid/BluetoothGattManager.cpp b/dom/bluetooth/bluedroid/BluetoothGattManager.cpp
index 0b84892ee7ec..e1418029bede 100644
--- a/dom/bluetooth/bluedroid/BluetoothGattManager.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothGattManager.cpp
@@ -34,7 +34,7 @@ namespace {
   static BluetoothGattInterface* sBluetoothGattInterface;
   static BluetoothGattClientInterface* sBluetoothGattClientInterface;
   static BluetoothGattServerInterface* sBluetoothGattServerInterface;
-} // anonymous namespace
+} // namespace
 
 bool BluetoothGattManager::mInShutdown = false;
 
diff --git a/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp
index 689cdd2dd667..c88a977dad7b 100644
--- a/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp
@@ -18,7 +18,7 @@ USING_BLUETOOTH_NAMESPACE
 namespace {
   StaticRefPtr<BluetoothHfpManager> sBluetoothHfpManager;
   bool sInShutdown = false;
-} // anonymous namespace
+} // namespace
 
 /**
  * nsIObserver function
diff --git a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
index cdaec105605f..72108fc332b8 100644
--- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
@@ -54,7 +54,7 @@ namespace {
   // The mechanism should be revised once we know the exact time at which
   // Dialer stops playing.
   static int sBusyToneInterval = 3700; //unit: ms
-} // anonymous namespace
+} // namespace
 
 const int BluetoothHfpManager::MAX_NUM_CLIENTS = 1;
 
diff --git a/dom/bluetooth/bluetooth1/BluetoothService.cpp b/dom/bluetooth/bluetooth1/BluetoothService.cpp
index 616d750c123c..b641cd26afcf 100644
--- a/dom/bluetooth/bluetooth1/BluetoothService.cpp
+++ b/dom/bluetooth/bluetooth1/BluetoothService.cpp
@@ -134,7 +134,7 @@ GetAllBluetoothActors(InfallibleTArray<BluetoothParent*>& aActors)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 BluetoothService::ToggleBtAck::ToggleBtAck(bool aEnabled)
   : mEnabled(aEnabled)
diff --git a/dom/bluetooth/bluetooth1/ipc/BluetoothChild.cpp b/dom/bluetooth/bluetooth1/ipc/BluetoothChild.cpp
index 6c8df3794114..f4b32a61d1e6 100644
--- a/dom/bluetooth/bluetooth1/ipc/BluetoothChild.cpp
+++ b/dom/bluetooth/bluetooth1/ipc/BluetoothChild.cpp
@@ -26,7 +26,7 @@ namespace {
 
 StaticRefPtr<BluetoothServiceChildProcess> sBluetoothService;
 
-} // anonymous namespace
+} // namespace
 
 /*******************************************************************************
  * BluetoothChild
diff --git a/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp
index 1fcc1a116ef3..db5816a170ae 100644
--- a/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp
@@ -38,7 +38,7 @@ SendRequest(BluetoothReplyRunnable* aRunnable, const Request& aRequest)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 // static
 BluetoothServiceChildProcess*
diff --git a/dom/bluetooth/bluetooth2/BluetoothService.cpp b/dom/bluetooth/bluetooth2/BluetoothService.cpp
index 8db2d8d871da..07961ad83520 100644
--- a/dom/bluetooth/bluetooth2/BluetoothService.cpp
+++ b/dom/bluetooth/bluetooth2/BluetoothService.cpp
@@ -125,7 +125,7 @@ GetAllBluetoothActors(InfallibleTArray<BluetoothParent*>& aActors)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 BluetoothService::ToggleBtAck::ToggleBtAck(bool aEnabled)
   : mEnabled(aEnabled)
diff --git a/dom/bluetooth/bluetooth2/ipc/BluetoothChild.cpp b/dom/bluetooth/bluetooth2/ipc/BluetoothChild.cpp
index 67b983f433cf..b211d2a73916 100644
--- a/dom/bluetooth/bluetooth2/ipc/BluetoothChild.cpp
+++ b/dom/bluetooth/bluetooth2/ipc/BluetoothChild.cpp
@@ -23,7 +23,7 @@ namespace {
 
 BluetoothServiceChildProcess* sBluetoothService;
 
-} // anonymous namespace
+} // namespace
 
 /*******************************************************************************
  * BluetoothChild
diff --git a/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h b/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h
index 779e9a7977d7..00afe380f53e 100644
--- a/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h
+++ b/dom/bluetooth/bluetooth2/ipc/BluetoothMessageUtils.h
@@ -135,6 +135,7 @@ struct ParamTraits<mozilla::dom::bluetooth::BluetoothGattCharAttribute>
     return true;
   }
 };
+
 } // namespace IPC
 
 #endif // mozilla_dom_bluetooth_ipc_bluetoothmessageutils_h__
diff --git a/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp
index 303769395c93..bea285073ee0 100644
--- a/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp
+++ b/dom/bluetooth/bluetooth2/ipc/BluetoothServiceChildProcess.cpp
@@ -38,7 +38,7 @@ SendRequest(BluetoothReplyRunnable* aRunnable, const Request& aRequest)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 // static
 BluetoothServiceChildProcess*
diff --git a/dom/bluetooth/bluez/BluetoothA2dpManager.cpp b/dom/bluetooth/bluez/BluetoothA2dpManager.cpp
index 8d129ce699cd..098fe7918eb5 100644
--- a/dom/bluetooth/bluez/BluetoothA2dpManager.cpp
+++ b/dom/bluetooth/bluez/BluetoothA2dpManager.cpp
@@ -26,7 +26,7 @@ USING_BLUETOOTH_NAMESPACE
 namespace {
   StaticRefPtr<BluetoothA2dpManager> sBluetoothA2dpManager;
   bool sInShutdown = false;
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 BluetoothA2dpManager::Observe(nsISupports* aSubject,
diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.cpp b/dom/bluetooth/bluez/BluetoothHfpManager.cpp
index 09798bad305e..e0db0d0d752d 100644
--- a/dom/bluetooth/bluez/BluetoothHfpManager.cpp
+++ b/dom/bluetooth/bluez/BluetoothHfpManager.cpp
@@ -120,7 +120,7 @@ namespace {
   // Dialer stops playing.
   static int sBusyToneInterval = 3700; //unit: ms
 #endif // MOZ_B2G_RIL
-} // anonymous namespace
+} // namespace
 
 #ifdef MOZ_B2G_RIL
 /* CallState for sCINDItems[CINDType::CALL].value
diff --git a/dom/broadcastchannel/BroadcastChannel.cpp b/dom/broadcastchannel/BroadcastChannel.cpp
index 6c577c4b258c..b6331473c675 100644
--- a/dom/broadcastchannel/BroadcastChannel.cpp
+++ b/dom/broadcastchannel/BroadcastChannel.cpp
@@ -323,7 +323,7 @@ private:
   bool mEnabled;
 };
 
-} // anonymous namespace
+} // namespace
 
 /* static */ bool
 BroadcastChannel::IsEnabled(JSContext* aCx, JSObject* aGlobal)
@@ -740,5 +740,5 @@ NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
 NS_IMPL_ADDREF_INHERITED(BroadcastChannel, DOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(BroadcastChannel, DOMEventTargetHelper)
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/broadcastchannel/BroadcastChannel.h b/dom/broadcastchannel/BroadcastChannel.h
index e0c38e210477..65af55e76956 100644
--- a/dom/broadcastchannel/BroadcastChannel.h
+++ b/dom/broadcastchannel/BroadcastChannel.h
@@ -20,13 +20,13 @@ namespace mozilla {
 
 namespace ipc {
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 
 namespace workers {
 class WorkerFeature;
-}
+} // namespace workers
 
 class BroadcastChannelChild;
 class BroadcastChannelMessage;
diff --git a/dom/broadcastchannel/BroadcastChannelChild.cpp b/dom/broadcastchannel/BroadcastChannelChild.cpp
index ae8c7477a010..3c4c4aac8443 100644
--- a/dom/broadcastchannel/BroadcastChannelChild.cpp
+++ b/dom/broadcastchannel/BroadcastChannelChild.cpp
@@ -127,5 +127,5 @@ BroadcastChannelChild::ActorDestroy(ActorDestroyReason aWhy)
   mActorDestroyed = true;
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/broadcastchannel/BroadcastChannelChild.h b/dom/broadcastchannel/BroadcastChannelChild.h
index 8230c9b199c3..23cef899e7cc 100644
--- a/dom/broadcastchannel/BroadcastChannelChild.h
+++ b/dom/broadcastchannel/BroadcastChannelChild.h
@@ -13,7 +13,7 @@ namespace mozilla {
 
 namespace ipc {
 class BackgroundChildImpl;
-}
+} // namespace ipc
 
 namespace dom {
 
@@ -53,7 +53,7 @@ private:
   bool mActorDestroyed;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_BroadcastChannelChild_h
diff --git a/dom/broadcastchannel/BroadcastChannelParent.cpp b/dom/broadcastchannel/BroadcastChannelParent.cpp
index fe77d91c3bb2..0fbdd2eec42d 100644
--- a/dom/broadcastchannel/BroadcastChannelParent.cpp
+++ b/dom/broadcastchannel/BroadcastChannelParent.cpp
@@ -133,5 +133,5 @@ BroadcastChannelParent::CheckAndDeliver(const ClonedMessageData& aData,
   }
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/broadcastchannel/BroadcastChannelParent.h b/dom/broadcastchannel/BroadcastChannelParent.h
index 6da25ff8b062..5547a0aebd48 100644
--- a/dom/broadcastchannel/BroadcastChannelParent.h
+++ b/dom/broadcastchannel/BroadcastChannelParent.h
@@ -14,7 +14,7 @@ namespace mozilla {
 namespace ipc {
 class BackgroundParentImpl;
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 
@@ -56,7 +56,7 @@ private:
   bool mPrivateBrowsing;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_BroadcastChannelParent_h
diff --git a/dom/broadcastchannel/BroadcastChannelService.cpp b/dom/broadcastchannel/BroadcastChannelService.cpp
index 3d058dcca2c7..cce265e2ce2f 100644
--- a/dom/broadcastchannel/BroadcastChannelService.cpp
+++ b/dom/broadcastchannel/BroadcastChannelService.cpp
@@ -24,7 +24,7 @@ namespace {
 
 BroadcastChannelService* sInstance = nullptr;
 
-} // anonymous namespace
+} // namespace
 
 BroadcastChannelService::BroadcastChannelService()
 {
@@ -146,7 +146,7 @@ PostMessageEnumerator(nsPtrHashKey<BroadcastChannelParent>* aKey, void* aPtr)
   return PL_DHASH_NEXT;
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 BroadcastChannelService::PostMessage(BroadcastChannelParent* aParent,
@@ -166,5 +166,5 @@ BroadcastChannelService::PostMessage(BroadcastChannelParent* aParent,
   mAgents.EnumerateEntries(PostMessageEnumerator, &data);
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/broadcastchannel/BroadcastChannelService.h b/dom/broadcastchannel/BroadcastChannelService.h
index 05d2012cf568..535fbbd934ee 100644
--- a/dom/broadcastchannel/BroadcastChannelService.h
+++ b/dom/broadcastchannel/BroadcastChannelService.h
@@ -46,7 +46,7 @@ private:
   nsTHashtable<nsPtrHashKey<BroadcastChannelParent>> mAgents;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_BroadcastChannelService_h
diff --git a/dom/browser-element/BrowserElementParent.cpp b/dom/browser-element/BrowserElementParent.cpp
index d1094c121988..aa082823f285 100644
--- a/dom/browser-element/BrowserElementParent.cpp
+++ b/dom/browser-element/BrowserElementParent.cpp
@@ -130,7 +130,7 @@ DispatchCustomDOMEvent(Element* aFrameElement, const nsAString& aEventName,
   return NS_SUCCEEDED(rv);
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/dom/browser-element/BrowserElementParent.h b/dom/browser-element/BrowserElementParent.h
index 8f8cc7055fbd..f8c28c83185e 100644
--- a/dom/browser-element/BrowserElementParent.h
+++ b/dom/browser-element/BrowserElementParent.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace dom {
 class TabParent;
-}
+} // namespace dom
 
 /**
  * BrowserElementParent implements a portion of the parent-process side of
diff --git a/dom/cache/ActorUtils.h b/dom/cache/ActorUtils.h
index d0acba222ef3..7528821c9f34 100644
--- a/dom/cache/ActorUtils.h
+++ b/dom/cache/ActorUtils.h
@@ -14,7 +14,7 @@ namespace mozilla {
 namespace ipc {
 class PBackgroundParent;
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 namespace cache {
@@ -58,7 +58,7 @@ DeallocPCacheStorageChild(PCacheStorageChild* aActor);
 void
 DeallocPCacheStorageParent(PCacheStorageParent* aActor);
 
-} // namesapce cache
+} // namespace cache
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/cache/AutoUtils.cpp b/dom/cache/AutoUtils.cpp
index 58cda67a6863..7012d05b38c1 100644
--- a/dom/cache/AutoUtils.cpp
+++ b/dom/cache/AutoUtils.cpp
@@ -133,7 +133,7 @@ CleanupParentFds(CacheReadStreamOrVoid& aReadStreamOrVoid, CleanupAction aAction
   CleanupParentFds(aReadStreamOrVoid.get_CacheReadStream(), aAction);
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace dom {
@@ -363,7 +363,7 @@ MatchInPutList(InternalRequest* aRequest,
   return false;
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 AutoChildOpArgs::Add(InternalRequest* aRequest, BodyAction aBodyAction,
diff --git a/dom/cache/AutoUtils.h b/dom/cache/AutoUtils.h
index 2d9eec6b0854..afffb6268bbe 100644
--- a/dom/cache/AutoUtils.h
+++ b/dom/cache/AutoUtils.h
@@ -21,7 +21,7 @@ class ErrorResult;
 
 namespace ipc {
 class PBackgroundParent;
-}
+} // namespace ipc
 
 namespace dom {
 
diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
index f7651660c85d..e52e6dc2d341 100644
--- a/dom/cache/Cache.cpp
+++ b/dom/cache/Cache.cpp
@@ -79,7 +79,7 @@ IsValidPutRequestMethod(const RequestOrUSVString& aRequest, ErrorResult& aRv)
   return IsValidPutRequestMethod(aRequest.GetAsRequest(), aRv);
 }
 
-} // anonymous namespace
+} // namespace
 
 // Helper class to wait for Add()/AddAll() fetch requests to complete and
 // then perform a PutAll() with the responses.  This class holds a Feature
diff --git a/dom/cache/CacheChild.cpp b/dom/cache/CacheChild.cpp
index bb39d44e281d..3c52d09cda13 100644
--- a/dom/cache/CacheChild.cpp
+++ b/dom/cache/CacheChild.cpp
@@ -182,4 +182,4 @@ CacheChild::NoteDeletedActor()
 
 } // namespace cache
 } // namespace dom
-} // namesapce mozilla
+} // namespace mozilla
diff --git a/dom/cache/CacheOpChild.cpp b/dom/cache/CacheOpChild.cpp
index e14a29ad58e0..a9a14d389512 100644
--- a/dom/cache/CacheOpChild.cpp
+++ b/dom/cache/CacheOpChild.cpp
@@ -54,7 +54,7 @@ AddFeatureToStreamChild(const CacheRequest& aRequest, Feature* aFeature)
   AddFeatureToStreamChild(aRequest.body().get_CacheReadStream(), aFeature);
 }
 
-} // anonymous namespace
+} // namespace
 
 CacheOpChild::CacheOpChild(Feature* aFeature, nsIGlobalObject* aGlobal,
                            nsISupports* aParent, Promise* aPromise)
diff --git a/dom/cache/CacheOpParent.h b/dom/cache/CacheOpParent.h
index ef350b8b1fad..ceea9eff5d60 100644
--- a/dom/cache/CacheOpParent.h
+++ b/dom/cache/CacheOpParent.h
@@ -15,7 +15,7 @@
 namespace mozilla {
 namespace ipc {
 class PBackgroundParent;
-}
+} // namespace ipc
 namespace dom {
 namespace cache {
 
diff --git a/dom/cache/CacheParent.cpp b/dom/cache/CacheParent.cpp
index 2cca17d5ed1a..82979b1889d2 100644
--- a/dom/cache/CacheParent.cpp
+++ b/dom/cache/CacheParent.cpp
@@ -100,4 +100,4 @@ CacheParent::RecvTeardown()
 
 } // namespace cache
 } // namespace dom
-} // namesapce mozilla
+} // namespace mozilla
diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
index 11f9426e1215..b471ddc3ded7 100644
--- a/dom/cache/CacheStorage.cpp
+++ b/dom/cache/CacheStorage.cpp
@@ -140,7 +140,7 @@ IsTrusted(const PrincipalInfo& aPrincipalInfo, bool aTestingPrefEnabled)
          hostname.EqualsLiteral("::1");
 }
 
-} // anonymous namespace
+} // namespace
 
 // static
 already_AddRefed<CacheStorage>
diff --git a/dom/cache/CacheStorage.h b/dom/cache/CacheStorage.h
index 2e0af5661462..c5191ce674d8 100644
--- a/dom/cache/CacheStorage.h
+++ b/dom/cache/CacheStorage.h
@@ -24,7 +24,7 @@ class ErrorResult;
 
 namespace ipc {
   class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 
@@ -33,7 +33,7 @@ class Promise;
 
 namespace workers {
   class WorkerPrivate;
-}
+} // namespace workers
 
 namespace cache {
 
diff --git a/dom/cache/CacheStorageParent.h b/dom/cache/CacheStorageParent.h
index f46e226f3fa6..828f8aad07ea 100644
--- a/dom/cache/CacheStorageParent.h
+++ b/dom/cache/CacheStorageParent.h
@@ -53,7 +53,7 @@ private:
   nsRefPtr<ManagerId> mManagerId;
 };
 
-} // namesapce cache
+} // namespace cache
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/cache/Context.cpp b/dom/cache/Context.cpp
index d08e49f759ac..80283656c1a2 100644
--- a/dom/cache/Context.cpp
+++ b/dom/cache/Context.cpp
@@ -40,7 +40,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/cache/DBSchema.cpp b/dom/cache/DBSchema.cpp
index d00bb9f1715a..39f0a2e87849 100644
--- a/dom/cache/DBSchema.cpp
+++ b/dom/cache/DBSchema.cpp
@@ -55,7 +55,7 @@ const uint32_t kWalAutoCheckpointPages = kWalAutoCheckpointSize / kPageSize;
 static_assert(kWalAutoCheckpointSize % kPageSize == 0,
               "WAL checkpoint size must be multiple of page size");
 
-} // anonymous namespace
+} // namespace
 
 // If any of the static_asserts below fail, it means that you have changed
 // the corresponding WebIDL enum in a way that may be incompatible with the
@@ -204,7 +204,7 @@ static nsresult CreateAndBindKeyStatement(mozIStorageConnection* aConn,
                                           mozIStorageStatement** aStateOut);
 static nsresult HashCString(nsICryptoHash* aCrypto, const nsACString& aIn,
                             nsACString& aOut);
-} // anonymous namespace
+} // namespace
 
 nsresult
 CreateSchema(mozIStorageConnection* aConn)
@@ -2117,7 +2117,7 @@ HashCString(nsICryptoHash* aCrypto, const nsACString& aIn, nsACString& aOut)
   return rv;
 }
 
-} // anonymouns namespace
+} // namespace
 
 nsresult
 IncrementalVacuum(mozIStorageConnection* aConn)
diff --git a/dom/cache/Feature.h b/dom/cache/Feature.h
index 2ef50672d49d..bc4c4f1f7177 100644
--- a/dom/cache/Feature.h
+++ b/dom/cache/Feature.h
@@ -15,7 +15,7 @@ namespace mozilla {
 
 namespace workers {
 class WorkerPrivate;
-}
+} // namespace workers
 
 namespace dom {
 namespace cache {
diff --git a/dom/cache/FileUtils.cpp b/dom/cache/FileUtils.cpp
index 455abb712955..965a7b99fef4 100644
--- a/dom/cache/FileUtils.cpp
+++ b/dom/cache/FileUtils.cpp
@@ -37,7 +37,7 @@ nsresult
 BodyIdToFile(nsIFile* aBaseDir, const nsID& aId, BodyFileType aType,
              nsIFile** aBodyFileOut);
 
-} // anonymous namespace
+} // namespace
 
 // static
 nsresult
@@ -318,7 +318,7 @@ BodyIdToFile(nsIFile* aBaseDir, const nsID& aId, BodyFileType aType,
   return rv;
 }
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 BodyDeleteOrphanedFiles(nsIFile* aBaseDir, nsTArray<nsID>& aKnownBodyIdList)
@@ -438,7 +438,7 @@ GetMarkerFileHandle(const QuotaInfo& aQuotaInfo, nsIFile** aFileOut)
   return rv;
 }
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 CreateMarkerFile(const QuotaInfo& aQuotaInfo)
diff --git a/dom/cache/IPCUtils.h b/dom/cache/IPCUtils.h
index 0d86adcc60f8..cb09ebe6fc66 100644
--- a/dom/cache/IPCUtils.h
+++ b/dom/cache/IPCUtils.h
@@ -49,6 +49,6 @@ namespace IPC {
                                     mozilla::dom::cache::DEFAULT_NAMESPACE,
                                     mozilla::dom::cache::NUMBER_OF_NAMESPACES>
   {};
-}
+} // namespace IPC
 
 #endif // mozilla_dom_cache_IPCUtils_h
diff --git a/dom/cache/Manager.cpp b/dom/cache/Manager.cpp
index f4b9b38f8160..239f82f33dff 100644
--- a/dom/cache/Manager.cpp
+++ b/dom/cache/Manager.cpp
@@ -168,7 +168,7 @@ bool IsHeadRequest(CacheRequestOrVoid aRequest, CacheQueryParams aParams)
   return false;
 }
 
-} // anonymous namespace
+} // namespace
 
 // ----------------------------------------------------------------------------
 
diff --git a/dom/cache/PrincipalVerifier.cpp b/dom/cache/PrincipalVerifier.cpp
index b88b223037c6..14abb280d9e1 100644
--- a/dom/cache/PrincipalVerifier.cpp
+++ b/dom/cache/PrincipalVerifier.cpp
@@ -209,6 +209,6 @@ PrincipalVerifier::DispatchToInitiatingThread(nsresult aRv)
   }
 }
 
-} // namesapce cache
+} // namespace cache
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/cache/PrincipalVerifier.h b/dom/cache/PrincipalVerifier.h
index 689bf483aa8d..46b246dcb204 100644
--- a/dom/cache/PrincipalVerifier.h
+++ b/dom/cache/PrincipalVerifier.h
@@ -15,7 +15,7 @@ namespace mozilla {
 
 namespace ipc {
   class PBackgroundParent;
-}
+} // namespace ipc
 
 namespace dom {
 namespace cache {
@@ -72,7 +72,7 @@ public:
   NS_DECL_NSIRUNNABLE
 };
 
-} // namesapce cache
+} // namespace cache
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/cache/QuotaClient.cpp b/dom/cache/QuotaClient.cpp
index f55b48046070..726d0b351eaf 100644
--- a/dom/cache/QuotaClient.cpp
+++ b/dom/cache/QuotaClient.cpp
@@ -216,7 +216,7 @@ private:
   NS_INLINE_DECL_REFCOUNTING(CacheQuotaClient, override)
 };
 
-} // anonymous namespace;
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/cache/StreamControl.h b/dom/cache/StreamControl.h
index 9dbe50b3f1c8..74241ebc0708 100644
--- a/dom/cache/StreamControl.h
+++ b/dom/cache/StreamControl.h
@@ -16,7 +16,7 @@ struct nsID;
 namespace mozilla {
 namespace ipc {
  class FileDescriptor;
-}
+} // namespace ipc
 namespace dom {
 namespace cache {
 
diff --git a/dom/cache/TypeUtils.cpp b/dom/cache/TypeUtils.cpp
index eb5f5f45c8c8..6401e1d75bcf 100644
--- a/dom/cache/TypeUtils.cpp
+++ b/dom/cache/TypeUtils.cpp
@@ -103,7 +103,7 @@ ToHeadersEntryList(nsTArray<HeadersEntry>& aOut, InternalHeaders* aHeaders)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 already_AddRefed<InternalRequest>
 TypeUtils::ToInternalRequest(const RequestOrUSVString& aIn,
diff --git a/dom/camera/CameraControlImpl.h b/dom/camera/CameraControlImpl.h
index 371c5a346c15..5d6035c9c790 100644
--- a/dom/camera/CameraControlImpl.h
+++ b/dom/camera/CameraControlImpl.h
@@ -22,11 +22,11 @@ namespace mozilla {
 
 namespace dom {
   class BlobImpl;
-}
+} // namespace dom
 
 namespace layers {
   class Image;
-}
+} // namespace layers
 
 class CameraControlImpl : public ICameraControl
 {
diff --git a/dom/camera/CameraControlListener.h b/dom/camera/CameraControlListener.h
index bd066f962f27..c3092302e89e 100644
--- a/dom/camera/CameraControlListener.h
+++ b/dom/camera/CameraControlListener.h
@@ -12,11 +12,11 @@ namespace mozilla {
 
 namespace dom {
   class BlobImpl;
-}
+} // namespace dom
 
 namespace layers {
   class Image;
-}
+} // namespace layers
 
 class CameraControlListener
 {
diff --git a/dom/camera/CameraPreviewMediaStream.cpp b/dom/camera/CameraPreviewMediaStream.cpp
index deb5f67cfbd7..8eb66c17f589 100644
--- a/dom/camera/CameraPreviewMediaStream.cpp
+++ b/dom/camera/CameraPreviewMediaStream.cpp
@@ -205,4 +205,4 @@ CameraPreviewMediaStream::ClearCurrentFrame()
   }
 }
 
-}
+} // namespace mozilla
diff --git a/dom/camera/CameraPreviewMediaStream.h b/dom/camera/CameraPreviewMediaStream.h
index 5c5473846483..359f814d78a7 100644
--- a/dom/camera/CameraPreviewMediaStream.h
+++ b/dom/camera/CameraPreviewMediaStream.h
@@ -73,6 +73,6 @@ protected:
   nsRefPtr<FakeMediaStreamGraph> mFakeMediaStreamGraph;
 };
 
-}
+} // namespace mozilla
 
 #endif // DOM_CAMERA_CAMERAPREVIEWMEDIASTREAM_H
diff --git a/dom/camera/DOMCameraControl.h b/dom/camera/DOMCameraControl.h
index c70a6d06f0b3..ad20ef0c6471 100644
--- a/dom/camera/DOMCameraControl.h
+++ b/dom/camera/DOMCameraControl.h
@@ -36,7 +36,7 @@ namespace dom {
   struct CameraRegion;
   struct CameraSize;
   template<typename T> class Optional;
-}
+} // namespace dom
 class ErrorResult;
 class StartRecordingHelper;
 class RecorderPosterHelper;
diff --git a/dom/camera/DOMCameraManager.h b/dom/camera/DOMCameraManager.h
index f9e37c1dcbf6..a63dd8f2c51b 100644
--- a/dom/camera/DOMCameraManager.h
+++ b/dom/camera/DOMCameraManager.h
@@ -26,8 +26,8 @@ namespace mozilla {
   class nsDOMCameraControl;
   namespace dom {
     struct CameraConfiguration;
-  }
-}
+  } // namespace dom
+} // namespace mozilla
 
 typedef nsTArray<nsWeakPtr> CameraControls;
 typedef nsClassHashtable<nsUint64HashKey, CameraControls> WindowTable;
diff --git a/dom/camera/FallbackCameraControl.cpp b/dom/camera/FallbackCameraControl.cpp
index abbe2ab7ed4a..c474a7471b77 100644
--- a/dom/camera/FallbackCameraControl.cpp
+++ b/dom/camera/FallbackCameraControl.cpp
@@ -12,8 +12,8 @@ namespace mozilla {
 
   namespace layers {
     class GraphicBufferLocked;
-  }
-}
+  } // namespace layers
+} // namespace mozilla
 
 /**
  * Fallback camera control subclass. Can be used as a template for the
diff --git a/dom/canvas/CanvasImageCache.h b/dom/canvas/CanvasImageCache.h
index 95d0eebea5df..6b5fb3cfaa24 100644
--- a/dom/canvas/CanvasImageCache.h
+++ b/dom/canvas/CanvasImageCache.h
@@ -53,6 +53,6 @@ public:
   static SourceSurface* SimpleLookup(dom::Element* aImage);
 };
 
-}
+} // namespace mozilla
 
 #endif /* CANVASIMAGECACHE_H_ */
diff --git a/dom/canvas/CanvasPath.h b/dom/canvas/CanvasPath.h
index 1734bfba6730..64ceb73d1046 100644
--- a/dom/canvas/CanvasPath.h
+++ b/dom/canvas/CanvasPath.h
@@ -81,8 +81,8 @@ private:
   void EnsurePathBuilder() const;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /* CanvasPath_h */
 
diff --git a/dom/canvas/CanvasPattern.h b/dom/canvas/CanvasPattern.h
index 64d26168c186..3744c3679689 100644
--- a/dom/canvas/CanvasPattern.h
+++ b/dom/canvas/CanvasPattern.h
@@ -17,7 +17,7 @@ class nsIPrincipal;
 namespace mozilla {
 namespace gfx {
 class SourceSurface;
-}
+} // namespace gfx
 
 namespace dom {
 class SVGMatrix;
@@ -74,7 +74,7 @@ public:
   const RepeatMode mRepeat;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_CanvasPattern_h
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 07d5499f80fb..9ce82ba9b33a 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -53,6 +53,7 @@
 #include "gfxPlatform.h"
 #include "gfxFont.h"
 #include "gfxBlur.h"
+#include "gfxPrefs.h"
 #include "gfxUtils.h"
 
 #include "nsFrameLoader.h"
@@ -2715,7 +2716,7 @@ void CanvasRenderingContext2D::DrawFocusIfNeeded(mozilla::dom::Element& aElement
     Stroke();
 
     // set dashing for foreground
-    FallibleTArray<mozilla::gfx::Float>& dash = CurrentState().dash;
+    nsTArray<mozilla::gfx::Float>& dash = CurrentState().dash;
     for (uint32_t i = 0; i < 2; ++i) {
       if (!dash.AppendElement(1, fallible)) {
         aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
@@ -3970,11 +3971,11 @@ CanvasRenderingContext2D::SetMozDash(JSContext* cx,
                                      const JS::Value& mozDash,
                                      ErrorResult& error)
 {
-  FallibleTArray<Float> dash;
+  nsTArray<Float> dash;
   error = JSValToDashArray(cx, mozDash, dash);
   if (!error.Failed()) {
     ContextState& state = CurrentState();
-    state.dash = dash;
+    state.dash = Move(dash);
     if (state.dash.IsEmpty()) {
       state.dashOffset = 0;
     }
@@ -4002,7 +4003,7 @@ void
 CanvasRenderingContext2D::SetLineDash(const Sequence<double>& aSegments,
                                       ErrorResult& aRv)
 {
-  FallibleTArray<mozilla::gfx::Float> dash;
+  nsTArray<mozilla::gfx::Float> dash;
 
   for (uint32_t x = 0; x < aSegments.Length(); x++) {
     if (aSegments[x] < 0.0) {
@@ -4025,12 +4026,12 @@ CanvasRenderingContext2D::SetLineDash(const Sequence<double>& aSegments,
     }
   }
 
-  CurrentState().dash = dash;
+  CurrentState().dash = Move(dash);
 }
 
 void
 CanvasRenderingContext2D::GetLineDash(nsTArray<double>& aSegments) const {
-  const FallibleTArray<mozilla::gfx::Float>& dash = CurrentState().dash;
+  const nsTArray<mozilla::gfx::Float>& dash = CurrentState().dash;
   aSegments.Clear();
 
   for (uint32_t x = 0; x < dash.Length(); x++) {
@@ -5820,5 +5821,5 @@ CanvasPath::EnsurePathBuilder() const
   mPath = nullptr;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/canvas/CanvasRenderingContext2D.h b/dom/canvas/CanvasRenderingContext2D.h
index 14a594f10904..4ba85197608a 100644
--- a/dom/canvas/CanvasRenderingContext2D.h
+++ b/dom/canvas/CanvasRenderingContext2D.h
@@ -35,7 +35,7 @@ class nsXULElement;
 namespace mozilla {
 namespace gl {
 class SourceSurface;
-}
+} // namespace gl
 
 namespace dom {
 class HTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement;
@@ -991,7 +991,7 @@ protected:
     mozilla::gfx::Float miterLimit;
     mozilla::gfx::Float globalAlpha;
     mozilla::gfx::Float shadowBlur;
-    FallibleTArray<mozilla::gfx::Float> dash;
+    nsTArray<mozilla::gfx::Float> dash;
     mozilla::gfx::Float dashOffset;
 
     mozilla::gfx::CompositionOp op;
@@ -1052,7 +1052,7 @@ protected:
   friend class CanvasDrawObserver;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /* CanvasRenderingContext2D_h */
diff --git a/dom/canvas/CanvasUtils.h b/dom/canvas/CanvasUtils.h
index ee4eb9a066ac..044b847053e9 100644
--- a/dom/canvas/CanvasUtils.h
+++ b/dom/canvas/CanvasUtils.h
@@ -17,7 +17,7 @@ namespace mozilla {
 
 namespace dom {
 class HTMLCanvasElement;
-}
+} // namespace dom
 
 namespace CanvasUtils {
 
@@ -84,20 +84,10 @@ inline bool FloatValidate (double f1, double f2, double f3, double f4, double f5
 
 #undef VALIDATE
 
-template<typename T>
-nsresult
-JSValToDashArray(JSContext* cx, const JS::Value& val,
-                 FallibleTArray<T>& dashArray);
-
-template<typename T>
-JS::Value
-DashArrayToJSVal(FallibleTArray<T>& dashArray,
-                 JSContext* cx, mozilla::ErrorResult& rv);
-
 template<typename T>
 nsresult
 JSValToDashArray(JSContext* cx, const JS::Value& patternArray,
-                 FallibleTArray<T>& dashes)
+                 nsTArray<T>& dashes)
 {
     // The cap is pretty arbitrary.  16k should be enough for
     // anybody...
@@ -149,7 +139,7 @@ JSValToDashArray(JSContext* cx, const JS::Value& patternArray,
 
 template<typename T>
 void
-DashArrayToJSVal(FallibleTArray<T>& dashes,
+DashArrayToJSVal(nsTArray<T>& dashes,
                  JSContext* cx,
                  JS::MutableHandle<JS::Value> retval,
                  mozilla::ErrorResult& rv)
@@ -164,7 +154,7 @@ DashArrayToJSVal(FallibleTArray<T>& dashes,
     }
 }
 
-}
-}
+} // namespace CanvasUtils
+} // namespace mozilla
 
 #endif /* _CANVASUTILS_H_ */
diff --git a/dom/canvas/DocumentRendererChild.h b/dom/canvas/DocumentRendererChild.h
index d7a8e3c1661f..7c914ee46e01 100644
--- a/dom/canvas/DocumentRendererChild.h
+++ b/dom/canvas/DocumentRendererChild.h
@@ -31,7 +31,7 @@ private:
     DISALLOW_EVIL_CONSTRUCTORS(DocumentRendererChild);
 };
 
-}
-}
+} // namespace ipc
+} // namespace mozilla
 
 #endif
diff --git a/dom/canvas/DocumentRendererParent.h b/dom/canvas/DocumentRendererParent.h
index f4f1b17d1026..d0e30e7f9723 100644
--- a/dom/canvas/DocumentRendererParent.h
+++ b/dom/canvas/DocumentRendererParent.h
@@ -38,7 +38,7 @@ private:
     DISALLOW_EVIL_CONSTRUCTORS(DocumentRendererParent);
 };
 
-}
-}
+} // namespace ipc
+} // namespace mozilla
 
 #endif
diff --git a/dom/canvas/WebGL2Context.h b/dom/canvas/WebGL2Context.h
index 6ddad7ec1ed5..ec1f8e5ac48f 100644
--- a/dom/canvas/WebGL2Context.h
+++ b/dom/canvas/WebGL2Context.h
@@ -18,7 +18,7 @@ class WebGLVertexArrayObject;
 namespace dom {
 class OwningUnsignedLongOrUint32ArrayOrBoolean;
 class OwningWebGLBufferOrLongLong;
-}
+} // namespace dom
 
 class WebGL2Context
     : public WebGLContext
diff --git a/dom/canvas/WebGLContext.h b/dom/canvas/WebGLContext.h
index e044df7aa9ce..7e67d4cdbc9c 100644
--- a/dom/canvas/WebGLContext.h
+++ b/dom/canvas/WebGLContext.h
@@ -100,15 +100,15 @@ class Element;
 class ImageData;
 struct WebGLContextAttributes;
 template<typename> struct Nullable;
-}
+} // namespace dom
 
 namespace gfx {
 class SourceSurface;
-}
+} // namespace gfx
 
 namespace webgl {
 struct LinkedProgramInfo;
-}
+} // namespace webgl
 
 WebGLTexelFormat GetWebGLTexelFormat(TexInternalFormat format);
 
diff --git a/dom/canvas/WebGLContextUnchecked.h b/dom/canvas/WebGLContextUnchecked.h
index 364b0c3354bc..81621125ba1a 100644
--- a/dom/canvas/WebGLContextUnchecked.h
+++ b/dom/canvas/WebGLContextUnchecked.h
@@ -17,7 +17,7 @@ class WebGLBuffer;
 class WebGLSampler;
 namespace gl {
     class GLContext;
-}
+} // namespace gl
 
 class WebGLContextUnchecked
 {
diff --git a/dom/canvas/WebGLFramebuffer.h b/dom/canvas/WebGLFramebuffer.h
index 220f225dc3d9..7e901c06d404 100644
--- a/dom/canvas/WebGLFramebuffer.h
+++ b/dom/canvas/WebGLFramebuffer.h
@@ -18,7 +18,7 @@ class WebGLTexture;
 
 namespace gl {
     class GLContext;
-}
+} // namespace gl
 
 class WebGLFramebuffer final
     : public nsWrapperCache
diff --git a/dom/canvas/WebGLUniformLocation.h b/dom/canvas/WebGLUniformLocation.h
index 134d19a5c85e..13df4cd08535 100644
--- a/dom/canvas/WebGLUniformLocation.h
+++ b/dom/canvas/WebGLUniformLocation.h
@@ -22,7 +22,7 @@ class WebGLProgram;
 
 namespace webgl {
 struct LinkedProgramInfo;
-}
+} // namespace webgl
 
 class WebGLUniformLocation final
     : public nsWrapperCache
diff --git a/dom/canvas/nsICanvasRenderingContextInternal.h b/dom/canvas/nsICanvasRenderingContextInternal.h
index 7301fa806305..ce83079380e0 100644
--- a/dom/canvas/nsICanvasRenderingContextInternal.h
+++ b/dom/canvas/nsICanvasRenderingContextInternal.h
@@ -26,11 +26,11 @@ namespace mozilla {
 namespace layers {
 class CanvasLayer;
 class LayerManager;
-}
+} // namespace layers
 namespace gfx {
 class SourceSurface;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 class nsICanvasRenderingContextInternal :
   public nsISupports,
diff --git a/dom/datastore/DataStoreCallbacks.h b/dom/datastore/DataStoreCallbacks.h
index 361c89d0b363..a59fce738aad 100644
--- a/dom/datastore/DataStoreCallbacks.h
+++ b/dom/datastore/DataStoreCallbacks.h
@@ -48,7 +48,7 @@ protected:
   }
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_DataStoreCallbacks_h
diff --git a/dom/datastore/DataStoreDB.h b/dom/datastore/DataStoreDB.h
index e702d73c0e33..307f0ca3cb7b 100644
--- a/dom/datastore/DataStoreDB.h
+++ b/dom/datastore/DataStoreDB.h
@@ -23,7 +23,7 @@ class IDBDatabase;
 class IDBFactory;
 class IDBOpenDBRequest;
 class IDBTransaction;
-}
+} // namespace indexedDB
 
 class DataStoreDBCallback;
 
diff --git a/dom/datastore/DataStoreRevision.cpp b/dom/datastore/DataStoreRevision.cpp
index bf226ff0896e..b4db1ff93149 100644
--- a/dom/datastore/DataStoreRevision.cpp
+++ b/dom/datastore/DataStoreRevision.cpp
@@ -98,5 +98,5 @@ DataStoreRevision::HandleEvent(nsIDOMEvent* aEvent)
   return NS_OK;
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/datastore/DataStoreRevision.h b/dom/datastore/DataStoreRevision.h
index cbb75e0e8095..7ddac6af0c37 100644
--- a/dom/datastore/DataStoreRevision.h
+++ b/dom/datastore/DataStoreRevision.h
@@ -18,7 +18,7 @@ namespace dom {
 namespace indexedDB {
 class IDBObjectStore;
 class IDBRequest;
-}
+} // namespace indexedDB
 
 class DataStoreRevisionCallback;
 
diff --git a/dom/devicestorage/DeviceStorage.h b/dom/devicestorage/DeviceStorage.h
index 61166e0f6897..dc819a380af3 100644
--- a/dom/devicestorage/DeviceStorage.h
+++ b/dom/devicestorage/DeviceStorage.h
@@ -38,7 +38,7 @@ class DeviceStorageFileSystem;
 } // namespace dom
 namespace ipc {
 class FileDescriptor;
-}
+} // namespace ipc
 } // namespace mozilla
 
 class DeviceStorageFile final
diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
index 1250fbbc98dd..53c6f7f760ab 100644
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -92,7 +92,7 @@ const char *kDownloadWatcherNotify = "download-watcher-notify";
 
 namespace mozilla {
   MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedPRFileDesc, PRFileDesc, PR_Close);
-}
+} // namespace mozilla
 
 StaticAutoPtr<DeviceStorageUsedSpaceCache>
   DeviceStorageUsedSpaceCache::sDeviceStorageUsedSpaceCache;
diff --git a/dom/devicestorage/nsDeviceStorage.h b/dom/devicestorage/nsDeviceStorage.h
index 620c194031ce..e4ecd86b56da 100644
--- a/dom/devicestorage/nsDeviceStorage.h
+++ b/dom/devicestorage/nsDeviceStorage.h
@@ -36,7 +36,7 @@ class ErrorResult;
 
 namespace dom {
 class Blob;
-}
+} // namespace dom
 } // namespace mozilla
 
 #define POST_ERROR_EVENT_FILE_EXISTS                 "NoModificationAllowedError"
diff --git a/dom/encoding/EncodingUtils.h b/dom/encoding/EncodingUtils.h
index 812d061479ea..5bfb254998c1 100644
--- a/dom/encoding/EncodingUtils.h
+++ b/dom/encoding/EncodingUtils.h
@@ -144,7 +144,7 @@ private:
   EncodingUtils() = delete;
 };
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_encodingutils_h_
diff --git a/dom/encoding/FallbackEncoding.h b/dom/encoding/FallbackEncoding.h
index 2e63948caa9b..c9316a5f0b08 100644
--- a/dom/encoding/FallbackEncoding.h
+++ b/dom/encoding/FallbackEncoding.h
@@ -89,8 +89,8 @@ private:
   nsCString mFallback;
 };
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_FallbackEncoding_h_
 
diff --git a/dom/encoding/TextDecoder.cpp b/dom/encoding/TextDecoder.cpp
index 1ed4b192e43d..8636c0c314a0 100644
--- a/dom/encoding/TextDecoder.cpp
+++ b/dom/encoding/TextDecoder.cpp
@@ -138,5 +138,5 @@ TextDecoder::GetEncoding(nsAString& aEncoding)
   nsContentUtils::ASCIIToLower(aEncoding);
 }
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/encoding/TextDecoder.h b/dom/encoding/TextDecoder.h
index 7c25dfd51008..48ddda3a3825 100644
--- a/dom/encoding/TextDecoder.h
+++ b/dom/encoding/TextDecoder.h
@@ -117,7 +117,7 @@ private:
   bool mFatal;
 };
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_textdecoder_h_
diff --git a/dom/encoding/TextEncoder.cpp b/dom/encoding/TextEncoder.cpp
index 6baae0c02279..cbd7cf0da6c8 100644
--- a/dom/encoding/TextEncoder.cpp
+++ b/dom/encoding/TextEncoder.cpp
@@ -95,5 +95,5 @@ TextEncoder::GetEncoding(nsAString& aEncoding)
   nsContentUtils::ASCIIToLower(aEncoding);
 }
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/encoding/TextEncoder.h b/dom/encoding/TextEncoder.h
index 304fc2256b91..52273907e0d9 100644
--- a/dom/encoding/TextEncoder.h
+++ b/dom/encoding/TextEncoder.h
@@ -88,7 +88,7 @@ private:
   nsCOMPtr<nsIUnicodeEncoder> mEncoder;
 };
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_textencoder_h_
diff --git a/dom/events/EventListenerService.h b/dom/events/EventListenerService.h
index 4fb3684db6f4..51be12b065ba 100644
--- a/dom/events/EventListenerService.h
+++ b/dom/events/EventListenerService.h
@@ -22,7 +22,7 @@ class nsIMutableArray;
 namespace mozilla {
 namespace dom {
 class EventTarget;
-};
+} // namespace dom
 
 template<typename T>
 class Maybe;
diff --git a/dom/events/MessageEvent.h b/dom/events/MessageEvent.h
index 662b3c928b62..fe629679b27e 100644
--- a/dom/events/MessageEvent.h
+++ b/dom/events/MessageEvent.h
@@ -25,7 +25,7 @@ namespace workers {
 
 class ServiceWorkerClient;
 
-}
+} // namespace workers
 
 /**
  * Implements the MessageEvent event, used for cross-document messaging and
diff --git a/dom/events/SpeechRecognitionError.h b/dom/events/SpeechRecognitionError.h
index 537a59b3e042..7035900f04e5 100644
--- a/dom/events/SpeechRecognitionError.h
+++ b/dom/events/SpeechRecognitionError.h
@@ -57,7 +57,7 @@ protected:
   nsString mMessage;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif // SpeechRecognitionError_h__
diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
index 216f40d2cb79..1436c001ae97 100644
--- a/dom/fetch/Fetch.cpp
+++ b/dom/fetch/Fetch.cpp
@@ -879,7 +879,7 @@ public:
     return mFormData.forget();
   }
 };
-} // anonymous namespace
+} // namespace
 
 nsresult
 ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams& aBodyInit,
@@ -1206,7 +1206,7 @@ public:
     return true;
   }
 };
-} // anonymous namespace
+} // namespace
 
 template <class Derived>
 class FetchBodyFeature final : public workers::WorkerFeature
diff --git a/dom/fetch/FetchDriver.cpp b/dom/fetch/FetchDriver.cpp
index d8403ed8a76c..368c052941b9 100644
--- a/dom/fetch/FetchDriver.cpp
+++ b/dom/fetch/FetchDriver.cpp
@@ -668,7 +668,7 @@ public:
 };
 
 NS_IMPL_ISUPPORTS(FillResponseHeaders, nsIHttpHeaderVisitor)
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 FetchDriver::OnStartRequest(nsIRequest* aRequest,
@@ -964,5 +964,6 @@ FetchDriver::SetDocument(nsIDocument* aDocument)
   MOZ_ASSERT(mFetchRecursionCount == 0);
   mDocument = aDocument;
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/fetch/Headers.cpp b/dom/fetch/Headers.cpp
index a88bb96cbcf1..22f9249189be 100644
--- a/dom/fetch/Headers.cpp
+++ b/dom/fetch/Headers.cpp
@@ -92,5 +92,6 @@ Headers::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 Headers::~Headers()
 {
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/fetch/InternalHeaders.cpp b/dom/fetch/InternalHeaders.cpp
index 244e6621c862..633ade84c693 100644
--- a/dom/fetch/InternalHeaders.cpp
+++ b/dom/fetch/InternalHeaders.cpp
@@ -368,5 +368,6 @@ InternalHeaders::GetUnsafeHeaders(nsTArray<nsCString>& aNames) const
     }
   }
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/fetch/InternalResponse.h b/dom/fetch/InternalResponse.h
index 769a560d9c65..90a8d9e08537 100644
--- a/dom/fetch/InternalResponse.h
+++ b/dom/fetch/InternalResponse.h
@@ -17,7 +17,7 @@
 namespace mozilla {
 namespace ipc {
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 
diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp
index d508632c8758..40fcd20bab74 100644
--- a/dom/fetch/Request.cpp
+++ b/dom/fetch/Request.cpp
@@ -119,7 +119,7 @@ GetRequestURLFromWorker(const GlobalObject& aGlobal, const nsAString& aInput,
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 /*static*/ already_AddRefed<Request>
 Request::Constructor(const GlobalObject& aGlobal,
diff --git a/dom/fetch/Response.cpp b/dom/fetch/Response.cpp
index 84f5d8a0242a..2f9f90b8806c 100644
--- a/dom/fetch/Response.cpp
+++ b/dom/fetch/Response.cpp
@@ -234,5 +234,6 @@ Response::Headers_()
 
   return mHeaders;
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/fetch/Response.h b/dom/fetch/Response.h
index 81fb6fcf44c9..5e4e07a773aa 100644
--- a/dom/fetch/Response.h
+++ b/dom/fetch/Response.h
@@ -19,7 +19,7 @@
 namespace mozilla {
 namespace ipc {
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 
diff --git a/dom/filehandle/FileHandle.cpp b/dom/filehandle/FileHandle.cpp
index 4cc67c26c127..87455e98603d 100644
--- a/dom/filehandle/FileHandle.cpp
+++ b/dom/filehandle/FileHandle.cpp
@@ -190,7 +190,7 @@ private:
   nsCOMPtr<nsIInputStream> mStream;
 };
 
-} // anonymous namespace
+} // namespace
 
 FileHandleBase::FileHandleBase(FileMode aMode,
                                RequestMode aRequestMode)
diff --git a/dom/filehandle/FileHelper.cpp b/dom/filehandle/FileHelper.cpp
index b7f092c2f04a..edc96c234805 100644
--- a/dom/filehandle/FileHelper.cpp
+++ b/dom/filehandle/FileHelper.cpp
@@ -24,7 +24,7 @@ namespace {
 
 FileHandleBase* gCurrentFileHandle = nullptr;
 
-} // anonymous namespace
+} // namespace
 
 FileHelper::FileHelper(FileHandleBase* aFileHandle,
                        FileRequestBase* aFileRequest)
diff --git a/dom/filehandle/FileService.cpp b/dom/filehandle/FileService.cpp
index 7f1048c84331..db83189c891e 100644
--- a/dom/filehandle/FileService.cpp
+++ b/dom/filehandle/FileService.cpp
@@ -29,7 +29,7 @@ const uint32_t kIdleThreadTimeoutMs = 30000;
 StaticAutoPtr<FileService> gInstance;
 bool gShutdown = false;
 
-} // anonymous namespace
+} // namespace
 
 FileService::FileService()
 {
diff --git a/dom/filehandle/FileStreamWrappers.cpp b/dom/filehandle/FileStreamWrappers.cpp
index cb01eeef636d..014ede2babcb 100644
--- a/dom/filehandle/FileStreamWrappers.cpp
+++ b/dom/filehandle/FileStreamWrappers.cpp
@@ -83,7 +83,7 @@ private:
   nsRefPtr<FileHelper> mFileHelper;
 };
 
-} // anonymous namespace
+} // namespace
 
 FileStreamWrapper::FileStreamWrapper(nsISupports* aFileStream,
                                      FileHelper* aFileHelper,
diff --git a/dom/gamepad/GamepadService.h b/dom/gamepad/GamepadService.h
index aba6282b09af..531927b401d6 100644
--- a/dom/gamepad/GamepadService.h
+++ b/dom/gamepad/GamepadService.h
@@ -132,6 +132,7 @@ class GamepadService : public nsIObserver
   nsCOMPtr<nsITimer> mTimer;
 };
 
-}  // namespace dom
-}  // namespace mozilla
+} // namespace dom
+} // namespace mozilla
+
 #endif // mozilla_dom_GamepadService_h_
diff --git a/dom/gamepad/GamepadServiceTest.h b/dom/gamepad/GamepadServiceTest.h
index 70ecb0146c1a..e98f44c46425 100644
--- a/dom/gamepad/GamepadServiceTest.h
+++ b/dom/gamepad/GamepadServiceTest.h
@@ -33,8 +33,8 @@ private:
   virtual ~GamepadServiceTest();
 };
 
-}  // namespace dom
-}  // namespace mozilla
+} // namespace dom
+} // namespace mozilla
 
 #define NS_GAMEPAD_TEST_CID \
 { 0xfb1fcb57, 0xebab, 0x4cf4, \
diff --git a/dom/geolocation/nsGeoPositionIPCSerialiser.h b/dom/geolocation/nsGeoPositionIPCSerialiser.h
index 8ee9a0e6ff0d..aa3780d4e3b8 100644
--- a/dom/geolocation/nsGeoPositionIPCSerialiser.h
+++ b/dom/geolocation/nsGeoPositionIPCSerialiser.h
@@ -147,6 +147,6 @@ struct ParamTraits<nsIDOMGeoPosition*>
 
 };
 
-}
+} // namespace IPC
 
 #endif
diff --git a/dom/geolocation/nsGeolocation.h b/dom/geolocation/nsGeolocation.h
index 04969f721114..4b8956c9255b 100644
--- a/dom/geolocation/nsGeolocation.h
+++ b/dom/geolocation/nsGeolocation.h
@@ -44,8 +44,8 @@ namespace dom {
 class Geolocation;
 typedef CallbackObjectHolder<PositionCallback, nsIDOMGeoPositionCallback> GeoPositionCallback;
 typedef CallbackObjectHolder<PositionErrorCallback, nsIDOMGeoPositionErrorCallback> GeoPositionErrorCallback;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 struct CachedPositionAndAccuracy {
   nsCOMPtr<nsIDOMGeoPosition> position;
@@ -249,13 +249,14 @@ private:
   nsRefPtr<Geolocation> mParent;
 };
 
-}
+} // namespace dom
 
 inline nsISupports*
 ToSupports(dom::Geolocation* aGeolocation)
 {
   return ToSupports(static_cast<nsIDOMGeoGeolocation*>(aGeolocation));
 }
-}
+
+} // namespace mozilla
 
 #endif /* nsGeoLocation_h */
diff --git a/dom/html/HTMLAnchorElement.cpp b/dom/html/HTMLAnchorElement.cpp
index 08912d3497ec..7115f14e6781 100644
--- a/dom/html/HTMLAnchorElement.cpp
+++ b/dom/html/HTMLAnchorElement.cpp
@@ -471,5 +471,5 @@ HTMLAnchorElement::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) cons
          Link::SizeOfExcludingThis(aMallocSizeOf);
 }
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
diff --git a/dom/html/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp
index 95b744685a15..5d30e6b52211 100644
--- a/dom/html/HTMLCanvasElement.cpp
+++ b/dom/html/HTMLCanvasElement.cpp
@@ -50,7 +50,7 @@ namespace {
 typedef mozilla::dom::HTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement
 HTMLImageOrCanvasOrVideoElement;
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/html/HTMLCanvasElement.h b/dom/html/HTMLCanvasElement.h
index 1ff207ecc3e7..dd0073c3a264 100644
--- a/dom/html/HTMLCanvasElement.h
+++ b/dom/html/HTMLCanvasElement.h
@@ -23,10 +23,10 @@ namespace mozilla {
 namespace layers {
 class CanvasLayer;
 class LayerManager;
-}
+} // namespace layers
 namespace gfx {
 class SourceSurface;
-}
+} // namespace gfx
 
 namespace dom {
 class CanvasCaptureMediaStream;
diff --git a/dom/html/HTMLFrameElement.cpp b/dom/html/HTMLFrameElement.cpp
index bb456157a8f8..f3d1557023f8 100644
--- a/dom/html/HTMLFrameElement.cpp
+++ b/dom/html/HTMLFrameElement.cpp
@@ -87,5 +87,5 @@ HTMLFrameElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
   return HTMLFrameElementBinding::Wrap(aCx, this, aGivenProto);
 }
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
diff --git a/dom/html/HTMLHRElement.cpp b/dom/html/HTMLHRElement.cpp
index 610136624720..62c40154ee64 100644
--- a/dom/html/HTMLHRElement.cpp
+++ b/dom/html/HTMLHRElement.cpp
@@ -263,5 +263,5 @@ HTMLHRElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
   return HTMLHRElementBinding::Wrap(aCx, this, aGivenProto);
 }
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
diff --git a/dom/html/HTMLHeadingElement.h b/dom/html/HTMLHeadingElement.h
index c79d93d0f6fb..2abf5bbb5e93 100644
--- a/dom/html/HTMLHeadingElement.h
+++ b/dom/html/HTMLHeadingElement.h
@@ -48,7 +48,7 @@ private:
                                     nsRuleData* aData);
 };
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_HTMLHeadingElement_h
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
index ef13dfa55964..90af62497d97 100644
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -356,7 +356,7 @@ DOMFileToLocalFile(File* aDomFile)
   return localFile.forget();
 }
 
-} // anonymous namespace
+} // namespace
 
 
 NS_IMETHODIMP
diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h
index 16056e7fa66d..71b09e3b2cc6 100644
--- a/dom/html/HTMLMediaElement.h
+++ b/dom/html/HTMLMediaElement.h
@@ -53,8 +53,8 @@ class TextTrack;
 class TimeRanges;
 class WakeLock;
 class MediaTrack;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsITimer;
 class nsRange;
diff --git a/dom/html/HTMLPropertiesCollection.h b/dom/html/HTMLPropertiesCollection.h
index 199067fef08c..342a73fc6932 100644
--- a/dom/html/HTMLPropertiesCollection.h
+++ b/dom/html/HTMLPropertiesCollection.h
@@ -218,4 +218,5 @@ protected:
 
 } // namespace dom
 } // namespace mozilla
+
 #endif // HTMLPropertiesCollection_h_
diff --git a/dom/html/HTMLSharedElement.cpp b/dom/html/HTMLSharedElement.cpp
index 2790398830f8..0b8099b4aab6 100644
--- a/dom/html/HTMLSharedElement.cpp
+++ b/dom/html/HTMLSharedElement.cpp
@@ -336,5 +336,5 @@ HTMLSharedElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
   return HTMLHtmlElementBinding::Wrap(aCx, this, aGivenProto);
 }
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
diff --git a/dom/html/HTMLSharedElement.h b/dom/html/HTMLSharedElement.h
index 67bb8a01ffa6..205750cf6dda 100644
--- a/dom/html/HTMLSharedElement.h
+++ b/dom/html/HTMLSharedElement.h
@@ -183,7 +183,7 @@ protected:
   virtual JSObject* WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 };
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_HTMLSharedElement_h
diff --git a/dom/html/TimeRanges.h b/dom/html/TimeRanges.h
index 7f07237b64e1..0e138f605139 100644
--- a/dom/html/TimeRanges.h
+++ b/dom/html/TimeRanges.h
@@ -19,7 +19,7 @@ namespace dom {
 
 class TimeRanges;
 
-}
+} // namespace dom
 
 namespace dom {
 
diff --git a/dom/html/nsDOMStringMap.h b/dom/html/nsDOMStringMap.h
index 2b5658f23853..bb30ef18d93b 100644
--- a/dom/html/nsDOMStringMap.h
+++ b/dom/html/nsDOMStringMap.h
@@ -17,7 +17,7 @@
 
 namespace mozilla {
 class ErrorResult;
-}
+} // namespace mozilla
 
 class nsDOMStringMap : public nsStubMutationObserver,
                        public nsWrapperCache
diff --git a/dom/html/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h
index e3d7a76ef5f6..5a926de9aee0 100644
--- a/dom/html/nsGenericHTMLElement.h
+++ b/dom/html/nsGenericHTMLElement.h
@@ -39,8 +39,8 @@ namespace dom {
 class HTMLFormElement;
 class HTMLPropertiesCollection;
 class HTMLMenuElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 typedef nsMappedAttributeElement nsGenericHTMLElementBase;
 
@@ -1244,8 +1244,8 @@ private:
 namespace mozilla {
 namespace dom {
 class HTMLFieldSetElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #define FORM_ELEMENT_FLAG_BIT(n_) NODE_FLAG_BIT(ELEMENT_TYPE_SPECIFIC_BITS_OFFSET + (n_))
 
diff --git a/dom/html/nsGenericHTMLFrameElement.cpp b/dom/html/nsGenericHTMLFrameElement.cpp
index 4e31ee249189..3f37f162452d 100644
--- a/dom/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -505,7 +505,7 @@ bool NestedEnabled()
   return sMozNestedEnabled;
 }
 
-} // anonymous namespace
+} // namespace
 
 /* [infallible] */ NS_IMETHODIMP
 nsGenericHTMLFrameElement::GetReallyIsWidget(bool *aOut)
diff --git a/dom/html/nsIConstraintValidation.h b/dom/html/nsIConstraintValidation.h
index 63683067244b..396010876357 100644
--- a/dom/html/nsIConstraintValidation.h
+++ b/dom/html/nsIConstraintValidation.h
@@ -16,8 +16,8 @@ class nsIDOMValidityState;
 namespace mozilla {
 namespace dom {
 class ValidityState;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #define NS_ICONSTRAINTVALIDATION_IID \
 { 0x983829da, 0x1aaf, 0x449c, \
diff --git a/dom/html/nsIRadioGroupContainer.h b/dom/html/nsIRadioGroupContainer.h
index 1d9422fff67e..3d530a723857 100644
--- a/dom/html/nsIRadioGroupContainer.h
+++ b/dom/html/nsIRadioGroupContainer.h
@@ -14,8 +14,8 @@ class nsIFormControl;
 namespace mozilla {
 namespace dom {
 class HTMLInputElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #define NS_IRADIOGROUPCONTAINER_IID   \
 { 0x800320a0, 0x733f, 0x11e4, \
diff --git a/dom/html/nsTextEditorState.h b/dom/html/nsTextEditorState.h
index 6a5c6702300f..287ed2987684 100644
--- a/dom/html/nsTextEditorState.h
+++ b/dom/html/nsTextEditorState.h
@@ -29,8 +29,8 @@ class nsFrame;
 namespace mozilla {
 namespace dom {
 class HTMLInputElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * nsTextEditorState is a class which is responsible for managing the state of
diff --git a/dom/html/test/test_fullscreen-api.html b/dom/html/test/test_fullscreen-api.html
index 424e78bcdd46..e8da30006132 100644
--- a/dom/html/test/test_fullscreen-api.html
+++ b/dom/html/test/test_fullscreen-api.html
@@ -86,8 +86,12 @@ is(window.fullScreen, false, "Shouldn't be able to set window fullscreen from co
 // to write
 addLoadEvent(function() {
   SpecialPowers.pushPrefEnv({
-    "set":[["full-screen-api.enabled", true],
-            ["full-screen-api.allow-trusted-requests-only", false]]}, nextTest);
+      "set": [
+        ["full-screen-api.enabled", true],
+        ["full-screen-api.allow-trusted-requests-only", false],
+        ["full-screen-api.transition-duration.enter", "0 0"],
+        ["full-screen-api.transition-duration.leave", "0 0"]
+      ]}, nextTest);
 });
 SimpleTest.waitForExplicitFinish();
 </script>
diff --git a/dom/icc/Icc.cpp b/dom/icc/Icc.cpp
index 8a391ed3c801..72723a8820ee 100644
--- a/dom/icc/Icc.cpp
+++ b/dom/icc/Icc.cpp
@@ -49,7 +49,7 @@ IsPukCardLockType(IccLockType aLockType)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(Icc, DOMEventTargetHelper, mIccInfo)
 
diff --git a/dom/icc/ipc/IccParent.cpp b/dom/icc/ipc/IccParent.cpp
index 1f1d5492f7a0..96178d6e90dd 100644
--- a/dom/icc/ipc/IccParent.cpp
+++ b/dom/icc/ipc/IccParent.cpp
@@ -43,7 +43,7 @@ GetIccInfoDataFromIccInfo(nsIIccInfo* aInInfo, IccInfoData& aOutData) {
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 /**
  * PIccParent Implementation.
diff --git a/dom/indexedDB/ActorsChild.cpp b/dom/indexedDB/ActorsChild.cpp
index 99dd1d019318..0445f1cefb77 100644
--- a/dom/indexedDB/ActorsChild.cpp
+++ b/dom/indexedDB/ActorsChild.cpp
@@ -1014,7 +1014,7 @@ WorkerPermissionRequestChildProcessActor::Recv__delete__(
   return true;
 }
 
-} // anonymous namespace
+} // namespace
 
 /*******************************************************************************
  * Local class implementations
diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
index 21e9129b2909..d9e4dba4f985 100644
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -8648,7 +8648,7 @@ TelemetryIdForFile(nsIFile* aFile)
   return id;
 }
 
-} // anonymous namespace
+} // namespace
 
 /*******************************************************************************
  * Exported functions
diff --git a/dom/indexedDB/FileInfo.cpp b/dom/indexedDB/FileInfo.cpp
index ba2bc25ccb86..d1d1c3140899 100644
--- a/dom/indexedDB/FileInfo.cpp
+++ b/dom/indexedDB/FileInfo.cpp
@@ -76,7 +76,7 @@ private:
   NS_DECL_NSIRUNNABLE
 };
 
-} // anonymous namespace
+} // namespace
 
 FileInfo::FileInfo(FileManager* aFileManager)
   : mFileManager(aFileManager)
diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp
index c7554a30b23a..3404992f1612 100644
--- a/dom/indexedDB/IDBDatabase.cpp
+++ b/dom/indexedDB/IDBDatabase.cpp
@@ -179,7 +179,7 @@ private:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 class IDBDatabase::LogWarningRunnable final
   : public nsRunnable
diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp
index 514e087ce1dd..b821466ebba2 100644
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -52,7 +52,7 @@ namespace {
 
 const char kPrefIndexedDBEnabled[] = "dom.indexedDB.enabled";
 
-} // anonymous namespace
+} // namespace
 
 class IDBFactory::BackgroundCreateCallback final
   : public nsIIPCBackgroundChildCreateCallback
diff --git a/dom/indexedDB/IDBFileHandle.cpp b/dom/indexedDB/IDBFileHandle.cpp
index 65f14267f101..702c70e25200 100644
--- a/dom/indexedDB/IDBFileHandle.cpp
+++ b/dom/indexedDB/IDBFileHandle.cpp
@@ -24,7 +24,7 @@ namespace {
 
 NS_DEFINE_CID(kAppShellCID2, NS_APPSHELL_CID);
 
-} // anonymous namespace
+} // namespace
 
 IDBFileHandle::IDBFileHandle(FileMode aMode,
                              RequestMode aRequestMode,
diff --git a/dom/indexedDB/IDBIndex.cpp b/dom/indexedDB/IDBIndex.cpp
index 3d5226864fcc..ed8ca2aa10f5 100644
--- a/dom/indexedDB/IDBIndex.cpp
+++ b/dom/indexedDB/IDBIndex.cpp
@@ -44,7 +44,7 @@ GenerateRequest(IDBIndex* aIndex)
   return request.forget();
 }
 
-} // anonymous namespace
+} // namespace
 
 IDBIndex::IDBIndex(IDBObjectStore* aObjectStore, const IndexMetadata* aMetadata)
   : mObjectStore(aObjectStore)
diff --git a/dom/indexedDB/IDBKeyRange.cpp b/dom/indexedDB/IDBKeyRange.cpp
index ef7b00465ad0..cafd3b9c1a5e 100644
--- a/dom/indexedDB/IDBKeyRange.cpp
+++ b/dom/indexedDB/IDBKeyRange.cpp
@@ -37,7 +37,7 @@ GetKeyFromJSVal(JSContext* aCx,
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 IDBKeyRange::IDBKeyRange(nsISupports* aGlobal,
                          bool aLowerOpen,
diff --git a/dom/indexedDB/IDBMutableFile.cpp b/dom/indexedDB/IDBMutableFile.cpp
index a39c4d9f5e7a..74ccb51937a8 100644
--- a/dom/indexedDB/IDBMutableFile.cpp
+++ b/dom/indexedDB/IDBMutableFile.cpp
@@ -88,7 +88,7 @@ GetFileFor(FileInfo* aFileInfo)
   return file.forget();
 }
 
-} // anonymous namespace
+} // namespace
 
 IDBMutableFile::IDBMutableFile(IDBDatabase* aDatabase,
                                const nsAString& aName,
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 9138c12d6925..89a5ea505464 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -852,7 +852,7 @@ ClearStructuredCloneBuffer(JSAutoStructuredCloneBuffer& aBuffer)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 const JSClass IDBObjectStore::sDummyPropJSClass = {
   "IDBObjectStore Dummy",
diff --git a/dom/indexedDB/IDBRequest.cpp b/dom/indexedDB/IDBRequest.cpp
index e6c41ef3cb24..193e90cd24d9 100644
--- a/dom/indexedDB/IDBRequest.cpp
+++ b/dom/indexedDB/IDBRequest.cpp
@@ -47,7 +47,7 @@ namespace {
 
 NS_DEFINE_IID(kIDBRequestIID, PRIVATE_IDBREQUEST_IID);
 
-} // anonymous namespace
+} // namespace
 
 IDBRequest::IDBRequest(IDBDatabase* aDatabase)
   : IDBWrapperCache(aDatabase)
diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp
index bf7238231b70..d8d5aa3fd6ab 100644
--- a/dom/indexedDB/IDBTransaction.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -64,7 +64,7 @@ RunBeforeNextEvent(IDBTransaction* aTransaction)
   return true;
 }
 
-} // anonymous namespace
+} // namespace
 
 class IDBTransaction::WorkerFeature final
   : public mozilla::dom::workers::WorkerFeature
diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp
index 5b2c3187f68d..3724dd5ee12a 100644
--- a/dom/indexedDB/IndexedDatabaseManager.cpp
+++ b/dom/indexedDB/IndexedDatabaseManager.cpp
@@ -266,7 +266,7 @@ AtomicBoolPrefChangedCallback(const char* aPrefName, void* aClosure)
   *static_cast<Atomic<bool>*>(aClosure) = Preferences::GetBool(aPrefName);
 }
 
-} // anonymous namespace
+} // namespace
 
 IndexedDatabaseManager::IndexedDatabaseManager()
 : mFileMutex("IndexedDatabaseManager.mFileMutex")
diff --git a/dom/indexedDB/KeyPath.cpp b/dom/indexedDB/KeyPath.cpp
index 27eac5e4c824..dc8d10668f0a 100644
--- a/dom/indexedDB/KeyPath.cpp
+++ b/dom/indexedDB/KeyPath.cpp
@@ -221,7 +221,7 @@ GetJSValFromKeyPathString(JSContext* aCx,
   return rv;
 }
 
-} // anonymous namespace
+} // namespace
 
 // static
 nsresult
diff --git a/dom/indexedDB/PermissionRequestBase.cpp b/dom/indexedDB/PermissionRequestBase.cpp
index 8a7579d45f97..668869042f26 100644
--- a/dom/indexedDB/PermissionRequestBase.cpp
+++ b/dom/indexedDB/PermissionRequestBase.cpp
@@ -47,7 +47,7 @@ AssertSanity()
   MOZ_ASSERT(NS_IsMainThread());
 }
 
-} // anonymous namespace
+} // namespace
 
 PermissionRequestBase::PermissionRequestBase(Element* aOwnerElement,
                                              nsIPrincipal* aPrincipal)
diff --git a/dom/inputport/FakeInputPortService.cpp b/dom/inputport/FakeInputPortService.cpp
index 917d7e2e20c6..82cbc91f3449 100644
--- a/dom/inputport/FakeInputPortService.cpp
+++ b/dom/inputport/FakeInputPortService.cpp
@@ -77,7 +77,7 @@ private:
   bool mIsConnected;
 };
 
-} // namespace anonymous
+} // namespace
 
 NS_IMPL_ISUPPORTS(PortConnectionChangedCallback, nsITimerCallback)
 
diff --git a/dom/inputport/InputPortData.cpp b/dom/inputport/InputPortData.cpp
index 9fba2b7a7b0f..90befe370c59 100644
--- a/dom/inputport/InputPortData.cpp
+++ b/dom/inputport/InputPortData.cpp
@@ -30,7 +30,7 @@ ToInputPortType(const nsAString& aStr)
   return InputPortType::EndGuard_;
 }
 
-} // namespace anonymous
+} // namespace
 
 NS_IMPL_ISUPPORTS(InputPortData, nsIInputPortData)
 
diff --git a/dom/interfaces/base/nsIFocusManager.idl b/dom/interfaces/base/nsIFocusManager.idl
index 7781b3f84bd3..cd1234976b4f 100644
--- a/dom/interfaces/base/nsIFocusManager.idl
+++ b/dom/interfaces/base/nsIFocusManager.idl
@@ -8,7 +8,7 @@
 interface nsIDocument;
 interface nsIContent;
 
-[scriptable, uuid(c0716002-5602-4002-a0de-cc69b924b2c6)]
+[scriptable, uuid(2487F9CA-D05F-4BD1-8F43-5964E746C482)]
 /**
  * The focus manager deals with all focus related behaviour. Only one element
  * in the entire application may have the focus at a time; this element
@@ -97,7 +97,8 @@ interface nsIFocusManager : nsISupports
    * MOVEFOCUS_CARET, then the focus is cleared. If aType is any other value,
    * the focus is not changed.
    *
-   * Returns the element that was focused.
+   * Returns the element that was focused. The return value may be null if focus
+   * was moved into a child process.
    */
   nsIDOMElement moveFocus(in nsIDOMWindow aWindow, in nsIDOMElement aStartElement,
                           in unsigned long aType, in unsigned long aFlags);
@@ -215,6 +216,11 @@ interface nsIFocusManager : nsISupports
    */
   const unsigned long MOVEFOCUS_CARET = 8;
 
+  /** move focus to the first focusable document */
+  const unsigned long MOVEFOCUS_FIRSTDOC = 9;
+  /** move focus to the last focusable document */
+  const unsigned long MOVEFOCUS_LASTDOC = 10;
+
   /**
    * Called when a window has been raised.
    */
diff --git a/dom/interfaces/base/nsITabParent.idl b/dom/interfaces/base/nsITabParent.idl
index e7b2e6c0bf81..2551b23257eb 100644
--- a/dom/interfaces/base/nsITabParent.idl
+++ b/dom/interfaces/base/nsITabParent.idl
@@ -5,7 +5,7 @@
 
 #include "domstubs.idl"
 
-[scriptable, uuid(4d4576eb-ecfe-47b9-93b8-4121518621ad)]
+[scriptable, uuid(A10D887D-7FC2-48A2-ABC6-A2027423860C)]
 interface nsITabParent : nsISupports
 {
   void injectTouchEvent(in AString aType,
@@ -27,5 +27,11 @@ interface nsITabParent : nsISupports
 
   readonly attribute uint64_t tabId;
 
+  /**
+   * If aForward is true, navigate to the first focusable document.
+   * If aForward is false, navigate to the last focusable document.
+   */
+  void navigateDocument(in bool aForward);
+
   readonly attribute boolean hasContentOpener;
 };
diff --git a/dom/ipc/AppProcessChecker.cpp b/dom/ipc/AppProcessChecker.cpp
index 5b71db91ed31..57118a1a8bc4 100644
--- a/dom/ipc/AppProcessChecker.cpp
+++ b/dom/ipc/AppProcessChecker.cpp
@@ -28,8 +28,8 @@ using namespace mozilla::services;
 namespace mozilla {
 namespace dom {
 class PContentParent;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsIPrincipal;
 #endif
diff --git a/dom/ipc/AppProcessChecker.h b/dom/ipc/AppProcessChecker.h
index fb6b63ecac02..e5e7a90ba727 100644
--- a/dom/ipc/AppProcessChecker.h
+++ b/dom/ipc/AppProcessChecker.h
@@ -17,11 +17,11 @@ namespace dom {
 class TabContext;
 class PBrowserParent;
 class PContentParent;
-}
+} // namespace dom
 
 namespace hal_sandbox {
 class PHalParent;
-}
+} // namespace hal_sandbox
 
 enum AssertAppProcessType {
   ASSERT_APP_PROCESS_PERMISSION,
diff --git a/dom/ipc/Blob.cpp b/dom/ipc/Blob.cpp
index 15647f43fc25..81cb3ca8ab70 100644
--- a/dom/ipc/Blob.cpp
+++ b/dom/ipc/Blob.cpp
@@ -1489,7 +1489,7 @@ RemoteInputStream::BlockAndGetInternalStream()
   return mStream;
 }
 
-} // anonymous namespace
+} // namespace
 
 StaticAutoPtr<BlobParent::IDTable> BlobParent::sIDTable;
 StaticAutoPtr<Mutex> BlobParent::sIDTableMutex;
diff --git a/dom/ipc/ContentBridgeChild.h b/dom/ipc/ContentBridgeChild.h
index 7c3122360a95..b04c2f137cfb 100644
--- a/dom/ipc/ContentBridgeChild.h
+++ b/dom/ipc/ContentBridgeChild.h
@@ -80,7 +80,7 @@ protected: // members
   Transport* mTransport; // owned
 };
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_ContentBridgeChild_h
diff --git a/dom/ipc/ContentBridgeParent.h b/dom/ipc/ContentBridgeParent.h
index 8c0944213a65..af2fbc1acd1e 100644
--- a/dom/ipc/ContentBridgeParent.h
+++ b/dom/ipc/ContentBridgeParent.h
@@ -118,7 +118,7 @@ private:
   friend class ContentParent;
 };
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_ContentBridgeParent_h
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 0f582ffcd561..c2b484bd3221 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -1567,7 +1567,7 @@ StaticAutoPtr<LinkedList<SystemMessageHandledListener> >
 NS_IMPL_ISUPPORTS(SystemMessageHandledListener,
                   nsITimerCallback)
 
-} // anonymous namespace
+} // namespace
 
 void
 ContentParent::MaybeTakeCPUWakeLock(Element* aFrameElement)
@@ -1881,7 +1881,7 @@ NestedBrowserLayerIds()
   static std::map<ContentParent*, std::set<uint64_t> > sNestedBrowserIds;
   return sNestedBrowserIds;
 }
-} // anonymous namespace
+} // namespace
 
 bool
 ContentParent::RecvAllocateLayerTreeId(uint64_t* aId)
@@ -1936,7 +1936,7 @@ struct DelayedDeleteContentParentTask : public nsRunnable
     nsRefPtr<ContentParent> mObj;
 };
 
-}
+} // namespace
 
 void
 ContentParent::ActorDestroy(ActorDestroyReason why)
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index db41e14dd680..e7b207dc1d29 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -50,7 +50,7 @@ class TestShellParent;
 
 namespace jsipc {
 class PJavaScriptParent;
-}
+} // namespace jsipc
 
 namespace layers {
 class PCompositorParent;
diff --git a/dom/ipc/ContentProcess.h b/dom/ipc/ContentProcess.h
index 0a2cad997587..3231214163e3 100644
--- a/dom/ipc/ContentProcess.h
+++ b/dom/ipc/ContentProcess.h
@@ -42,7 +42,7 @@ private:
     DISALLOW_EVIL_CONSTRUCTORS(ContentProcess);
 };
 
-}  // namespace dom
-}  // namespace mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif  // ifndef dom_tabs_ContentThread_h
diff --git a/dom/ipc/ContentProcessManager.h b/dom/ipc/ContentProcessManager.h
index 97499a154a2d..ea5b36e96e9b 100644
--- a/dom/ipc/ContentProcessManager.h
+++ b/dom/ipc/ContentProcessManager.h
@@ -145,4 +145,5 @@ private:
 
 } // namespace dom
 } // namespace mozilla
+
 #endif
diff --git a/dom/ipc/CrashReporterChild.cpp b/dom/ipc/CrashReporterChild.cpp
index b61033b2e718..eddf384453cd 100644
--- a/dom/ipc/CrashReporterChild.cpp
+++ b/dom/ipc/CrashReporterChild.cpp
@@ -38,5 +38,5 @@ CrashReporterChild::GetCrashReporter()
   return nullptr;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/ipc/IdType.h b/dom/ipc/IdType.h
index 5cfa70b6a9c3..1da446143168 100644
--- a/dom/ipc/IdType.h
+++ b/dom/ipc/IdType.h
@@ -11,7 +11,7 @@
 
 namespace IPC {
 template<typename T> struct ParamTraits;
-}
+} // namespace IPC
 
 namespace mozilla {
 namespace dom {
@@ -69,6 +69,6 @@ struct ParamTraits<mozilla::dom::IdType<T>>
   }
 };
 
-}
+} // namespace IPC
 
 #endif
\ No newline at end of file
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 54865fd13c34..f9117f6737fe 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -150,9 +150,9 @@ parent:
 parent:
     /**
      * When child sends this message, parent should move focus to
-     * the next or previous focusable element.
+     * the next or previous focusable element or document.
      */
-    MoveFocus(bool forward);
+    MoveFocus(bool forward, bool forDocumentNavigation);
 
     Event(RemoteDOMEvent aEvent);
 
@@ -703,6 +703,11 @@ child:
      */
     SetIsDocShellActive(bool aIsActive);
 
+    /**
+     * Navigate by document.
+     */
+    NavigateDocument(bool aForward);
+
     /**
      * The parent (chrome thread) requests that the child inform it when
      * the graphics objects are ready to display.
diff --git a/dom/ipc/PreallocatedProcessManager.cpp b/dom/ipc/PreallocatedProcessManager.cpp
index f92110f11ecf..b9cb984b283c 100644
--- a/dom/ipc/PreallocatedProcessManager.cpp
+++ b/dom/ipc/PreallocatedProcessManager.cpp
@@ -428,7 +428,7 @@ inline PreallocatedProcessManagerImpl* GetPPMImpl()
   return PreallocatedProcessManagerImpl::Singleton();
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/dom/ipc/PreallocatedProcessManager.h b/dom/ipc/PreallocatedProcessManager.h
index 2c2dc017d9ec..298390dc962a 100644
--- a/dom/ipc/PreallocatedProcessManager.h
+++ b/dom/ipc/PreallocatedProcessManager.h
@@ -14,7 +14,7 @@
 namespace mozilla {
 namespace dom {
 class ContentParent;
-}
+} // namespace dom
 
 /**
  * This class manages a ContentParent that it starts up ahead of any particular
diff --git a/dom/ipc/ProcessHangMonitor.h b/dom/ipc/ProcessHangMonitor.h
index 3106654e9b1f..f2f3d8e7dcf5 100644
--- a/dom/ipc/ProcessHangMonitor.h
+++ b/dom/ipc/ProcessHangMonitor.h
@@ -16,13 +16,13 @@ class MessageLoop;
 
 namespace base {
 class Thread;
-};
+} // namespace base
 
 namespace mozilla {
 
 namespace dom {
 class ContentParent;
-}
+} // namespace dom
 
 class PProcessHangMonitorParent;
 
diff --git a/dom/ipc/ProcessHangMonitorIPC.h b/dom/ipc/ProcessHangMonitorIPC.h
index 87c0e856bb1f..dbb9f9b76871 100644
--- a/dom/ipc/ProcessHangMonitorIPC.h
+++ b/dom/ipc/ProcessHangMonitorIPC.h
@@ -18,7 +18,7 @@ namespace mozilla {
 
 namespace dom {
 class ContentParent;
-}
+} // namespace dom
 
 PProcessHangMonitorParent*
 CreateHangMonitorParent(mozilla::dom::ContentParent* aContentParent,
diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp
index e1b5909ce3a5..29c1e4495795 100644
--- a/dom/ipc/ProcessPriorityManager.cpp
+++ b/dom/ipc/ProcessPriorityManager.cpp
@@ -1372,7 +1372,7 @@ ProcessLRUPool::Add(ParticularProcessPriorityManager* aParticularManager)
       ProcessPriorityToString(mPriority));
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/dom/ipc/ProcessPriorityManager.h b/dom/ipc/ProcessPriorityManager.h
index 0407960e2ece..5e02c9c323af 100644
--- a/dom/ipc/ProcessPriorityManager.h
+++ b/dom/ipc/ProcessPriorityManager.h
@@ -12,7 +12,7 @@
 namespace mozilla {
 namespace dom {
 class ContentParent;
-}
+} // namespace dom
 
 /**
  * This class sets the priority of subprocesses in response to explicit
diff --git a/dom/ipc/StructuredCloneUtils.cpp b/dom/ipc/StructuredCloneUtils.cpp
index f7ced0cdb034..dfcb140cb866 100644
--- a/dom/ipc/StructuredCloneUtils.cpp
+++ b/dom/ipc/StructuredCloneUtils.cpp
@@ -111,7 +111,7 @@ const JSStructuredCloneCallbacks gCallbacks = {
   nullptr
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 42bdabc0abd7..1e8783d45e96 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -742,7 +742,7 @@ NestedTabChildMap()
   static std::map<TabId, nsRefPtr<TabChild>> sNestedTabChildMap;
   return sNestedTabChildMap;
 }
-} // anonymous namespace
+} // namespace
 
 already_AddRefed<TabChild>
 TabChild::FindTabChild(const TabId& aTabId)
@@ -1436,16 +1436,16 @@ TabChild::Blur()
 }
 
 NS_IMETHODIMP
-TabChild::FocusNextElement()
+TabChild::FocusNextElement(bool aForDocumentNavigation)
 {
-  SendMoveFocus(true);
+  SendMoveFocus(true, aForDocumentNavigation);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-TabChild::FocusPrevElement()
+TabChild::FocusPrevElement(bool aForDocumentNavigation)
 {
-  SendMoveFocus(false);
+  SendMoveFocus(false, aForDocumentNavigation);
   return NS_OK;
 }
 
@@ -2940,6 +2940,24 @@ TabChild::RecvSetIsDocShellActive(const bool& aIsActive)
     return true;
 }
 
+bool
+TabChild::RecvNavigateDocument(const bool& aForward)
+{
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIDOMElement> result;
+    nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(WebNavigation());
+
+    // Move to the first or last document.
+    fm->MoveFocus(window, nullptr, aForward ? nsIFocusManager::MOVEFOCUS_FIRSTDOC :
+                                              nsIFocusManager::MOVEFOCUS_LASTDOC,
+                  nsIFocusManager::FLAG_BYKEY, getter_AddRefs(result));
+    SendRequestFocus(false);
+  }
+
+  return true;
+}
+
 PRenderFrameChild*
 TabChild::AllocPRenderFrameChild()
 {
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index f864ddbcdd81..e3be952c55b8 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -43,22 +43,22 @@ class nsIDOMWindowUtils;
 namespace mozilla {
 namespace layout {
 class RenderFrameChild;
-}
+} // namespace layout
 
 namespace layers {
 class APZEventState;
 class ImageCompositeNotification;
 struct SetTargetAPZCCallback;
 struct SetAllowedTouchBehaviorCallback;
-}
+} // namespace layers
 
 namespace widget {
 struct AutoCacheNativeKeyCommands;
-}
+} // namespace widget
 
 namespace plugins {
 class PluginWidgetChild;
-}
+} // namespace plugins
 
 namespace dom {
 
@@ -525,6 +525,7 @@ protected:
     virtual bool RecvDestroy() override;
     virtual bool RecvSetUpdateHitRegion(const bool& aEnabled) override;
     virtual bool RecvSetIsDocShellActive(const bool& aIsActive) override;
+    virtual bool RecvNavigateDocument(const bool& aForward) override;
 
     virtual bool RecvRequestNotifyAfterRemotePaint() override;
 
@@ -666,7 +667,7 @@ private:
     DISALLOW_EVIL_CONSTRUCTORS(TabChild);
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_TabChild_h
diff --git a/dom/ipc/TabMessageUtils.cpp b/dom/ipc/TabMessageUtils.cpp
index 3fca5dd709ea..efad15efc756 100644
--- a/dom/ipc/TabMessageUtils.cpp
+++ b/dom/ipc/TabMessageUtils.cpp
@@ -29,5 +29,5 @@ ReadRemoteEvent(const IPC::Message* aMsg, void** aIter,
   return aResult->mEvent->Deserialize(aMsg, aIter);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/ipc/TabMessageUtils.h b/dom/ipc/TabMessageUtils.h
index b2e3beef2442..2aef32b39a00 100644
--- a/dom/ipc/TabMessageUtils.h
+++ b/dom/ipc/TabMessageUtils.h
@@ -34,8 +34,8 @@ typedef CrashReporter::ThreadId NativeThreadId;
 typedef int32_t NativeThreadId;
 #endif
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 namespace IPC {
 
@@ -95,6 +95,6 @@ struct ParamTraits<nsEventStatus>
                                     nsEventStatus_eSentinel>
 { };
 
-}
+} // namespace IPC
 
 #endif
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index f76e0f8bb84a..d931cd78ebc2 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -225,7 +225,7 @@ private:
             // Intentionally leak the runnable (but not the fd) rather
             // than crash when trying to release a main thread object
             // off the main thread.
-            mTabParent.forget();
+            mozilla::unused << mTabParent.forget();
             CloseFile();
         }
     }
@@ -509,13 +509,17 @@ TabParent::ActorDestroy(ActorDestroyReason why)
 }
 
 bool
-TabParent::RecvMoveFocus(const bool& aForward)
+TabParent::RecvMoveFocus(const bool& aForward, const bool& aForDocumentNavigation)
 {
   nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
   if (fm) {
     nsCOMPtr<nsIDOMElement> dummy;
-    uint32_t type = aForward ? uint32_t(nsIFocusManager::MOVEFOCUS_FORWARD)
-                             : uint32_t(nsIFocusManager::MOVEFOCUS_BACKWARD);
+
+    uint32_t type = aForward ?
+      (aForDocumentNavigation ? static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_FORWARDDOC) :
+                                static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_FORWARD)) :
+      (aForDocumentNavigation ? static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_BACKWARDDOC) :
+                                static_cast<uint32_t>(nsIFocusManager::MOVEFOCUS_BACKWARD));
     nsCOMPtr<nsIDOMElement> frame = do_QueryInterface(mFrameElement);
     fm->MoveFocus(nullptr, frame, type, nsIFocusManager::FLAG_BYKEY,
                   getter_AddRefs(dummy));
@@ -2932,6 +2936,13 @@ TabParent::SetHasContentOpener(bool aHasContentOpener)
   mHasContentOpener = aHasContentOpener;
 }
 
+NS_IMETHODIMP
+TabParent::NavigateDocument(bool aForward)
+{
+  unused << SendNavigateDocument(aForward);
+  return NS_OK;
+}
+
 class LayerTreeUpdateRunnable final
   : public nsRunnable
 {
@@ -3340,5 +3351,5 @@ FakeChannel::OnAuthCancelled(nsISupports *aContext, bool userCancel)
 }
 
 
-} // namespace tabs
+} // namespace dom
 } // namespace mozilla
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 7b57957e61b6..eb9b0a823ae4 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -40,25 +40,25 @@ namespace mozilla {
 
 namespace jsipc {
 class CpowHolder;
-}
+} // namespace jsipc
 
 namespace layers {
 struct FrameMetrics;
 struct TextureFactoryIdentifier;
-}
+} // namespace layers
 
 namespace layout {
 class RenderFrameParent;
-}
+} // namespace layout
 
 namespace widget {
 struct IMENotification;
-}
+} // namespace widget
 
 namespace gfx {
 class SourceSurface;
 class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace dom {
 
@@ -125,7 +125,8 @@ public:
     void AddWindowListeners();
     void DidRefresh() override;
 
-    virtual bool RecvMoveFocus(const bool& aForward) override;
+    virtual bool RecvMoveFocus(const bool& aForward,
+                               const bool& aForDocumentNavigation) override;
     virtual bool RecvEvent(const RemoteDOMEvent& aEvent) override;
     virtual bool RecvReplyKeyEvent(const WidgetKeyboardEvent& aEvent) override;
     virtual bool RecvDispatchAfterKeyboardEvent(const WidgetKeyboardEvent& aEvent) override;
diff --git a/dom/ipc/nsICachedFileDescriptorListener.h b/dom/ipc/nsICachedFileDescriptorListener.h
index f081ef7ecd4f..4413794f097a 100644
--- a/dom/ipc/nsICachedFileDescriptorListener.h
+++ b/dom/ipc/nsICachedFileDescriptorListener.h
@@ -21,8 +21,8 @@ class nsAString;
 namespace mozilla {
 namespace ipc {
 class FileDescriptor;
-}
-}
+} // namespace ipc
+} // namespace mozilla
 
 class NS_NO_VTABLE nsICachedFileDescriptorListener : public nsISupports
 {
diff --git a/dom/ipc/nsIContentChild.cpp b/dom/ipc/nsIContentChild.cpp
index 9331d1dd3f16..814d3d73bcec 100644
--- a/dom/ipc/nsIContentChild.cpp
+++ b/dom/ipc/nsIContentChild.cpp
@@ -125,5 +125,5 @@ nsIContentChild::RecvAsyncMessage(const nsString& aMsg,
   return true;
 }
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/ipc/nsIContentChild.h b/dom/ipc/nsIContentChild.h
index f2147b7969ca..ab5a23ddc00d 100644
--- a/dom/ipc/nsIContentChild.h
+++ b/dom/ipc/nsIContentChild.h
@@ -21,14 +21,14 @@ class nsString;
 
 namespace IPC {
 class Principal;
-} // IPC
+} // namespace IPC
 
 namespace mozilla {
 
 namespace jsipc {
 class PJavaScriptChild;
 class CpowEntry;
-} // jsipc
+} // namespace jsipc
 
 namespace dom {
 
@@ -86,6 +86,7 @@ protected:
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentChild, NS_ICONTENTCHILD_IID)
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
+
 #endif /* mozilla_dom_nsIContentChild_h */
diff --git a/dom/media/AbstractMediaDecoder.h b/dom/media/AbstractMediaDecoder.h
index 7013857b597c..08b1d903ae3e 100644
--- a/dom/media/AbstractMediaDecoder.h
+++ b/dom/media/AbstractMediaDecoder.h
@@ -20,7 +20,7 @@ namespace mozilla
 namespace layers
 {
   class ImageContainer;
-}
+} // namespace layers
 class MediaResource;
 class ReentrantMonitor;
 class VideoFrameContainer;
@@ -259,7 +259,7 @@ private:
   nsRefPtr<AbstractMediaDecoder> mDecoder;
 };
 
-}
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/AudioBufferUtils.h b/dom/media/AudioBufferUtils.h
index b332e034970b..cbe305f11ecb 100644
--- a/dom/media/AudioBufferUtils.h
+++ b/dom/media/AudioBufferUtils.h
@@ -160,6 +160,6 @@ private:
   uint32_t mPosition;
 };
 
-}
+} // namespace mozilla
 
 #endif // MOZILLA_SCRATCHBUFFER_H_
diff --git a/dom/media/AudioChannelFormat.cpp b/dom/media/AudioChannelFormat.cpp
index 49a5f7c7dc91..a447b1dd5d73 100644
--- a/dom/media/AudioChannelFormat.cpp
+++ b/dom/media/AudioChannelFormat.cpp
@@ -198,4 +198,4 @@ AudioChannelsDownMix(const nsTArray<const void*>& aChannelArray,
   }
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/AudioMixer.h b/dom/media/AudioMixer.h
index 9eeff82d2777..c992942e25f9 100644
--- a/dom/media/AudioMixer.h
+++ b/dom/media/AudioMixer.h
@@ -145,6 +145,7 @@ private:
   /* Buffer containing the mixed audio data. */
   nsTArray<AudioDataValue> mMixedAudio;
 };
-}
+
+} // namespace mozilla
 
 #endif // MOZILLA_AUDIOMIXER_H_
diff --git a/dom/media/AudioSegment.cpp b/dom/media/AudioSegment.cpp
index 53dfa1eff3fd..ddd16bbe16a5 100644
--- a/dom/media/AudioSegment.cpp
+++ b/dom/media/AudioSegment.cpp
@@ -214,4 +214,4 @@ AudioSegment::WriteTo(uint64_t aID, AudioMixer& aMixer, uint32_t aOutputChannels
   }
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/AudioSegment.h b/dom/media/AudioSegment.h
index 3bf5fb8f17ca..22bad4e7790a 100644
--- a/dom/media/AudioSegment.h
+++ b/dom/media/AudioSegment.h
@@ -332,6 +332,6 @@ public:
   }
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_AUDIOSEGMENT_H_ */
diff --git a/dom/media/AudioStream.cpp b/dom/media/AudioStream.cpp
index 0077edb2824b..67a002cb0d80 100644
--- a/dom/media/AudioStream.cpp
+++ b/dom/media/AudioStream.cpp
@@ -1220,4 +1220,5 @@ bool AudioClock::GetPreservesPitch() const
 {
   return mPreservesPitch;
 }
+
 } // namespace mozilla
diff --git a/dom/media/AudioStreamTrack.cpp b/dom/media/AudioStreamTrack.cpp
index 7afaf34245c8..0008411afa49 100644
--- a/dom/media/AudioStreamTrack.cpp
+++ b/dom/media/AudioStreamTrack.cpp
@@ -16,5 +16,5 @@ AudioStreamTrack::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
   return AudioStreamTrackBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/AudioStreamTrack.h b/dom/media/AudioStreamTrack.h
index 5071140784c3..b05ca84cc7ef 100644
--- a/dom/media/AudioStreamTrack.h
+++ b/dom/media/AudioStreamTrack.h
@@ -25,7 +25,7 @@ public:
   virtual void GetKind(nsAString& aKind) override { aKind.AssignLiteral("audio"); }
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /* AUDIOSTREAMTRACK_H_ */
diff --git a/dom/media/BufferMediaResource.h b/dom/media/BufferMediaResource.h
index 56d06eab58bf..6e81da8d6a40 100644
--- a/dom/media/BufferMediaResource.h
+++ b/dom/media/BufferMediaResource.h
@@ -168,6 +168,6 @@ private:
   const nsAutoCString mContentType;
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/CanvasCaptureMediaStream.h b/dom/media/CanvasCaptureMediaStream.h
index 106d24906aad..049f2827a84f 100644
--- a/dom/media/CanvasCaptureMediaStream.h
+++ b/dom/media/CanvasCaptureMediaStream.h
@@ -16,7 +16,7 @@ class SourceMediaStream;
 
 namespace layers {
 class Image;
-}
+} // namespace layers
 
 namespace dom {
 class CanvasCaptureMediaStream;
diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
index 2e3ab19421bb..4e0262b1d958 100644
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -38,7 +38,7 @@ bool sCubebLatencyPrefSet;
 // visible on the querying thread/CPU.
 uint32_t sPreferredSampleRate;
 
-} // anonymous namespace
+} // namespace
 
 extern PRLogModuleInfo* gAudioStreamLog;
 
diff --git a/dom/media/DOMMediaStream.h b/dom/media/DOMMediaStream.h
index fc2d1646b938..ebad4e70afbc 100644
--- a/dom/media/DOMMediaStream.h
+++ b/dom/media/DOMMediaStream.h
@@ -48,12 +48,12 @@ class VideoTrack;
 class AudioTrackList;
 class VideoTrackList;
 class MediaTrackListListener;
-}
+} // namespace dom
 
 namespace layers {
 class ImageContainer;
 class OverlayImage;
-}
+} // namespace layers
 
 class MediaStreamDirectListener;
 
@@ -418,6 +418,6 @@ private:
 #endif
 };
 
-}
+} // namespace mozilla
 
 #endif /* NSDOMMEDIASTREAM_H_ */
diff --git a/dom/media/DecodedStream.h b/dom/media/DecodedStream.h
index 42e232e50c71..1866c53be3b7 100644
--- a/dom/media/DecodedStream.h
+++ b/dom/media/DecodedStream.h
@@ -35,7 +35,7 @@ template <class T> class MediaQueue;
 
 namespace layers {
 class Image;
-}
+} // namespace layers
 
 /*
  * All MediaStream-related data is protected by the decoder's monitor.
diff --git a/dom/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp
index 2a3df9dd414b..b6c1514102cb 100644
--- a/dom/media/DecoderTraits.cpp
+++ b/dom/media/DecoderTraits.cpp
@@ -755,4 +755,4 @@ bool DecoderTraits::IsSupportedInVideoDocument(const nsACString& aType)
     false;
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/DecoderTraits.h b/dom/media/DecoderTraits.h
index a85b141ca345..bca6bf651dc2 100644
--- a/dom/media/DecoderTraits.h
+++ b/dom/media/DecoderTraits.h
@@ -65,7 +65,7 @@ public:
   static bool IsWebMType(const nsACString& aType);
 };
 
-}
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/EncodedBufferCache.cpp b/dom/media/EncodedBufferCache.cpp
index ad0bd02856a0..b2bd6f2ac8ea 100644
--- a/dom/media/EncodedBufferCache.cpp
+++ b/dom/media/EncodedBufferCache.cpp
@@ -88,4 +88,4 @@ EncodedBufferCache::ExtractBlob(nsISupports* aParent,
   return blob.forget();
 }
 
-} //end namespace
+} // namespace mozilla
diff --git a/dom/media/EncodedBufferCache.h b/dom/media/EncodedBufferCache.h
index e0a921a823f8..3baaa05aa521 100644
--- a/dom/media/EncodedBufferCache.h
+++ b/dom/media/EncodedBufferCache.h
@@ -17,7 +17,7 @@ namespace mozilla {
 
 namespace dom {
 class Blob;
-}
+} // namespace dom
 
 /**
  * Data is moved into a temporary file when it grows beyond
diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index c61d2b37b913..9c69b423d4f2 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -1100,4 +1100,4 @@ void AudioCallbackDriver::CompleteAudioContextOperations(AsyncCubebOperation aOp
 }
 
 
-} // namepace mozilla
+} // namespace mozilla
diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 9ef0692775b7..13915f3d6e0f 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -547,6 +547,6 @@ private:
   nsRefPtr<MediaStreamGraphImpl> mShutdownGrip;
 };
 
-}
+} // namespace mozilla
 
 #endif // GRAPHDRIVER_H_
diff --git a/dom/media/Intervals.h b/dom/media/Intervals.h
index a4f14019f4ab..69ad0ca59f42 100644
--- a/dom/media/Intervals.h
+++ b/dom/media/Intervals.h
@@ -16,8 +16,8 @@ namespace mozilla {
 namespace media {
 template<class T>
 class IntervalSet;
-}
-}
+} // namespace media
+} // namespace mozilla
 
 template<class E>
 struct nsTArray_CopyChooser<mozilla::media::IntervalSet<E>>
diff --git a/dom/media/MP3Demuxer.cpp b/dom/media/MP3Demuxer.cpp
index 8205d8a8d074..f39df372184b 100644
--- a/dom/media/MP3Demuxer.cpp
+++ b/dom/media/MP3Demuxer.cpp
@@ -426,7 +426,7 @@ static const int SYNC1 = 0;
 static const int SYNC2_VERSION_LAYER_PROTECTION = 1;
 static const int BITRATE_SAMPLERATE_PADDING_PRIVATE = 2;
 static const int CHANNELMODE_MODEEXT_COPY_ORIG_EMPH = 3;
-}
+} // namespace frame_header
 
 FrameParser::FrameParser()
 {
@@ -825,7 +825,7 @@ static const int FLAGS_END = VERSION_END + FLAGS_LEN;
 static const int SIZE_END = FLAGS_END + SIZE_LEN;
 
 static const uint8_t ID[ID_LEN] = {'I', 'D', '3'};
-}
+} // namespace id3_header
 
 const uint8_t*
 ID3Parser::Parse(const uint8_t* aBeg, const uint8_t* aEnd) {
@@ -937,5 +937,5 @@ ID3Parser::ID3Header::Update(uint8_t c) {
   return IsValid(mPos++);
 }
 
-}  // namespace mp3
-}  // namespace mozilla
+} // namespace mp3
+} // namespace mozilla
diff --git a/dom/media/MP3Demuxer.h b/dom/media/MP3Demuxer.h
index b4ad3711339c..c63a8f1f2734 100644
--- a/dom/media/MP3Demuxer.h
+++ b/dom/media/MP3Demuxer.h
@@ -409,7 +409,7 @@ private:
   UniquePtr<AudioInfo> mInfo;
 };
 
-}  // namespace mp3
-}  // namespace mozilla
+} // namespace mp3
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/MP3FrameParser.cpp b/dom/media/MP3FrameParser.cpp
index e706b2a2a316..6448c6d344a6 100644
--- a/dom/media/MP3FrameParser.cpp
+++ b/dom/media/MP3FrameParser.cpp
@@ -588,4 +588,4 @@ bool MP3FrameParser::NeedsData()
   return IsMP3() && !HasExactDuration();
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/MP3FrameParser.h b/dom/media/MP3FrameParser.h
index 30427575f3e5..154bff21e851 100644
--- a/dom/media/MP3FrameParser.h
+++ b/dom/media/MP3FrameParser.h
@@ -213,6 +213,6 @@ private:
 
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/MediaData.h b/dom/media/MediaData.h
index e9927fda749f..3924876a68e3 100644
--- a/dom/media/MediaData.h
+++ b/dom/media/MediaData.h
@@ -20,7 +20,7 @@ namespace mozilla {
 namespace layers {
 class Image;
 class ImageContainer;
-}
+} // namespace layers
 
 class MediaByteBuffer;
 class SharedTrackInfo;
@@ -144,7 +144,7 @@ protected:
 namespace layers {
 class TextureClient;
 class PlanarYCbCrImage;
-}
+} // namespace layers
 
 class VideoInfo;
 
diff --git a/dom/media/MediaDecoderOwner.h b/dom/media/MediaDecoderOwner.h
index 42fe1cea8b82..d1cf56081239 100644
--- a/dom/media/MediaDecoderOwner.h
+++ b/dom/media/MediaDecoderOwner.h
@@ -13,7 +13,7 @@ class VideoFrameContainer;
 
 namespace dom {
 class HTMLMediaElement;
-}
+} // namespace dom
 
 class MediaDecoderOwner
 {
@@ -139,7 +139,7 @@ public:
 #endif // MOZ_EME
 };
 
-}
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h
index 316222a00e78..8987d6fa3f25 100644
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -1367,5 +1367,6 @@ protected:
   nsRefPtr<DecodedStream> mDecodedStream;
 };
 
-} // namespace mozilla;
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h
index 54c2d6564b62..722f71898192 100644
--- a/dom/media/MediaManager.h
+++ b/dom/media/MediaManager.h
@@ -48,7 +48,7 @@ namespace mozilla {
 namespace dom {
 struct MediaStreamConstraints;
 struct MediaTrackConstraintSet;
-}
+} // namespace dom
 
 extern PRLogModuleInfo* GetMediaManagerLog();
 #define MM_LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
diff --git a/dom/media/MediaMetadataManager.h b/dom/media/MediaMetadataManager.h
index 4a5a27cf0a19..d11d98ae19c0 100644
--- a/dom/media/MediaMetadataManager.h
+++ b/dom/media/MediaMetadataManager.h
@@ -63,6 +63,6 @@ namespace mozilla {
     protected:
       LinkedList<TimedMetadata> mMetadataQueue;
   };
-}
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/MediaPermissionGonk.h b/dom/media/MediaPermissionGonk.h
index 464557f3adcd..2d2106d8c2aa 100644
--- a/dom/media/MediaPermissionGonk.h
+++ b/dom/media/MediaPermissionGonk.h
@@ -34,5 +34,6 @@ private:
 };
 
 } // namespace mozilla
+
 #endif // DOM_MEDIA_MEDIAPERMISSIONGONK_H
 
diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
index 94dca28123fb..5f33f4c178d0 100644
--- a/dom/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -1188,5 +1188,5 @@ MediaRecorderReporter::~MediaRecorderReporter()
   UnregisterWeakMemoryReporter(this);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/MediaRecorder.h b/dom/media/MediaRecorder.h
index 8ad14fdafa62..3aeb8aa00cb6 100644
--- a/dom/media/MediaRecorder.h
+++ b/dom/media/MediaRecorder.h
@@ -152,7 +152,7 @@ private:
   bool Check3gppPermission();
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/MediaSegment.h b/dom/media/MediaSegment.h
index 9c1f5353cec2..a6821e5508dd 100644
--- a/dom/media/MediaSegment.h
+++ b/dom/media/MediaSegment.h
@@ -425,6 +425,6 @@ protected:
 #endif
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_MEDIASEGMENT_H_ */
diff --git a/dom/media/MediaStreamError.h b/dom/media/MediaStreamError.h
index 411ac0479d6e..726a8ac99186 100644
--- a/dom/media/MediaStreamError.h
+++ b/dom/media/MediaStreamError.h
@@ -26,7 +26,7 @@ namespace dom {
  { 0x9d, 0xa9, 0xf2, 0xeb, 0x03, 0x91, 0x0b, 0xd1 } }
 
 class MediaStreamError;
-}
+} // namespace dom
 
 class BaseMediaMgrError
 {
diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 301e1a2448e0..68bb12692697 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -565,7 +565,7 @@ namespace {
   const uint32_t NOT_VISITED = UINT32_MAX;
   // Value of mCycleMarker for ordered streams in muted cycles.
   const uint32_t IN_MUTED_CYCLE = 1;
-}
+} // namespace
 
 void
 MediaStreamGraphImpl::UpdateStreamOrder()
@@ -1671,7 +1671,7 @@ public:
   NS_DECL_NSIOBSERVER
 };
 
-}
+} // namespace
 
 void
 MediaStreamGraphImpl::RunInStableState(bool aSourceIsMSG)
@@ -3008,7 +3008,7 @@ ForceShutdownEnumerator(const uint32_t& /* aAudioChannel */,
   return PL_DHASH_NEXT;
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 MediaStreamGraphShutdownObserver::Observe(nsISupports *aSubject,
@@ -3535,4 +3535,4 @@ ProcessedMediaStream::AddInput(MediaInputPort* aPort)
   GraphImpl()->SetStreamOrderDirty();
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/MediaStreamGraph.h b/dom/media/MediaStreamGraph.h
index 341679857dd3..5e975660cec1 100644
--- a/dom/media/MediaStreamGraph.h
+++ b/dom/media/MediaStreamGraph.h
@@ -1344,6 +1344,6 @@ protected:
   TrackRate mSampleRate;
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_MEDIASTREAMGRAPH_H_ */
diff --git a/dom/media/MediaStreamGraphImpl.h b/dom/media/MediaStreamGraphImpl.h
index 4bafb1aa791f..262cae526c2e 100644
--- a/dom/media/MediaStreamGraphImpl.h
+++ b/dom/media/MediaStreamGraphImpl.h
@@ -772,6 +772,6 @@ private:
   uint32_t mAudioChannel;
 };
 
-}
+} // namespace mozilla
 
 #endif /* MEDIASTREAMGRAPHIMPL_H_ */
diff --git a/dom/media/MediaStreamTrack.cpp b/dom/media/MediaStreamTrack.cpp
index 13b0a06a7773..b6da955bde9c 100644
--- a/dom/media/MediaStreamTrack.cpp
+++ b/dom/media/MediaStreamTrack.cpp
@@ -62,5 +62,5 @@ MediaStreamTrack::Stop()
   mStream->StopTrack(mTrackID);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/MediaStreamTrack.h b/dom/media/MediaStreamTrack.h
index b96645f915f4..baaaf8bd44e0 100644
--- a/dom/media/MediaStreamTrack.h
+++ b/dom/media/MediaStreamTrack.h
@@ -67,7 +67,7 @@ protected:
   bool mEnabled;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /* MEDIASTREAMTRACK_H_ */
diff --git a/dom/media/SelfRef.h b/dom/media/SelfRef.h
index 301d986fa0dc..ca9d0b749fd8 100644
--- a/dom/media/SelfRef.h
+++ b/dom/media/SelfRef.h
@@ -42,6 +42,7 @@ public:
 private:
   bool mHeld;
 };
-} // mozilla
+
+} // namespace mozilla
 
 #endif // SELF_REF_H
diff --git a/dom/media/SharedBuffer.h b/dom/media/SharedBuffer.h
index 7d9f83a56b98..632098ecfb2a 100644
--- a/dom/media/SharedBuffer.h
+++ b/dom/media/SharedBuffer.h
@@ -72,6 +72,6 @@ private:
   SharedBuffer() {}
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_SHAREDBUFFER_H_ */
diff --git a/dom/media/StreamBuffer.cpp b/dom/media/StreamBuffer.cpp
index ec78594e027d..5af63e5b01c3 100644
--- a/dom/media/StreamBuffer.cpp
+++ b/dom/media/StreamBuffer.cpp
@@ -114,4 +114,4 @@ StreamBuffer::ForgetUpTo(StreamTime aTime)
   }
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/StreamBuffer.h b/dom/media/StreamBuffer.h
index eba37499c08e..0efd46cfa927 100644
--- a/dom/media/StreamBuffer.h
+++ b/dom/media/StreamBuffer.h
@@ -332,7 +332,7 @@ private:
 #endif
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_STREAMBUFFER_H_ */
 
diff --git a/dom/media/TimeUnits.h b/dom/media/TimeUnits.h
index 7da8f6e8f4ca..2f03fded7726 100644
--- a/dom/media/TimeUnits.h
+++ b/dom/media/TimeUnits.h
@@ -16,8 +16,8 @@
 namespace mozilla {
 namespace media {
 class TimeIntervals;
-}
-}
+} // namespace media
+} // namespace mozilla
 // CopyChooser specalization for nsTArray
 template<>
 struct nsTArray_CopyChooser<mozilla::media::TimeIntervals>
diff --git a/dom/media/TimeVarying.h b/dom/media/TimeVarying.h
index 58d9ecc9a6a6..a319559a12f6 100644
--- a/dom/media/TimeVarying.h
+++ b/dom/media/TimeVarying.h
@@ -232,6 +232,6 @@ private:
   T mCurrent;
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_TIMEVARYING_H_ */
diff --git a/dom/media/TrackUnionStream.cpp b/dom/media/TrackUnionStream.cpp
index 76940dcf3289..a540e857ed86 100644
--- a/dom/media/TrackUnionStream.cpp
+++ b/dom/media/TrackUnionStream.cpp
@@ -289,4 +289,4 @@ TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) :
       outputTrack->GetSegment()->AppendFrom(segment);
     }
   }
-}
+} // namespace mozilla
diff --git a/dom/media/TrackUnionStream.h b/dom/media/TrackUnionStream.h
index 80e8b35c2c22..e9dd97922515 100644
--- a/dom/media/TrackUnionStream.h
+++ b/dom/media/TrackUnionStream.h
@@ -69,6 +69,6 @@ protected:
   nsTArray<TrackID> mUsedTracks;
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_MEDIASTREAMGRAPH_H_ */
diff --git a/dom/media/VideoFrameContainer.cpp b/dom/media/VideoFrameContainer.cpp
index 409ab3892c3c..280a73fd3b5d 100644
--- a/dom/media/VideoFrameContainer.cpp
+++ b/dom/media/VideoFrameContainer.cpp
@@ -155,4 +155,4 @@ void VideoFrameContainer::InvalidateWithFlags(uint32_t aFlags)
   nsSVGEffects::InvalidateDirectRenderingObservers(mElement);
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/VideoFrameContainer.h b/dom/media/VideoFrameContainer.h
index 3c7e1a26209d..e89041973712 100644
--- a/dom/media/VideoFrameContainer.h
+++ b/dom/media/VideoFrameContainer.h
@@ -18,7 +18,7 @@ namespace mozilla {
 
 namespace dom {
 class HTMLMediaElement;
-}
+} // namespace dom
 
 /**
  * This object is used in the decoder backend threads and the main thread
@@ -99,6 +99,6 @@ protected:
   bool mImageSizeChanged;
 };
 
-}
+} // namespace mozilla
 
 #endif /* VIDEOFRAMECONTAINER_H_ */
diff --git a/dom/media/VideoPlaybackQuality.h b/dom/media/VideoPlaybackQuality.h
index 9c834994ba41..5a67bd01133c 100644
--- a/dom/media/VideoPlaybackQuality.h
+++ b/dom/media/VideoPlaybackQuality.h
@@ -61,4 +61,5 @@ private:
 
 } // namespace dom
 } // namespace mozilla
+
 #endif /* mozilla_dom_VideoPlaybackQuality_h_ */
diff --git a/dom/media/VideoSegment.cpp b/dom/media/VideoSegment.cpp
index a0484ac710c2..41cf8ca9f0a0 100644
--- a/dom/media/VideoSegment.cpp
+++ b/dom/media/VideoSegment.cpp
@@ -111,4 +111,4 @@ VideoSegment::VideoSegment()
 VideoSegment::~VideoSegment()
 {}
 
-}
+} // namespace mozilla
diff --git a/dom/media/VideoSegment.h b/dom/media/VideoSegment.h
index 2fb459fba356..fed071c1de66 100644
--- a/dom/media/VideoSegment.h
+++ b/dom/media/VideoSegment.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace layers {
 class Image;
-}
+} // namespace layers
 
 class VideoFrame {
 public:
@@ -154,6 +154,6 @@ public:
   }
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_VIDEOSEGMENT_H_ */
diff --git a/dom/media/VideoStreamTrack.cpp b/dom/media/VideoStreamTrack.cpp
index 483de42edea5..20b924fcf6ca 100644
--- a/dom/media/VideoStreamTrack.cpp
+++ b/dom/media/VideoStreamTrack.cpp
@@ -16,5 +16,5 @@ VideoStreamTrack::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
   return VideoStreamTrackBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/VideoStreamTrack.h b/dom/media/VideoStreamTrack.h
index 339b1ac5bfe3..7a628a7921b5 100644
--- a/dom/media/VideoStreamTrack.h
+++ b/dom/media/VideoStreamTrack.h
@@ -25,7 +25,7 @@ public:
   virtual void GetKind(nsAString& aKind) override { aKind.AssignLiteral("video"); }
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif /* VIDEOSTREAMTRACK_H_ */
diff --git a/dom/media/apple/AppleDecoder.h b/dom/media/apple/AppleDecoder.h
index 395f96fc11cd..53cf749ad017 100644
--- a/dom/media/apple/AppleDecoder.h
+++ b/dom/media/apple/AppleDecoder.h
@@ -19,6 +19,6 @@ public:
 
 };
 
-}
+} // namespace mozilla
 
 #endif // __AppleDecoder_h__
diff --git a/dom/media/directshow/AudioSinkFilter.h b/dom/media/directshow/AudioSinkFilter.h
index aa9eae97ffea..85abdfccf7bc 100644
--- a/dom/media/directshow/AudioSinkFilter.h
+++ b/dom/media/directshow/AudioSinkFilter.h
@@ -91,4 +91,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif // AudioSinkFilter_h_
diff --git a/dom/media/directshow/AudioSinkInputPin.h b/dom/media/directshow/AudioSinkInputPin.h
index aa565772cd95..80503c641ee3 100644
--- a/dom/media/directshow/AudioSinkInputPin.h
+++ b/dom/media/directshow/AudioSinkInputPin.h
@@ -72,4 +72,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif // AudioSinkInputPin_h_
diff --git a/dom/media/directshow/SampleSink.h b/dom/media/directshow/SampleSink.h
index 8a75bb60915f..ccb6a8a4ce7f 100644
--- a/dom/media/directshow/SampleSink.h
+++ b/dom/media/directshow/SampleSink.h
@@ -64,4 +64,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif // SampleSink_h_
diff --git a/dom/media/eme/CDMProxy.h b/dom/media/eme/CDMProxy.h
index eef4a44ff08f..e05640e2c38e 100644
--- a/dom/media/eme/CDMProxy.h
+++ b/dom/media/eme/CDMProxy.h
@@ -22,7 +22,7 @@ class CDMCallbackProxy;
 
 namespace dom {
 class MediaKeySession;
-}
+} // namespace dom
 
 struct DecryptResult {
   DecryptResult(GMPErr aStatus, MediaRawData* aSample)
diff --git a/dom/media/eme/DetailedPromise.cpp b/dom/media/eme/DetailedPromise.cpp
index 33ec43817016..863a9634a302 100644
--- a/dom/media/eme/DetailedPromise.cpp
+++ b/dom/media/eme/DetailedPromise.cpp
@@ -60,5 +60,5 @@ DetailedPromise::Create(nsIGlobalObject* aGlobal, ErrorResult& aRv)
   return aRv.Failed() ? nullptr : promise.forget();
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/eme/DetailedPromise.h b/dom/media/eme/DetailedPromise.h
index a7c403b2b884..922e95f58e74 100644
--- a/dom/media/eme/DetailedPromise.h
+++ b/dom/media/eme/DetailedPromise.h
@@ -43,7 +43,7 @@ private:
   bool mResponded;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif // __DetailedPromise_h__
diff --git a/dom/media/encoder/ContainerWriter.h b/dom/media/encoder/ContainerWriter.h
index 39c413acea48..53d7bbff11db 100644
--- a/dom/media/encoder/ContainerWriter.h
+++ b/dom/media/encoder/ContainerWriter.h
@@ -73,5 +73,7 @@ protected:
   bool mInitialized;
   bool mIsWritingComplete;
 };
-}
+
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/encoder/EncodedFrameContainer.h b/dom/media/encoder/EncodedFrameContainer.h
index 8ef6b6a8b0dc..6dd778d78acf 100644
--- a/dom/media/encoder/EncodedFrameContainer.h
+++ b/dom/media/encoder/EncodedFrameContainer.h
@@ -103,5 +103,6 @@ private:
   FrameType mFrameType;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/encoder/MediaEncoder.cpp b/dom/media/encoder/MediaEncoder.cpp
index f9bf75a0e4f5..fe6ff93813ea 100644
--- a/dom/media/encoder/MediaEncoder.cpp
+++ b/dom/media/encoder/MediaEncoder.cpp
@@ -352,4 +352,4 @@ MediaEncoder::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
   return amount;
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/encoder/MediaEncoder.h b/dom/media/encoder/MediaEncoder.h
index e8b6ecd82331..c947840aec00 100644
--- a/dom/media/encoder/MediaEncoder.h
+++ b/dom/media/encoder/MediaEncoder.h
@@ -171,5 +171,6 @@ private:
   }
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/encoder/OpusTrackEncoder.cpp b/dom/media/encoder/OpusTrackEncoder.cpp
index b034e5562dbd..ec6f2352e167 100644
--- a/dom/media/encoder/OpusTrackEncoder.cpp
+++ b/dom/media/encoder/OpusTrackEncoder.cpp
@@ -436,4 +436,4 @@ OpusTrackEncoder::GetEncodedTrack(EncodedFrameContainer& aData)
   return result >= 0 ? NS_OK : NS_ERROR_FAILURE;
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/encoder/OpusTrackEncoder.h b/dom/media/encoder/OpusTrackEncoder.h
index 9038b0a8f059..557065b454e4 100644
--- a/dom/media/encoder/OpusTrackEncoder.h
+++ b/dom/media/encoder/OpusTrackEncoder.h
@@ -82,5 +82,6 @@ private:
   nsTArray<AudioDataValue> mResampledLeftover;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/encoder/TrackEncoder.cpp b/dom/media/encoder/TrackEncoder.cpp
index f77c10993ec8..b00f1d0936df 100644
--- a/dom/media/encoder/TrackEncoder.cpp
+++ b/dom/media/encoder/TrackEncoder.cpp
@@ -261,4 +261,4 @@ VideoTrackEncoder::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) cons
   return mRawSegment.SizeOfExcludingThis(aMallocSizeOf);
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/encoder/TrackEncoder.h b/dom/media/encoder/TrackEncoder.h
index ee752892a486..dd2a42514558 100644
--- a/dom/media/encoder/TrackEncoder.h
+++ b/dom/media/encoder/TrackEncoder.h
@@ -312,5 +312,6 @@ protected:
   VideoSegment mRawSegment;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/encoder/TrackMetadataBase.h b/dom/media/encoder/TrackMetadataBase.h
index 2d782df263a5..9baf96e917dd 100644
--- a/dom/media/encoder/TrackMetadataBase.h
+++ b/dom/media/encoder/TrackMetadataBase.h
@@ -70,5 +70,6 @@ public:
   virtual uint32_t GetVideoFrameRate() = 0;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/encoder/VorbisTrackEncoder.h b/dom/media/encoder/VorbisTrackEncoder.h
index 3b0a54a645db..c15355edc0b4 100644
--- a/dom/media/encoder/VorbisTrackEncoder.h
+++ b/dom/media/encoder/VorbisTrackEncoder.h
@@ -50,5 +50,6 @@ private:
   vorbis_block mVorbisBlock;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp
index f944e685e3cc..55451ca2491e 100644
--- a/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp
+++ b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp
@@ -228,4 +228,4 @@ ISOMediaWriter::SetMetadata(TrackMetadataBase* aMetadata)
   return NS_ERROR_FAILURE;
 }
 
-}  // namespace mozilla
+} // namespace mozilla
diff --git a/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h
index 78d7a4a7599b..342b9fbaf703 100644
--- a/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h
+++ b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h
@@ -99,4 +99,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif // ISOMediaWriter_h_
diff --git a/dom/media/fmp4/MP4Demuxer.h b/dom/media/fmp4/MP4Demuxer.h
index b0838a4d4de4..9ae91844c66a 100644
--- a/dom/media/fmp4/MP4Demuxer.h
+++ b/dom/media/fmp4/MP4Demuxer.h
@@ -17,7 +17,7 @@ class Index;
 class MP4Metadata;
 class ResourceStream;
 class SampleIterator;
-}
+} // namespace mp4_demuxer
 
 namespace mozilla {
 
diff --git a/dom/media/fmp4/MP4Stream.cpp b/dom/media/fmp4/MP4Stream.cpp
index 11d5654d4d4e..108c0f8835e0 100644
--- a/dom/media/fmp4/MP4Stream.cpp
+++ b/dom/media/fmp4/MP4Stream.cpp
@@ -103,4 +103,5 @@ MP4Stream::Length(int64_t* aSize)
   *aSize = mResource->GetLength();
   return true;
 }
-}
+
+} // namespace mozilla
diff --git a/dom/media/fmp4/MP4Stream.h b/dom/media/fmp4/MP4Stream.h
index 62f702f55d59..d0b2bfb825f9 100644
--- a/dom/media/fmp4/MP4Stream.h
+++ b/dom/media/fmp4/MP4Stream.h
@@ -92,6 +92,6 @@ private:
   nsTArray<CacheBlock> mCache;
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/gmp-plugin/gmp-test-output-protection.h b/dom/media/gmp-plugin/gmp-test-output-protection.h
index 85e9bfc4e912..4a56f6bd7145 100644
--- a/dom/media/gmp-plugin/gmp-test-output-protection.h
+++ b/dom/media/gmp-plugin/gmp-test-output-protection.h
@@ -126,5 +126,5 @@ TestOuputProtectionAPIs()
   return;
 }
 
-} // gmptest
-} // mozilla
+} // namespace gmptest
+} // namespace mozilla
diff --git a/dom/media/gmp/GMPDecryptorProxy.h b/dom/media/gmp/GMPDecryptorProxy.h
index b418c2f84a19..56b89629c957 100644
--- a/dom/media/gmp/GMPDecryptorProxy.h
+++ b/dom/media/gmp/GMPDecryptorProxy.h
@@ -12,7 +12,7 @@
 
 namespace mozilla {
 class CryptoSample;
-}
+} // namespace mozilla
 
 class GMPDecryptorProxyCallback : public GMPCallbackBase {
 public:
diff --git a/dom/media/gmp/GMPLoader.cpp b/dom/media/gmp/GMPLoader.cpp
index d2229c592642..9c48b701b3d4 100644
--- a/dom/media/gmp/GMPLoader.cpp
+++ b/dom/media/gmp/GMPLoader.cpp
@@ -56,7 +56,7 @@ struct ScopedActCtxHandleTraits
 };
 typedef mozilla::Scoped<ScopedActCtxHandleTraits> ScopedActCtxHandle;
 
-} // anonymous namespace
+} // namespace
 #endif
 
 namespace mozilla {
diff --git a/dom/media/gmp/GMPSharedMemManager.cpp b/dom/media/gmp/GMPSharedMemManager.cpp
index d24a75fe75fe..06e4fd241ceb 100644
--- a/dom/media/gmp/GMPSharedMemManager.cpp
+++ b/dom/media/gmp/GMPSharedMemManager.cpp
@@ -94,5 +94,5 @@ GMPSharedMemManager::NumInUse(GMPSharedMem::GMPMemoryClasses aClass)
   return mData->mGmpAllocated[aClass] - GetGmpFreelist(aClass).Length();
 }
 
-}
-}
+} // namespace gmp
+} // namespace mozilla
diff --git a/dom/media/gtest/MockMediaResource.cpp b/dom/media/gtest/MockMediaResource.cpp
index 03cc0e5e2738..c695a3a5d0f4 100644
--- a/dom/media/gtest/MockMediaResource.cpp
+++ b/dom/media/gtest/MockMediaResource.cpp
@@ -109,4 +109,5 @@ MockMediaResource::GetCachedRanges(nsTArray<MediaByteRange>& aRanges)
   aRanges.AppendElements(mRanges);
   return NS_OK;
 }
-}
+
+} // namespace mozilla
diff --git a/dom/media/gtest/MockMediaResource.h b/dom/media/gtest/MockMediaResource.h
index a61b95f767e7..5803c383fd0a 100644
--- a/dom/media/gtest/MockMediaResource.h
+++ b/dom/media/gtest/MockMediaResource.h
@@ -87,6 +87,7 @@ private:
   Atomic<int> mEntry;
   nsCString mContentType;
 };
-}
+
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/gtest/TestVideoSegment.cpp b/dom/media/gtest/TestVideoSegment.cpp
index 412d71e8e9fb..d9f2bdead6ca 100644
--- a/dom/media/gtest/TestVideoSegment.cpp
+++ b/dom/media/gtest/TestVideoSegment.cpp
@@ -10,8 +10,8 @@ using namespace mozilla;
 namespace mozilla {
   namespace layer {
     class Image;
-  }
-}
+  } // namespace layer
+} // namespace mozilla
 
 TEST(VideoSegment, TestAppendFrameForceBlack)
 {
diff --git a/dom/media/imagecapture/CaptureTask.h b/dom/media/imagecapture/CaptureTask.h
index 47d344dfaf7f..4920d8ee0f62 100644
--- a/dom/media/imagecapture/CaptureTask.h
+++ b/dom/media/imagecapture/CaptureTask.h
@@ -15,7 +15,7 @@ namespace mozilla {
 namespace dom {
 class Blob;
 class ImageCapture;
-}
+} // namespace dom
 
 /**
  * CaptureTask retrieves image from MediaStream and encodes the image to jpeg in
diff --git a/dom/media/mediasource/AsyncEventRunner.h b/dom/media/mediasource/AsyncEventRunner.h
index e563e7cf8c79..d24e8015d9ad 100644
--- a/dom/media/mediasource/AsyncEventRunner.h
+++ b/dom/media/mediasource/AsyncEventRunner.h
@@ -32,4 +32,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif /* MOZILLA_ASYNCEVENTRUNNER_H_ */
diff --git a/dom/media/mediasource/ContainerParser.h b/dom/media/mediasource/ContainerParser.h
index 4ef737e23697..a6b940afc873 100644
--- a/dom/media/mediasource/ContainerParser.h
+++ b/dom/media/mediasource/ContainerParser.h
@@ -75,4 +75,5 @@ protected:
 };
 
 } // namespace mozilla
+
 #endif /* MOZILLA_CONTAINERPARSER_H_ */
diff --git a/dom/media/mediasource/MediaSource.h b/dom/media/mediasource/MediaSource.h
index f76dcb6c4506..8b47b202cc20 100644
--- a/dom/media/mediasource/MediaSource.h
+++ b/dom/media/mediasource/MediaSource.h
@@ -163,4 +163,5 @@ NS_DEFINE_STATIC_IID_ACCESSOR(MediaSource, MOZILLA_DOM_MEDIASOURCE_IMPLEMENTATIO
 } // namespace dom
 
 } // namespace mozilla
+
 #endif /* mozilla_dom_MediaSource_h_ */
diff --git a/dom/media/mediasource/ResourceQueue.h b/dom/media/mediasource/ResourceQueue.h
index de49cdc8e493..5ca9f047ef34 100644
--- a/dom/media/mediasource/ResourceQueue.h
+++ b/dom/media/mediasource/ResourceQueue.h
@@ -82,4 +82,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif /* MOZILLA_RESOURCEQUEUE_H_ */
diff --git a/dom/media/mediasource/SourceBuffer.h b/dom/media/mediasource/SourceBuffer.h
index cdaf3a8e5408..aa3d387b748e 100644
--- a/dom/media/mediasource/SourceBuffer.h
+++ b/dom/media/mediasource/SourceBuffer.h
@@ -202,4 +202,5 @@ private:
 } // namespace dom
 
 } // namespace mozilla
+
 #endif /* mozilla_dom_SourceBuffer_h_ */
diff --git a/dom/media/mediasource/SourceBufferContentManager.cpp b/dom/media/mediasource/SourceBufferContentManager.cpp
index 8f7349cbddac..d62d2ca9934a 100644
--- a/dom/media/mediasource/SourceBufferContentManager.cpp
+++ b/dom/media/mediasource/SourceBufferContentManager.cpp
@@ -44,4 +44,4 @@ SourceBufferContentManager::CreateManager(dom::SourceBuffer* aParent,
   return  manager.forget();
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/mediasource/SourceBufferContentManager.h b/dom/media/mediasource/SourceBufferContentManager.h
index 3d49f7a5efe8..9f6f526a2750 100644
--- a/dom/media/mediasource/SourceBufferContentManager.h
+++ b/dom/media/mediasource/SourceBufferContentManager.h
@@ -111,4 +111,5 @@ protected:
 };
 
 } // namespace mozilla
+
 #endif /* MOZILLA_SOURCEBUFFERCONTENTMANAGER_H_ */
diff --git a/dom/media/mediasource/SourceBufferList.h b/dom/media/mediasource/SourceBufferList.h
index 83c019c87f42..99c38279bc9f 100644
--- a/dom/media/mediasource/SourceBufferList.h
+++ b/dom/media/mediasource/SourceBufferList.h
@@ -102,4 +102,5 @@ private:
 } // namespace dom
 
 } // namespace mozilla
+
 #endif /* mozilla_dom_SourceBufferList_h_ */
diff --git a/dom/media/mediasource/SourceBufferResource.h b/dom/media/mediasource/SourceBufferResource.h
index 5eb82f9abfd4..755ac091dc12 100644
--- a/dom/media/mediasource/SourceBufferResource.h
+++ b/dom/media/mediasource/SourceBufferResource.h
@@ -33,7 +33,7 @@ namespace dom {
 
 class SourceBuffer;
 
-}  // namespace dom
+} // namespace dom
 
 class SourceBufferResource final : public MediaResource
 {
diff --git a/dom/media/mediasource/TrackBuffer.h b/dom/media/mediasource/TrackBuffer.h
index 9faeb03e0136..75ba114bdf5b 100644
--- a/dom/media/mediasource/TrackBuffer.h
+++ b/dom/media/mediasource/TrackBuffer.h
@@ -245,4 +245,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif /* MOZILLA_TRACKBUFFER_H_ */
diff --git a/dom/media/mediasource/TrackBuffersManager.cpp b/dom/media/mediasource/TrackBuffersManager.cpp
index 2fc8cfd9a788..14ec1ff0107a 100644
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -1883,7 +1883,7 @@ TrackBuffersManager::GetNextRandomAccessPoint(TrackInfo::TrackType aTrack)
   return media::TimeUnit::FromInfinity();
 }
 
-}
+} // namespace mozilla
 #undef MSE_DEBUG
 #undef MSE_DEBUGV
 #undef SAMPLE_DEBUG
diff --git a/dom/media/mediasource/TrackBuffersManager.h b/dom/media/mediasource/TrackBuffersManager.h
index 4486b7f22a8d..d5dae47cef73 100644
--- a/dom/media/mediasource/TrackBuffersManager.h
+++ b/dom/media/mediasource/TrackBuffersManager.h
@@ -336,4 +336,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif /* MOZILLA_TRACKBUFFERSMANAGER_H_ */
diff --git a/dom/media/ogg/OggWriter.cpp b/dom/media/ogg/OggWriter.cpp
index 1845c0638c5e..f6389fa52303 100644
--- a/dom/media/ogg/OggWriter.cpp
+++ b/dom/media/ogg/OggWriter.cpp
@@ -208,4 +208,4 @@ OggWriter::SetMetadata(TrackMetadataBase* aMetadata)
   return NS_OK;
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/ogg/OggWriter.h b/dom/media/ogg/OggWriter.h
index 2f2059aa3d51..95ce0c597428 100644
--- a/dom/media/ogg/OggWriter.h
+++ b/dom/media/ogg/OggWriter.h
@@ -46,5 +46,7 @@ private:
   ogg_page mOggPage;
   ogg_packet mPacket;
 };
-}
+
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/omx/MediaStreamSource.cpp b/dom/media/omx/MediaStreamSource.cpp
index c97cfcdc334c..c9d4cbd67d23 100644
--- a/dom/media/omx/MediaStreamSource.cpp
+++ b/dom/media/omx/MediaStreamSource.cpp
@@ -61,4 +61,4 @@ status_t MediaStreamSource::getSize(off64_t *size)
   return OK;
 }
 
-}  // namespace android
+} // namespace android
diff --git a/dom/media/omx/OMXCodecProxy.cpp b/dom/media/omx/OMXCodecProxy.cpp
index dbf46bb988ed..dd250a89ae00 100644
--- a/dom/media/omx/OMXCodecProxy.cpp
+++ b/dom/media/omx/OMXCodecProxy.cpp
@@ -249,4 +249,4 @@ status_t OMXCodecProxy::pause()
   return mOMXCodec->pause();
 }
 
-}  // namespace android
+} // namespace android
diff --git a/dom/media/omx/OMXCodecProxy.h b/dom/media/omx/OMXCodecProxy.h
index 5378e7f13ef6..3c3ef77043d5 100644
--- a/dom/media/omx/OMXCodecProxy.h
+++ b/dom/media/omx/OMXCodecProxy.h
@@ -117,6 +117,6 @@ private:
     wp<CodecResourceListener> mListener;
 };
 
-}  // namespace android
+} // namespace android
 
 #endif  // OMX_CODEC_PROXY_DECODER_H_
diff --git a/dom/media/omx/OMXCodecWrapper.h b/dom/media/omx/OMXCodecWrapper.h
index 670088e2cda3..79188678c951 100644
--- a/dom/media/omx/OMXCodecWrapper.h
+++ b/dom/media/omx/OMXCodecWrapper.h
@@ -349,4 +349,5 @@ private:
 };
 
 } // namespace android
+
 #endif // OMXCodecWrapper_h_
diff --git a/dom/media/platforms/PlatformDecoderModule.h b/dom/media/platforms/PlatformDecoderModule.h
index e5fd4e1eff42..8847797a1946 100644
--- a/dom/media/platforms/PlatformDecoderModule.h
+++ b/dom/media/platforms/PlatformDecoderModule.h
@@ -21,7 +21,7 @@ class MediaRawData;
 
 namespace layers {
 class ImageContainer;
-}
+} // namespace layers
 
 class MediaDataDecoder;
 class MediaDataDecoderCallback;
diff --git a/dom/media/platforms/SharedDecoderManager.cpp b/dom/media/platforms/SharedDecoderManager.cpp
index 05c896a14b73..30ba5ebb5249 100644
--- a/dom/media/platforms/SharedDecoderManager.cpp
+++ b/dom/media/platforms/SharedDecoderManager.cpp
@@ -273,4 +273,4 @@ SharedDecoderProxy::IsHardwareAccelerated() const
   return mManager->mDecoder->IsHardwareAccelerated();
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/platforms/SharedDecoderManager.h b/dom/media/platforms/SharedDecoderManager.h
index 7c2830856620..30da9af29c0b 100644
--- a/dom/media/platforms/SharedDecoderManager.h
+++ b/dom/media/platforms/SharedDecoderManager.h
@@ -82,6 +82,7 @@ private:
   nsRefPtr<SharedDecoderManager> mManager;
   MediaDataDecoderCallback* mCallback;
 };
-}
+
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h b/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h
index bf7247185d87..868e0df0fa5a 100644
--- a/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h
+++ b/dom/media/platforms/agnostic/eme/EMEVideoDecoder.h
@@ -55,6 +55,6 @@ private:
   nsRefPtr<CDMProxy> mProxy;
 };
 
-}
+} // namespace mozilla
 
 #endif // EMEVideoDecoder_h_
diff --git a/dom/media/platforms/apple/AppleATDecoder.cpp b/dom/media/platforms/apple/AppleATDecoder.cpp
index 83fc13cb1d2b..cdafba67ea33 100644
--- a/dom/media/platforms/apple/AppleATDecoder.cpp
+++ b/dom/media/platforms/apple/AppleATDecoder.cpp
@@ -505,4 +505,5 @@ AppleATDecoder::GetImplicitAACMagicCookie(const MediaRawData* aSample)
 
   return (mFileStreamError || status) ? NS_ERROR_FAILURE : NS_OK;
 }
+
 } // namespace mozilla
diff --git a/dom/media/platforms/apple/AppleVDADecoder.h b/dom/media/platforms/apple/AppleVDADecoder.h
index 85a2d225195d..5096129c0e92 100644
--- a/dom/media/platforms/apple/AppleVDADecoder.h
+++ b/dom/media/platforms/apple/AppleVDADecoder.h
@@ -23,7 +23,7 @@ class FlushableMediaTaskQueue;
 class MediaDataDecoderCallback;
 namespace layers {
   class ImageContainer;
-}
+} // namespace layers
 
 class AppleVDADecoder : public MediaDataDecoder {
 public:
diff --git a/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp b/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
index f84fb39c6b72..f4146f567eda 100644
--- a/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
+++ b/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
@@ -298,4 +298,5 @@ void GonkAudioDecoderManager::ReleaseAudioBuffer() {
     mAudioBuffer = nullptr;
   }
 }
+
 } // namespace mozilla
diff --git a/dom/media/platforms/gonk/GonkDecoderModule.cpp b/dom/media/platforms/gonk/GonkDecoderModule.cpp
index f63616b28d73..d1e849a82c32 100644
--- a/dom/media/platforms/gonk/GonkDecoderModule.cpp
+++ b/dom/media/platforms/gonk/GonkDecoderModule.cpp
@@ -72,4 +72,5 @@ GonkDecoderModule::SupportsMimeType(const nsACString& aMimeType)
     aMimeType.EqualsLiteral("video/avc") ||
     aMimeType.EqualsLiteral("video/3gpp");
 }
+
 } // namespace mozilla
diff --git a/dom/media/systemservices/MediaChild.cpp b/dom/media/systemservices/MediaChild.cpp
index a1bde0e59cfb..28f00aba992e 100644
--- a/dom/media/systemservices/MediaChild.cpp
+++ b/dom/media/systemservices/MediaChild.cpp
@@ -112,5 +112,5 @@ DeallocPMediaChild(media::PMediaChild *aActor)
   return true;
 }
 
-}
-}
+} // namespace media
+} // namespace mozilla
diff --git a/dom/media/systemservices/MediaParent.cpp b/dom/media/systemservices/MediaParent.cpp
index 6c24c902eec5..b62994f97ebe 100644
--- a/dom/media/systemservices/MediaParent.cpp
+++ b/dom/media/systemservices/MediaParent.cpp
@@ -530,8 +530,8 @@ DeallocPMediaParent(media::PMediaParent *aActor)
   return true;
 }
 
-}
-}
+} // namespace media
+} // namespace mozilla
 
 // Instantiate templates to satisfy linker
 template class mozilla::media::Parent<mozilla::media::NonE10s>;
diff --git a/dom/media/systemservices/MediaSystemResourceManager.h b/dom/media/systemservices/MediaSystemResourceManager.h
index cee00dfee1de..ecdd9ff95bd3 100644
--- a/dom/media/systemservices/MediaSystemResourceManager.h
+++ b/dom/media/systemservices/MediaSystemResourceManager.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace media {
 class MediaSystemResourceManagerChild;
-}
+} // namespace media
 
 class MediaSystemResourceClient;
 class MediaSystemResourceReservationListener;
diff --git a/dom/media/systemservices/MediaSystemResourceManagerChild.h b/dom/media/systemservices/MediaSystemResourceManagerChild.h
index 57c451b9367b..51d4de8d13e7 100644
--- a/dom/media/systemservices/MediaSystemResourceManagerChild.h
+++ b/dom/media/systemservices/MediaSystemResourceManagerChild.h
@@ -15,7 +15,7 @@ class MediaSystemResourceManager;
 
 namespace ipc {
 class BackgroundChildImpl;
-}
+} // namespace ipc
 
 namespace media {
 
@@ -60,7 +60,7 @@ private:
   friend class mozilla::ipc::BackgroundChildImpl;
 };
 
-} // namespatce media
-} // namespatce mozilla
+} // namespace media
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/systemservices/MediaSystemResourceManagerParent.h b/dom/media/systemservices/MediaSystemResourceManagerParent.h
index 7ccf557b152e..66945b7a116a 100644
--- a/dom/media/systemservices/MediaSystemResourceManagerParent.h
+++ b/dom/media/systemservices/MediaSystemResourceManagerParent.h
@@ -51,7 +51,7 @@ private:
   nsClassHashtable<nsUint32HashKey, MediaSystemResourceRequest> mResourceRequests;
 };
 
-} // namespatce media
-} // namespatce mozilla
+} // namespace media
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/systemservices/MediaSystemResourceService.h b/dom/media/systemservices/MediaSystemResourceService.h
index a0d0967e7a65..62e56da75b9e 100644
--- a/dom/media/systemservices/MediaSystemResourceService.h
+++ b/dom/media/systemservices/MediaSystemResourceService.h
@@ -17,7 +17,7 @@ namespace mozilla {
 
 namespace media {
 class MediaSystemResourceManagerParent;
-}
+} // namespace media
 
 /**
  * Manage media system resource allocation requests within system.
diff --git a/dom/media/systemservices/MediaUtils.cpp b/dom/media/systemservices/MediaUtils.cpp
index 17fb500efb67..7d3bd577bb95 100644
--- a/dom/media/systemservices/MediaUtils.cpp
+++ b/dom/media/systemservices/MediaUtils.cpp
@@ -9,5 +9,5 @@
 namespace mozilla {
 namespace media {
 
-}
-}
+} // namespace media
+} // namespace mozilla
diff --git a/dom/media/systemservices/MediaUtils.h b/dom/media/systemservices/MediaUtils.h
index 488644a08821..1851f3ac83fb 100644
--- a/dom/media/systemservices/MediaUtils.h
+++ b/dom/media/systemservices/MediaUtils.h
@@ -413,7 +413,7 @@ private:
   nsAutoTArray<Element, 3> mElements;
 };
 
-}
-}
+} // namespace media
+} // namespace mozilla
 
 #endif // mozilla_MediaUtils_h
diff --git a/dom/media/tests/mochitest/test_enumerateDevices.html b/dom/media/tests/mochitest/test_enumerateDevices.html
index 7db3c894c474..9582d91c15fa 100644
--- a/dom/media/tests/mochitest/test_enumerateDevices.html
+++ b/dom/media/tests/mochitest/test_enumerateDevices.html
@@ -34,6 +34,9 @@ runTest(() =>
       ok(d.label.length !== undefined, "Device label: " + d.label);
       is(d.groupId, "", "Don't support groupId yet");
     });
+    var jsoned = JSON.parse(JSON.stringify(devices));
+    is(jsoned[0].kind, devices[0].kind, "kind survived serializer");
+    is(jsoned[0].deviceId, devices[0].deviceId, "deviceId survived serializer");
   })
   // Check deviceId failure paths for video.
   .then(() => mustSucceed("unknown plain deviceId on video",
diff --git a/dom/media/wave/WaveReader.cpp b/dom/media/wave/WaveReader.cpp
index d8fc55017f7d..3f79db70071f 100644
--- a/dom/media/wave/WaveReader.cpp
+++ b/dom/media/wave/WaveReader.cpp
@@ -103,7 +103,7 @@ namespace {
     *aBuffer += sizeof(uint8_t);
     return result;
   }
-}
+} // namespace
 
 WaveReader::WaveReader(AbstractMediaDecoder* aDecoder)
   : MediaDecoderReader(aDecoder)
diff --git a/dom/media/webaudio/AnalyserNode.cpp b/dom/media/webaudio/AnalyserNode.cpp
index 3071b0ab6cdc..36bc2712f86e 100644
--- a/dom/media/webaudio/AnalyserNode.cpp
+++ b/dom/media/webaudio/AnalyserNode.cpp
@@ -346,6 +346,6 @@ AnalyserNode::AppendChunk(const AudioChunk& aChunk)
   }
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/AnalyserNode.h b/dom/media/webaudio/AnalyserNode.h
index 1fe82c97ed8f..ac0da1701d62 100644
--- a/dom/media/webaudio/AnalyserNode.h
+++ b/dom/media/webaudio/AnalyserNode.h
@@ -82,8 +82,8 @@ private:
   AlignedFallibleTArray<float> mOutputBuffer;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/AudioBuffer.cpp b/dom/media/webaudio/AudioBuffer.cpp
index 28bd022c3fc5..0ad4d55fcecf 100644
--- a/dom/media/webaudio/AudioBuffer.cpp
+++ b/dom/media/webaudio/AudioBuffer.cpp
@@ -267,5 +267,5 @@ AudioBuffer::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
   return amount;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioBuffer.h b/dom/media/webaudio/AudioBuffer.h
index ba4ed9c3b233..92a52149ef75 100644
--- a/dom/media/webaudio/AudioBuffer.h
+++ b/dom/media/webaudio/AudioBuffer.h
@@ -116,8 +116,8 @@ protected:
   float mSampleRate;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/AudioBufferSourceNode.cpp b/dom/media/webaudio/AudioBufferSourceNode.cpp
index 554e4699831b..bacb6c6c7212 100644
--- a/dom/media/webaudio/AudioBufferSourceNode.cpp
+++ b/dom/media/webaudio/AudioBufferSourceNode.cpp
@@ -797,5 +797,5 @@ AudioBufferSourceNode::SendLoopParametersToStream()
   }
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioBufferSourceNode.h b/dom/media/webaudio/AudioBufferSourceNode.h
index fb5f117692d2..c9f5cd169cb0 100644
--- a/dom/media/webaudio/AudioBufferSourceNode.h
+++ b/dom/media/webaudio/AudioBufferSourceNode.h
@@ -144,8 +144,8 @@ private:
   bool mStartCalled;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp
index 6808cbe13d2f..9a2d21313b18 100644
--- a/dom/media/webaudio/AudioContext.cpp
+++ b/dom/media/webaudio/AudioContext.cpp
@@ -266,7 +266,7 @@ bool IsValidBufferSize(uint32_t aBufferSize) {
   }
 }
 
-}
+} // namespace
 
 already_AddRefed<MediaStreamAudioDestinationNode>
 AudioContext::CreateMediaStreamDestination(ErrorResult& aRv)
@@ -1103,5 +1103,5 @@ BasicWaveFormCache::GetBasicWaveForm(OscillatorType aType)
   }
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioContext.h b/dom/media/webaudio/AudioContext.h
index cf6e1e8a1d13..363f49c43a2b 100644
--- a/dom/media/webaudio/AudioContext.h
+++ b/dom/media/webaudio/AudioContext.h
@@ -29,7 +29,7 @@
 
 namespace WebCore {
   class PeriodicWave;
-};
+} // namespace WebCore
 
 class nsPIDOMWindow;
 
@@ -379,8 +379,8 @@ private:
 
 static const dom::AudioContext::AudioContextId NO_AUDIO_CONTEXT = 0;
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/AudioDestinationNode.cpp b/dom/media/webaudio/AudioDestinationNode.cpp
index 471a023f3bb3..95ab1b413459 100644
--- a/dom/media/webaudio/AudioDestinationNode.cpp
+++ b/dom/media/webaudio/AudioDestinationNode.cpp
@@ -685,5 +685,5 @@ AudioDestinationNode::InputMuted(bool aMuted)
   WindowVolumeChanged(volume, muted);
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioDestinationNode.h b/dom/media/webaudio/AudioDestinationNode.h
index f5f6865d7b5d..db5418a9cb51 100644
--- a/dom/media/webaudio/AudioDestinationNode.h
+++ b/dom/media/webaudio/AudioDestinationNode.h
@@ -113,8 +113,8 @@ private:
   bool mExtraCurrentTimeUpdatedSinceLastStableState;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/AudioEventTimeline.h b/dom/media/webaudio/AudioEventTimeline.h
index b2a32a3aecf3..393a30137b1f 100644
--- a/dom/media/webaudio/AudioEventTimeline.h
+++ b/dom/media/webaudio/AudioEventTimeline.h
@@ -620,7 +620,7 @@ private:
   float mLastComputedValue;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/AudioListener.cpp b/dom/media/webaudio/AudioListener.cpp
index 5a55d9b97f40..6b08531e465c 100644
--- a/dom/media/webaudio/AudioListener.cpp
+++ b/dom/media/webaudio/AudioListener.cpp
@@ -126,6 +126,6 @@ AudioListener::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
   return amount;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/AudioListener.h b/dom/media/webaudio/AudioListener.h
index c432d8fb6685..86626045b205 100644
--- a/dom/media/webaudio/AudioListener.h
+++ b/dom/media/webaudio/AudioListener.h
@@ -127,8 +127,8 @@ private:
   nsTArray<WeakPtr<PannerNode> > mPanners;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/AudioNode.cpp b/dom/media/webaudio/AudioNode.cpp
index cf188a740a74..1adf60c5c96a 100644
--- a/dom/media/webaudio/AudioNode.cpp
+++ b/dom/media/webaudio/AudioNode.cpp
@@ -431,5 +431,5 @@ AudioNode::SetPassThrough(bool aPassThrough)
   mStream->SetPassThrough(mPassThrough);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioNode.h b/dom/media/webaudio/AudioNode.h
index 79f4675c0be2..d1d7b6005448 100644
--- a/dom/media/webaudio/AudioNode.h
+++ b/dom/media/webaudio/AudioNode.h
@@ -253,7 +253,7 @@ private:
 #endif
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/AudioNodeEngine.cpp b/dom/media/webaudio/AudioNodeEngine.cpp
index 82a969a965b3..57a9f71d98cb 100644
--- a/dom/media/webaudio/AudioNodeEngine.cpp
+++ b/dom/media/webaudio/AudioNodeEngine.cpp
@@ -273,4 +273,4 @@ AudioBufferSumOfSquares(const float* aInput, uint32_t aLength)
   return sum;
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioNodeEngine.h b/dom/media/webaudio/AudioNodeEngine.h
index 21733fb411e7..0b44cd85bd95 100644
--- a/dom/media/webaudio/AudioNodeEngine.h
+++ b/dom/media/webaudio/AudioNodeEngine.h
@@ -17,7 +17,7 @@ namespace dom {
 struct ThreeDPoint;
 class AudioParamTimeline;
 class DelayNodeEngine;
-}
+} // namespace dom
 
 class AudioNodeStream;
 
@@ -402,6 +402,6 @@ private:
   const uint16_t mOutputCount;
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_AUDIONODEENGINE_H_ */
diff --git a/dom/media/webaudio/AudioNodeExternalInputStream.cpp b/dom/media/webaudio/AudioNodeExternalInputStream.cpp
index b165af71d0c9..84fdecbaeac0 100644
--- a/dom/media/webaudio/AudioNodeExternalInputStream.cpp
+++ b/dom/media/webaudio/AudioNodeExternalInputStream.cpp
@@ -195,4 +195,4 @@ AudioNodeExternalInputStream::IsEnabled()
   return ((MediaStreamAudioSourceNodeEngine*)Engine())->IsEnabled();
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioNodeExternalInputStream.h b/dom/media/webaudio/AudioNodeExternalInputStream.h
index 6bcc40391c2e..84b81320b3ce 100644
--- a/dom/media/webaudio/AudioNodeExternalInputStream.h
+++ b/dom/media/webaudio/AudioNodeExternalInputStream.h
@@ -39,6 +39,6 @@ private:
   bool IsEnabled();
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_AUDIONODESTREAM_H_ */
diff --git a/dom/media/webaudio/AudioNodeStream.cpp b/dom/media/webaudio/AudioNodeStream.cpp
index 8e029d15dca7..ecbfbc4810ac 100644
--- a/dom/media/webaudio/AudioNodeStream.cpp
+++ b/dom/media/webaudio/AudioNodeStream.cpp
@@ -660,4 +660,4 @@ AudioNodeStream::DestinationTimeFromTicks(AudioNodeStream* aDestination,
   return StreamTimeToSeconds(destinationTime);
 }
 
-}
+} // namespace mozilla
diff --git a/dom/media/webaudio/AudioNodeStream.h b/dom/media/webaudio/AudioNodeStream.h
index e6802b3b1f51..0b8b1cfa91b4 100644
--- a/dom/media/webaudio/AudioNodeStream.h
+++ b/dom/media/webaudio/AudioNodeStream.h
@@ -16,7 +16,7 @@ namespace dom {
 struct ThreeDPoint;
 class AudioParamTimeline;
 class AudioContext;
-}
+} // namespace dom
 
 class ThreadSharedFloatArrayBufferList;
 class AudioNodeEngine;
@@ -189,6 +189,6 @@ protected:
   bool mPassThrough;
 };
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_AUDIONODESTREAM_H_ */
diff --git a/dom/media/webaudio/AudioParam.cpp b/dom/media/webaudio/AudioParam.cpp
index 7fbb5eca2ad8..01e52641c967 100644
--- a/dom/media/webaudio/AudioParam.cpp
+++ b/dom/media/webaudio/AudioParam.cpp
@@ -146,6 +146,6 @@ AudioParamTimeline::AudioNodeInputValue(size_t aCounter) const
   return audioNodeInputValue;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/AudioParam.h b/dom/media/webaudio/AudioParam.h
index 4b153121e347..289833e85b24 100644
--- a/dom/media/webaudio/AudioParam.h
+++ b/dom/media/webaudio/AudioParam.h
@@ -199,8 +199,8 @@ private:
   nsRefPtr<MediaInputPort> mNodeStreamPort;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/AudioParamTimeline.h b/dom/media/webaudio/AudioParamTimeline.h
index a99c7c0ac578..e132c97efa22 100644
--- a/dom/media/webaudio/AudioParamTimeline.h
+++ b/dom/media/webaudio/AudioParamTimeline.h
@@ -134,7 +134,7 @@ AudioParamTimeline::GetValuesAtTime(int64_t aTime, float* aBuffer,
   }
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/AudioProcessingEvent.cpp b/dom/media/webaudio/AudioProcessingEvent.cpp
index f3f67b78defe..5af19fd317ac 100644
--- a/dom/media/webaudio/AudioProcessingEvent.cpp
+++ b/dom/media/webaudio/AudioProcessingEvent.cpp
@@ -59,6 +59,6 @@ AudioProcessingEvent::LazilyCreateBuffer(uint32_t aNumberOfChannels,
   return buffer.forget();
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/AudioProcessingEvent.h b/dom/media/webaudio/AudioProcessingEvent.h
index 69ab47a9af72..4f32a7b4696b 100644
--- a/dom/media/webaudio/AudioProcessingEvent.h
+++ b/dom/media/webaudio/AudioProcessingEvent.h
@@ -78,8 +78,8 @@ private:
   uint32_t mNumberOfInputChannels;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/BiquadFilterNode.cpp b/dom/media/webaudio/BiquadFilterNode.cpp
index b71d34e6538e..b5bf83a70d75 100644
--- a/dom/media/webaudio/BiquadFilterNode.cpp
+++ b/dom/media/webaudio/BiquadFilterNode.cpp
@@ -366,5 +366,5 @@ BiquadFilterNode::SendGainToStream(AudioNode* aNode)
   SendTimelineParameterToStream(This, BiquadFilterNodeEngine::GAIN, *This->mGain);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/BiquadFilterNode.h b/dom/media/webaudio/BiquadFilterNode.h
index e94bf25d9e5e..33edb0957d3f 100644
--- a/dom/media/webaudio/BiquadFilterNode.h
+++ b/dom/media/webaudio/BiquadFilterNode.h
@@ -81,8 +81,8 @@ private:
   nsRefPtr<AudioParam> mGain;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/ChannelMergerNode.cpp b/dom/media/webaudio/ChannelMergerNode.cpp
index ccad3420665e..b095e7a81875 100644
--- a/dom/media/webaudio/ChannelMergerNode.cpp
+++ b/dom/media/webaudio/ChannelMergerNode.cpp
@@ -87,6 +87,6 @@ ChannelMergerNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
   return ChannelMergerNodeBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/ChannelMergerNode.h b/dom/media/webaudio/ChannelMergerNode.h
index bede7e634c5f..772c3a879c41 100644
--- a/dom/media/webaudio/ChannelMergerNode.h
+++ b/dom/media/webaudio/ChannelMergerNode.h
@@ -43,8 +43,8 @@ private:
   const uint16_t mInputCount;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/ChannelSplitterNode.cpp b/dom/media/webaudio/ChannelSplitterNode.cpp
index e26d5abeeacd..e15255bf57aa 100644
--- a/dom/media/webaudio/ChannelSplitterNode.cpp
+++ b/dom/media/webaudio/ChannelSplitterNode.cpp
@@ -74,6 +74,6 @@ ChannelSplitterNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProt
   return ChannelSplitterNodeBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/ChannelSplitterNode.h b/dom/media/webaudio/ChannelSplitterNode.h
index 3e12c5dc34e4..f23603cfa9d7 100644
--- a/dom/media/webaudio/ChannelSplitterNode.h
+++ b/dom/media/webaudio/ChannelSplitterNode.h
@@ -43,8 +43,8 @@ private:
   const uint16_t mOutputCount;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/ConvolverNode.cpp b/dom/media/webaudio/ConvolverNode.cpp
index d7ae08dc2e33..4aa5bd31d664 100644
--- a/dom/media/webaudio/ConvolverNode.cpp
+++ b/dom/media/webaudio/ConvolverNode.cpp
@@ -278,6 +278,6 @@ ConvolverNode::SetNormalize(bool aNormalize)
   SendInt32ParameterToStream(ConvolverNodeEngine::NORMALIZE, aNormalize);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/DelayBuffer.cpp b/dom/media/webaudio/DelayBuffer.cpp
index e1103be75836..1bf0a480aeee 100644
--- a/dom/media/webaudio/DelayBuffer.cpp
+++ b/dom/media/webaudio/DelayBuffer.cpp
@@ -264,4 +264,4 @@ DelayBuffer::UpdateUpmixChannels(int aNewReadChunk, uint32_t aChannelCount,
   }
 }
 
-} // mozilla
+} // namespace mozilla
diff --git a/dom/media/webaudio/DelayBuffer.h b/dom/media/webaudio/DelayBuffer.h
index 2de28d55ceb2..86ff03c055dd 100644
--- a/dom/media/webaudio/DelayBuffer.h
+++ b/dom/media/webaudio/DelayBuffer.h
@@ -110,6 +110,6 @@ private:
 #endif
 };
 
-} // mozilla
+} // namespace mozilla
 
 #endif // DelayBuffer_h_
diff --git a/dom/media/webaudio/DelayNode.cpp b/dom/media/webaudio/DelayNode.cpp
index c37d6a0c60fe..2a4d8c1cf5a2 100644
--- a/dom/media/webaudio/DelayNode.cpp
+++ b/dom/media/webaudio/DelayNode.cpp
@@ -233,5 +233,5 @@ DelayNode::SendDelayToStream(AudioNode* aNode)
   SendTimelineParameterToStream(This, DelayNodeEngine::DELAY, *This->mDelay);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/DelayNode.h b/dom/media/webaudio/DelayNode.h
index aa3a429aa1ee..d27febdc48b0 100644
--- a/dom/media/webaudio/DelayNode.h
+++ b/dom/media/webaudio/DelayNode.h
@@ -49,8 +49,8 @@ private:
   nsRefPtr<AudioParam> mDelay;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/DynamicsCompressorNode.cpp b/dom/media/webaudio/DynamicsCompressorNode.cpp
index 93b2bbc1feae..2afab63e15af 100644
--- a/dom/media/webaudio/DynamicsCompressorNode.cpp
+++ b/dom/media/webaudio/DynamicsCompressorNode.cpp
@@ -276,5 +276,5 @@ DynamicsCompressorNode::SendReleaseToStream(AudioNode* aNode)
   SendTimelineParameterToStream(This, DynamicsCompressorNodeEngine::RELEASE, *This->mRelease);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/DynamicsCompressorNode.h b/dom/media/webaudio/DynamicsCompressorNode.h
index c5a1087db102..3e237450f972 100644
--- a/dom/media/webaudio/DynamicsCompressorNode.h
+++ b/dom/media/webaudio/DynamicsCompressorNode.h
@@ -89,8 +89,8 @@ private:
   nsRefPtr<AudioParam> mRelease;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/FFTBlock.h b/dom/media/webaudio/FFTBlock.h
index ee3d29a6e44f..15d9c23eb883 100644
--- a/dom/media/webaudio/FFTBlock.h
+++ b/dom/media/webaudio/FFTBlock.h
@@ -341,7 +341,8 @@ private:
   AlignedTArray<ComplexU> mOutputBuffer;
   uint32_t mFFTSize;
 };
-}
+
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/GainNode.cpp b/dom/media/webaudio/GainNode.cpp
index ea38b806b3ec..207d6a136e06 100644
--- a/dom/media/webaudio/GainNode.cpp
+++ b/dom/media/webaudio/GainNode.cpp
@@ -164,5 +164,5 @@ GainNode::SendGainToStream(AudioNode* aNode)
   SendTimelineParameterToStream(This, GainNodeEngine::GAIN, *This->mGain);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/GainNode.h b/dom/media/webaudio/GainNode.h
index d89ea63f2cd1..7d5f9e9ece51 100644
--- a/dom/media/webaudio/GainNode.h
+++ b/dom/media/webaudio/GainNode.h
@@ -48,8 +48,8 @@ private:
   nsRefPtr<AudioParam> mGain;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/MediaBufferDecoder.cpp b/dom/media/webaudio/MediaBufferDecoder.cpp
index 918b20cb2710..ca594555a996 100644
--- a/dom/media/webaudio/MediaBufferDecoder.cpp
+++ b/dom/media/webaudio/MediaBufferDecoder.cpp
@@ -627,5 +627,5 @@ WebAudioDecodeJob::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
   return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
 }
 
-}
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/MediaBufferDecoder.h b/dom/media/webaudio/MediaBufferDecoder.h
index 5cdcd4863295..32e1c922d06c 100644
--- a/dom/media/webaudio/MediaBufferDecoder.h
+++ b/dom/media/webaudio/MediaBufferDecoder.h
@@ -22,7 +22,7 @@ class AudioContext;
 class DecodeErrorCallback;
 class DecodeSuccessCallback;
 class Promise;
-}
+} // namespace dom
 
 struct WebAudioDecodeJob final
 {
@@ -72,7 +72,7 @@ private:
 void AsyncDecodeWebAudio(const char* aContentType, uint8_t* aBuffer,
                          uint32_t aLength, WebAudioDecodeJob& aDecodeJob);
 
-}
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/MediaElementAudioSourceNode.cpp b/dom/media/webaudio/MediaElementAudioSourceNode.cpp
index b6bdadc31111..08afd44711da 100644
--- a/dom/media/webaudio/MediaElementAudioSourceNode.cpp
+++ b/dom/media/webaudio/MediaElementAudioSourceNode.cpp
@@ -22,5 +22,5 @@ MediaElementAudioSourceNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aG
   return MediaElementAudioSourceNodeBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/MediaElementAudioSourceNode.h b/dom/media/webaudio/MediaElementAudioSourceNode.h
index e253d8499160..ffae188c7760 100644
--- a/dom/media/webaudio/MediaElementAudioSourceNode.h
+++ b/dom/media/webaudio/MediaElementAudioSourceNode.h
@@ -31,7 +31,7 @@ public:
   }
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp
index b88972c0034d..f471711843c1 100644
--- a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp
+++ b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp
@@ -81,5 +81,5 @@ MediaStreamAudioDestinationNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*
   return MediaStreamAudioDestinationNodeBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/MediaStreamAudioDestinationNode.h b/dom/media/webaudio/MediaStreamAudioDestinationNode.h
index 6d5b544848ea..1b5d3412d095 100644
--- a/dom/media/webaudio/MediaStreamAudioDestinationNode.h
+++ b/dom/media/webaudio/MediaStreamAudioDestinationNode.h
@@ -50,7 +50,7 @@ private:
   nsRefPtr<MediaInputPort> mPort;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
index 6c9630f25a79..20ce3f37bb3d 100644
--- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
+++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
@@ -122,5 +122,5 @@ MediaStreamAudioSourceNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGi
   return MediaStreamAudioSourceNodeBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.h b/dom/media/webaudio/MediaStreamAudioSourceNode.h
index 871ff2688ace..57385090258e 100644
--- a/dom/media/webaudio/MediaStreamAudioSourceNode.h
+++ b/dom/media/webaudio/MediaStreamAudioSourceNode.h
@@ -73,7 +73,7 @@ private:
   nsRefPtr<DOMMediaStream> mInputStream;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/OfflineAudioCompletionEvent.cpp b/dom/media/webaudio/OfflineAudioCompletionEvent.cpp
index b745952f0393..30a57171930f 100644
--- a/dom/media/webaudio/OfflineAudioCompletionEvent.cpp
+++ b/dom/media/webaudio/OfflineAudioCompletionEvent.cpp
@@ -37,6 +37,6 @@ OfflineAudioCompletionEvent::WrapObjectInternal(JSContext* aCx, JS::Handle<JSObj
   return OfflineAudioCompletionEventBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/OfflineAudioCompletionEvent.h b/dom/media/webaudio/OfflineAudioCompletionEvent.h
index bd8ce608a08c..58e5d95f3aef 100644
--- a/dom/media/webaudio/OfflineAudioCompletionEvent.h
+++ b/dom/media/webaudio/OfflineAudioCompletionEvent.h
@@ -46,8 +46,8 @@ private:
   nsRefPtr<AudioBuffer> mRenderedBuffer;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/OscillatorNode.cpp b/dom/media/webaudio/OscillatorNode.cpp
index 405cfc6b86db..2faca4e9dac4 100644
--- a/dom/media/webaudio/OscillatorNode.cpp
+++ b/dom/media/webaudio/OscillatorNode.cpp
@@ -558,5 +558,5 @@ OscillatorNode::NotifyMainThreadStreamFinished()
   MarkInactive();
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/OscillatorNode.h b/dom/media/webaudio/OscillatorNode.h
index 9bcc73a7f1ca..39262e1c340e 100644
--- a/dom/media/webaudio/OscillatorNode.h
+++ b/dom/media/webaudio/OscillatorNode.h
@@ -100,8 +100,8 @@ private:
   bool mStartCalled;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/PannerNode.cpp b/dom/media/webaudio/PannerNode.cpp
index a69c8799c335..7a1f8530934e 100644
--- a/dom/media/webaudio/PannerNode.cpp
+++ b/dom/media/webaudio/PannerNode.cpp
@@ -562,6 +562,6 @@ PannerNode::SendDopplerToSourcesIfNeeded()
 }
 
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/PannerNode.h b/dom/media/webaudio/PannerNode.h
index 75bbbf6ae5db..2310a313bc19 100644
--- a/dom/media/webaudio/PannerNode.h
+++ b/dom/media/webaudio/PannerNode.h
@@ -247,8 +247,8 @@ private:
   nsTArray<AudioBufferSourceNode*> mSources;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/PanningUtils.h b/dom/media/webaudio/PanningUtils.h
index 3a7df06d3426..126bc898287c 100644
--- a/dom/media/webaudio/PanningUtils.h
+++ b/dom/media/webaudio/PanningUtils.h
@@ -59,7 +59,7 @@ void ApplyStereoPanning(const AudioChunk& aInput, AudioChunk* aOutput,
   }
 }
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif // PANNING_UTILS_H
diff --git a/dom/media/webaudio/PeriodicWave.h b/dom/media/webaudio/PeriodicWave.h
index da05a20eb0a3..f1614f625ae7 100644
--- a/dom/media/webaudio/PeriodicWave.h
+++ b/dom/media/webaudio/PeriodicWave.h
@@ -57,7 +57,7 @@ private:
   uint32_t mLength;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/PlayingRefChangeHandler.h b/dom/media/webaudio/PlayingRefChangeHandler.h
index 8bf37bba36d9..96a8c7f94983 100644
--- a/dom/media/webaudio/PlayingRefChangeHandler.h
+++ b/dom/media/webaudio/PlayingRefChangeHandler.h
@@ -49,8 +49,8 @@ private:
   ChangeType mChange;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/ScriptProcessorNode.cpp b/dom/media/webaudio/ScriptProcessorNode.cpp
index 8a302b22a72d..3a1ac1c8db01 100644
--- a/dom/media/webaudio/ScriptProcessorNode.cpp
+++ b/dom/media/webaudio/ScriptProcessorNode.cpp
@@ -517,6 +517,6 @@ ScriptProcessorNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProt
   return ScriptProcessorNodeBinding::Wrap(aCx, this, aGivenProto);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
diff --git a/dom/media/webaudio/ScriptProcessorNode.h b/dom/media/webaudio/ScriptProcessorNode.h
index 30d174e7954a..9c616f667624 100644
--- a/dom/media/webaudio/ScriptProcessorNode.h
+++ b/dom/media/webaudio/ScriptProcessorNode.h
@@ -105,8 +105,8 @@ private:
   const uint32_t mNumberOfOutputChannels;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/StereoPannerNode.cpp b/dom/media/webaudio/StereoPannerNode.cpp
index a5e6be941e8c..c00758b9a2d0 100644
--- a/dom/media/webaudio/StereoPannerNode.cpp
+++ b/dom/media/webaudio/StereoPannerNode.cpp
@@ -217,5 +217,5 @@ StereoPannerNode::SendPanToStream(AudioNode* aNode)
   SendTimelineParameterToStream(This, StereoPannerNodeEngine::PAN, *This->mPan);
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/StereoPannerNode.h b/dom/media/webaudio/StereoPannerNode.h
index e1cbdff3172a..35e6da908a24 100644
--- a/dom/media/webaudio/StereoPannerNode.h
+++ b/dom/media/webaudio/StereoPannerNode.h
@@ -64,8 +64,8 @@ private:
   nsRefPtr<AudioParam> mPan;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/ThreeDPoint.cpp b/dom/media/webaudio/ThreeDPoint.cpp
index 422c36078ace..ad816eb89df3 100644
--- a/dom/media/webaudio/ThreeDPoint.cpp
+++ b/dom/media/webaudio/ThreeDPoint.cpp
@@ -45,5 +45,5 @@ bool operator==(const ThreeDPoint& lhs, const ThreeDPoint& rhs)
          lhs.z == rhs.z;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/ThreeDPoint.h b/dom/media/webaudio/ThreeDPoint.h
index 6b0c9f31ec89..b6d51e69a32c 100644
--- a/dom/media/webaudio/ThreeDPoint.h
+++ b/dom/media/webaudio/ThreeDPoint.h
@@ -82,8 +82,8 @@ ThreeDPoint operator*(const ThreeDPoint& lhs, const ThreeDPoint& rhs);
 ThreeDPoint operator*(const ThreeDPoint& lhs, const double rhs);
 bool operator==(const ThreeDPoint& lhs, const ThreeDPoint& rhs);
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/WaveShaperNode.cpp b/dom/media/webaudio/WaveShaperNode.cpp
index 5adb2f2347f0..1e315f4158cf 100644
--- a/dom/media/webaudio/WaveShaperNode.cpp
+++ b/dom/media/webaudio/WaveShaperNode.cpp
@@ -338,5 +338,5 @@ WaveShaperNode::SetOversample(OverSampleType aType)
   SendInt32ParameterToStream(WaveShaperNodeEngine::TYPE, static_cast<int32_t>(aType));
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/WaveShaperNode.h b/dom/media/webaudio/WaveShaperNode.h
index a64ad63b241d..9d3266363885 100644
--- a/dom/media/webaudio/WaveShaperNode.h
+++ b/dom/media/webaudio/WaveShaperNode.h
@@ -69,7 +69,7 @@ private:
   OverSampleType mType;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/media/webaudio/WebAudioUtils.cpp b/dom/media/webaudio/WebAudioUtils.cpp
index b0a20cf28680..6c1146087270 100644
--- a/dom/media/webaudio/WebAudioUtils.cpp
+++ b/dom/media/webaudio/WebAudioUtils.cpp
@@ -105,5 +105,5 @@ WebAudioUtils::SpeexResamplerProcess(SpeexResamplerState* aResampler,
 #endif
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/media/webaudio/WebAudioUtils.h b/dom/media/webaudio/WebAudioUtils.h
index baaa373535c8..060072d9409d 100644
--- a/dom/media/webaudio/WebAudioUtils.h
+++ b/dom/media/webaudio/WebAudioUtils.h
@@ -222,10 +222,10 @@ namespace WebAudioUtils {
                         uint32_t aChannel,
                         const int16_t* aIn, uint32_t* aInLen,
                         int16_t* aOut, uint32_t* aOutLen);
-  }
+  } // namespace WebAudioUtils
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
 
diff --git a/dom/media/webaudio/blink/DenormalDisabler.h b/dom/media/webaudio/blink/DenormalDisabler.h
index d0ce4eae097a..34a56069abe6 100644
--- a/dom/media/webaudio/blink/DenormalDisabler.h
+++ b/dom/media/webaudio/blink/DenormalDisabler.h
@@ -119,7 +119,7 @@ public:
 
 #endif
 
-} // WebCore
+} // namespace WebCore
 
 #undef HAVE_DENORMAL
 #endif // DenormalDisabler_h
diff --git a/dom/media/webaudio/blink/DynamicsCompressor.h b/dom/media/webaudio/blink/DynamicsCompressor.h
index 17b6d24b06fa..be492bd77119 100644
--- a/dom/media/webaudio/blink/DynamicsCompressor.h
+++ b/dom/media/webaudio/blink/DynamicsCompressor.h
@@ -38,7 +38,7 @@
 
 namespace mozilla {
 struct AudioChunk;
-}
+} // namespace mozilla
 
 namespace WebCore {
 
diff --git a/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp b/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
index 1ef34036d978..6e47e1b1cf6d 100644
--- a/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
+++ b/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
@@ -225,4 +225,5 @@ void HRTFDatabaseLoader::shutdown()
         delete loaderMap;
     }
 }
+
 } // namespace WebCore
diff --git a/dom/media/webaudio/blink/HRTFKernel.h b/dom/media/webaudio/blink/HRTFKernel.h
index 5533dc4df1e4..940e69b13986 100644
--- a/dom/media/webaudio/blink/HRTFKernel.h
+++ b/dom/media/webaudio/blink/HRTFKernel.h
@@ -115,4 +115,5 @@ inline nsReturnRef<HRTFKernel> HRTFKernel::create(nsAutoPtr<FFTBlock> fftFrame,
 }
 
 } // namespace WebCore
+
 #endif // HRTFKernel_h
diff --git a/dom/media/webaudio/blink/HRTFPanner.h b/dom/media/webaudio/blink/HRTFPanner.h
index cf52bbd4ddad..e271f5c00595 100644
--- a/dom/media/webaudio/blink/HRTFPanner.h
+++ b/dom/media/webaudio/blink/HRTFPanner.h
@@ -31,7 +31,7 @@
 
 namespace mozilla {
 struct AudioChunk;
-}
+} // namespace mozilla
 
 namespace WebCore {
 
diff --git a/dom/media/webaudio/blink/Reverb.h b/dom/media/webaudio/blink/Reverb.h
index 135381fe87e4..97d01b454d2d 100644
--- a/dom/media/webaudio/blink/Reverb.h
+++ b/dom/media/webaudio/blink/Reverb.h
@@ -37,7 +37,7 @@
 
 namespace mozilla {
 class ThreadSharedFloatArrayBufferList;
-}
+} // namespace mozilla
 
 namespace WebCore {
 
diff --git a/dom/media/webaudio/compiledtest/TestAudioEventTimeline.cpp b/dom/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
index cc08ec429258..dd69075a89ae 100644
--- a/dom/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
+++ b/dom/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
@@ -33,7 +33,7 @@ operator<<(basic_ostream<T, char_traits<T> >& os, nsresult rv)
   return os;
 }
 
-}
+} // namespace std
 
 template <class T, class U>
 void is(const T& a, const U& b, const char* msg)
diff --git a/dom/media/webm/EbmlComposer.cpp b/dom/media/webm/EbmlComposer.cpp
index 257e2ca606d0..186078e9601c 100644
--- a/dom/media/webm/EbmlComposer.cpp
+++ b/dom/media/webm/EbmlComposer.cpp
@@ -212,4 +212,4 @@ EbmlComposer::EbmlComposer()
   , mChannels(0)
 {}
 
-}
+} // namespace mozilla
diff --git a/dom/media/webm/EbmlComposer.h b/dom/media/webm/EbmlComposer.h
index ac7446e12320..86d84d518ec0 100644
--- a/dom/media/webm/EbmlComposer.h
+++ b/dom/media/webm/EbmlComposer.h
@@ -84,5 +84,6 @@ private:
   int mChannels;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/webm/WebMWriter.cpp b/dom/media/webm/WebMWriter.cpp
index 4a6c2368fb3f..cdafa74f971a 100644
--- a/dom/media/webm/WebMWriter.cpp
+++ b/dom/media/webm/WebMWriter.cpp
@@ -75,4 +75,4 @@ WebMWriter::SetMetadata(TrackMetadataBase* aMetadata)
   return NS_OK;
 }
 
-} // mozilla namespace
+} // namespace mozilla
diff --git a/dom/media/webm/WebMWriter.h b/dom/media/webm/WebMWriter.h
index 8ea58c1b3eb9..89ef0006cd81 100644
--- a/dom/media/webm/WebMWriter.h
+++ b/dom/media/webm/WebMWriter.h
@@ -70,5 +70,6 @@ private:
   uint8_t mMetadataRequiredFlag;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/dom/media/webrtc/MediaEngine.h b/dom/media/webrtc/MediaEngine.h
index 94be3e0c09c3..e5400a12a6d4 100644
--- a/dom/media/webrtc/MediaEngine.h
+++ b/dom/media/webrtc/MediaEngine.h
@@ -15,7 +15,7 @@ namespace mozilla {
 
 namespace dom {
 class Blob;
-}
+} // namespace dom
 
 enum {
   kVideoTrack = 1,
@@ -256,6 +256,6 @@ protected:
 
 };
 
-}
+} // namespace mozilla
 
 #endif /* MEDIAENGINE_H_ */
diff --git a/dom/media/webrtc/MediaEngineCameraVideoSource.h b/dom/media/webrtc/MediaEngineCameraVideoSource.h
index 2bda3020921e..d5edb3111b50 100644
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.h
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.h
@@ -132,4 +132,5 @@ private:
 
 
 } // namespace mozilla
+
 #endif // MediaEngineCameraVideoSource_h
diff --git a/dom/media/webrtc/MediaEngineDefault.h b/dom/media/webrtc/MediaEngineDefault.h
index 36b147b12350..1bc6d0c4a920 100644
--- a/dom/media/webrtc/MediaEngineDefault.h
+++ b/dom/media/webrtc/MediaEngineDefault.h
@@ -24,7 +24,7 @@ namespace mozilla {
 
 namespace layers {
 class ImageContainer;
-}
+} // namespace layers
 
 class MediaEngineDefault;
 
@@ -194,6 +194,6 @@ private:
   nsTArray<nsRefPtr<MediaEngineAudioSource> > mASources;
 };
 
-}
+} // namespace mozilla
 
 #endif /* NSMEDIAENGINEDEFAULT_H_ */
diff --git a/dom/media/webrtc/MediaTrackConstraints.h b/dom/media/webrtc/MediaTrackConstraints.h
index ce7cb4853827..ac1c3414622b 100644
--- a/dom/media/webrtc/MediaTrackConstraints.h
+++ b/dom/media/webrtc/MediaTrackConstraints.h
@@ -106,6 +106,6 @@ protected:
                             const nsString& aDeviceId);
 };
 
-}
+} // namespace mozilla
 
 #endif /* MEDIATRACKCONSTRAINTS_H_ */
diff --git a/dom/media/webrtc/WebrtcGlobal.h b/dom/media/webrtc/WebrtcGlobal.h
index dedf63f3d084..bcb4225c82b1 100644
--- a/dom/media/webrtc/WebrtcGlobal.h
+++ b/dom/media/webrtc/WebrtcGlobal.h
@@ -490,6 +490,7 @@ struct ParamTraits<mozilla::dom::RTCMediaStreamTrackStats>
     return true;
   }
 };
+
 } // namespace ipc
 
 #endif  // _WEBRTC_GLOBAL_H_
diff --git a/dom/media/webspeech/recognition/SpeechGrammarList.cpp b/dom/media/webspeech/recognition/SpeechGrammarList.cpp
index 09657018348c..6274b99f25c8 100644
--- a/dom/media/webspeech/recognition/SpeechGrammarList.cpp
+++ b/dom/media/webspeech/recognition/SpeechGrammarList.cpp
@@ -107,5 +107,6 @@ SpeechGrammarList::IndexedGetter(uint32_t aIndex, bool& aPresent,
   aPresent = true;
   return Item(aIndex, rv);
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/media/webspeech/recognition/SpeechRecognition.h b/dom/media/webspeech/recognition/SpeechRecognition.h
index 7c5649faee79..dfdbcdcaf5ae 100644
--- a/dom/media/webspeech/recognition/SpeechRecognition.h
+++ b/dom/media/webspeech/recognition/SpeechRecognition.h
@@ -295,6 +295,7 @@ ToSupports(dom::SpeechRecognition* aRec)
 {
   return ToSupports(static_cast<DOMEventTargetHelper*>(aRec));
 }
+
 } // namespace mozilla
 
 #endif
diff --git a/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp b/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
index 0609c19ef788..8526e0f003e3 100644
--- a/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
+++ b/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
@@ -54,5 +54,6 @@ SpeechRecognitionAlternative::Confidence() const
 {
   return mConfidence;
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp b/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp
index 00bcec4396ee..0d66bee65123 100644
--- a/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp
+++ b/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp
@@ -71,5 +71,6 @@ SpeechRecognitionResult::IsFinal() const
 {
   return true; // TODO
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp b/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp
index 2c64dfad6f70..89536b6d6517 100644
--- a/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp
+++ b/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp
@@ -66,5 +66,6 @@ SpeechRecognitionResultList::Item(uint32_t aIndex)
   nsRefPtr<SpeechRecognitionResult> result = mItems.ElementAt(aIndex);
   return result.forget();
 }
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/media/webspeech/recognition/models/dict/cmu07a.dic b/dom/media/webspeech/recognition/models/dict/cmu07a.dic
index 557136d10262..6f30f90e0cbf 100644
--- a/dom/media/webspeech/recognition/models/dict/cmu07a.dic
+++ b/dom/media/webspeech/recognition/models/dict/cmu07a.dic
@@ -36328,6 +36328,7 @@ eigenvalues	AY G AH N V AE L Y UW Z
 eighmey	EY M IY
 eighmy	EY G M IY
 eight	EY T
+8	EY T
 eight's	EY T S
 eighteen	EY T IY N
 eighteen's	EY T IY N Z
@@ -42550,6 +42551,7 @@ fitzwater's	F IH T S W AO T ER Z
 fitzwilliam	F IH T S W IH L Y AH M
 fiumara	F IY UW M AA R AH
 five	F AY V
+5	F AY V
 five's	F AY V Z
 fiveash	F AY V AE SH
 fivecoat	F AY V K OW T
@@ -44000,6 +44002,7 @@ fountain	F AW N T AH N
 fountaine	F UW N T EY N
 fountains	F AW N T AH N Z
 four	F AO R
+4	F AO R
 four's	F AO R Z
 fourfold	F AO R F OW L D
 fourier	F UH R IY EY
@@ -83563,6 +83566,7 @@ ninagawa	N IY N AA G AA W AH
 nincompoop	N IH NG K AH M P UW P
 nincompoops	N IH NG K AH M P UW P S
 nine	N AY N
+9	N AY N
 nine's	N AY N Z
 ninefold	N IH N F OW L D
 niner	N AY N ER
@@ -85948,6 +85952,8 @@ onderdonk	AA N D ER D AH NG K
 ondo	AO N D OW
 ondracek	AA N D R AH S EH K
 one	W AH N
+1	W AH N
+1(2)	HH W AH N
 one's	W AH N Z
 one(2)	HH W AH N
 one-up-manship	W AH N AH P M AE N SH IH P
@@ -108111,6 +108117,7 @@ sevareid	S EH V AH R AY D
 sevcik	S EH V S IH K
 seve	S EH V EY
 seven	S EH V AH N
+7	S EH V AH N
 seven's	S EH V AH N Z
 sevenfold	S EH V AH N F OW L D
 sevens	S EH V AH N Z
@@ -110416,6 +110423,7 @@ sivley	S IH V L IY
 sivy	S IH V IY
 siwek	S IH W IH K
 six	S IH K S
+6	S IH K S
 six's	S IH K S IH Z
 sixed	S IH K S T
 sixer	S IH K S ER
@@ -120004,6 +120012,7 @@ threatens	TH R EH T AH N Z
 threats	TH R EH T S
 threatt	TH R IY T
 three	TH R IY
+3	TH R IY
 three's	TH R IY Z
 threefold	TH R IY F OW L D
 threemonth	TH R IY M AH N TH
@@ -123176,6 +123185,7 @@ twitching	T W IH CH IH NG
 twite	T W AY T
 twitty	T W IH T IY
 two	T UW
+2	T UW
 two's	T UW Z
 twofold	T UW F OW L D
 twohig	T W OW HH IH G
@@ -132980,6 +132990,7 @@ zerlinda	Z ER L IY N D AH
 zermeno	Z ER M EH N OW
 zern	Z IH R N
 zero	Z IH R OW
+0	Z IH R OW
 zero's	Z IH R OW Z
 zero's(2)	Z IY R OW Z
 zero(2)	Z IY R OW
diff --git a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
index 62e8111c15be..f6c610b00911 100644
--- a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
+++ b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
@@ -56,7 +56,8 @@ GetAllSpeechSynthActors(InfallibleTArray<mozilla::dom::SpeechSynthesisParent*>&
     }
   }
 }
-}
+
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/messagechannel/MessageChannel.cpp b/dom/messagechannel/MessageChannel.cpp
index a2635d10c2e5..2ec1d9b66cd4 100644
--- a/dom/messagechannel/MessageChannel.cpp
+++ b/dom/messagechannel/MessageChannel.cpp
@@ -140,7 +140,7 @@ protected:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 /* static */ bool
 MessageChannel::Enabled(JSContext* aCx, JSObject* aGlobal)
diff --git a/dom/messagechannel/MessagePort.cpp b/dom/messagechannel/MessagePort.cpp
index 85e9e5114218..69c40202d68b 100644
--- a/dom/messagechannel/MessagePort.cpp
+++ b/dom/messagechannel/MessagePort.cpp
@@ -294,7 +294,7 @@ private:
 
 NS_IMPL_ISUPPORTS(ForceCloseHelper, nsIIPCBackgroundChildCreateCallback)
 
-} // anonymous namespace
+} // namespace
 
 MessagePort::MessagePort(nsPIDOMWindow* aWindow)
   : MessagePortBase(aWindow)
diff --git a/dom/messagechannel/MessagePort.h b/dom/messagechannel/MessagePort.h
index 28b2920c2099..75f865458287 100644
--- a/dom/messagechannel/MessagePort.h
+++ b/dom/messagechannel/MessagePort.h
@@ -29,7 +29,7 @@ class SharedMessagePortMessage;
 
 namespace workers {
 class WorkerFeature;
-}
+} // namespace workers
 
 class MessagePortBase : public DOMEventTargetHelper
 {
diff --git a/dom/messagechannel/MessagePortChild.cpp b/dom/messagechannel/MessagePortChild.cpp
index baa1b3771316..98259e110758 100644
--- a/dom/messagechannel/MessagePortChild.cpp
+++ b/dom/messagechannel/MessagePortChild.cpp
@@ -45,5 +45,5 @@ MessagePortChild::ActorDestroy(ActorDestroyReason aWhy)
   }
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/messagechannel/MessagePortChild.h b/dom/messagechannel/MessagePortChild.h
index 7ab954ad0687..918ba6133668 100644
--- a/dom/messagechannel/MessagePortChild.h
+++ b/dom/messagechannel/MessagePortChild.h
@@ -46,7 +46,7 @@ private:
   MessagePort* mPort;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_MessagePortChild_h
diff --git a/dom/messagechannel/MessagePortParent.cpp b/dom/messagechannel/MessagePortParent.cpp
index 917606bf09d5..b8ea4a8a25db 100644
--- a/dom/messagechannel/MessagePortParent.cpp
+++ b/dom/messagechannel/MessagePortParent.cpp
@@ -173,5 +173,5 @@ MessagePortParent::ForceClose(const nsID& aUUID,
   return service->ForceClose(aUUID, aDestinationUUID, aSequenceID);
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/messagechannel/MessagePortParent.h b/dom/messagechannel/MessagePortParent.h
index 1dcfb53e79f8..08dcbbf75399 100644
--- a/dom/messagechannel/MessagePortParent.h
+++ b/dom/messagechannel/MessagePortParent.h
@@ -59,7 +59,7 @@ private:
   bool mCanSendData;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_MessagePortParent_h
diff --git a/dom/messagechannel/MessagePortService.cpp b/dom/messagechannel/MessagePortService.cpp
index afd5ab98af2b..42c796c1bec7 100644
--- a/dom/messagechannel/MessagePortService.cpp
+++ b/dom/messagechannel/MessagePortService.cpp
@@ -27,7 +27,7 @@ AssertIsInMainProcess()
   MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
 }
 
-} // anonymous namespace
+} // namespace
 
 class MessagePortService::MessagePortServiceData final
 {
@@ -374,5 +374,5 @@ MessagePortService::ForceClose(const nsID& aUUID,
   return true;
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/messagechannel/MessagePortService.h b/dom/messagechannel/MessagePortService.h
index faae81fcbc38..5ef93b989275 100644
--- a/dom/messagechannel/MessagePortService.h
+++ b/dom/messagechannel/MessagePortService.h
@@ -60,7 +60,7 @@ private:
   nsClassHashtable<nsIDHashKey, MessagePortServiceData> mPorts;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_MessagePortService_h
diff --git a/dom/messagechannel/MessagePortUtils.cpp b/dom/messagechannel/MessagePortUtils.cpp
index ccd3b13043e2..452b00b19ca5 100644
--- a/dom/messagechannel/MessagePortUtils.cpp
+++ b/dom/messagechannel/MessagePortUtils.cpp
@@ -218,7 +218,7 @@ const JSStructuredCloneCallbacks gCallbacks = {
   FreeTransfer,
 };
 
-} // anonymous namespace
+} // namespace
 
 bool
 ReadStructuredCloneWithTransfer(JSContext* aCx, nsTArray<uint8_t>& aData,
@@ -286,6 +286,6 @@ FreeStructuredClone(nsTArray<uint8_t>& aData, StructuredCloneClosure& aClosure)
   aData.Clear();
 }
 
-} // messageport namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace messageport
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/messagechannel/MessagePortUtils.h b/dom/messagechannel/MessagePortUtils.h
index 9c9442700e73..77e380db9c2a 100644
--- a/dom/messagechannel/MessagePortUtils.h
+++ b/dom/messagechannel/MessagePortUtils.h
@@ -48,8 +48,8 @@ void
 FreeStructuredClone(nsTArray<uint8_t>& aData,
                     StructuredCloneClosure& aClosure);
 
-} // messageport namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace messageport
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_MessagePortUtils_h
diff --git a/dom/messagechannel/SharedMessagePortMessage.cpp b/dom/messagechannel/SharedMessagePortMessage.cpp
index bbd8fbdbdd5d..00d2e4e65815 100644
--- a/dom/messagechannel/SharedMessagePortMessage.cpp
+++ b/dom/messagechannel/SharedMessagePortMessage.cpp
@@ -176,5 +176,5 @@ SharedMessagePortMessage::FromMessagesToSharedParent(
   return true;
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/messagechannel/SharedMessagePortMessage.h b/dom/messagechannel/SharedMessagePortMessage.h
index c2516874edf5..fb039454039b 100644
--- a/dom/messagechannel/SharedMessagePortMessage.h
+++ b/dom/messagechannel/SharedMessagePortMessage.h
@@ -52,7 +52,7 @@ private:
   ~SharedMessagePortMessage();
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_SharedMessagePortMessage_h
diff --git a/dom/mobilemessage/MobileMessageCallback.cpp b/dom/mobilemessage/MobileMessageCallback.cpp
index 1e8e82ee7628..b6323fe3cb0c 100644
--- a/dom/mobilemessage/MobileMessageCallback.cpp
+++ b/dom/mobilemessage/MobileMessageCallback.cpp
@@ -315,6 +315,6 @@ MobileMessageCallback::NotifySetSmscAddressFailed(int32_t aError)
   return NS_OK;
 }
 
-} // namesapce mobilemessage
+} // namespace mobilemessage
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/mobilemessage/ipc/SmsChild.cpp b/dom/mobilemessage/ipc/SmsChild.cpp
index e2892fe794f9..154b00bd641f 100644
--- a/dom/mobilemessage/ipc/SmsChild.cpp
+++ b/dom/mobilemessage/ipc/SmsChild.cpp
@@ -53,7 +53,7 @@ NotifyObserversWithMobileMessage(const char* aEventName,
   obs->NotifyObservers(msg, aEventName, nullptr);
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/mobilemessage/ipc/SmsIPCService.cpp b/dom/mobilemessage/ipc/SmsIPCService.cpp
index 799acfcec061..1465e83dd4cb 100644
--- a/dom/mobilemessage/ipc/SmsIPCService.cpp
+++ b/dom/mobilemessage/ipc/SmsIPCService.cpp
@@ -95,7 +95,7 @@ getDefaultServiceId(const char* aPrefKey)
   return id;
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(SmsIPCService,
                   nsISmsService,
diff --git a/dom/network/TCPSocketParent.cpp b/dom/network/TCPSocketParent.cpp
index c53f55d6f2a6..a238bdb631db 100644
--- a/dom/network/TCPSocketParent.cpp
+++ b/dom/network/TCPSocketParent.cpp
@@ -28,7 +28,7 @@ DeserializeArrayBuffer(JS::Handle<JSObject*> aObj,
                        const InfallibleTArray<uint8_t>& aBuffer,
                        JS::MutableHandle<JS::Value> aVal);
 
-}
+} // namespace IPC
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/network/UDPSocketParent.h b/dom/network/UDPSocketParent.h
index 2e3a0f74b091..c0a35114180f 100644
--- a/dom/network/UDPSocketParent.h
+++ b/dom/network/UDPSocketParent.h
@@ -17,7 +17,7 @@
 namespace mozilla {
 namespace net {
 class PNeckoParent;
-}
+} // namespace net
 
 namespace dom {
 
diff --git a/dom/nfc/gonk/NfcService.cpp b/dom/nfc/gonk/NfcService.cpp
index 40b655cdea63..ecd0b5101316 100644
--- a/dom/nfc/gonk/NfcService.cpp
+++ b/dom/nfc/gonk/NfcService.cpp
@@ -55,7 +55,7 @@ private:
   nsAutoPtr<UnixSocketRawData> mRawData;
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
index 9f078c85fa2d..12cff00dc524 100644
--- a/dom/notification/Notification.cpp
+++ b/dom/notification/Notification.cpp
@@ -275,7 +275,7 @@ public:
     return NS_OK;
   }
 };
-} // anonymous namespace
+} // namespace
 
 // Subclass that can be directly dispatched to child workers from the main
 // thread.
@@ -1663,6 +1663,7 @@ Notification::UnregisterFeature()
                                 mFeature.get());
   mFeature = nullptr;
 }
+
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/plugins/base/nsIPluginHost.idl b/dom/plugins/base/nsIPluginHost.idl
index f62a763e2035..d7545812f4a4 100644
--- a/dom/plugins/base/nsIPluginHost.idl
+++ b/dom/plugins/base/nsIPluginHost.idl
@@ -36,7 +36,7 @@ interface nsIClearSiteDataCallback : nsISupports
     void callback(in nsresult rv);
 };
 
-[scriptable, uuid(a884e736-5396-4400-bc82-9a23d871d12c)]
+[scriptable, uuid(2bed7533-50e3-45dd-9e47-102e2c6f5ea8)]
 interface nsIPluginHost : nsISupports
 {
   /**
@@ -154,5 +154,10 @@ interface nsIPluginHost : nsISupports
    */
   uint32_t getBlocklistStateForType(in AUTF8String aMimeType,
                                     [optional] in uint32_t excludeFlags);
+
+  /**
+   * Returns true if plugins with the given mimetype will run out of process.
+   */
+  boolean isPluginOOP(in AUTF8String aMimeType);
 };
 
diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp
index 5c084bd1d1ac..3e9d3455dd4d 100644
--- a/dom/plugins/base/nsJSNPRuntime.cpp
+++ b/dom/plugins/base/nsJSNPRuntime.cpp
@@ -116,7 +116,7 @@ NPObjectIsOutOfProcessProxy(NPObject *obj)
          obj->_class == PluginAsyncSurrogate::GetClass();
 }
 
-} // anonymous namespace
+} // namespace
 
 // Helper class that reports any JS exceptions that were thrown while
 // the plugin executed JS.
@@ -472,9 +472,9 @@ GetJSContext(NPP npp)
   return scx->GetNativeContext();
 }
 
-}
-}
-}
+} // namespace parent
+} // namespace plugins
+} // namespace mozilla
 
 static NPP
 LookupNPP(NPObject *npobj);
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index 85f3c9e77cf5..4da9c58c4709 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -186,6 +186,37 @@ PRLogModuleInfo* nsPluginLogging::gPluginLog = nullptr;
 nsIFile *nsPluginHost::sPluginTempDir;
 nsPluginHost *nsPluginHost::sInst;
 
+/* to cope with short read */
+/* we should probably put this into a global library now that this is the second
+   time we need this. */
+static
+PRInt32
+busy_beaver_PR_Read(PRFileDesc *fd, void * start, PRInt32 len)
+{
+    int n;
+    PRInt32 remaining = len;
+
+    while (remaining > 0)
+    {
+        n = PR_Read(fd, start, remaining);
+        if (n < 0)
+        {
+            /* may want to repeat if errno == EINTR */
+            if( (len - remaining) == 0 ) // no octet is ever read
+                return -1;
+            break;
+        }
+        else
+        {
+            remaining -= n;
+            char *cp = (char *) start;
+            cp += n;
+            start = cp;
+        }
+    }
+    return len - remaining;
+}
+
 NS_IMPL_ISUPPORTS0(nsInvalidPluginTag)
 
 nsInvalidPluginTag::nsInvalidPluginTag(const char* aFullPath, int64_t aLastModifiedTime)
@@ -1064,6 +1095,18 @@ nsPluginHost::GetBlocklistStateForType(const nsACString &aMimeType,
   return tag->GetBlocklistState(aState);
 }
 
+NS_IMETHODIMP
+nsPluginHost::IsPluginOOP(const nsACString& aMimeType,
+                          bool* aResult)
+{
+  nsPluginTag* tag = FindNativePluginForType(aMimeType, true);
+  if (!tag) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  *aResult = nsNPAPIPlugin::RunPluginOOP(tag);
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsPluginHost::GetPermissionStringForType(const nsACString &aMimeType,
                                          uint32_t aExcludeFlags,
@@ -1913,7 +1956,7 @@ struct CompareFilesByTime
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 nsPluginHost::AddPluginTag(nsPluginTag* aPluginTag)
@@ -2839,7 +2882,9 @@ nsPluginHost::ReadPluginInfo()
   // set rv to return an error on goto out
   rv = NS_ERROR_FAILURE;
 
-  int32_t bread = PR_Read(fd, registry, flen);
+  // We know how many octes we are supposed to read.
+  // So let use the busy_beaver_PR_Read version.
+  int32_t bread = busy_beaver_PR_Read(fd, registry, flen);
 
   PRStatus prrc;
   prrc = PR_Close(fd);
@@ -2850,6 +2895,7 @@ nsPluginHost::ReadPluginInfo()
     return rv;
   }
 
+  // short read error, so to speak.
   if (flen > bread)
     return rv;
 
diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h
index b406428ce225..fe616ec80e9f 100644
--- a/dom/plugins/base/nsPluginHost.h
+++ b/dom/plugins/base/nsPluginHost.h
@@ -37,8 +37,8 @@ namespace mozilla {
 namespace plugins {
 class PluginAsyncSurrogate;
 class PluginTag;
-} // namespace mozilla
 } // namespace plugins
+} // namespace mozilla
 
 class nsNPAPIPlugin;
 class nsIFile;
diff --git a/dom/plugins/base/nsPluginInstanceOwner.h b/dom/plugins/base/nsPluginInstanceOwner.h
index 3c105eaf3c60..2df4ee2af7a6 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.h
+++ b/dom/plugins/base/nsPluginInstanceOwner.h
@@ -31,11 +31,11 @@ class nsDisplayListBuilder;
 namespace mozilla {
 namespace dom {
 struct MozPluginParameter;
-}
+} // namespace dom
 namespace widget {
 class PuppetWidget;
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 using mozilla::widget::PuppetWidget;
 
diff --git a/dom/plugins/ipc/PluginBridge.h b/dom/plugins/ipc/PluginBridge.h
index 1775511e984c..4066994ff4af 100644
--- a/dom/plugins/ipc/PluginBridge.h
+++ b/dom/plugins/ipc/PluginBridge.h
@@ -11,7 +11,7 @@ namespace mozilla {
 
 namespace dom {
 class ContentParent;
-}
+} // namespace dom
 
 namespace plugins {
 
diff --git a/dom/plugins/ipc/PluginHangUIParent.cpp b/dom/plugins/ipc/PluginHangUIParent.cpp
index 1c42cd069baf..092308a7a3cb 100644
--- a/dom/plugins/ipc/PluginHangUIParent.cpp
+++ b/dom/plugins/ipc/PluginHangUIParent.cpp
@@ -64,7 +64,7 @@ private:
   uint32_t mResponseTimeMs;
   uint32_t mTimeoutMs;
 };
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace plugins {
diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp
index 9df9ba3c3d7c..45c012c40b92 100644
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -1493,7 +1493,7 @@ ActorSearch(NPObject* aKey,
     return PL_DHASH_NEXT;
 }
 
-} // anonymous namespace
+} // namespace
 #endif // DEBUG
 
 bool
diff --git a/dom/plugins/ipc/PluginInstanceParent.h b/dom/plugins/ipc/PluginInstanceParent.h
index b85788b2842b..052408528f17 100644
--- a/dom/plugins/ipc/PluginInstanceParent.h
+++ b/dom/plugins/ipc/PluginInstanceParent.h
@@ -33,7 +33,7 @@ class nsPluginInstanceOwner;
 namespace mozilla {
 namespace layers {
 class ImageContainer;
-}
+} // namespace layers
 namespace plugins {
 
 class PBrowserStreamParent;
diff --git a/dom/plugins/ipc/PluginInterposeOSX.h b/dom/plugins/ipc/PluginInterposeOSX.h
index c9bb023318c3..2a742b8aa2dc 100644
--- a/dom/plugins/ipc/PluginInterposeOSX.h
+++ b/dom/plugins/ipc/PluginInterposeOSX.h
@@ -124,14 +124,14 @@ void OnShowCursor(bool show);
 void OnPushCursor(const NSCursorInfo& cursorInfo);
 void OnPopCursor();
 
-}
+} // namespace parent
 
 namespace child {
 
 void SetUpCocoaInterposing();
 
-}
+} // namespace child
 
-}
+} // namespace mac_plugin_interposing
 
 #endif /* DOM_PLUGINS_IPC_PLUGININTERPOSEOSX_H */
diff --git a/dom/plugins/ipc/PluginInterposeOSX.mm b/dom/plugins/ipc/PluginInterposeOSX.mm
index 885700c85c6e..de747de8b006 100644
--- a/dom/plugins/ipc/PluginInterposeOSX.mm
+++ b/dom/plugins/ipc/PluginInterposeOSX.mm
@@ -664,7 +664,7 @@ void OnPopCursor()
   [NSCursor pop];
 }
 
-} // parent
+} // namespace parent
 } // namespace mac_plugin_interposing
 
 namespace mac_plugin_interposing {
@@ -819,7 +819,7 @@ static BOOL OnPopCursor()
   return NO;
 }
 
-} // child
+} // namespace child
 } // namespace mac_plugin_interposing
 
 using namespace mac_plugin_interposing::child;
diff --git a/dom/plugins/ipc/PluginLibrary.h b/dom/plugins/ipc/PluginLibrary.h
index 63ea2f800642..262220956712 100644
--- a/dom/plugins/ipc/PluginLibrary.h
+++ b/dom/plugins/ipc/PluginLibrary.h
@@ -25,8 +25,8 @@ namespace mozilla {
 namespace layers {
 class Image;
 class ImageContainer;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 class nsIClearSiteDataCallback;
 
diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp
index 36f9d4382e73..b09d9c398891 100644
--- a/dom/plugins/ipc/PluginMessageUtils.cpp
+++ b/dom/plugins/ipc/PluginMessageUtils.cpp
@@ -43,7 +43,7 @@ DeferNPObjectReleaseRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace plugins {
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
index 0d3dc6025acc..74a3dea519a6 100644
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -67,7 +67,7 @@ const wchar_t * kMozillaWindowClass = L"MozillaWindowClass";
 namespace {
 // see PluginModuleChild::GetChrome()
 PluginModuleChild* gChromeInstance = nullptr;
-}
+} // namespace
 
 #ifdef MOZ_WIDGET_QT
 typedef void (*_gtk_init_fn)(int argc, char **argv);
diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h
index 322c967f993e..6463576037fb 100644
--- a/dom/plugins/ipc/PluginModuleChild.h
+++ b/dom/plugins/ipc/PluginModuleChild.h
@@ -48,7 +48,7 @@ typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGINSHUTDOWN) (void);
 namespace mozilla {
 namespace dom {
 class PCrashReporterChild;
-}
+} // namespace dom
 
 namespace plugins {
 
diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp
index 8649895c151a..3a2329458943 100755
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -358,7 +358,7 @@ PRCList PluginModuleMapping::sModuleListHead =
 
 bool PluginModuleMapping::sIsLoadModuleOnStack = false;
 
-} // anonymous namespace
+} // namespace
 
 void
 mozilla::plugins::TerminatePlugin(uint32_t aPluginId,
@@ -958,7 +958,7 @@ GetProcessCpuUsage(const InfallibleTArray<base::ProcessHandle>& processHandles,
   return true;
 }
 
-} // anonymous namespace
+} // namespace
 
 #endif // #ifdef XP_WIN
 
diff --git a/dom/plugins/ipc/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h
index 31e2acf5dd6f..a826d6a4d526 100644
--- a/dom/plugins/ipc/PluginModuleParent.h
+++ b/dom/plugins/ipc/PluginModuleParent.h
@@ -41,7 +41,7 @@ class ProfileGatherer;
 namespace dom {
 class PCrashReporterParent;
 class CrashReporterParent;
-}
+} // namespace dom
 
 namespace plugins {
 //-----------------------------------------------------------------------------
diff --git a/dom/plugins/ipc/PluginProcessChild.h b/dom/plugins/ipc/PluginProcessChild.h
index e9c96cfb394b..dcae523839ff 100644
--- a/dom/plugins/ipc/PluginProcessChild.h
+++ b/dom/plugins/ipc/PluginProcessChild.h
@@ -40,7 +40,7 @@ private:
     DISALLOW_EVIL_CONSTRUCTORS(PluginProcessChild);
 };
 
-}  // namespace plugins
-}  // namespace mozilla
+} // namespace plugins
+} // namespace mozilla
 
 #endif  // ifndef dom_plugins_PluginProcessChild_h
diff --git a/dom/plugins/ipc/PluginScriptableObjectParent.cpp b/dom/plugins/ipc/PluginScriptableObjectParent.cpp
index 64f84f011ae8..1a33288ab16f 100644
--- a/dom/plugins/ipc/PluginScriptableObjectParent.cpp
+++ b/dom/plugins/ipc/PluginScriptableObjectParent.cpp
@@ -118,7 +118,7 @@ ReleaseVariant(NPVariant& aVariant,
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 // static
 NPObject*
diff --git a/dom/plugins/ipc/PluginUtilsOSX.mm b/dom/plugins/ipc/PluginUtilsOSX.mm
index 1410cc9a4225..7a5947f300b2 100644
--- a/dom/plugins/ipc/PluginUtilsOSX.mm
+++ b/dom/plugins/ipc/PluginUtilsOSX.mm
@@ -266,9 +266,9 @@ namespace plugins {
 namespace PluginUtilsOSX {
   static void *sApplicationASN = NULL;
   static void *sApplicationInfoItem = NULL;
-}
-}
-}
+} // namespace PluginUtilsOSX
+} // namespace plugins
+} // namespace mozilla
 
 bool mozilla::plugins::PluginUtilsOSX::SetProcessName(const char* aProcessName) {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
@@ -511,7 +511,7 @@ void nsDoubleBufferCARenderer::ClearBackSurface() {
   }
 }
 
-} //PluginUtilsOSX
-} //plugins
-} //mozilla
+} // namespace PluginUtilsOSX
+} // namespace plugins
+} // namespace mozilla
 
diff --git a/dom/plugins/ipc/PluginWidgetChild.h b/dom/plugins/ipc/PluginWidgetChild.h
index 7c3a53e0ffbb..cfb5a4327c00 100644
--- a/dom/plugins/ipc/PluginWidgetChild.h
+++ b/dom/plugins/ipc/PluginWidgetChild.h
@@ -10,7 +10,7 @@
 namespace mozilla {
 namespace widget {
 class PluginWidgetProxy;
-}
+} // namespace widget
 namespace plugins {
 
 class PluginWidgetChild : public PPluginWidgetChild
diff --git a/dom/plugins/ipc/PluginWidgetParent.h b/dom/plugins/ipc/PluginWidgetParent.h
index 08ac43e0abc6..121e88687634 100644
--- a/dom/plugins/ipc/PluginWidgetParent.h
+++ b/dom/plugins/ipc/PluginWidgetParent.h
@@ -17,7 +17,7 @@ namespace mozilla {
 
 namespace dom {
 class TabParent;
-}
+} // namespace dom
 
 namespace plugins {
 
diff --git a/dom/power/PowerManager.cpp b/dom/power/PowerManager.cpp
index 2109db078629..425a2052c21c 100644
--- a/dom/power/PowerManager.cpp
+++ b/dom/power/PowerManager.cpp
@@ -206,5 +206,5 @@ PowerManager::CreateInstance(nsPIDOMWindow* aWindow)
   return powerManager.forget();
 }
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/power/PowerManagerService.cpp b/dom/power/PowerManagerService.cpp
index ac10acea1c5f..0729917c1081 100644
--- a/dom/power/PowerManagerService.cpp
+++ b/dom/power/PowerManagerService.cpp
@@ -248,6 +248,6 @@ PowerManagerService::NewWakeLockOnBehalfOfProcess(const nsAString& aTopic,
   return wakelock.forget();
 }
 
-} // power
-} // dom
-} // mozilla
+} // namespace power
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/power/WakeLock.cpp b/dom/power/WakeLock.cpp
index ab319d3c2b77..eddec9973a37 100644
--- a/dom/power/WakeLock.cpp
+++ b/dom/power/WakeLock.cpp
@@ -282,5 +282,5 @@ WakeLock::GetParentObject() const
   return window;
 }
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/promise/Promise.cpp b/dom/promise/Promise.cpp
index 48a7498ca348..b33515be3f07 100644
--- a/dom/promise/Promise.cpp
+++ b/dom/promise/Promise.cpp
@@ -39,7 +39,7 @@ namespace dom {
 namespace {
 // Generator used by Promise::GetID.
 Atomic<uintptr_t> gIDGenerator(0);
-}
+} // namespace
 
 using namespace workers;
 
@@ -167,7 +167,7 @@ GetPromise(JSContext* aCx, JS::Handle<JSObject*> aFunc)
   UNWRAP_OBJECT(Promise, &promiseVal.toObject(), promise);
   return promise;
 }
-};
+} // namespace
 
 // Runnable to resolve thenables.
 // Equivalent to the specification's ResolvePromiseViaThenableTask.
diff --git a/dom/promise/PromiseDebugging.h b/dom/promise/PromiseDebugging.h
index ad31ba0c9459..ad3bfe1ef1a9 100644
--- a/dom/promise/PromiseDebugging.h
+++ b/dom/promise/PromiseDebugging.h
@@ -18,7 +18,7 @@ class ErrorResult;
 namespace dom {
 namespace workers {
 class WorkerPrivate;
-}
+} // namespace workers
 
 class Promise;
 struct PromiseDebuggingStateHolder;
diff --git a/dom/promise/PromiseWorkerProxy.h b/dom/promise/PromiseWorkerProxy.h
index db87589573ed..ff0499ea2047 100644
--- a/dom/promise/PromiseWorkerProxy.h
+++ b/dom/promise/PromiseWorkerProxy.h
@@ -22,7 +22,7 @@ class Promise;
 
 namespace workers {
 class WorkerPrivate;
-}
+} // namespace workers
 
 // A proxy to catch the resolved/rejected Promise's result from the main thread
 // and resolve/reject that on the worker thread eventually.
diff --git a/dom/quota/QuotaManager.cpp b/dom/quota/QuotaManager.cpp
index 0362716fafa4..a09f81bff21e 100644
--- a/dom/quota/QuotaManager.cpp
+++ b/dom/quota/QuotaManager.cpp
@@ -132,7 +132,7 @@ enum AppId {
  * Quota manager class declarations
  ******************************************************************************/
 
-} // anonymous namespace
+} // namespace
 
 class DirectoryLockImpl final
   : public DirectoryLock
@@ -275,7 +275,7 @@ namespace {
  * Local class declarations
  ******************************************************************************/
 
-} // anonymous namespace
+} // namespace
 
 class OriginInfo final
 {
@@ -838,7 +838,7 @@ AssertNoUnderflow(T aDest, U aArg)
   MOZ_ASSERT(uint64_t(aDest) >= uint64_t(aArg));
 }
 
-} // anonymous namespace
+} // namespace
 
 bool
 IsOnIOThread()
@@ -1602,7 +1602,7 @@ GetTemporaryStorageLimit(nsIFile* aDirectory, uint64_t aCurrentUsage,
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 /*******************************************************************************
  * Directory lock
@@ -2843,7 +2843,7 @@ MaybeRemoveCorruptDirectory(const nsAString& aLeafName, nsIFile* aDir)
 #endif // NIGHTLY_BUILD
 }
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 QuotaManager::InitializeOrigin(PersistenceType aPersistenceType,
diff --git a/dom/quota/QuotaManager.h b/dom/quota/QuotaManager.h
index 58c3a1fc85a8..bfdc8cc99c0a 100644
--- a/dom/quota/QuotaManager.h
+++ b/dom/quota/QuotaManager.h
@@ -34,8 +34,8 @@ class nsIRunnable;
 namespace mozilla {
 namespace dom {
 class OptionalContentId;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 BEGIN_QUOTA_NAMESPACE
 
diff --git a/dom/requestsync/RequestSyncWifiService.cpp b/dom/requestsync/RequestSyncWifiService.cpp
index 34db33ee16df..2036fc6eeab5 100644
--- a/dom/requestsync/RequestSyncWifiService.cpp
+++ b/dom/requestsync/RequestSyncWifiService.cpp
@@ -21,7 +21,7 @@ namespace {
 
 StaticRefPtr<RequestSyncWifiService> sService;
 
-} // anonymous namespace
+} // namespace
 
 /* static */ void
 RequestSyncWifiService::Init()
@@ -63,5 +63,5 @@ RequestSyncWifiService::Notify(const hal::NetworkInformation& aNetworkInfo)
   }
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/requestsync/RequestSyncWifiService.h b/dom/requestsync/RequestSyncWifiService.h
index 0bbee37043df..baa40c955f65 100644
--- a/dom/requestsync/RequestSyncWifiService.h
+++ b/dom/requestsync/RequestSyncWifiService.h
@@ -37,7 +37,7 @@ private:
   bool mIsWifi;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_RequestSyncWifiService_h
diff --git a/dom/security/nsCSPUtils.h b/dom/security/nsCSPUtils.h
index 970b36649205..64d7e3030b64 100644
--- a/dom/security/nsCSPUtils.h
+++ b/dom/security/nsCSPUtils.h
@@ -19,8 +19,8 @@
 namespace mozilla {
 namespace dom {
   struct CSP;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /* =============== Logging =================== */
 
diff --git a/dom/smil/nsISMILAttr.h b/dom/smil/nsISMILAttr.h
index a4b1ff57027b..de65a42bbd8b 100644
--- a/dom/smil/nsISMILAttr.h
+++ b/dom/smil/nsISMILAttr.h
@@ -16,8 +16,8 @@ class nsAString;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 ////////////////////////////////////////////////////////////////////////
 // nsISMILAttr: A variable targeted by SMIL for animation and can therefore have
diff --git a/dom/smil/nsSMILAnimationController.h b/dom/smil/nsSMILAnimationController.h
index 32bb00620993..6e77cf141199 100644
--- a/dom/smil/nsSMILAnimationController.h
+++ b/dom/smil/nsSMILAnimationController.h
@@ -26,8 +26,8 @@ namespace mozilla {
 class RestyleTracker;
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //----------------------------------------------------------------------
 // nsSMILAnimationController
diff --git a/dom/smil/nsSMILAnimationFunction.h b/dom/smil/nsSMILAnimationFunction.h
index 732a4e76dd72..a5ce08c7d09f 100644
--- a/dom/smil/nsSMILAnimationFunction.h
+++ b/dom/smil/nsSMILAnimationFunction.h
@@ -22,8 +22,8 @@
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //----------------------------------------------------------------------
 // nsSMILAnimationFunction
diff --git a/dom/smil/nsSMILParserUtils.cpp b/dom/smil/nsSMILParserUtils.cpp
index 3b4efb80ea34..21e630aab1ae 100644
--- a/dom/smil/nsSMILParserUtils.cpp
+++ b/dom/smil/nsSMILParserUtils.cpp
@@ -478,7 +478,7 @@ ParseElementBaseTimeValueSpec(const nsAString& aSpec,
   return true;
 }
 
-} // end anonymous namespace block
+} // namespace
 
 //------------------------------------------------------------------------------
 // Implementation
diff --git a/dom/smil/nsSMILParserUtils.h b/dom/smil/nsSMILParserUtils.h
index ba83565ce6be..c80fd98a283f 100644
--- a/dom/smil/nsSMILParserUtils.h
+++ b/dom/smil/nsSMILParserUtils.h
@@ -20,8 +20,8 @@ class nsSMILTimeValueSpecParams;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * Common parsing utilities for the SMIL module. There is little re-use here; it
diff --git a/dom/smil/nsSMILTimedElement.cpp b/dom/smil/nsSMILTimedElement.cpp
index 0b158ca496cf..8d482c71106e 100644
--- a/dom/smil/nsSMILTimedElement.cpp
+++ b/dom/smil/nsSMILTimedElement.cpp
@@ -108,7 +108,7 @@ namespace
       return EventDispatcher::Dispatch(mTarget, context, &event);
     }
   };
-}
+} // namespace
 
 //----------------------------------------------------------------------
 // Helper class: AutoIntervalUpdateBatcher
@@ -492,7 +492,7 @@ namespace
   private:
     const nsSMILTimeValueSpec* mCreator;
   };
-}
+} // namespace
 
 void
 nsSMILTimedElement::RemoveInstanceTimesForCreator(
@@ -776,7 +776,7 @@ namespace
                "Dynamic instance time should be unlinked from its creator");
     return !aInstanceTime->IsDynamic() && !aInstanceTime->ShouldPreserve();
   }
-}
+} // namespace
 
 void
 nsSMILTimedElement::Rewind()
@@ -818,7 +818,7 @@ namespace
   {
     return true;
   }
-}
+} // namespace
 
 bool
 nsSMILTimedElement::SetIsDisabled(bool aIsDisabled)
@@ -843,7 +843,7 @@ namespace
   {
     return !aInstanceTime->FromDOM() && !aInstanceTime->ShouldPreserve();
   }
-}
+} // namespace
 
 bool
 nsSMILTimedElement::SetAttr(nsIAtom* aAttribute, const nsAString& aValue,
@@ -1349,7 +1349,7 @@ namespace
   private:
     nsSMILTimedElement::RemovalTestFunction mFunction;
   };
-}
+} // namespace
 
 void
 nsSMILTimedElement::ClearSpecs(TimeValueSpecList& aSpecs,
@@ -1435,7 +1435,7 @@ namespace
   private:
     const nsSMILInstanceTime* mCurrentIntervalBegin;
   };
-}
+} // namespace
 
 void
 nsSMILTimedElement::Reset()
@@ -1648,7 +1648,7 @@ namespace
     uint32_t mThreshold;
     nsTArray<const nsSMILInstanceTime *>& mTimesToKeep;
   };
-}
+} // namespace
 
 void
 nsSMILTimedElement::FilterInstanceTimes(InstanceTimeList& aList)
diff --git a/dom/smil/nsSMILTimedElement.h b/dom/smil/nsSMILTimedElement.h
index 74e91e656b03..2213173402b8 100644
--- a/dom/smil/nsSMILTimedElement.h
+++ b/dom/smil/nsSMILTimedElement.h
@@ -28,8 +28,8 @@ class nsIAtom;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //----------------------------------------------------------------------
 // nsSMILTimedElement
diff --git a/dom/storage/DOMStorage.cpp b/dom/storage/DOMStorage.cpp
index 5594afac5415..a2dd80314651 100644
--- a/dom/storage/DOMStorage.cpp
+++ b/dom/storage/DOMStorage.cpp
@@ -199,7 +199,7 @@ StorageNotifierRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 DOMStorage::BroadcastChangeNotification(const nsSubstring& aKey,
@@ -338,5 +338,5 @@ DOMStorage::GetSupportedNames(unsigned, nsTArray<nsString>& aKeys)
   mCache->GetKeys(this, aKeys);
 }
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/storage/DOMStorage.h b/dom/storage/DOMStorage.h
index eed7261dc873..8f25e14cfa11 100644
--- a/dom/storage/DOMStorage.h
+++ b/dom/storage/DOMStorage.h
@@ -161,7 +161,7 @@ private:
                                    const nsSubstring& aNewValue);
 };
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif /* nsDOMStorage_h___ */
diff --git a/dom/storage/DOMStorageCache.cpp b/dom/storage/DOMStorageCache.cpp
index 82f7bd41188c..5e28549191e7 100644
--- a/dom/storage/DOMStorageCache.cpp
+++ b/dom/storage/DOMStorageCache.cpp
@@ -26,7 +26,7 @@ namespace dom {
 DOMStorageDBBridge* DOMStorageCache::sDatabase = nullptr;
 bool DOMStorageCache::sDatabaseDown = false;
 
-namespace { // anon
+namespace {
 
 const uint32_t kDefaultSet = 0;
 const uint32_t kPrivateSet = 1;
@@ -52,7 +52,7 @@ GetDataSetIndex(const DOMStorage* aStorage)
   return GetDataSetIndex(aStorage->IsPrivate(), aStorage->IsSessionOnly());
 }
 
-} // anon
+} // namespace
 
 // DOMStorageCacheBridge
 
@@ -151,7 +151,7 @@ DOMStorageCache::Persist(const DOMStorage* aStorage) const
          !aStorage->IsPrivate();
 }
 
-namespace { // anon
+namespace {
 
 PLDHashOperator
 CloneSetData(const nsAString& aKey, const nsString aValue, void* aArg)
@@ -162,7 +162,7 @@ CloneSetData(const nsAString& aKey, const nsString aValue, void* aArg)
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 DOMStorageCache::Data&
 DOMStorageCache::DataSet(const DOMStorage* aStorage)
@@ -237,7 +237,7 @@ DOMStorageCache::Preload()
   sDatabase->AsyncPreload(this);
 }
 
-namespace { // anon
+namespace {
 
 // This class is passed to timer as a tick observer.  It refers the cache
 // and keeps it alive for a time.
@@ -262,7 +262,7 @@ public:
 
 NS_IMPL_ISUPPORTS(DOMStorageCacheHolder, nsITimerCallback)
 
-} // anon
+} // namespace
 
 void
 DOMStorageCache::KeepAlive()
@@ -294,7 +294,7 @@ DOMStorageCache::KeepAlive()
   mKeepAliveTimer.swap(timer);
 }
 
-namespace { // anon
+namespace {
 
 // The AutoTimer provided by telemetry headers is only using static,
 // i.e. compile time known ID, but here we know the ID only at run time.
@@ -311,7 +311,7 @@ private:
   const TimeStamp start;
 };
 
-} // anon
+} // namespace
 
 void
 DOMStorageCache::WaitForPreload(Telemetry::ID aTelemetryID)
@@ -363,7 +363,7 @@ DOMStorageCache::GetLength(const DOMStorage* aStorage, uint32_t* aRetval)
   return NS_OK;
 }
 
-namespace { // anon
+namespace {
 
 class IndexFinderData
 {
@@ -391,7 +391,7 @@ FindKeyOrder(const nsAString& aKey, const nsString aValue, void* aArg)
   return PL_DHASH_STOP;
 }
 
-} // anon
+} // namespace
 
 nsresult
 DOMStorageCache::GetKey(const DOMStorage* aStorage, uint32_t aIndex, nsAString& aRetval)
@@ -412,7 +412,7 @@ DOMStorageCache::GetKey(const DOMStorage* aStorage, uint32_t aIndex, nsAString&
   return NS_OK;
 }
 
-namespace { // anon
+namespace {
 
 static PLDHashOperator
 KeysArrayBuilder(const nsAString& aKey, const nsString aValue, void* aArg)
@@ -423,7 +423,7 @@ KeysArrayBuilder(const nsAString& aKey, const nsString aValue, void* aArg)
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 void
 DOMStorageCache::GetKeys(const DOMStorage* aStorage, nsTArray<nsString>& aKeys)
@@ -700,7 +700,7 @@ DOMStorageUsage::DOMStorageUsage(const nsACString& aScope)
   mUsage[kDefaultSet] = mUsage[kPrivateSet] = mUsage[kSessionSet] = 0LL;
 }
 
-namespace { // anon
+namespace {
 
 class LoadUsageRunnable : public nsRunnable
 {
@@ -717,7 +717,7 @@ private:
   NS_IMETHOD Run() { *mTarget = mDelta; return NS_OK; }
 };
 
-} // anon
+} // namespace
 
 void
 DOMStorageUsage::LoadUsage(const int64_t aUsage)
@@ -817,5 +817,5 @@ DOMStorageCache::StopDatabase()
   return rv;
 }
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/storage/DOMStorageCache.h b/dom/storage/DOMStorageCache.h
index a64b62f5e647..182b7c71e36d 100644
--- a/dom/storage/DOMStorageCache.h
+++ b/dom/storage/DOMStorageCache.h
@@ -264,7 +264,7 @@ private:
   int64_t mUsage[DOMStorageCache::kDataSetCount];
 };
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/storage/DOMStorageDBThread.cpp b/dom/storage/DOMStorageDBThread.cpp
index 1264bdc0eb99..d0293eff2b9c 100644
--- a/dom/storage/DOMStorageDBThread.cpp
+++ b/dom/storage/DOMStorageDBThread.cpp
@@ -170,7 +170,7 @@ DOMStorageDBThread::ShouldPreloadScope(const nsACString& aScope)
   return mScopesHavingData.Contains(aScope);
 }
 
-namespace { // anon
+namespace {
 
 PLDHashOperator
 GetScopesHavingDataEnum(nsCStringHashKey* aKey, void* aArg)
@@ -181,7 +181,7 @@ GetScopesHavingDataEnum(nsCStringHashKey* aKey, void* aArg)
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 void
 DOMStorageDBThread::GetScopesHavingData(InfallibleTArray<nsCString>* aScopes)
@@ -391,7 +391,7 @@ DOMStorageDBThread::ThreadObserver::AfterProcessNextEvent(nsIThreadInternal *thr
 extern void
 ReverseString(const nsCSubstring& aSource, nsCSubstring& aResult);
 
-namespace { // anon
+namespace {
 
 class nsReverseStringSQLFunction final : public mozIStorageFunction
 {
@@ -423,12 +423,11 @@ nsReverseStringSQLFunction::OnFunctionCall(
   rv = outVar->SetAsAUTF8String(result);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  *aResult = outVar.get();
-  outVar.forget();
+  outVar.forget(aResult);
   return NS_OK;
 }
 
-} // anon
+} // namespace
 
 nsresult
 DOMStorageDBThread::OpenDatabaseConnection()
@@ -1076,7 +1075,7 @@ DOMStorageDBThread::PendingOperations::HasTasks()
   return !!mUpdates.Count() || !!mClears.Count();
 }
 
-namespace { // anon
+namespace {
 
 PLDHashOperator
 ForgetUpdatesForScope(const nsACString& aMapping,
@@ -1098,7 +1097,7 @@ ForgetUpdatesForScope(const nsACString& aMapping,
   return PL_DHASH_REMOVE;
 }
 
-} // anon
+} // namespace
 
 bool
 DOMStorageDBThread::PendingOperations::CheckForCoalesceOpportunity(DBOperation* aNewOp,
@@ -1185,7 +1184,7 @@ DOMStorageDBThread::PendingOperations::Add(DOMStorageDBThread::DBOperation* aOpe
   }
 }
 
-namespace { // anon
+namespace {
 
 PLDHashOperator
 CollectTasks(const nsACString& aMapping, nsAutoPtr<DOMStorageDBThread::DBOperation>& aOperation, void* aArg)
@@ -1197,7 +1196,7 @@ CollectTasks(const nsACString& aMapping, nsAutoPtr<DOMStorageDBThread::DBOperati
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 bool
 DOMStorageDBThread::PendingOperations::Prepare()
@@ -1268,7 +1267,7 @@ DOMStorageDBThread::PendingOperations::Finalize(nsresult aRv)
   return true;
 }
 
-namespace { // anon
+namespace {
 
 class FindPendingOperationForScopeData
 {
@@ -1306,7 +1305,7 @@ FindPendingClearForScope(const nsACString& aMapping,
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 bool
 DOMStorageDBThread::PendingOperations::IsScopeClearPending(const nsACString& aScope)
@@ -1331,7 +1330,7 @@ DOMStorageDBThread::PendingOperations::IsScopeClearPending(const nsACString& aSc
   return false;
 }
 
-namespace { // anon
+namespace {
 
 PLDHashOperator
 FindPendingUpdateForScope(const nsACString& aMapping,
@@ -1352,7 +1351,7 @@ FindPendingUpdateForScope(const nsACString& aMapping,
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 bool
 DOMStorageDBThread::PendingOperations::IsScopeUpdatePending(const nsACString& aScope)
@@ -1377,5 +1376,5 @@ DOMStorageDBThread::PendingOperations::IsScopeUpdatePending(const nsACString& aS
   return false;
 }
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/storage/DOMStorageDBThread.h b/dom/storage/DOMStorageDBThread.h
index ffdc03f44b91..a2f6889f9119 100644
--- a/dom/storage/DOMStorageDBThread.h
+++ b/dom/storage/DOMStorageDBThread.h
@@ -371,7 +371,7 @@ private:
   void ThreadFunc();
 };
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif /* DOMStorageDBThread_h___ */
diff --git a/dom/storage/DOMStorageIPC.cpp b/dom/storage/DOMStorageIPC.cpp
index 34fb7e1a8e1c..b5001a96e00d 100644
--- a/dom/storage/DOMStorageIPC.cpp
+++ b/dom/storage/DOMStorageIPC.cpp
@@ -289,7 +289,7 @@ DOMStorageDBParent::ReleaseIPDLReference()
   Release();
 }
 
-namespace { // anon
+namespace {
 
 class SendInitialChildDataRunnable : public nsRunnable
 {
@@ -333,7 +333,7 @@ private:
   nsRefPtr<DOMStorageDBParent> mParent;
 };
 
-} // anon
+} // namespace
 
 DOMStorageDBParent::DOMStorageDBParent()
 : mIPCOpen(false)
@@ -411,7 +411,7 @@ DOMStorageDBParent::RecvAsyncGetUsage(const nsCString& aScope)
   return true;
 }
 
-namespace { // anon
+namespace {
 
 // We need another implementation of DOMStorageCacheBridge to do
 // synchronous IPC preload.  This class just receives Load* notifications
@@ -481,7 +481,7 @@ private:
   uint32_t mLoadedCount;
 };
 
-} // anon
+} // namespace
 
 bool
 DOMStorageDBParent::RecvPreload(const nsCString& aScope,
@@ -604,7 +604,7 @@ DOMStorageDBParent::Observe(const char* aTopic,
   return NS_OK;
 }
 
-namespace { // anon
+namespace {
 
 // Results must be sent back on the main thread
 class LoadRunnable : public nsRunnable
@@ -665,7 +665,7 @@ private:
   }
 };
 
-} // anon
+} // namespace
 
 // DOMStorageDBParent::CacheParentBridge
 
@@ -708,7 +708,7 @@ DOMStorageDBParent::CacheParentBridge::LoadWait()
 
 // DOMStorageDBParent::UsageParentBridge
 
-namespace { // anon
+namespace {
 
 class UsageRunnable : public nsRunnable
 {
@@ -735,7 +735,7 @@ private:
   int64_t mUsage;
 };
 
-} // anon
+} // namespace
 
 void
 DOMStorageDBParent::UsageParentBridge::LoadUsage(const int64_t aUsage)
@@ -744,5 +744,5 @@ DOMStorageDBParent::UsageParentBridge::LoadUsage(const int64_t aUsage)
   NS_DispatchToMainThread(r);
 }
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/storage/DOMStorageIPC.h b/dom/storage/DOMStorageIPC.h
index 2fa439b2ef12..73f575e537a6 100644
--- a/dom/storage/DOMStorageIPC.h
+++ b/dom/storage/DOMStorageIPC.h
@@ -199,7 +199,7 @@ private:
   bool mIPCOpen;
 };
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/storage/DOMStorageManager.cpp b/dom/storage/DOMStorageManager.cpp
index 2db3e30fb737..2c658aa533bf 100644
--- a/dom/storage/DOMStorageManager.cpp
+++ b/dom/storage/DOMStorageManager.cpp
@@ -29,11 +29,11 @@
 namespace mozilla {
 namespace dom {
 
-namespace { // anon
+namespace {
 
 int32_t gQuotaLimit = DEFAULT_QUOTA_LIMIT;
 
-} // anon
+} // namespace
 
 DOMLocalStorageManager*
 DOMLocalStorageManager::sSelf = nullptr;
@@ -121,7 +121,7 @@ DOMStorageManager::~DOMStorageManager()
   }
 }
 
-namespace { // anon
+namespace {
 
 nsresult
 CreateScopeKey(nsIPrincipal* aPrincipal,
@@ -232,7 +232,7 @@ CreateQuotaDBKey(nsIPrincipal* aPrincipal,
   return NS_OK;
 }
 
-} // anon
+} // namespace
 
 DOMStorageCache*
 DOMStorageManager::GetCache(const nsACString& aScope) const
@@ -472,7 +472,7 @@ DOMStorageManager::GetLocalStorageForPrincipal(nsIPrincipal* aPrincipal,
   return CreateStorage(nullptr, aPrincipal, aDocumentURI, aPrivate, aRetval);
 }
 
-namespace { // anon
+namespace {
 
 class ClearCacheEnumeratorData
 {
@@ -485,7 +485,7 @@ public:
   nsCString mKeyPrefix;
 };
 
-} // anon
+} // namespace
 
 PLDHashOperator
 DOMStorageManager::ClearCacheEnumerator(DOMStorageCacheHashKey* aEntry, void* aClosure)
@@ -657,5 +657,5 @@ DOMSessionStorageManager::DOMSessionStorageManager()
   }
 }
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/storage/DOMStorageManager.h b/dom/storage/DOMStorageManager.h
index 99582017fdf4..385e9f7cdf76 100644
--- a/dom/storage/DOMStorageManager.h
+++ b/dom/storage/DOMStorageManager.h
@@ -139,7 +139,7 @@ public:
   DOMSessionStorageManager();
 };
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif /* nsDOMStorageManager_h__ */
diff --git a/dom/storage/DOMStorageObserver.cpp b/dom/storage/DOMStorageObserver.cpp
index 51806c97a8a8..29a20ed98722 100644
--- a/dom/storage/DOMStorageObserver.cpp
+++ b/dom/storage/DOMStorageObserver.cpp
@@ -342,5 +342,5 @@ DOMStorageObserver::Observe(nsISupports* aSubject,
   return NS_ERROR_UNEXPECTED;
 }
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/storage/DOMStorageObserver.h b/dom/storage/DOMStorageObserver.h
index 33a977d23c43..b4f63a02076c 100644
--- a/dom/storage/DOMStorageObserver.h
+++ b/dom/storage/DOMStorageObserver.h
@@ -57,7 +57,7 @@ private:
   nsCOMPtr<nsITimer> mDBThreadStartDelayTimer;
 };
 
-} // ::dom
-} // ::mozilla
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/svg/DOMSVGPoint.cpp b/dom/svg/DOMSVGPoint.cpp
index 89424413a7b7..20da6ae04b54 100644
--- a/dom/svg/DOMSVGPoint.cpp
+++ b/dom/svg/DOMSVGPoint.cpp
@@ -51,7 +51,7 @@ private:
   MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-}
+} // namespace mozilla
 
 float
 DOMSVGPoint::X()
diff --git a/dom/svg/DOMSVGPoint.h b/dom/svg/DOMSVGPoint.h
index 47b6eab4c9f3..d322f1123909 100644
--- a/dom/svg/DOMSVGPoint.h
+++ b/dom/svg/DOMSVGPoint.h
@@ -22,7 +22,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGMatrix;
-}
+} // namespace dom
 
 /**
  * Class DOMSVGPoint
diff --git a/dom/svg/DOMSVGTransformList.cpp b/dom/svg/DOMSVGTransformList.cpp
index 1c37a2a5d6d8..87930c994db2 100644
--- a/dom/svg/DOMSVGTransformList.cpp
+++ b/dom/svg/DOMSVGTransformList.cpp
@@ -29,7 +29,7 @@ void UpdateListIndicesFromIndex(
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/dom/svg/DOMSVGTransformList.h b/dom/svg/DOMSVGTransformList.h
index b019bbe66a63..89a9b0a251f5 100644
--- a/dom/svg/DOMSVGTransformList.h
+++ b/dom/svg/DOMSVGTransformList.h
@@ -23,7 +23,7 @@ namespace mozilla {
 namespace dom {
 class SVGMatrix;
 class SVGTransform;
-}
+} // namespace dom
 
 /**
  * Class DOMSVGTransformList
diff --git a/dom/svg/SVGAnimateElement.cpp b/dom/svg/SVGAnimateElement.cpp
index b249e9cab3b2..2ba4c5703e8a 100644
--- a/dom/svg/SVGAnimateElement.cpp
+++ b/dom/svg/SVGAnimateElement.cpp
@@ -39,6 +39,6 @@ SVGAnimateElement::AnimationFunction()
   return mAnimationFunction;
 }
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
diff --git a/dom/svg/SVGAnimatedLengthList.h b/dom/svg/SVGAnimatedLengthList.h
index 927587a75576..447e947a0d4a 100644
--- a/dom/svg/SVGAnimatedLengthList.h
+++ b/dom/svg/SVGAnimatedLengthList.h
@@ -19,7 +19,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGAnimationElement;
-}
+} // namespace dom
 
 /**
  * Class SVGAnimatedLengthList
diff --git a/dom/svg/SVGAnimatedNumberList.h b/dom/svg/SVGAnimatedNumberList.h
index 1a5946f12155..6ef713c9d567 100644
--- a/dom/svg/SVGAnimatedNumberList.h
+++ b/dom/svg/SVGAnimatedNumberList.h
@@ -19,7 +19,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGAnimationElement;
-}
+} // namespace dom
 
 /**
  * Class SVGAnimatedNumberList
diff --git a/dom/svg/SVGAnimatedPathSegList.h b/dom/svg/SVGAnimatedPathSegList.h
index 62f785d95fa3..42136db92cd5 100644
--- a/dom/svg/SVGAnimatedPathSegList.h
+++ b/dom/svg/SVGAnimatedPathSegList.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGAnimationElement;
-}
+} // namespace dom
 
 /**
  * Class SVGAnimatedPathSegList
diff --git a/dom/svg/SVGAnimatedPointList.h b/dom/svg/SVGAnimatedPointList.h
index 6a7ade3ece6e..57f9bc06bfcd 100644
--- a/dom/svg/SVGAnimatedPointList.h
+++ b/dom/svg/SVGAnimatedPointList.h
@@ -19,7 +19,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGAnimationElement;
-}
+} // namespace dom
 
 /**
  * Class SVGAnimatedPointList
diff --git a/dom/svg/SVGAnimatedPreserveAspectRatio.h b/dom/svg/SVGAnimatedPreserveAspectRatio.h
index 07e7a629dccf..ac9df9139a29 100644
--- a/dom/svg/SVGAnimatedPreserveAspectRatio.h
+++ b/dom/svg/SVGAnimatedPreserveAspectRatio.h
@@ -21,7 +21,7 @@ namespace mozilla {
 namespace dom {
 class DOMSVGAnimatedPreserveAspectRatio;
 class SVGAnimationElement;
-}
+} // namespace dom
 
 class SVGAnimatedPreserveAspectRatio final
 {
diff --git a/dom/svg/SVGAnimationElement.h b/dom/svg/SVGAnimationElement.h
index 99347c9ac3e6..8297a339fb97 100644
--- a/dom/svg/SVGAnimationElement.h
+++ b/dom/svg/SVGAnimationElement.h
@@ -117,7 +117,7 @@ public:
   nsSMILTimedElement   mTimedElement;
 };
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_SVGAnimationElement_h
diff --git a/dom/svg/SVGAttrValueWrapper.h b/dom/svg/SVGAttrValueWrapper.h
index 8224624d49a5..27ec9cb30da0 100644
--- a/dom/svg/SVGAttrValueWrapper.h
+++ b/dom/svg/SVGAttrValueWrapper.h
@@ -28,7 +28,7 @@ class SVGPointList;
 class SVGAnimatedPreserveAspectRatio;
 class SVGStringList;
 class SVGTransformList;
-}
+} // namespace mozilla
 
 namespace mozilla {
 
diff --git a/dom/svg/SVGFEColorMatrixElement.h b/dom/svg/SVGFEColorMatrixElement.h
index aeb5e287049a..19ace41cae0b 100644
--- a/dom/svg/SVGFEColorMatrixElement.h
+++ b/dom/svg/SVGFEColorMatrixElement.h
@@ -67,7 +67,7 @@ public:
   static NumberListInfo sNumberListInfo[1];
 };
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_SVGFEColorMatrixElement_h
diff --git a/dom/svg/SVGFEComponentTransferElement.h b/dom/svg/SVGFEComponentTransferElement.h
index ab08eb5fb277..b3d0177a5404 100644
--- a/dom/svg/SVGFEComponentTransferElement.h
+++ b/dom/svg/SVGFEComponentTransferElement.h
@@ -53,7 +53,7 @@ protected:
   static StringInfo sStringInfo[2];
 };
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_SVGFEComponentTransferElement_h
diff --git a/dom/svg/SVGFragmentIdentifier.h b/dom/svg/SVGFragmentIdentifier.h
index 5942e1586888..2591af698bd1 100644
--- a/dom/svg/SVGFragmentIdentifier.h
+++ b/dom/svg/SVGFragmentIdentifier.h
@@ -15,7 +15,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGSVGElement;
-}
+} // namespace dom
 
 /**
  * Implements support for parsing SVG fragment identifiers
diff --git a/dom/svg/SVGMotionSMILAnimationFunction.h b/dom/svg/SVGMotionSMILAnimationFunction.h
index af69d0866a20..75e64a4ef0a7 100644
--- a/dom/svg/SVGMotionSMILAnimationFunction.h
+++ b/dom/svg/SVGMotionSMILAnimationFunction.h
@@ -24,7 +24,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGMPathElement;
-}
+} // namespace dom
 
 //----------------------------------------------------------------------
 // SVGMotionSMILAnimationFunction
diff --git a/dom/svg/SVGMotionSMILAttr.h b/dom/svg/SVGMotionSMILAttr.h
index 723463adf15f..9fcf52dc2111 100644
--- a/dom/svg/SVGMotionSMILAttr.h
+++ b/dom/svg/SVGMotionSMILAttr.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGAnimationElement;
-}
+} // namespace dom
 
 /**
  * SVGMotionSMILAttr: Implements the nsISMILAttr interface for SMIL animations
diff --git a/dom/svg/SVGMotionSMILType.h b/dom/svg/SVGMotionSMILType.h
index 0aceb4f69471..5f197d90c559 100644
--- a/dom/svg/SVGMotionSMILType.h
+++ b/dom/svg/SVGMotionSMILType.h
@@ -19,7 +19,7 @@ namespace mozilla {
 
 namespace gfx {
 class Matrix;
-}
+} // namespace gfx
 
 /**
  * MotionRotateType: Enum to indicate the type of our "rotate" attribute.
diff --git a/dom/svg/SVGPolylineElement.h b/dom/svg/SVGPolylineElement.h
index f12737c863cb..d5e1052d8be8 100644
--- a/dom/svg/SVGPolylineElement.h
+++ b/dom/svg/SVGPolylineElement.h
@@ -33,7 +33,7 @@ public:
   virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override;
 };
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_SVGPolylineElement_h
diff --git a/dom/svg/SVGTransform.cpp b/dom/svg/SVGTransform.cpp
index f9faff3068c7..daa09644b14b 100644
--- a/dom/svg/SVGTransform.cpp
+++ b/dom/svg/SVGTransform.cpp
@@ -17,7 +17,7 @@
 
 namespace {
   const double kRadPerDegree = 2.0 * M_PI / 360.0;
-}
+} // namespace
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/svg/SVGTransformList.h b/dom/svg/SVGTransformList.h
index 22f0b616e8c0..ed8202bce707 100644
--- a/dom/svg/SVGTransformList.h
+++ b/dom/svg/SVGTransformList.h
@@ -16,7 +16,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGTransform;
-}
+} // namespace dom
 
 /**
  * ATTENTION! WARNING! WATCH OUT!!
diff --git a/dom/svg/nsISVGPoint.h b/dom/svg/nsISVGPoint.h
index 2762aa5024f4..c489411b24f1 100644
--- a/dom/svg/nsISVGPoint.h
+++ b/dom/svg/nsISVGPoint.h
@@ -23,7 +23,7 @@ namespace mozilla {
 
 namespace dom {
 class SVGMatrix;
-}
+} // namespace dom
 
 /**
  * Class nsISVGPoint
diff --git a/dom/svg/nsSVGAngle.h b/dom/svg/nsSVGAngle.h
index 62729e4860a3..29b7d066a98c 100644
--- a/dom/svg/nsSVGAngle.h
+++ b/dom/svg/nsSVGAngle.h
@@ -30,8 +30,8 @@ class nsSVGOrientType;
 class SVGAngle;
 class SVGAnimatedAngle;
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGAngle
 {
diff --git a/dom/svg/nsSVGAnimatedTransformList.h b/dom/svg/nsSVGAnimatedTransformList.h
index c592e4739dd8..c2514d2e83ca 100644
--- a/dom/svg/nsSVGAnimatedTransformList.h
+++ b/dom/svg/nsSVGAnimatedTransformList.h
@@ -21,7 +21,7 @@ namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
 class SVGTransform;
-}
+} // namespace dom
 
 /**
  * Class nsSVGAnimatedTransformList
diff --git a/dom/svg/nsSVGBoolean.h b/dom/svg/nsSVGBoolean.h
index fe7a738baa19..95bfced326eb 100644
--- a/dom/svg/nsSVGBoolean.h
+++ b/dom/svg/nsSVGBoolean.h
@@ -20,8 +20,8 @@ namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
 class SVGAnimatedBoolean;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGBoolean
 {
diff --git a/dom/svg/nsSVGClass.h b/dom/svg/nsSVGClass.h
index df6c4afd705a..8f38ba39f8c5 100644
--- a/dom/svg/nsSVGClass.h
+++ b/dom/svg/nsSVGClass.h
@@ -19,8 +19,8 @@ class nsSVGElement;
 namespace mozilla {
 namespace dom {
 class SVGAnimatedString;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGClass
 {
diff --git a/dom/svg/nsSVGElement.cpp b/dom/svg/nsSVGElement.cpp
index f056ce20daa2..cbfc9454c41c 100644
--- a/dom/svg/nsSVGElement.cpp
+++ b/dom/svg/nsSVGElement.cpp
@@ -1218,7 +1218,7 @@ MappedAttrParser::CreateStyleRule()
   return rule.forget();
 }
 
-} // anonymous namespace
+} // namespace
 
 //----------------------------------------------------------------------
 // Implementation Helpers:
diff --git a/dom/svg/nsSVGElement.h b/dom/svg/nsSVGElement.h
index d8f4198d5918..d86e3c13c704 100644
--- a/dom/svg/nsSVGElement.h
+++ b/dom/svg/nsSVGElement.h
@@ -45,7 +45,7 @@ static const unsigned short SVG_UNIT_TYPE_UNKNOWN           = 0;
 static const unsigned short SVG_UNIT_TYPE_USERSPACEONUSE    = 1;
 static const unsigned short SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
 
-}
+} // namespace dom
 
 class SVGAnimatedNumberList;
 class SVGNumberList;
@@ -60,9 +60,9 @@ class DOMSVGStringList;
 
 namespace gfx {
 class Matrix;
-}
+} // namespace gfx
 
-}
+} // namespace mozilla
 
 class gfxMatrix;
 struct nsSVGEnumMapping;
diff --git a/dom/svg/nsSVGEnum.h b/dom/svg/nsSVGEnum.h
index 462f4f6c0cc0..8c6eb96dfc2b 100644
--- a/dom/svg/nsSVGEnum.h
+++ b/dom/svg/nsSVGEnum.h
@@ -21,8 +21,8 @@ class nsSMILValue;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 typedef uint8_t nsSVGEnumValue;
 
diff --git a/dom/svg/nsSVGFilters.h b/dom/svg/nsSVGFilters.h
index cb96e7309d42..e9673c0c26e8 100644
--- a/dom/svg/nsSVGFilters.h
+++ b/dom/svg/nsSVGFilters.h
@@ -236,7 +236,7 @@ public:
     ComputeLightAttributes(nsSVGFilterInstance* aInstance) = 0;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/dom/svg/nsSVGInteger.h b/dom/svg/nsSVGInteger.h
index ca3c954bd83e..353f7ebb28d4 100644
--- a/dom/svg/nsSVGInteger.h
+++ b/dom/svg/nsSVGInteger.h
@@ -20,8 +20,8 @@ class nsSMILValue;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGInteger
 {
diff --git a/dom/svg/nsSVGIntegerPair.h b/dom/svg/nsSVGIntegerPair.h
index ab12180e6060..6306552a932d 100644
--- a/dom/svg/nsSVGIntegerPair.h
+++ b/dom/svg/nsSVGIntegerPair.h
@@ -20,8 +20,8 @@ class nsSMILValue;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGIntegerPair
 {
diff --git a/dom/svg/nsSVGLength2.h b/dom/svg/nsSVGLength2.h
index 60104c1b3bf3..da6ce671e65d 100644
--- a/dom/svg/nsSVGLength2.h
+++ b/dom/svg/nsSVGLength2.h
@@ -28,8 +28,8 @@ namespace dom {
 class SVGAnimatedLength;
 class SVGAnimationElement;
 class SVGSVGElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 namespace mozilla {
 namespace dom {
@@ -81,8 +81,8 @@ private:
   nsIFrame* mFrame;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGLength2
 {
diff --git a/dom/svg/nsSVGNumber2.h b/dom/svg/nsSVGNumber2.h
index 38be5407c88a..b97556dd4f07 100644
--- a/dom/svg/nsSVGNumber2.h
+++ b/dom/svg/nsSVGNumber2.h
@@ -22,8 +22,8 @@ class nsSMILValue;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGNumber2
 {
diff --git a/dom/svg/nsSVGNumberPair.h b/dom/svg/nsSVGNumberPair.h
index a2ecc63ccd60..5e00b0a5ed98 100644
--- a/dom/svg/nsSVGNumberPair.h
+++ b/dom/svg/nsSVGNumberPair.h
@@ -23,8 +23,8 @@ class nsSMILValue;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsSVGNumberPair
 {
diff --git a/dom/svg/nsSVGPathDataParser.h b/dom/svg/nsSVGPathDataParser.h
index 4eb099516cd8..3a880218d3d9 100644
--- a/dom/svg/nsSVGPathDataParser.h
+++ b/dom/svg/nsSVGPathDataParser.h
@@ -13,7 +13,7 @@
 
 namespace mozilla {
 class SVGPathData;
-}
+} // namespace mozilla
 
 ////////////////////////////////////////////////////////////////////////
 // nsSVGPathDataParser: a simple recursive descent parser that builds
diff --git a/dom/svg/nsSVGPolyElement.h b/dom/svg/nsSVGPolyElement.h
index 9ccebb6083fb..ffcb145c7384 100644
--- a/dom/svg/nsSVGPolyElement.h
+++ b/dom/svg/nsSVGPolyElement.h
@@ -15,7 +15,7 @@ typedef nsSVGPathGeometryElement nsSVGPolyElementBase;
 
 namespace mozilla {
 class DOMSVGPointList;
-}
+} // namespace mozilla
 
 class nsSVGPolyElement : public nsSVGPolyElementBase
 {
diff --git a/dom/svg/nsSVGTransform.cpp b/dom/svg/nsSVGTransform.cpp
index 6bb3f0eeea7b..dc3ea0112121 100644
--- a/dom/svg/nsSVGTransform.cpp
+++ b/dom/svg/nsSVGTransform.cpp
@@ -11,7 +11,7 @@
 
 namespace {
   const double kRadPerDegree = 2.0 * M_PI / 360.0;
-}
+} // namespace
 
 namespace mozilla {
 
diff --git a/dom/svg/nsSVGViewBox.h b/dom/svg/nsSVGViewBox.h
index 443706ed2139..99c6a99ad91a 100644
--- a/dom/svg/nsSVGViewBox.h
+++ b/dom/svg/nsSVGViewBox.h
@@ -22,8 +22,8 @@ class nsSMILValue;
 namespace mozilla {
 namespace dom {
 class SVGAnimationElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 struct nsSVGViewBoxRect
 {
diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp
index ca98d2182297..1c6c90c0e2b1 100644
--- a/dom/system/OSFileConstants.cpp
+++ b/dom/system/OSFileConstants.cpp
@@ -180,7 +180,7 @@ Paths* gPaths = nullptr;
  * on the main thread.
  */
 uint32_t gUserUmask = 0;
-}
+} // namespace
 
 /**
  * Return the path to one of the special directories.
diff --git a/dom/system/OSFileConstants.h b/dom/system/OSFileConstants.h
index d6e3463e69c8..855184d4d28d 100644
--- a/dom/system/OSFileConstants.h
+++ b/dom/system/OSFileConstants.h
@@ -55,6 +55,6 @@ private:
   ~OSFileConstantsService();
 };
 
-}
+} // namespace mozilla
 
 #endif // mozilla_osfileconstants_h__
diff --git a/dom/system/gonk/AutoMounterSetting.cpp b/dom/system/gonk/AutoMounterSetting.cpp
index 8045f94e1820..3460bd6b2fbb 100644
--- a/dom/system/gonk/AutoMounterSetting.cpp
+++ b/dom/system/gonk/AutoMounterSetting.cpp
@@ -280,5 +280,5 @@ AutoMounterSetting::Observe(nsISupports* aSubject,
   return NS_OK;
 }
 
-}   // namespace system
-}   // namespace mozilla
+} // namespace system
+} // namespace mozilla
diff --git a/dom/system/gonk/AutoMounterSetting.h b/dom/system/gonk/AutoMounterSetting.h
index 9a874ee78066..7972de379ef2 100644
--- a/dom/system/gonk/AutoMounterSetting.h
+++ b/dom/system/gonk/AutoMounterSetting.h
@@ -31,8 +31,8 @@ private:
   int32_t mStatus;
 };
 
-}   // namespace system
-}   // namespace mozilla
+} // namespace system
+} // namespace mozilla
 
 #endif  // mozilla_system_automountersetting_h__
 
diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp
index 95fbfde37f49..9dbcfce6d2ed 100644
--- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp
+++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp
@@ -539,7 +539,7 @@ ConvertToGpsRefLocationType(const nsAString& aConnectionType)
   }
   return AGPS_REF_LOCATION_TYPE_GSM_CELLID;
 }
-} // anonymous namespace
+} // namespace
 
 void
 GonkGPSGeolocationProvider::SetReferenceLocation()
@@ -1026,7 +1026,7 @@ ConvertToGpsNetworkType(int aNetworkInterfaceType)
       return -1;
   }
 }
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 GonkGPSGeolocationProvider::Observe(nsISupports* aSubject,
diff --git a/dom/system/gonk/SystemWorkerManager.cpp b/dom/system/gonk/SystemWorkerManager.cpp
index 1a67d0e9fd05..a5622f57c995 100644
--- a/dom/system/gonk/SystemWorkerManager.cpp
+++ b/dom/system/gonk/SystemWorkerManager.cpp
@@ -52,7 +52,7 @@ NS_DEFINE_CID(kWifiWorkerCID, NS_WIFIWORKER_CID);
 // Doesn't carry a reference, we're owned by services.
 SystemWorkerManager *gInstance = nullptr;
 
-} // anonymous namespace
+} // namespace
 
 SystemWorkerManager::SystemWorkerManager()
   : mShutdown(false)
diff --git a/dom/system/gonk/TimeZoneSettingObserver.cpp b/dom/system/gonk/TimeZoneSettingObserver.cpp
index e224bd865038..512f79908889 100644
--- a/dom/system/gonk/TimeZoneSettingObserver.cpp
+++ b/dom/system/gonk/TimeZoneSettingObserver.cpp
@@ -223,7 +223,7 @@ TimeZoneSettingObserver::Observe(nsISupports *aSubject,
   return SetTimeZone(setting.mValue, cx);
 }
 
-} // anonymous namespace
+} // namespace
 
 static mozilla::StaticRefPtr<TimeZoneSettingObserver> sTimeZoneSettingObserver;
 namespace mozilla {
diff --git a/dom/system/nsDeviceSensors.h b/dom/system/nsDeviceSensors.h
index 60f006bb4e16..660658c3cd95 100644
--- a/dom/system/nsDeviceSensors.h
+++ b/dom/system/nsDeviceSensors.h
@@ -22,8 +22,8 @@ class nsIDOMWindow;
 namespace mozilla {
 namespace dom {
 class EventTarget;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsDeviceSensors : public nsIDeviceSensors, public mozilla::hal::ISensorObserver
 {
diff --git a/dom/telephony/ipc/TelephonyIPCService.cpp b/dom/telephony/ipc/TelephonyIPCService.cpp
index 73d398c78154..5d612227575a 100644
--- a/dom/telephony/ipc/TelephonyIPCService.cpp
+++ b/dom/telephony/ipc/TelephonyIPCService.cpp
@@ -37,7 +37,7 @@ getDefaultServiceId()
   return id;
 }
 
-} // Anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(TelephonyIPCService,
                   nsITelephonyService,
diff --git a/dom/tests/mochitest/chrome/test_MozDomFullscreen_event.xul b/dom/tests/mochitest/chrome/test_MozDomFullscreen_event.xul
index 076e9db4e49c..7bb5f2352aea 100644
--- a/dom/tests/mochitest/chrome/test_MozDomFullscreen_event.xul
+++ b/dom/tests/mochitest/chrome/test_MozDomFullscreen_event.xul
@@ -32,8 +32,12 @@ var principal = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
                   .getNoAppCodebasePrincipal(uri);
 pm.removeFromPrincipal(principal, "fullscreen");
 
-SpecialPowers.pushPrefEnv({"set": [['full-screen-api.enabled', true],
-                                   ['full-screen-api.allow-trusted-requests-only', false]]}, setup);
+SpecialPowers.pushPrefEnv({"set": [
+  ['full-screen-api.enabled', true],
+  ['full-screen-api.allow-trusted-requests-only', false],
+  ['full-screen-api.transition-duration.enter', '0 0'],
+  ['full-screen-api.transition-duration.leave', '0 0']
+]}, setup);
 
 function setup() {
    newwindow = window.open("MozDomFullscreen_chrome.xul", "_blank","chrome,resizable=yes,width=400,height=400");
diff --git a/dom/tests/mochitest/chrome/window_focus_docnav.xul b/dom/tests/mochitest/chrome/window_focus_docnav.xul
index b51ae340cded..d2b6e50fef75 100644
--- a/dom/tests/mochitest/chrome/window_focus_docnav.xul
+++ b/dom/tests/mochitest/chrome/window_focus_docnav.xul
@@ -9,13 +9,13 @@
 
 <textbox id="textbox"/>
 
-<panel id="panel2" onpopupshown="runTests(this, 2);" onpopuphidden="document.getElementById('panel').hidePopup()">
-  <textbox id="p2textbox" value="Popup2"/>
-</panel>
 <panel id="panel" onpopupshown="runTests(this, 1);"
                   onpopuphidden="done()">
   <textbox id="p1textbox" value="Popup1"/>
 </panel>
+<panel id="panel2" onpopupshown="runTests(this, 2);" onpopuphidden="document.getElementById('panel').hidePopup()">
+  <textbox id="p2textbox" value="Popup2"/>
+</panel>
 
 <browser id="browser" type="content" src="focus_frameset.html" width="500" height="400"/>
 
@@ -62,11 +62,11 @@ function runTests(panel, popupCount)
   var childwin = document.getElementById("browser").contentWindow;
 
   if (popupCount) {
+    next(window, document.getElementById("p1textbox").inputField, "First into popup 1 with " + popupCount);
+
     if (popupCount == 2) {
       next(window, document.getElementById("p2textbox").inputField, "First into popup 2 with " + popupCount);
     }
-
-    next(window, document.getElementById("p1textbox").inputField, "First into popup 1 with " + popupCount);
   }
 
   next(childwin.frames[0], childwin.frames[0].document.documentElement, "First with " + popupCount);
@@ -74,11 +74,11 @@ function runTests(panel, popupCount)
   previous(childwin.frames[0], childwin.frames[0].document.documentElement, "Second back with " + popupCount);
 
   if (popupCount) {
-    previous(window, document.getElementById("p1textbox").inputField, "First back from popup 1 with " + popupCount);
-
     if (popupCount == 2) {
       previous(window, document.getElementById("p2textbox").inputField, "First back from popup 2 with " + popupCount);
     }
+
+    previous(window, document.getElementById("p1textbox").inputField, "First back from popup 1 with " + popupCount);
   }
 
   previous(window, document.getElementById("textbox").inputField, "First back with " + popupCount);
diff --git a/dom/tests/mochitest/pointerlock/test_pointerlock-api.html b/dom/tests/mochitest/pointerlock/test_pointerlock-api.html
index 78e61c6bfe04..94c3d4023fe9 100644
--- a/dom/tests/mochitest/pointerlock/test_pointerlock-api.html
+++ b/dom/tests/mochitest/pointerlock/test_pointerlock-api.html
@@ -28,16 +28,17 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=633602
 
         SimpleTest.waitForExplicitFinish();
 
-        // Ensure the full-screen api is enabled, and will be disabled on test exit.
-        SpecialPowers.setBoolPref("full-screen-api.enabled", true);
-
-        // Disable the requirement for trusted contexts only, so the tests are easier to write.
-        SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false);
-
         // Grant "fullscreen" permission on the test domain. This means fullscreen will be
         // automatically approved, so pointer lock in the tests will be too.
         SpecialPowers.setFullscreenAllowed(document);
 
+        SpecialPowers.pushPrefEnv({"set": [
+          ["full-screen-api.enabled", true],
+          ["full-screen-api.allow-trusted-requests-only", false],
+          ["full-screen-api.transition-duration.enter", "0 0"],
+          ["full-screen-api.transition-duration.leave", "0 0"]
+        ]}, nextTest);
+
         // Run the tests which go full-screen in new window, as Mochitests
         // normally run in an iframe, which by default will not have the
         // allowfullscreen attribute set, so full-screen won't work.
@@ -72,8 +73,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=633602
         var gTestIndex = 0;
 
         function finish() {
-          SpecialPowers.clearUserPref("full-screen-api.enabled");
-          SpecialPowers.clearUserPref("full-screen-api.allow-trusted-requests-only");
           SpecialPowers.removeFullscreenAllowed(document)
           SimpleTest.finish();
         }
@@ -107,8 +106,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=633602
             finish();
           }
         }
-
-        addLoadEvent(nextTest);
       </script>
     </pre>
   </body>
diff --git a/dom/webidl/MediaDeviceInfo.webidl b/dom/webidl/MediaDeviceInfo.webidl
index fe28aa5bab6d..b42519ad1319 100644
--- a/dom/webidl/MediaDeviceInfo.webidl
+++ b/dom/webidl/MediaDeviceInfo.webidl
@@ -19,4 +19,6 @@ interface MediaDeviceInfo {
   readonly attribute MediaDeviceKind kind;
   readonly attribute DOMString       label;
   readonly attribute DOMString       groupId;
+
+  jsonifier;
 };
diff --git a/dom/workers/ChromeWorkerScope.cpp b/dom/workers/ChromeWorkerScope.cpp
index aa0edc09d9ae..aa9c39830d6d 100644
--- a/dom/workers/ChromeWorkerScope.cpp
+++ b/dom/workers/ChromeWorkerScope.cpp
@@ -44,7 +44,7 @@ UnicodeToNative(JSContext* aCx, const char16_t* aSource, size_t aSourceLen)
 
 #endif // BUILD_CTYPES
 
-} // anonymous namespace
+} // namespace
 
 BEGIN_WORKERS_NAMESPACE
 
diff --git a/dom/workers/FileReaderSync.h b/dom/workers/FileReaderSync.h
index 49be76bdd606..2d097233d83e 100644
--- a/dom/workers/FileReaderSync.h
+++ b/dom/workers/FileReaderSync.h
@@ -18,8 +18,8 @@ namespace dom {
 class Blob;
 class GlobalObject;
 template<typename> class Optional;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 BEGIN_WORKERS_NAMESPACE
 
diff --git a/dom/workers/MessagePort.cpp b/dom/workers/MessagePort.cpp
index 19aa73559e31..e37e9dd9bb7b 100644
--- a/dom/workers/MessagePort.cpp
+++ b/dom/workers/MessagePort.cpp
@@ -72,7 +72,7 @@ public:
   WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate);
 };
 
-} // anonymous namespace
+} // namespace
 
 BEGIN_WORKERS_NAMESPACE
 
diff --git a/dom/workers/Navigator.cpp b/dom/workers/Navigator.cpp
index e5156bb3096c..78370e03a9c9 100644
--- a/dom/workers/Navigator.cpp
+++ b/dom/workers/Navigator.cpp
@@ -381,7 +381,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 WorkerNavigator::GetUserAgent(nsString& aUserAgent) const
diff --git a/dom/workers/Navigator.h b/dom/workers/Navigator.h
index 2e97b59e2502..1189ad8cb9ed 100644
--- a/dom/workers/Navigator.h
+++ b/dom/workers/Navigator.h
@@ -19,8 +19,8 @@
 namespace mozilla {
 namespace dom {
 class Promise;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 BEGIN_WORKERS_NAMESPACE
 
diff --git a/dom/workers/ServiceWorkerClient.cpp b/dom/workers/ServiceWorkerClient.cpp
index 1436893e46dd..31990b0048a6 100644
--- a/dom/workers/ServiceWorkerClient.cpp
+++ b/dom/workers/ServiceWorkerClient.cpp
@@ -164,7 +164,7 @@ private:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 ServiceWorkerClient::PostMessage(JSContext* aCx, JS::Handle<JS::Value> aMessage,
diff --git a/dom/workers/ServiceWorkerClients.cpp b/dom/workers/ServiceWorkerClients.cpp
index 42fe998c15c0..495742e36de3 100644
--- a/dom/workers/ServiceWorkerClients.cpp
+++ b/dom/workers/ServiceWorkerClients.cpp
@@ -232,7 +232,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 already_AddRefed<Promise>
 ServiceWorkerClients::MatchAll(const ClientQueryOptions& aOptions,
diff --git a/dom/workers/ServiceWorkerCommon.h b/dom/workers/ServiceWorkerCommon.h
index 1f0e806826c3..1c272c125c9a 100644
--- a/dom/workers/ServiceWorkerCommon.h
+++ b/dom/workers/ServiceWorkerCommon.h
@@ -19,7 +19,7 @@ enum class WhichServiceWorker {
 };
 MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(WhichServiceWorker)
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_ServiceWorkerCommon_h
diff --git a/dom/workers/ServiceWorkerContainer.h b/dom/workers/ServiceWorkerContainer.h
index 9d0cb105416f..0f7879c47a36 100644
--- a/dom/workers/ServiceWorkerContainer.h
+++ b/dom/workers/ServiceWorkerContainer.h
@@ -19,7 +19,7 @@ struct RegistrationOptions;
 
 namespace workers {
 class ServiceWorker;
-}
+} // namespace workers
 
 // Lightweight serviceWorker APIs collection.
 class ServiceWorkerContainer final : public DOMEventTargetHelper
diff --git a/dom/workers/ServiceWorkerEvents.cpp b/dom/workers/ServiceWorkerEvents.cpp
index 05a927298cd2..19d3d9a4ee7a 100644
--- a/dom/workers/ServiceWorkerEvents.cpp
+++ b/dom/workers/ServiceWorkerEvents.cpp
@@ -312,7 +312,7 @@ RespondWithHandler::CancelRequest()
   NS_DispatchToMainThread(runnable);
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 FetchEvent::RespondWith(const ResponseOrPromise& aArg, ErrorResult& aRv)
diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index afc3e5542ee7..e6a2e3c33ca2 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -286,7 +286,7 @@ private:
   nsRefPtr<ServiceWorkerManagerChild> mActor;
 };
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS0(ServiceWorkerJob)
 NS_IMPL_ISUPPORTS0(ServiceWorkerRegistrationInfo)
@@ -859,7 +859,7 @@ private:
   {}
 };
 
-} // anonymous namespace
+} // namespace
 
 class ServiceWorkerRegisterJob final : public ServiceWorkerJob,
                                        public serviceWorkerScriptCache::CompareCallback
@@ -1661,7 +1661,7 @@ DispatchExtendableEventOnWorkerScope(JSContext* aCx,
   MOZ_ASSERT(waitUntilPromise);
   return waitUntilPromise.forget();
 }
-}; // anonymous namespace
+} // namespace
 
 /*
  * Used to handle ExtendableEvent::waitUntil() and proceed with
@@ -4008,7 +4008,7 @@ ClaimMatchingClients(nsISupportsHashKey* aKey, void* aData)
 
   return PL_DHASH_NEXT;
 }
-} // anonymous namespace
+} // namespace
 
 void
 ServiceWorkerManager::GetAllClients(nsIPrincipal* aPrincipal,
@@ -4403,7 +4403,7 @@ GetAllRegistrationsPerPrincipalEnumerator(const nsACString& aKey,
   return PL_DHASH_NEXT;
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(ServiceWorkerDataInfo, nsIServiceWorkerInfo)
 
diff --git a/dom/workers/ServiceWorkerManagerChild.cpp b/dom/workers/ServiceWorkerManagerChild.cpp
index be52dda5c52a..1fa263d30cf0 100644
--- a/dom/workers/ServiceWorkerManagerChild.cpp
+++ b/dom/workers/ServiceWorkerManagerChild.cpp
@@ -95,6 +95,6 @@ ServiceWorkerManagerChild::RecvNotifyRemoveAll()
   return true;
 }
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/workers/ServiceWorkerManagerChild.h b/dom/workers/ServiceWorkerManagerChild.h
index e78f9e4c6916..287c89dea7a3 100644
--- a/dom/workers/ServiceWorkerManagerChild.h
+++ b/dom/workers/ServiceWorkerManagerChild.h
@@ -16,7 +16,7 @@ class OriginAttributes;
 
 namespace ipc {
 class BackgroundChildImpl;
-}
+} // namespace ipc
 
 namespace dom {
 namespace workers {
@@ -56,8 +56,8 @@ private:
   bool mShuttingDown;
 };
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_ServiceWorkerManagerChild_h
diff --git a/dom/workers/ServiceWorkerManagerParent.cpp b/dom/workers/ServiceWorkerManagerParent.cpp
index 7679238c7a30..60b63e81e61d 100644
--- a/dom/workers/ServiceWorkerManagerParent.cpp
+++ b/dom/workers/ServiceWorkerManagerParent.cpp
@@ -145,7 +145,7 @@ private:
   nsCOMPtr<nsIThread> mBackgroundThread;
 };
 
-} // anonymous namespace
+} // namespace
 
 ServiceWorkerManagerParent::ServiceWorkerManagerParent()
   : mService(ServiceWorkerManagerService::GetOrCreate())
@@ -313,6 +313,6 @@ ServiceWorkerManagerParent::ActorDestroy(ActorDestroyReason aWhy)
   }
 }
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/workers/ServiceWorkerManagerParent.h b/dom/workers/ServiceWorkerManagerParent.h
index 00c4c32a1290..193b93522a39 100644
--- a/dom/workers/ServiceWorkerManagerParent.h
+++ b/dom/workers/ServiceWorkerManagerParent.h
@@ -15,7 +15,7 @@ class OriginAttributes;
 
 namespace ipc {
 class BackgroundParentImpl;
-}
+} // namespace ipc
 
 namespace dom {
 namespace workers {
@@ -63,8 +63,8 @@ private:
   uint64_t mID;
 };
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_ServiceWorkerManagerParent_h
diff --git a/dom/workers/ServiceWorkerManagerService.cpp b/dom/workers/ServiceWorkerManagerService.cpp
index c6d083b17a1d..a4a6ac1dffc3 100644
--- a/dom/workers/ServiceWorkerManagerService.cpp
+++ b/dom/workers/ServiceWorkerManagerService.cpp
@@ -21,7 +21,7 @@ namespace {
 
 ServiceWorkerManagerService* sInstance = nullptr;
 
-} // anonymous namespace
+} // namespace
 
 ServiceWorkerManagerService::ServiceWorkerManagerService()
 {
@@ -314,7 +314,7 @@ RemoveEnumerator(nsPtrHashKey<ServiceWorkerManagerParent>* aKey, void* aPtr)
   return PL_DHASH_NEXT;
 }
 
-} // anonymous namespce
+} // namespace
 
 void
 ServiceWorkerManagerService::PropagateRegistration(
@@ -405,6 +405,6 @@ ServiceWorkerManagerService::PropagateRemoveAll(uint64_t aParentID)
 #endif
 }
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/workers/ServiceWorkerManagerService.h b/dom/workers/ServiceWorkerManagerService.h
index 2e42485dc568..4bec7bcc6f6b 100644
--- a/dom/workers/ServiceWorkerManagerService.h
+++ b/dom/workers/ServiceWorkerManagerService.h
@@ -17,7 +17,7 @@ class OriginAttributes;
 
 namespace ipc {
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 
@@ -60,8 +60,8 @@ private:
   nsTHashtable<nsPtrHashKey<ServiceWorkerManagerParent>> mAgents;
 };
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_ServiceWorkerManagerService_h
diff --git a/dom/workers/ServiceWorkerRegistrar.cpp b/dom/workers/ServiceWorkerRegistrar.cpp
index 1cb855c42ef6..ccef21f565da 100644
--- a/dom/workers/ServiceWorkerRegistrar.cpp
+++ b/dom/workers/ServiceWorkerRegistrar.cpp
@@ -39,7 +39,7 @@ namespace {
 
 StaticRefPtr<ServiceWorkerRegistrar> gServiceWorkerRegistrar;
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(ServiceWorkerRegistrar,
                   nsIObserver)
@@ -708,5 +708,5 @@ ServiceWorkerRegistrar::Observe(nsISupports* aSubject, const char* aTopic,
   return NS_ERROR_UNEXPECTED;
 }
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/workers/ServiceWorkerRegistrar.h b/dom/workers/ServiceWorkerRegistrar.h
index 484f0140531c..fcdc3b981566 100644
--- a/dom/workers/ServiceWorkerRegistrar.h
+++ b/dom/workers/ServiceWorkerRegistrar.h
@@ -27,7 +27,7 @@ namespace mozilla {
 
 namespace ipc {
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 
@@ -91,7 +91,7 @@ protected:
   nsCOMPtr<nsIFile> mProfileDir;
 };
 
-} // dom namespace
-} // mozilla namespace
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_workers_ServiceWorkerRegistrar_h
diff --git a/dom/workers/ServiceWorkerRegistration.cpp b/dom/workers/ServiceWorkerRegistration.cpp
index 2133ace956eb..c084895cc85f 100644
--- a/dom/workers/ServiceWorkerRegistration.cpp
+++ b/dom/workers/ServiceWorkerRegistration.cpp
@@ -521,7 +521,7 @@ public:
     return NS_OK;
   }
 };
-} // anonymous namespace
+} // namespace
 
 void
 ServiceWorkerRegistrationMainThread::Update()
@@ -1000,5 +1000,6 @@ WorkerListener::UpdateFound()
     }
   }
 }
-} // dom namespace
-} // mozilla namespace
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/workers/ServiceWorkerRegistration.h b/dom/workers/ServiceWorkerRegistration.h
index 2ef61b86df1e..3b38771ff97f 100644
--- a/dom/workers/ServiceWorkerRegistration.h
+++ b/dom/workers/ServiceWorkerRegistration.h
@@ -24,7 +24,7 @@ class WorkerListener;
 namespace workers {
 class ServiceWorker;
 class WorkerPrivate;
-}
+} // namespace workers
 
 bool
 ServiceWorkerRegistrationVisible(JSContext* aCx, JSObject* aObj);
diff --git a/dom/workers/ServiceWorkerScriptCache.cpp b/dom/workers/ServiceWorkerScriptCache.cpp
index 3a6def56d32a..48b695585e16 100644
--- a/dom/workers/ServiceWorkerScriptCache.cpp
+++ b/dom/workers/ServiceWorkerScriptCache.cpp
@@ -947,7 +947,7 @@ CompareCache::ManageValueResult(JSContext* aCx, JS::Handle<JS::Value> aValue)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 PurgeCache(nsIPrincipal* aPrincipal, const nsAString& aCacheName)
@@ -1019,6 +1019,6 @@ Compare(nsIPrincipal* aPrincipal, const nsAString& aCacheName,
   return NS_OK;
 }
 
-} // serviceWorkerScriptCache namespace
+} // namespace serviceWorkerScriptCache
 
 END_WORKERS_NAMESPACE
diff --git a/dom/workers/ServiceWorkerScriptCache.h b/dom/workers/ServiceWorkerScriptCache.h
index 5af17ce7a495..165bd038baac 100644
--- a/dom/workers/ServiceWorkerScriptCache.h
+++ b/dom/workers/ServiceWorkerScriptCache.h
@@ -47,10 +47,10 @@ nsresult
 Compare(nsIPrincipal* aPrincipal, const nsAString& aCacheName,
         const nsAString& aURL, CompareCallback* aCallback, nsILoadGroup* aLoadGroup);
 
-} // serviceWorkerScriptCache namespace
+} // namespace serviceWorkerScriptCache
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_workers_ServiceWorkerScriptCache_h
diff --git a/dom/workers/ServiceWorkerWindowClient.cpp b/dom/workers/ServiceWorkerWindowClient.cpp
index 7124f0551a85..eec89fde7b21 100644
--- a/dom/workers/ServiceWorkerWindowClient.cpp
+++ b/dom/workers/ServiceWorkerWindowClient.cpp
@@ -125,7 +125,7 @@ private:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 already_AddRefed<Promise>
 ServiceWorkerWindowClient::Focus(ErrorResult& aRv) const
diff --git a/dom/workers/URL.h b/dom/workers/URL.h
index eaed4ceec71c..37281556e818 100644
--- a/dom/workers/URL.h
+++ b/dom/workers/URL.h
@@ -18,8 +18,8 @@ namespace mozilla {
 namespace dom {
 class Blob;
 struct objectURLOptions;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 BEGIN_WORKERS_NAMESPACE
 
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index 0ab4cc8a3502..2389f31fba41 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -47,16 +47,16 @@ class nsIURI;
 
 namespace JS {
 struct RuntimeStats;
-}
+} // namespace JS
 
 namespace mozilla {
 namespace dom {
 class Function;
-}
+} // namespace dom
 namespace ipc {
 class PrincipalInfo;
-}
-}
+} // namespace ipc
+} // namespace mozilla
 
 struct PRThread;
 
diff --git a/dom/workers/WorkerRunnable.cpp b/dom/workers/WorkerRunnable.cpp
index 3f809fc51b8f..297c2576b35a 100644
--- a/dom/workers/WorkerRunnable.cpp
+++ b/dom/workers/WorkerRunnable.cpp
@@ -39,7 +39,7 @@ MaybeReportMainThreadException(JSContext* aCx, bool aResult)
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 #ifdef DEBUG
 WorkerRunnable::WorkerRunnable(WorkerPrivate* aWorkerPrivate,
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
index 82b24d2cf143..9f2372dd35cf 100644
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -594,7 +594,7 @@ public:
   }
 };
 
-}
+} // namespace
 
 already_AddRefed<Promise>
 ServiceWorkerGlobalScope::SkipWaiting(ErrorResult& aRv)
diff --git a/dom/workers/WorkerStructuredClone.h b/dom/workers/WorkerStructuredClone.h
index 85b7ab3f7f5f..c430d32b2fee 100644
--- a/dom/workers/WorkerStructuredClone.h
+++ b/dom/workers/WorkerStructuredClone.h
@@ -46,8 +46,8 @@ public:
   nsTArray<nsRefPtr<MessagePortBase>> mTransferredPorts;
 };
 
-} // workers namespace
-} // dom namespace
-} // mozilla namespace
+} // namespace workers
+} // namespace dom
+} // namespace mozilla
 
 #endif // mozilla_dom_workers_WorkerStructuredClone_h
diff --git a/dom/workers/WorkerThread.cpp b/dom/workers/WorkerThread.cpp
index 4fc76d536eb4..29fa26556de4 100644
--- a/dom/workers/WorkerThread.cpp
+++ b/dom/workers/WorkerThread.cpp
@@ -28,7 +28,7 @@ namespace {
 // consistency.
 const uint32_t kWorkerStackSize = 256 * sizeof(size_t) * 1024;
 
-} // anonymous namespace
+} // namespace
 
 WorkerThreadFriendKey::WorkerThreadFriendKey()
 {
diff --git a/dom/workers/Workers.h b/dom/workers/Workers.h
index 6e1674e0681d..19f66c0ce759 100644
--- a/dom/workers/Workers.h
+++ b/dom/workers/Workers.h
@@ -44,7 +44,7 @@ class nsIURI;
 namespace mozilla {
 namespace ipc {
 class PrincipalInfo;
-}
+} // namespace ipc
 
 namespace dom {
 // If you change this, the corresponding list in nsIWorkerDebugger.idl needs to
@@ -55,8 +55,9 @@ enum WorkerType
   WorkerTypeShared,
   WorkerTypeService
 };
-}
-}
+
+} // namespace dom
+} // namespace mozilla
 
 BEGIN_WORKERS_NAMESPACE
 
diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp
index 1975893989b7..8cf65cf4c4fa 100644
--- a/dom/workers/XMLHttpRequest.cpp
+++ b/dom/workers/XMLHttpRequest.cpp
@@ -892,7 +892,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 bool
 Proxy::Init()
diff --git a/dom/workers/XMLHttpRequest.h b/dom/workers/XMLHttpRequest.h
index 330cb5f89bc3..ed396b335dbd 100644
--- a/dom/workers/XMLHttpRequest.h
+++ b/dom/workers/XMLHttpRequest.h
@@ -20,8 +20,8 @@
 namespace mozilla {
 namespace dom {
 class Blob;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 BEGIN_WORKERS_NAMESPACE
 
diff --git a/dom/xbl/XBLChildrenElement.cpp b/dom/xbl/XBLChildrenElement.cpp
index 8c319cacfa01..a407b7b8748c 100644
--- a/dom/xbl/XBLChildrenElement.cpp
+++ b/dom/xbl/XBLChildrenElement.cpp
@@ -57,8 +57,8 @@ XBLChildrenElement::ParseAttribute(int32_t aNamespaceID,
   return false;
 }
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
 
 using namespace mozilla::dom;
 
diff --git a/dom/xbl/nsXBLPrototypeHandler.h b/dom/xbl/nsXBLPrototypeHandler.h
index 19d7ad092338..18b85fbeab39 100644
--- a/dom/xbl/nsXBLPrototypeHandler.h
+++ b/dom/xbl/nsXBLPrototypeHandler.h
@@ -30,8 +30,8 @@ namespace mozilla {
 namespace dom {
 class AutoJSAPI;
 class EventTarget;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #define NS_HANDLER_TYPE_XBL_JS              (1 << 0)
 #define NS_HANDLER_TYPE_XBL_COMMAND         (1 << 1)
diff --git a/dom/xbl/nsXBLService.h b/dom/xbl/nsXBLService.h
index 8291f2fbac97..9772b928389b 100644
--- a/dom/xbl/nsXBLService.h
+++ b/dom/xbl/nsXBLService.h
@@ -26,8 +26,8 @@ class nsIPrincipal;
 namespace mozilla {
 namespace dom {
 class EventTarget;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsXBLService final : public nsSupportsWeakReference
 {
diff --git a/dom/xbl/nsXBLWindowKeyHandler.h b/dom/xbl/nsXBLWindowKeyHandler.h
index fd50e2dea497..dcbf4adb53a5 100644
--- a/dom/xbl/nsXBLWindowKeyHandler.h
+++ b/dom/xbl/nsXBLWindowKeyHandler.h
@@ -21,8 +21,8 @@ namespace dom {
 class Element;
 class EventTarget;
 struct IgnoreModifierState;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsXBLWindowKeyHandler : public nsIDOMEventListener
 {
diff --git a/dom/xml/CDATASection.cpp b/dom/xml/CDATASection.cpp
index 828be461bd33..873a7a891a70 100644
--- a/dom/xml/CDATASection.cpp
+++ b/dom/xml/CDATASection.cpp
@@ -65,5 +65,5 @@ CDATASection::DumpContent(FILE* out, int32_t aIndent,
 }
 #endif
 
-} // namespace mozilla
 } // namespace dom
+} // namespace mozilla
diff --git a/dom/xml/nsXMLContentSink.h b/dom/xml/nsXMLContentSink.h
index 934979ed03cd..7ec23dba21d2 100644
--- a/dom/xml/nsXMLContentSink.h
+++ b/dom/xml/nsXMLContentSink.h
@@ -27,8 +27,8 @@ class nsIParser;
 namespace mozilla {
 namespace dom {
 class NodeInfo;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 typedef enum {
   eXMLContentSinkState_InProlog,
diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.h b/dom/xslt/xslt/txMozillaXSLTProcessor.h
index c8a70befe7e1..af840f0857aa 100644
--- a/dom/xslt/xslt/txMozillaXSLTProcessor.h
+++ b/dom/xslt/xslt/txMozillaXSLTProcessor.h
@@ -33,8 +33,8 @@ class Document;
 class DocumentFragment;
 class GlobalObject;
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /* bacd8ad0-552f-11d3-a9f7-000064657374 */
 #define TRANSFORMIIX_XSLT_PROCESSOR_CID   \
diff --git a/dom/xul/nsXULElement.h b/dom/xul/nsXULElement.h
index ac6edc3fd7c5..3b4a88e0e031 100644
--- a/dom/xul/nsXULElement.h
+++ b/dom/xul/nsXULElement.h
@@ -51,15 +51,15 @@ class EventChainPreVisitor;
 class EventListenerManager;
 namespace css {
 class StyleRule;
-}
+} // namespace css
 namespace dom {
 class BoxObject;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 namespace JS {
 class SourceBufferHolder;
-}
+} // namespace JS
 
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/dom/xul/templates/nsXMLBinding.h b/dom/xul/templates/nsXMLBinding.h
index 41414e317810..79d479ab3f6c 100644
--- a/dom/xul/templates/nsXMLBinding.h
+++ b/dom/xul/templates/nsXMLBinding.h
@@ -17,8 +17,8 @@ class nsXMLBindingValues;
 namespace mozilla {
 namespace dom {
 class XPathResult;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * Classes related to storing bindings for XML handling.
diff --git a/editor/libeditor/ChangeAttributeTxn.h b/editor/libeditor/ChangeAttributeTxn.h
index 2ca55eb44584..80138b795467 100644
--- a/editor/libeditor/ChangeAttributeTxn.h
+++ b/editor/libeditor/ChangeAttributeTxn.h
@@ -63,7 +63,7 @@ private:
   nsString mUndoValue;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/ChangeStyleTxn.h b/editor/libeditor/ChangeStyleTxn.h
index c6e90e685a1f..130a44e667a9 100644
--- a/editor/libeditor/ChangeStyleTxn.h
+++ b/editor/libeditor/ChangeStyleTxn.h
@@ -106,7 +106,7 @@ private:
   bool mRedoAttributeWasSet;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/CreateElementTxn.h b/editor/libeditor/CreateElementTxn.h
index 1b3b4dad734f..8108bf0b9f5a 100644
--- a/editor/libeditor/CreateElementTxn.h
+++ b/editor/libeditor/CreateElementTxn.h
@@ -70,7 +70,7 @@ protected:
   nsCOMPtr<nsIContent> mRefNode;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/DeleteTextTxn.h b/editor/libeditor/DeleteTextTxn.h
index e3bcb33160c2..1cfb9bc925e9 100644
--- a/editor/libeditor/DeleteTextTxn.h
+++ b/editor/libeditor/DeleteTextTxn.h
@@ -70,7 +70,7 @@ protected:
   nsRangeUpdater* mRangeUpdater;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/IMETextTxn.h b/editor/libeditor/IMETextTxn.h
index 374580d26a82..65b7f1c1a41e 100644
--- a/editor/libeditor/IMETextTxn.h
+++ b/editor/libeditor/IMETextTxn.h
@@ -87,7 +87,7 @@ private:
 
 NS_DEFINE_STATIC_IID_ACCESSOR(IMETextTxn, NS_IMETEXTTXN_IID)
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/InsertNodeTxn.h b/editor/libeditor/InsertNodeTxn.h
index d38df18a23ff..9dcdee213ab4 100644
--- a/editor/libeditor/InsertNodeTxn.h
+++ b/editor/libeditor/InsertNodeTxn.h
@@ -52,7 +52,7 @@ protected:
   nsEditor& mEditor;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/InsertTextTxn.h b/editor/libeditor/InsertTextTxn.h
index c3013951e563..235a9746caec 100644
--- a/editor/libeditor/InsertTextTxn.h
+++ b/editor/libeditor/InsertTextTxn.h
@@ -73,7 +73,7 @@ private:
 
 NS_DEFINE_STATIC_IID_ACCESSOR(InsertTextTxn, NS_INSERTTEXTTXN_IID)
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/JoinNodeTxn.h b/editor/libeditor/JoinNodeTxn.h
index af070b77959d..229877192748 100644
--- a/editor/libeditor/JoinNodeTxn.h
+++ b/editor/libeditor/JoinNodeTxn.h
@@ -60,7 +60,7 @@ protected:
   nsCOMPtr<nsINode> mParent;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/PlaceholderTxn.h b/editor/libeditor/PlaceholderTxn.h
index 46a5c46f09ff..bd17cf92c9d8 100644
--- a/editor/libeditor/PlaceholderTxn.h
+++ b/editor/libeditor/PlaceholderTxn.h
@@ -18,8 +18,8 @@
 namespace mozilla {
 namespace dom {
 class IMETextTxn;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * An aggregate transaction that knows how to absorb all subsequent
diff --git a/editor/libeditor/SplitNodeTxn.h b/editor/libeditor/SplitNodeTxn.h
index d596220aa0b2..c2e83026bc9e 100644
--- a/editor/libeditor/SplitNodeTxn.h
+++ b/editor/libeditor/SplitNodeTxn.h
@@ -64,7 +64,7 @@ protected:
   nsCOMPtr<nsINode> mParent;
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/editor/libeditor/TypeInState.h b/editor/libeditor/TypeInState.h
index dfff16a2a8bb..77466289a9be 100644
--- a/editor/libeditor/TypeInState.h
+++ b/editor/libeditor/TypeInState.h
@@ -19,8 +19,8 @@ class nsIDOMNode;
 namespace mozilla {
 namespace dom {
 class Selection;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 struct PropItem
 {
diff --git a/editor/libeditor/nsEditRules.h b/editor/libeditor/nsEditRules.h
index e90e988be245..3e161e5b0364 100644
--- a/editor/libeditor/nsEditRules.h
+++ b/editor/libeditor/nsEditRules.h
@@ -16,8 +16,8 @@ class nsPlaintextEditor;
 namespace mozilla {
 namespace dom {
 class Selection;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /***************************************************************************
  * base for an object to encapsulate any additional info needed to be passed
diff --git a/editor/libeditor/nsEditor.h b/editor/libeditor/nsEditor.h
index d4eac0784cf7..24dbfe29e4f3 100644
--- a/editor/libeditor/nsEditor.h
+++ b/editor/libeditor/nsEditor.h
@@ -73,8 +73,8 @@ class JoinNodeTxn;
 class Selection;
 class SplitNodeTxn;
 class Text;
-}  // namespace dom
-}  // namespace mozilla
+} // namespace dom
+} // namespace mozilla
 
 namespace mozilla {
 namespace widget {
diff --git a/editor/libeditor/nsEditorUtils.h b/editor/libeditor/nsEditorUtils.h
index 75b7b955e98e..32d6af7ea7ac 100644
--- a/editor/libeditor/nsEditorUtils.h
+++ b/editor/libeditor/nsEditorUtils.h
@@ -23,8 +23,8 @@ namespace mozilla {
 namespace dom {
 template <class T> class OwningNonNull;
 class Selection;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /***************************************************************************
  * stack based helper class for batching a collection of txns inside a
diff --git a/editor/libeditor/nsHTMLCSSUtils.h b/editor/libeditor/nsHTMLCSSUtils.h
index 8a6c705d3816..dd50952e0f0a 100644
--- a/editor/libeditor/nsHTMLCSSUtils.h
+++ b/editor/libeditor/nsHTMLCSSUtils.h
@@ -22,8 +22,8 @@ class nsString;
 namespace mozilla {
 namespace dom {
 class Element;
-}  // namespace dom
-}  // namespace mozilla
+} // namespace dom
+} // namespace mozilla
 
 class nsHTMLEditor;
 
diff --git a/editor/libeditor/nsHTMLEditRules.h b/editor/libeditor/nsHTMLEditRules.h
index 432cff868e65..48c7b5ac450f 100644
--- a/editor/libeditor/nsHTMLEditRules.h
+++ b/editor/libeditor/nsHTMLEditRules.h
@@ -34,8 +34,8 @@ namespace mozilla {
 namespace dom {
 class Element;
 class Selection;
-}  // namespace dom
-}  // namespace mozilla
+} // namespace dom
+} // namespace mozilla
 struct DOMPoint;
 
 struct StyleCache : public PropItem
diff --git a/editor/libeditor/nsPlaintextEditor.h b/editor/libeditor/nsPlaintextEditor.h
index 7e56e0dc46bd..5304304c6261 100644
--- a/editor/libeditor/nsPlaintextEditor.h
+++ b/editor/libeditor/nsPlaintextEditor.h
@@ -30,8 +30,8 @@ class nsITransferable;
 namespace mozilla {
 namespace dom {
 class Selection;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * The text editor implementation.
diff --git a/editor/libeditor/nsSelectionState.h b/editor/libeditor/nsSelectionState.h
index 5f949253ddb2..d3c6abbfdbc5 100644
--- a/editor/libeditor/nsSelectionState.h
+++ b/editor/libeditor/nsSelectionState.h
@@ -19,8 +19,8 @@ namespace mozilla {
 namespace dom {
 class Selection;
 class Text;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /***************************************************************************
  * class for recording selection info.  stores selection as collection of
@@ -215,8 +215,9 @@ class MOZ_STACK_CLASS AutoReplaceContainerSelNotify
       mRU.DidReplaceContainer(mOriginalElement, mNewElement);
     }
 };
-}
-}
+
+} // namespace dom
+} // namespace mozilla
 
 
 /***************************************************************************
diff --git a/editor/libeditor/nsTextEditRules.h b/editor/libeditor/nsTextEditRules.h
index 5cc1d7cecb40..9b951eae1ed7 100644
--- a/editor/libeditor/nsTextEditRules.h
+++ b/editor/libeditor/nsTextEditRules.h
@@ -22,8 +22,8 @@ class nsIDOMNode;
 namespace mozilla {
 namespace dom {
 class Selection;
-}  // namespace dom
-}  // namespace mozilla
+} // namespace dom
+} // namespace mozilla
 
 /** Object that encapsulates HTML text-specific editing rules.
   *
diff --git a/embedding/browser/nsDocShellTreeOwner.h b/embedding/browser/nsDocShellTreeOwner.h
index 10f9c7425385..2914b4f9024c 100644
--- a/embedding/browser/nsDocShellTreeOwner.h
+++ b/embedding/browser/nsDocShellTreeOwner.h
@@ -34,8 +34,8 @@
 namespace mozilla {
 namespace dom {
 class EventTarget;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsWebBrowser;
 class ChromeTooltipListener;
diff --git a/embedding/browser/nsIWebBrowserChromeFocus.idl b/embedding/browser/nsIWebBrowserChromeFocus.idl
index 4fba680bd105..8e0b849b92ff 100644
--- a/embedding/browser/nsIWebBrowserChromeFocus.idl
+++ b/embedding/browser/nsIWebBrowserChromeFocus.idl
@@ -12,19 +12,21 @@
  * to the embedding chrome. See mozilla bug #70224 for gratuitous info.
  */
 
-[scriptable, uuid(d2206418-1dd1-11b2-8e55-acddcd2bcfb8)]
+[scriptable, uuid(947B2EE6-51ED-4C2B-9F45-426C27CA84C6)]
 interface nsIWebBrowserChromeFocus : nsISupports
 {
     /**
-     * Set the focus at the next focusable element in the chrome.
+     * Set the focus at the next focusable element in the chrome. If
+     * aForDocumentNavigation is true, this was a document navigation, so
+     * focus the parent window. 
      */
 
-    void focusNextElement();
+    void focusNextElement(in bool aForDocumentNavigation);
 
     /**
      * Set the focus at the previous focusable element in the chrome.
      */
 
-    void focusPrevElement();
+    void focusPrevElement(in bool aForDocumentNavigation);
 
 };
diff --git a/embedding/components/printingui/ipc/PrintingParent.h b/embedding/components/printingui/ipc/PrintingParent.h
index 6079588205f5..145413c1964a 100644
--- a/embedding/components/printingui/ipc/PrintingParent.h
+++ b/embedding/components/printingui/ipc/PrintingParent.h
@@ -64,6 +64,7 @@ private:
                     const PrintData& data,
                     PrintData* result);
 };
+
 } // namespace embedding
 } // namespace mozilla
 
diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
index 9e675de8797f..1364886c36b5 100644
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -241,7 +241,7 @@ IsExpandedPrincipal(nsIPrincipal* aPrincipal)
   return !!ep;
 }
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/extensions/spellcheck/hunspell/src/RemoteSpellCheckEngineParent.h b/extensions/spellcheck/hunspell/src/RemoteSpellCheckEngineParent.h
index 7edf1e7df4b8..c0bb51139c0a 100644
--- a/extensions/spellcheck/hunspell/src/RemoteSpellCheckEngineParent.h
+++ b/extensions/spellcheck/hunspell/src/RemoteSpellCheckEngineParent.h
@@ -34,5 +34,6 @@ private:
   nsCOMPtr<nsISpellChecker> mSpellChecker;
 };
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/extensions/spellcheck/src/mozSpellChecker.h b/extensions/spellcheck/src/mozSpellChecker.h
index bb252300eb3b..d60b5ac26d21 100644
--- a/extensions/spellcheck/src/mozSpellChecker.h
+++ b/extensions/spellcheck/src/mozSpellChecker.h
@@ -22,7 +22,7 @@
 namespace mozilla {
 class PRemoteSpellcheckEngineChild;
 class RemoteSpellcheckEngineChild;
-}
+} // namespace mozilla
 
 class mozSpellChecker : public nsISpellChecker
 {
diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
index 5b96282cbc70..a3e03b95755e 100644
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -1287,7 +1287,7 @@ private:
   static DrawEventRecorder *mRecorder;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_2D_H
diff --git a/gfx/2d/BaseCoord.h b/gfx/2d/BaseCoord.h
index bbccbc7ae64a..7d1c824564a0 100644
--- a/gfx/2d/BaseCoord.h
+++ b/gfx/2d/BaseCoord.h
@@ -104,7 +104,7 @@ struct BaseCoord {
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_BASECOORD_H_ */
diff --git a/gfx/2d/BaseMargin.h b/gfx/2d/BaseMargin.h
index a0dcb26bb2a7..28bc648c5deb 100644
--- a/gfx/2d/BaseMargin.h
+++ b/gfx/2d/BaseMargin.h
@@ -138,7 +138,7 @@ struct BaseMargin {
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_BASEMARGIN_H_ */
diff --git a/gfx/2d/BasePoint.h b/gfx/2d/BasePoint.h
index a09390946a27..e93d4788e1d2 100644
--- a/gfx/2d/BasePoint.h
+++ b/gfx/2d/BasePoint.h
@@ -102,7 +102,7 @@ struct BasePoint {
 
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_BASEPOINT_H_ */
diff --git a/gfx/2d/BasePoint3D.h b/gfx/2d/BasePoint3D.h
index c64ea247a5a2..4deeaf00de17 100644
--- a/gfx/2d/BasePoint3D.h
+++ b/gfx/2d/BasePoint3D.h
@@ -111,7 +111,7 @@ struct BasePoint3D {
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_BASEPOINT3D_H_ */
diff --git a/gfx/2d/BasePoint4D.h b/gfx/2d/BasePoint4D.h
index e098876a8852..37e93f64746d 100644
--- a/gfx/2d/BasePoint4D.h
+++ b/gfx/2d/BasePoint4D.h
@@ -120,7 +120,7 @@ struct BasePoint4D {
   bool HasPositiveWCoord() { return w > 0; }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_BASEPOINT4D_H_ */
diff --git a/gfx/2d/BaseRect.h b/gfx/2d/BaseRect.h
index c0719112a61e..6812519a260a 100644
--- a/gfx/2d/BaseRect.h
+++ b/gfx/2d/BaseRect.h
@@ -546,7 +546,7 @@ private:
   bool operator!=(const Sub& aRect) const { return false; }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_BASERECT_H_ */
diff --git a/gfx/2d/BaseSize.h b/gfx/2d/BaseSize.h
index 2da956cced55..c146e4c70582 100644
--- a/gfx/2d/BaseSize.h
+++ b/gfx/2d/BaseSize.h
@@ -85,7 +85,7 @@ struct BaseSize {
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_BASESIZE_H_ */
diff --git a/gfx/2d/Blur.cpp b/gfx/2d/Blur.cpp
index 99147afa30ad..a669906c0a38 100644
--- a/gfx/2d/Blur.cpp
+++ b/gfx/2d/Blur.cpp
@@ -764,5 +764,5 @@ AlphaBoxBlur::CalculateBlurRadius(const Point& aStd)
     return size;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/Blur.h b/gfx/2d/Blur.h
index e6dfd8fbfae9..8464a57fe37f 100644
--- a/gfx/2d/Blur.h
+++ b/gfx/2d/Blur.h
@@ -180,7 +180,7 @@ private:
   bool mHasDirtyRect;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_BLUR_H_ */
diff --git a/gfx/2d/BlurSSE2.cpp b/gfx/2d/BlurSSE2.cpp
index 52ca189bbb28..d652325b9011 100644
--- a/gfx/2d/BlurSSE2.cpp
+++ b/gfx/2d/BlurSSE2.cpp
@@ -311,5 +311,5 @@ AlphaBoxBlur::BoxBlur_SSE2(uint8_t* aData,
 
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/BorrowedContext.h b/gfx/2d/BorrowedContext.h
index 2e2ec96691f9..477ec9d12da1 100644
--- a/gfx/2d/BorrowedContext.h
+++ b/gfx/2d/BorrowedContext.h
@@ -196,7 +196,7 @@ private:
 };
 #endif
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_BORROWED_CONTEXT_H
diff --git a/gfx/2d/Coord.h b/gfx/2d/Coord.h
index 2a981b0ef390..90bbcbc8a291 100644
--- a/gfx/2d/Coord.h
+++ b/gfx/2d/Coord.h
@@ -136,7 +136,7 @@ struct CoordTyped :
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_COORD_H_ */
diff --git a/gfx/2d/DataSourceSurface.cpp b/gfx/2d/DataSourceSurface.cpp
index c3a837f9968d..75d84350642c 100644
--- a/gfx/2d/DataSourceSurface.cpp
+++ b/gfx/2d/DataSourceSurface.cpp
@@ -17,5 +17,5 @@ DataSourceSurface::GetDataSurface()
   return surface.forget();
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DataSourceSurfaceWrapper.h b/gfx/2d/DataSourceSurfaceWrapper.h
index 445a4adc2b50..d1112b57c0f3 100644
--- a/gfx/2d/DataSourceSurfaceWrapper.h
+++ b/gfx/2d/DataSourceSurfaceWrapper.h
@@ -33,7 +33,7 @@ private:
   RefPtr<DataSourceSurface> mSurface;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_DATASOURCESURFACEWRAPPER_H_ */
diff --git a/gfx/2d/DataSurfaceHelpers.cpp b/gfx/2d/DataSurfaceHelpers.cpp
index 6ca71b3c4f4b..6776db243974 100644
--- a/gfx/2d/DataSurfaceHelpers.cpp
+++ b/gfx/2d/DataSurfaceHelpers.cpp
@@ -289,5 +289,5 @@ CreateDataSourceSurfaceByCloning(DataSourceSurface* aSource)
   return copy.forget();
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DataSurfaceHelpers.h b/gfx/2d/DataSurfaceHelpers.h
index 4327f71b453c..40a4db5b3ef0 100644
--- a/gfx/2d/DataSurfaceHelpers.h
+++ b/gfx/2d/DataSurfaceHelpers.h
@@ -102,7 +102,7 @@ DataAtOffset(DataSourceSurface* aSurface,
 bool
 SurfaceContainsPoint(SourceSurface* aSurface, const IntPoint& aPoint);
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_DATASURFACEHELPERS_H
diff --git a/gfx/2d/DrawCommand.h b/gfx/2d/DrawCommand.h
index 6f1466d8ea8a..228d627c0888 100644
--- a/gfx/2d/DrawCommand.h
+++ b/gfx/2d/DrawCommand.h
@@ -498,7 +498,9 @@ private:
   Matrix mTransform;
 };
 
-} /* namespace mozilla */
-} /* namespace gfx */
+} // namespace gfx
+
+} // namespace mozilla
+
 
 #endif /* MOZILLA_GFX_DRAWCOMMAND_H_ */
diff --git a/gfx/2d/DrawEventRecorder.cpp b/gfx/2d/DrawEventRecorder.cpp
index 3a663765cb28..bfabb127a664 100644
--- a/gfx/2d/DrawEventRecorder.cpp
+++ b/gfx/2d/DrawEventRecorder.cpp
@@ -50,5 +50,5 @@ DrawEventRecorderFile::Flush()
   mOutputFile.flush();
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawEventRecorder.h b/gfx/2d/DrawEventRecorder.h
index e297a58710e4..e6e5d4c8b362 100644
--- a/gfx/2d/DrawEventRecorder.h
+++ b/gfx/2d/DrawEventRecorder.h
@@ -75,7 +75,7 @@ private:
   std::ofstream mOutputFile;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_DRAWEVENTRECORDER_H_ */
diff --git a/gfx/2d/DrawTarget.cpp b/gfx/2d/DrawTarget.cpp
index f2a46681be14..d27d27944078 100644
--- a/gfx/2d/DrawTarget.cpp
+++ b/gfx/2d/DrawTarget.cpp
@@ -35,5 +35,5 @@ DrawTarget::DrawCapturedDT(DrawTargetCapture *aCaptureDT,
   static_cast<DrawTargetCaptureImpl*>(aCaptureDT)->ReplayToDrawTarget(this, aTransform);
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetCG.cpp b/gfx/2d/DrawTargetCG.cpp
index 3db021fcc78d..a0620891c7ab 100644
--- a/gfx/2d/DrawTargetCG.cpp
+++ b/gfx/2d/DrawTargetCG.cpp
@@ -2051,5 +2051,5 @@ BorrowedCGContext::ReturnCGContextToDrawTarget(DrawTarget *aDT, CGContextRef cg)
 }
 
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetCG.h b/gfx/2d/DrawTargetCG.h
index ba3250fe3df5..30e901bd6b63 100644
--- a/gfx/2d/DrawTargetCG.h
+++ b/gfx/2d/DrawTargetCG.h
@@ -212,8 +212,8 @@ private:
   bool mMayContainInvalidPremultipliedData;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
 
diff --git a/gfx/2d/DrawTargetCairo.cpp b/gfx/2d/DrawTargetCairo.cpp
index fd5f62985cce..177cc3ba169b 100644
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -675,6 +675,23 @@ DrawTargetCairo::GetSize()
   return mSize;
 }
 
+SurfaceFormat
+GfxFormatForCairoSurface(cairo_surface_t* surface)
+{
+  cairo_surface_type_t type = cairo_surface_get_type(surface);
+  if (type == CAIRO_SURFACE_TYPE_IMAGE) {
+    return CairoFormatToGfxFormat(cairo_image_surface_get_format(surface));
+  }
+#ifdef CAIRO_HAS_XLIB_SURFACE
+  // xlib is currently the only Cairo backend that creates 16bpp surfaces
+  if (type == CAIRO_SURFACE_TYPE_XLIB &&
+      cairo_xlib_surface_get_depth(surface) == 16) {
+    return SurfaceFormat::R5G6B5;
+  }
+#endif
+  return CairoContentToGfxFormat(cairo_surface_get_content(surface));
+}
+
 already_AddRefed<SourceSurface>
 DrawTargetCairo::Snapshot()
 {
@@ -1807,5 +1824,5 @@ BorrowedXlibDrawable::Finish()
 }
 #endif
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetCairo.h b/gfx/2d/DrawTargetCairo.h
index 7d2d649e22a6..f6a5dc60054c 100644
--- a/gfx/2d/DrawTargetCairo.h
+++ b/gfx/2d/DrawTargetCairo.h
@@ -218,7 +218,7 @@ private: // data
   static cairo_surface_t *mDummySurface;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_DRAWTARGET_CAIRO_H_
diff --git a/gfx/2d/DrawTargetCapture.cpp b/gfx/2d/DrawTargetCapture.cpp
index 69c118c640e4..84d08d7d28cc 100644
--- a/gfx/2d/DrawTargetCapture.cpp
+++ b/gfx/2d/DrawTargetCapture.cpp
@@ -193,5 +193,5 @@ DrawTargetCaptureImpl::ReplayToDrawTarget(DrawTarget* aDT, const Matrix& aTransf
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetCapture.h b/gfx/2d/DrawTargetCapture.h
index 3d2d56ce2130..0e33ff5a6bfe 100644
--- a/gfx/2d/DrawTargetCapture.h
+++ b/gfx/2d/DrawTargetCapture.h
@@ -157,7 +157,9 @@ private:
   std::vector<uint8_t> mDrawCommandStorage;
 };
 
-} /* namespace mozilla */
-} /* namespace gfx */
+} // namespace gfx
+
+} // namespace mozilla
+
 
 #endif /* MOZILLA_GFX_DRAWTARGETCAPTURE_H_ */
diff --git a/gfx/2d/DrawTargetDual.cpp b/gfx/2d/DrawTargetDual.cpp
index d5ed632a2801..bdc27897eb88 100644
--- a/gfx/2d/DrawTargetDual.cpp
+++ b/gfx/2d/DrawTargetDual.cpp
@@ -195,5 +195,5 @@ DrawTargetDual::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFor
   return MakeAndAddRef<DrawTargetDual>(dtA, dtB);
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetDual.h b/gfx/2d/DrawTargetDual.h
index 6c8a05abe5f5..bcc06be26e34 100644
--- a/gfx/2d/DrawTargetDual.h
+++ b/gfx/2d/DrawTargetDual.h
@@ -161,7 +161,7 @@ private:
   RefPtr<DrawTarget> mB;
 };
      
-}
-}
+} // namespace gfx
+} // namespace mozilla
      
 #endif /* MOZILLA_GFX_DRAWTARGETDUAL_H_ */ 
diff --git a/gfx/2d/DrawTargetRecording.cpp b/gfx/2d/DrawTargetRecording.cpp
index e541e07ef641..f05c49fb7c46 100644
--- a/gfx/2d/DrawTargetRecording.cpp
+++ b/gfx/2d/DrawTargetRecording.cpp
@@ -588,5 +588,5 @@ DrawTargetRecording::EnsureStored(const Path *aPath)
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetRecording.h b/gfx/2d/DrawTargetRecording.h
index 0e2b3fee7fd4..9bf7b2f7d9fc 100644
--- a/gfx/2d/DrawTargetRecording.h
+++ b/gfx/2d/DrawTargetRecording.h
@@ -281,7 +281,7 @@ private:
   RefPtr<DrawTarget> mFinalDT;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_DRAWTARGETRECORDING_H_ */
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
index 87da2f0722b4..9b26a63b5289 100644
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -1014,5 +1014,5 @@ DrawTargetSkia::SnapshotDestroyed()
   mSnapshot = nullptr;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetSkia.h b/gfx/2d/DrawTargetSkia.h
index 5f55c02bc7a7..35daeb5b8225 100644
--- a/gfx/2d/DrawTargetSkia.h
+++ b/gfx/2d/DrawTargetSkia.h
@@ -145,7 +145,7 @@ private:
   SourceSurfaceSkia* mSnapshot;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_SOURCESURFACESKIA_H
diff --git a/gfx/2d/DrawTargetTiled.cpp b/gfx/2d/DrawTargetTiled.cpp
index 31717577bd7f..d969b00d3062 100644
--- a/gfx/2d/DrawTargetTiled.cpp
+++ b/gfx/2d/DrawTargetTiled.cpp
@@ -305,5 +305,5 @@ DrawTargetTiled::Fill(const Path* aPath, const Pattern& aPattern, const DrawOpti
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/DrawTargetTiled.h b/gfx/2d/DrawTargetTiled.h
index aa9af05f16b3..1e4534e74db5 100644
--- a/gfx/2d/DrawTargetTiled.h
+++ b/gfx/2d/DrawTargetTiled.h
@@ -207,7 +207,7 @@ public:
   IntRect mRect;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp
index d9098235e012..bb6fab7d1950 100644
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -901,5 +901,5 @@ CriticalLogger::OutputMessage(const std::string &aString,
   BasicLogger::OutputMessage(aString, aLevel, aNoNewline);
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/FilterNodeSoftware.cpp b/gfx/2d/FilterNodeSoftware.cpp
index bec1ad9648af..fe23166d72f8 100644
--- a/gfx/2d/FilterNodeSoftware.cpp
+++ b/gfx/2d/FilterNodeSoftware.cpp
@@ -1554,7 +1554,8 @@ struct CompareIntRects
     return a.height < b.height;
   }
 };
-}
+
+} // namespace
 
 already_AddRefed<DataSourceSurface>
 FilterNodeTileSoftware::Render(const IntRect& aRect)
diff --git a/gfx/2d/FilterNodeSoftware.h b/gfx/2d/FilterNodeSoftware.h
index 74a6026998d3..8ae5afd0309f 100644
--- a/gfx/2d/FilterNodeSoftware.h
+++ b/gfx/2d/FilterNodeSoftware.h
@@ -718,7 +718,7 @@ private:
 #endif
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_FILTERNODESOFTWARE_H_
diff --git a/gfx/2d/FilterProcessingSIMD-inl.h b/gfx/2d/FilterProcessingSIMD-inl.h
index 40d8189260a5..21306a8f2039 100644
--- a/gfx/2d/FilterProcessingSIMD-inl.h
+++ b/gfx/2d/FilterProcessingSIMD-inl.h
@@ -1077,5 +1077,5 @@ ApplyArithmeticCombine_SIMD(DataSourceSurface* aInput1, DataSourceSurface* aInpu
   return target.forget();
 }
 
-} // namespace mozilla
 } // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/FilterProcessingSSE2.cpp b/gfx/2d/FilterProcessingSSE2.cpp
index 9cd0e7bc7dde..6f14fc3efd6b 100644
--- a/gfx/2d/FilterProcessingSSE2.cpp
+++ b/gfx/2d/FilterProcessingSSE2.cpp
@@ -108,5 +108,5 @@ FilterProcessing::ApplyArithmeticCombine_SSE2(DataSourceSurface* aInput1, DataSo
   return ApplyArithmeticCombine_SIMD<__m128i,__m128i,__m128i>(aInput1, aInput2, aK1, aK2, aK3, aK4);
 }
 
-} // namespace mozilla
 } // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/FilterProcessingScalar.cpp b/gfx/2d/FilterProcessingScalar.cpp
index ca8074bd9437..9e88c563e439 100644
--- a/gfx/2d/FilterProcessingScalar.cpp
+++ b/gfx/2d/FilterProcessingScalar.cpp
@@ -240,5 +240,5 @@ FilterProcessing::ApplyArithmeticCombine_Scalar(DataSourceSurface* aInput1, Data
   return ApplyArithmeticCombine_SIMD<simd::Scalari32x4_t,simd::Scalari16x8_t,simd::Scalaru8x16_t>(aInput1, aInput2, aK1, aK2, aK3, aK4);
 }
 
-} // namespace mozilla
 } // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/Filters.h b/gfx/2d/Filters.h
index 31c3e839447f..2b6d16228180 100644
--- a/gfx/2d/Filters.h
+++ b/gfx/2d/Filters.h
@@ -506,7 +506,7 @@ protected:
   FilterNode() {}
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/2d/HelpersCairo.h b/gfx/2d/HelpersCairo.h
index 04547b571017..f1872929de75 100644
--- a/gfx/2d/HelpersCairo.h
+++ b/gfx/2d/HelpersCairo.h
@@ -234,15 +234,7 @@ CairoFormatToGfxFormat(cairo_format_t format)
   }
 }
 
-static inline SurfaceFormat
-GfxFormatForCairoSurface(cairo_surface_t* surface)
-{
-  if (cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE) {
-    return CairoFormatToGfxFormat(cairo_image_surface_get_format(surface));
-  }
-
-  return CairoContentToGfxFormat(cairo_surface_get_content(surface));
-}
+SurfaceFormat GfxFormatForCairoSurface(cairo_surface_t* surface);
 
 static inline void
 GfxMatrixToCairoMatrix(const Matrix& mat, cairo_matrix_t& retval)
@@ -319,7 +311,7 @@ private:
   cairo_matrix_t mSaveMatrix;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_HELPERSCAIRO_H_ */
diff --git a/gfx/2d/HelpersSkia.h b/gfx/2d/HelpersSkia.h
index 72ad45372f97..f905c285c8a7 100644
--- a/gfx/2d/HelpersSkia.h
+++ b/gfx/2d/HelpersSkia.h
@@ -142,6 +142,8 @@ StrokeOptionsToPaint(SkPaint& aPaint, const StrokeOptions &aOptions)
 
     for (uint32_t i = 0; i < dashCount; i++) {
       pattern[i] = SkFloatToScalar(aOptions.mDashPattern[i % aOptions.mDashLength]);
+      if (!pattern[i])
+          pattern[i] = SK_ScalarNearlyZero;
     }
 
     SkDashPathEffect* dash = SkDashPathEffect::Create(&pattern.front(),
@@ -355,7 +357,7 @@ private:
 
 // End of code imported from Skia.
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_HELPERSSKIA_H_ */
diff --git a/gfx/2d/ImageScaling.cpp b/gfx/2d/ImageScaling.cpp
index 62d08d05669c..85e99522bd4f 100644
--- a/gfx/2d/ImageScaling.cpp
+++ b/gfx/2d/ImageScaling.cpp
@@ -247,5 +247,5 @@ ImageHalfScaler::HalfImageHorizontal_C(uint8_t *aSource, int32_t aSourceStride,
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/ImageScaling.h b/gfx/2d/ImageScaling.h
index 47d489f9d15f..56173b64480d 100644
--- a/gfx/2d/ImageScaling.h
+++ b/gfx/2d/ImageScaling.h
@@ -70,7 +70,7 @@ private:
   uint32_t mStride;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/2d/ImageScalingSSE2.cpp b/gfx/2d/ImageScalingSSE2.cpp
index 92bad43a17fd..1f4d4778efc8 100644
--- a/gfx/2d/ImageScalingSSE2.cpp
+++ b/gfx/2d/ImageScalingSSE2.cpp
@@ -326,5 +326,5 @@ ImageHalfScaler::HalfImageHorizontal_SSE2(uint8_t *aSource, int32_t aSourceStrid
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/Logging.h b/gfx/2d/Logging.h
index 2c112ae09a9c..1fd10a38348f 100644
--- a/gfx/2d/Logging.h
+++ b/gfx/2d/Logging.h
@@ -630,7 +630,7 @@ private:
   TreeLog& mTreeLog;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_LOGGING_H_ */
diff --git a/gfx/2d/Matrix.cpp b/gfx/2d/Matrix.cpp
index bbd8d70fbb5d..b4d8aa216c05 100644
--- a/gfx/2d/Matrix.cpp
+++ b/gfx/2d/Matrix.cpp
@@ -397,5 +397,5 @@ Matrix4x4::SetRotationFromQuaternion(const Quaternion& q)
   _44 = 1.0f;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/Matrix.h b/gfx/2d/Matrix.h
index dec7c9ff98fa..75930ae04695 100644
--- a/gfx/2d/Matrix.h
+++ b/gfx/2d/Matrix.h
@@ -1029,7 +1029,7 @@ public:
   Float _51, _52, _53, _54;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_MATRIX_H_ */
diff --git a/gfx/2d/Path.cpp b/gfx/2d/Path.cpp
index 35c0232b1af2..ed88ddd16f49 100644
--- a/gfx/2d/Path.cpp
+++ b/gfx/2d/Path.cpp
@@ -535,5 +535,5 @@ FlattenBezier(const BezierControlPoints &aControlPoints,
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/PathAnalysis.h b/gfx/2d/PathAnalysis.h
index 6b9b33f89007..5a38ed161dda 100644
--- a/gfx/2d/PathAnalysis.h
+++ b/gfx/2d/PathAnalysis.h
@@ -53,5 +53,5 @@ private:
   std::vector<FlatPathOp> mPathOps;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/PathCG.cpp b/gfx/2d/PathCG.cpp
index 1b9178374921..a81cfb34d24f 100644
--- a/gfx/2d/PathCG.cpp
+++ b/gfx/2d/PathCG.cpp
@@ -358,6 +358,6 @@ PathCG::GetStrokedBounds(const StrokeOptions &aStrokeOptions,
 }
 
 
-}
+} // namespace gfx
 
-}
+} // namespace mozilla
diff --git a/gfx/2d/PathCG.h b/gfx/2d/PathCG.h
index fc0ce7b72540..e627ab706a04 100644
--- a/gfx/2d/PathCG.h
+++ b/gfx/2d/PathCG.h
@@ -103,7 +103,7 @@ private:
   FillRule mFillRule;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/2d/PathCairo.cpp b/gfx/2d/PathCairo.cpp
index d85119f684f2..2d78a2771159 100644
--- a/gfx/2d/PathCairo.cpp
+++ b/gfx/2d/PathCairo.cpp
@@ -319,5 +319,5 @@ PathCairo::AppendPathToBuilder(PathBuilderCairo *aBuilder, const Matrix *aTransf
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/PathCairo.h b/gfx/2d/PathCairo.h
index 01538a1c39c8..8ee76ad95bd5 100644
--- a/gfx/2d/PathCairo.h
+++ b/gfx/2d/PathCairo.h
@@ -88,7 +88,7 @@ private:
   Point mCurrentPoint;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_PATH_CAIRO_H_ */
diff --git a/gfx/2d/PathRecording.cpp b/gfx/2d/PathRecording.cpp
index 243941be397e..03fd4cb5a55a 100644
--- a/gfx/2d/PathRecording.cpp
+++ b/gfx/2d/PathRecording.cpp
@@ -116,5 +116,5 @@ PathRecording::TransformedCopyToBuilder(const Matrix &aTransform, FillRule aFill
   return recording.forget();
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/PathRecording.h b/gfx/2d/PathRecording.h
index 7df80399f991..2d3e4eb9cd47 100644
--- a/gfx/2d/PathRecording.h
+++ b/gfx/2d/PathRecording.h
@@ -130,7 +130,7 @@ private:
   std::vector<DrawEventRecorderPrivate*> mStoredRecorders;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_PATHRECORDING_H_ */
diff --git a/gfx/2d/PathSkia.cpp b/gfx/2d/PathSkia.cpp
index e01d452a4be8..00fa0bd62bda 100644
--- a/gfx/2d/PathSkia.cpp
+++ b/gfx/2d/PathSkia.cpp
@@ -239,5 +239,5 @@ PathSkia::StreamToSink(PathSink *aSink) const
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/PathSkia.h b/gfx/2d/PathSkia.h
index 14144dbc1c9e..793813762632 100644
--- a/gfx/2d/PathSkia.h
+++ b/gfx/2d/PathSkia.h
@@ -86,7 +86,7 @@ private:
   FillRule mFillRule;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_PATH_SKIA_H_ */
diff --git a/gfx/2d/Point.h b/gfx/2d/Point.h
index 0e271ccc2a62..029b7f9cc8a5 100644
--- a/gfx/2d/Point.h
+++ b/gfx/2d/Point.h
@@ -27,7 +27,7 @@ namespace gfx {
 // This should only be used by the typedefs below.
 struct UnknownUnits {};
 
-}  // close namespace 'gfx' because IsPixel specialization must be in 'mozilla'
+} // namespace gfx
 
 template<> struct IsPixel<gfx::UnknownUnits> : TrueType {};
 
@@ -218,7 +218,7 @@ IntSizeTyped<units> RoundedToInt(const SizeTyped<units>& aSize) {
                              int32_t(floorf(aSize.height + 0.5f)));
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_POINT_H_ */
diff --git a/gfx/2d/Quaternion.cpp b/gfx/2d/Quaternion.cpp
index e0086b3ef959..63842d827b45 100644
--- a/gfx/2d/Quaternion.cpp
+++ b/gfx/2d/Quaternion.cpp
@@ -53,5 +53,5 @@ Quaternion::SetFromRotationMatrix(const Matrix4x4& m)
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/Quaternion.h b/gfx/2d/Quaternion.h
index 6010de16e626..92e4bff8009c 100644
--- a/gfx/2d/Quaternion.h
+++ b/gfx/2d/Quaternion.h
@@ -94,7 +94,7 @@ public:
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/2d/RecordedEvent.cpp b/gfx/2d/RecordedEvent.cpp
index 8506029a2926..1b3876976f85 100644
--- a/gfx/2d/RecordedEvent.cpp
+++ b/gfx/2d/RecordedEvent.cpp
@@ -1565,5 +1565,5 @@ RecordedFilterNodeSetInput::OutputSimpleEventInfo(stringstream &aStringStream) c
   aStringStream << ")";
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/RecordedEvent.h b/gfx/2d/RecordedEvent.h
index fca00765037a..5412478d2c5d 100644
--- a/gfx/2d/RecordedEvent.h
+++ b/gfx/2d/RecordedEvent.h
@@ -1073,7 +1073,7 @@ private:
   MOZ_IMPLICIT RecordedFilterNodeSetInput(std::istream &aStream);
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/2d/RecordingTypes.h b/gfx/2d/RecordingTypes.h
index 92ee46f5260f..93fc67a68f9e 100644
--- a/gfx/2d/RecordingTypes.h
+++ b/gfx/2d/RecordingTypes.h
@@ -35,7 +35,7 @@ void ReadElement(std::istream &aStream, T &aElement)
   ElementStreamFormat<T>::Read(aStream, aElement);
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_RECORDINGTYPES_H_ */
diff --git a/gfx/2d/Rect.h b/gfx/2d/Rect.h
index d2bc5292571e..6bce59ce559a 100644
--- a/gfx/2d/Rect.h
+++ b/gfx/2d/Rect.h
@@ -211,7 +211,7 @@ IntRectTyped<units> RoundedOut(const RectTyped<units>& aRect)
                              int32_t(copy.height));
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_RECT_H_ */
diff --git a/gfx/2d/Scale.cpp b/gfx/2d/Scale.cpp
index cc471043570b..776e34235aa3 100644
--- a/gfx/2d/Scale.cpp
+++ b/gfx/2d/Scale.cpp
@@ -51,5 +51,5 @@ bool Scale(uint8_t* srcData, int32_t srcWidth, int32_t srcHeight, int32_t srcStr
 #endif
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/Scale.h b/gfx/2d/Scale.h
index 0e8000d57764..75465da3889c 100644
--- a/gfx/2d/Scale.h
+++ b/gfx/2d/Scale.h
@@ -30,7 +30,7 @@ GFX2D_API bool Scale(uint8_t* srcData, int32_t srcWidth, int32_t srcHeight, int3
                      uint8_t* dstData, int32_t dstWidth, int32_t dstHeight, int32_t dstStride,
                      SurfaceFormat format);
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_BLUR_H_ */
diff --git a/gfx/2d/ScaleFactor.h b/gfx/2d/ScaleFactor.h
index 34b405ebabe5..89bbbc96d44d 100644
--- a/gfx/2d/ScaleFactor.h
+++ b/gfx/2d/ScaleFactor.h
@@ -79,7 +79,7 @@ struct ScaleFactor {
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SCALEFACTOR_H_ */
diff --git a/gfx/2d/ScaleFactors2D.h b/gfx/2d/ScaleFactors2D.h
index 16dfbce35323..3327b4ce9fe8 100644
--- a/gfx/2d/ScaleFactors2D.h
+++ b/gfx/2d/ScaleFactors2D.h
@@ -130,7 +130,7 @@ struct ScaleFactors2D {
   }
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SCALEFACTORS2D_H_ */
diff --git a/gfx/2d/ScaledFontBase.cpp b/gfx/2d/ScaledFontBase.cpp
index d0faed147106..1a11d0504bce 100644
--- a/gfx/2d/ScaledFontBase.cpp
+++ b/gfx/2d/ScaledFontBase.cpp
@@ -185,5 +185,5 @@ ScaledFontBase::SetCairoScaledFont(cairo_scaled_font_t* font)
 }
 #endif
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/ScaledFontBase.h b/gfx/2d/ScaledFontBase.h
index 74e13ad20b6e..04ab43376675 100644
--- a/gfx/2d/ScaledFontBase.h
+++ b/gfx/2d/ScaledFontBase.h
@@ -61,7 +61,7 @@ protected:
   Float mSize;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SCALEDFONTBASE_H_ */
diff --git a/gfx/2d/ScaledFontCairo.cpp b/gfx/2d/ScaledFontCairo.cpp
index 12ab27e262f9..b06b135829dd 100644
--- a/gfx/2d/ScaledFontCairo.cpp
+++ b/gfx/2d/ScaledFontCairo.cpp
@@ -61,5 +61,5 @@ SkTypeface* ScaledFontCairo::GetSkTypeface()
 }
 #endif
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/ScaledFontCairo.h b/gfx/2d/ScaledFontCairo.h
index 9f4d227aed0c..de1f7580435d 100644
--- a/gfx/2d/ScaledFontCairo.h
+++ b/gfx/2d/ScaledFontCairo.h
@@ -50,7 +50,7 @@ private:
   bool mAutoHinting;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SCALEDFONTCAIRO_H_ */
diff --git a/gfx/2d/ScaledFontMac.cpp b/gfx/2d/ScaledFontMac.cpp
index 6bc1509434f6..4a14f112f459 100644
--- a/gfx/2d/ScaledFontMac.cpp
+++ b/gfx/2d/ScaledFontMac.cpp
@@ -270,5 +270,5 @@ ScaledFontMac::GetFontFileData(FontFileDataOutput aDataCallback, void *aBaton)
 
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/ScaledFontMac.h b/gfx/2d/ScaledFontMac.h
index 98fd2c1d4969..7862a0a497f5 100644
--- a/gfx/2d/ScaledFontMac.h
+++ b/gfx/2d/ScaledFontMac.h
@@ -47,7 +47,7 @@ public:
   static CTFontDrawGlyphsFuncT* CTFontDrawGlyphsPtr;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SCALEDFONTMAC_H_ */
diff --git a/gfx/2d/SourceSurfaceCG.cpp b/gfx/2d/SourceSurfaceCG.cpp
index 2a2c73402faa..b2627b44036c 100644
--- a/gfx/2d/SourceSurfaceCG.cpp
+++ b/gfx/2d/SourceSurfaceCG.cpp
@@ -453,5 +453,5 @@ SourceSurfaceCGIOSurfaceContext::GetData()
   return (unsigned char*)mData;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/SourceSurfaceCG.h b/gfx/2d/SourceSurfaceCG.h
index f9b2a658ef7f..5d8655d503a5 100644
--- a/gfx/2d/SourceSurfaceCG.h
+++ b/gfx/2d/SourceSurfaceCG.h
@@ -198,7 +198,7 @@ private:
 };
 
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_SOURCESURFACECG_H
diff --git a/gfx/2d/SourceSurfaceCairo.cpp b/gfx/2d/SourceSurfaceCairo.cpp
index 2afae57ad0c0..2ead9510f3bb 100644
--- a/gfx/2d/SourceSurfaceCairo.cpp
+++ b/gfx/2d/SourceSurfaceCairo.cpp
@@ -158,5 +158,5 @@ DataSourceSurfaceCairo::GetSurface() const
   return mImageSurface;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/SourceSurfaceCairo.h b/gfx/2d/SourceSurfaceCairo.h
index 1466e9ac81ff..428c75957b08 100644
--- a/gfx/2d/SourceSurfaceCairo.h
+++ b/gfx/2d/SourceSurfaceCairo.h
@@ -64,7 +64,7 @@ private:
   cairo_surface_t* mImageSurface;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // _MOZILLA_GFX_OP_SOURCESURFACE_CAIRO_H
diff --git a/gfx/2d/SourceSurfaceDual.h b/gfx/2d/SourceSurfaceDual.h
index 7c44bbc0b630..d392459e87c4 100644
--- a/gfx/2d/SourceSurfaceDual.h
+++ b/gfx/2d/SourceSurfaceDual.h
@@ -37,7 +37,7 @@ private:
   RefPtr<SourceSurface> mB;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SOURCESURFACEDUAL_H_ */
diff --git a/gfx/2d/SourceSurfaceRawData.cpp b/gfx/2d/SourceSurfaceRawData.cpp
index 901a5f567669..c22de5d2b5de 100644
--- a/gfx/2d/SourceSurfaceRawData.cpp
+++ b/gfx/2d/SourceSurfaceRawData.cpp
@@ -87,5 +87,5 @@ SourceSurfaceAlignedRawData::InitWithStride(const IntSize &aSize,
   return mArray != nullptr;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/SourceSurfaceRawData.h b/gfx/2d/SourceSurfaceRawData.h
index 13a84e5d017d..de31ca893b4a 100644
--- a/gfx/2d/SourceSurfaceRawData.h
+++ b/gfx/2d/SourceSurfaceRawData.h
@@ -70,7 +70,7 @@ private:
   IntSize mSize;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SOURCESURFACERAWDATA_H_ */
diff --git a/gfx/2d/SourceSurfaceSkia.cpp b/gfx/2d/SourceSurfaceSkia.cpp
index 959e4f235c02..d081eb19443c 100644
--- a/gfx/2d/SourceSurfaceSkia.cpp
+++ b/gfx/2d/SourceSurfaceSkia.cpp
@@ -153,5 +153,5 @@ SourceSurfaceSkia::MaybeUnlock()
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/2d/SourceSurfaceSkia.h b/gfx/2d/SourceSurfaceSkia.h
index d13d38737596..3914cc31663e 100644
--- a/gfx/2d/SourceSurfaceSkia.h
+++ b/gfx/2d/SourceSurfaceSkia.h
@@ -66,7 +66,7 @@ private:
   bool mLocked;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SOURCESURFACESKIA_H_ */
diff --git a/gfx/2d/Tools.h b/gfx/2d/Tools.h
index 40e4de2272e4..c4b95d501352 100644
--- a/gfx/2d/Tools.h
+++ b/gfx/2d/Tools.h
@@ -215,7 +215,7 @@ int32_t GetAlignedStride(int32_t aStride)
   return (aStride + mask) & ~mask;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_TOOLS_H_ */
diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
index 29cf37e0ba07..9606d59e78a6 100644
--- a/gfx/2d/Types.h
+++ b/gfx/2d/Types.h
@@ -279,8 +279,8 @@ struct GradientStop
   Color color;
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #if defined(XP_WIN) && defined(MOZ_GFX)
 #ifdef GFX2D_INTERNAL
@@ -322,6 +322,7 @@ enum SideBits {
   eSideBitsLeftRight = eSideBitsLeft | eSideBitsRight,
   eSideBitsAll = eSideBitsTopBottom | eSideBitsLeftRight
 };
+
 } // namespace mozilla
 
 #define NS_SIDE_TOP    mozilla::eSideTop
diff --git a/gfx/2d/UserData.h b/gfx/2d/UserData.h
index e803dc04e1eb..04d50b619198 100644
--- a/gfx/2d/UserData.h
+++ b/gfx/2d/UserData.h
@@ -122,7 +122,7 @@ private:
 
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_USERDATA_H_ */
diff --git a/gfx/2d/image_operations.cpp b/gfx/2d/image_operations.cpp
index 59861bb9bd6a..79da02dcc5ef 100644
--- a/gfx/2d/image_operations.cpp
+++ b/gfx/2d/image_operations.cpp
@@ -155,7 +155,7 @@ void ComputeFilters(ImageOperations::ResizeMethod method,
   output->PaddingForSIMD(8);
 }
 
-}
+} // namespace resize
 
 ImageOperations::ResizeMethod ResizeMethodToAlgorithmMethod(
     ImageOperations::ResizeMethod method) {
@@ -388,4 +388,4 @@ SkBitmap ImageOperations::Resize(const SkBitmap& source,
                 dest_pixels);
 }
 
-}  // namespace skia
+} // namespace skia
diff --git a/gfx/2d/unittest/TestCairo.cpp b/gfx/2d/unittest/TestCairo.cpp
index 1ea4626b886d..7df604695aa2 100644
--- a/gfx/2d/unittest/TestCairo.cpp
+++ b/gfx/2d/unittest/TestCairo.cpp
@@ -92,5 +92,5 @@ TEST(Cairo, Bug1063486) {
   cairo_destroy(cairo);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/gl/DecomposeIntoNoRepeatTriangles.cpp b/gfx/gl/DecomposeIntoNoRepeatTriangles.cpp
index 077587f2fb68..a71ea2280bd9 100644
--- a/gfx/gl/DecomposeIntoNoRepeatTriangles.cpp
+++ b/gfx/gl/DecomposeIntoNoRepeatTriangles.cpp
@@ -176,5 +176,5 @@ DecomposeIntoNoRepeatTriangles(const gfx::IntRect& aTexCoordRect,
     }
 }
 
-}
-}
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/gl/DecomposeIntoNoRepeatTriangles.h b/gfx/gl/DecomposeIntoNoRepeatTriangles.h
index a6c3465857d6..8e8b27ec5f6d 100644
--- a/gfx/gl/DecomposeIntoNoRepeatTriangles.h
+++ b/gfx/gl/DecomposeIntoNoRepeatTriangles.h
@@ -71,7 +71,7 @@ void DecomposeIntoNoRepeatTriangles(const gfx::IntRect& aTexCoordRect,
                                     RectTriangles& aRects,
                                     bool aFlipY = false);
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif // DecomposeIntoNoRepeatTriangles_h_
diff --git a/gfx/gl/GLBlitHelper.h b/gfx/gl/GLBlitHelper.h
index 06f4a964e031..b6bff759c0a7 100644
--- a/gfx/gl/GLBlitHelper.h
+++ b/gfx/gl/GLBlitHelper.h
@@ -21,7 +21,7 @@ class PlanarYCbCrImage;
 class GrallocImage;
 class SurfaceTextureImage;
 class EGLImageImage;
-}
+} // namespace layers
 
 namespace gl {
 
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index cdfd244981b0..1d22450e0438 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -53,13 +53,13 @@
 
 namespace android {
     class GraphicBuffer;
-}
+} // namespace android
 
 namespace mozilla {
     namespace gfx {
         class DataSourceSurface;
         class SourceSurface;
-    }
+    } // namespace gfx
 
     namespace gl {
         class GLContext;
@@ -70,12 +70,12 @@ namespace mozilla {
         class GLBlitTextureImageHelper;
         class GLReadTexImageHelper;
         struct SurfaceCaps;
-    }
+    } // namespace gl
 
     namespace layers {
         class ColorTextureLayerProgram;
-    }
-}
+    } // namespace layers
+} // namespace mozilla
 
 namespace mozilla {
 namespace gl {
diff --git a/gfx/gl/GLContextCGL.h b/gfx/gl/GLContextCGL.h
index 8b812f775a84..f7416b334c4b 100644
--- a/gfx/gl/GLContextCGL.h
+++ b/gfx/gl/GLContextCGL.h
@@ -60,7 +60,7 @@ public:
     virtual bool SwapBuffers() override;
 };
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif // GLCONTEXTCGL_H_
diff --git a/gfx/gl/GLContextEGL.h b/gfx/gl/GLContextEGL.h
index 72881cc709e8..6574a300fcda 100644
--- a/gfx/gl/GLContextEGL.h
+++ b/gfx/gl/GLContextEGL.h
@@ -131,7 +131,7 @@ protected:
                                                            gfx::IntSize& pbsize);
 };
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif // GLCONTEXTEGL_H_
diff --git a/gfx/gl/GLContextProvider.h b/gfx/gl/GLContextProvider.h
index 834283b3c573..d3a34032e64b 100644
--- a/gfx/gl/GLContextProvider.h
+++ b/gfx/gl/GLContextProvider.h
@@ -70,7 +70,7 @@ typedef GLContextProviderNull GLContextProvider;
 
 #undef IN_GL_CONTEXT_PROVIDER_H
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif
diff --git a/gfx/gl/GLContextSymbols.h b/gfx/gl/GLContextSymbols.h
index 66b56cc8b57f..c68bb82d651b 100644
--- a/gfx/gl/GLContextSymbols.h
+++ b/gfx/gl/GLContextSymbols.h
@@ -680,7 +680,7 @@ struct GLContextSymbols
     PFNGLGETSTRINGIPROC fGetStringi;
 };
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif /* GLCONTEXTSYMBOLS_H_ */
diff --git a/gfx/gl/GLReadTexImageHelper.cpp b/gfx/gl/GLReadTexImageHelper.cpp
index 31fe011a65ee..6ba1a1238bcb 100644
--- a/gfx/gl/GLReadTexImageHelper.cpp
+++ b/gfx/gl/GLReadTexImageHelper.cpp
@@ -760,5 +760,5 @@ GLReadTexImageHelper::ReadTexImage(GLuint aTextureId,
 
 #undef CLEANUP_IF_GLERROR_OCCURRED
 
-}
-}
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/gl/GLReadTexImageHelper.h b/gfx/gl/GLReadTexImageHelper.h
index 12f8fe7cba1a..821c003a96a1 100644
--- a/gfx/gl/GLReadTexImageHelper.h
+++ b/gfx/gl/GLReadTexImageHelper.h
@@ -18,7 +18,7 @@ namespace mozilla {
 
 namespace gfx {
 class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace gl {
 
@@ -73,7 +73,7 @@ public:
 
 };
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif
diff --git a/gfx/gl/GLScreenBuffer.h b/gfx/gl/GLScreenBuffer.h
index b9dd9f74eee2..78b2ac6163e0 100644
--- a/gfx/gl/GLScreenBuffer.h
+++ b/gfx/gl/GLScreenBuffer.h
@@ -26,7 +26,7 @@
 namespace mozilla {
 namespace layers {
 class SharedSurfaceTextureClient;
-}
+} // namespace layers
 
 namespace gl {
 
@@ -274,7 +274,7 @@ public:
     bool IsReadFramebufferDefault() const;
 };
 
-}   // namespace gl
-}   // namespace mozilla
+} // namespace gl
+} // namespace mozilla
 
 #endif  // SCREEN_BUFFER_H_
diff --git a/gfx/gl/GLTextureImage.cpp b/gfx/gl/GLTextureImage.cpp
index 6256474897e9..26ebbe366530 100644
--- a/gfx/gl/GLTextureImage.cpp
+++ b/gfx/gl/GLTextureImage.cpp
@@ -729,5 +729,5 @@ CreateBasicTextureImage(GLContext* aGL,
     return texImage.forget();
 }
 
-} // namespace
-} // namespace
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/gl/GLTextureImage.h b/gfx/gl/GLTextureImage.h
index 2ed2c901aa1c..5c0203e8337f 100644
--- a/gfx/gl/GLTextureImage.h
+++ b/gfx/gl/GLTextureImage.h
@@ -21,8 +21,8 @@ namespace mozilla {
 namespace gfx {
 class DataSourceSurface;
 class DrawTarget;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 namespace mozilla {
 namespace gl {
diff --git a/gfx/gl/GLUploadHelpers.cpp b/gfx/gl/GLUploadHelpers.cpp
index 3cf04691d9a3..78867db529b4 100644
--- a/gfx/gl/GLUploadHelpers.cpp
+++ b/gfx/gl/GLUploadHelpers.cpp
@@ -582,5 +582,5 @@ CanUploadNonPowerOfTwo(GLContext* gl)
            gl->Renderer() != GLRenderer::Adreno205;
 }
 
-}
-}
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/gl/GLUploadHelpers.h b/gfx/gl/GLUploadHelpers.h
index 1f41b9457791..5ce7875fc24d 100644
--- a/gfx/gl/GLUploadHelpers.h
+++ b/gfx/gl/GLUploadHelpers.h
@@ -16,7 +16,7 @@ namespace mozilla {
 
 namespace gfx {
 class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace gl {
 
@@ -82,7 +82,7 @@ UploadSurfaceToTexture(GLContext* gl,
 bool CanUploadSubTextures(GLContext* gl);
 bool CanUploadNonPowerOfTwo(GLContext* gl);
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif
diff --git a/gfx/gl/GfxTexturesReporter.h b/gfx/gl/GfxTexturesReporter.h
index 1e1f0bc24310..89f9c4d151de 100644
--- a/gfx/gl/GfxTexturesReporter.h
+++ b/gfx/gl/GfxTexturesReporter.h
@@ -89,7 +89,7 @@ private:
   int32_t mBytes;
 };
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif // GFXTEXTURESREPORTER_H_
diff --git a/gfx/gl/HeapCopyOfStackArray.h b/gfx/gl/HeapCopyOfStackArray.h
index e6dbb2a1fe25..df4c050ed4a6 100644
--- a/gfx/gl/HeapCopyOfStackArray.h
+++ b/gfx/gl/HeapCopyOfStackArray.h
@@ -42,6 +42,6 @@ private:
   ScopedDeletePtr<ElemType> const mArrayData;
 };
 
-}
+} // namespace mozilla
 
 #endif // HEAPCOPYOFSTACKARRAY_H_
\ No newline at end of file
diff --git a/gfx/gl/SharedSurface.cpp b/gfx/gl/SharedSurface.cpp
index 58fcbfde9119..930a3c34e599 100644
--- a/gfx/gl/SharedSurface.cpp
+++ b/gfx/gl/SharedSurface.cpp
@@ -623,5 +623,6 @@ ReadPixel(SharedSurface* src)
     return pixel;
 }
 
-} /* namespace gfx */
+} // namespace gl
+
 } /* namespace mozilla */
diff --git a/gfx/gl/SharedSurface.h b/gfx/gl/SharedSurface.h
index 75cbf60bd649..8c25ac7063d1 100644
--- a/gfx/gl/SharedSurface.h
+++ b/gfx/gl/SharedSurface.h
@@ -34,7 +34,7 @@ class nsIThread;
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace layers {
 class ISurfaceAllocator;
@@ -42,7 +42,7 @@ class SharedSurfaceTextureClient;
 enum class TextureFlags : uint32_t;
 class SurfaceDescriptor;
 class TextureClient;
-}
+} // namespace layers
 
 namespace gl {
 
diff --git a/gfx/gl/SharedSurfaceEGL.cpp b/gfx/gl/SharedSurfaceEGL.cpp
index 3f8f8ae27a49..9c5b99be62d0 100644
--- a/gfx/gl/SharedSurfaceEGL.cpp
+++ b/gfx/gl/SharedSurfaceEGL.cpp
@@ -233,5 +233,6 @@ SurfaceFactory_EGLImage::Create(GLContext* prodGL, const SurfaceCaps& caps,
     return Move(ret);
 }
 
-} /* namespace gfx */
+} // namespace gl
+
 } /* namespace mozilla */
diff --git a/gfx/gl/SharedSurfaceEGL.h b/gfx/gl/SharedSurfaceEGL.h
index e3524f078424..0184887e0015 100644
--- a/gfx/gl/SharedSurfaceEGL.h
+++ b/gfx/gl/SharedSurfaceEGL.h
@@ -111,7 +111,8 @@ public:
     }
 };
 
-} /* namespace gfx */
+} // namespace gl
+
 } /* namespace mozilla */
 
 #endif /* SHARED_SURFACE_EGL_H_ */
diff --git a/gfx/gl/SharedSurfaceGL.cpp b/gfx/gl/SharedSurfaceGL.cpp
index 09dcadd2f50f..4cce70b82dee 100644
--- a/gfx/gl/SharedSurfaceGL.cpp
+++ b/gfx/gl/SharedSurfaceGL.cpp
@@ -105,5 +105,6 @@ SurfaceFactory_Basic::SurfaceFactory_Basic(GLContext* gl, const SurfaceCaps& cap
     : SurfaceFactory(SharedSurfaceType::Basic, gl, caps, nullptr, flags)
 { }
 
-} /* namespace gfx */
+} // namespace gl
+
 } /* namespace mozilla */
diff --git a/gfx/gl/SharedSurfaceGL.h b/gfx/gl/SharedSurfaceGL.h
index 9ecf76f270d7..be3ccecfb5c6 100644
--- a/gfx/gl/SharedSurfaceGL.h
+++ b/gfx/gl/SharedSurfaceGL.h
@@ -19,11 +19,11 @@
 namespace mozilla {
     namespace gl {
         class GLContext;
-    }
+    } // namespace gl
     namespace gfx {
         class DataSourceSurface;
-    }
-}
+    } // namespace gfx
+} // namespace mozilla
 
 namespace mozilla {
 namespace gl {
@@ -93,7 +93,8 @@ public:
     }
 };
 
-} /* namespace gfx */
+} // namespace gl
+
 } /* namespace mozilla */
 
 #endif /* SHARED_SURFACE_GL_H_ */
diff --git a/gfx/gl/SharedSurfaceGralloc.cpp b/gfx/gl/SharedSurfaceGralloc.cpp
index 0b95b6247000..ba957c401275 100644
--- a/gfx/gl/SharedSurfaceGralloc.cpp
+++ b/gfx/gl/SharedSurfaceGralloc.cpp
@@ -19,7 +19,6 @@
 #include "ScopedGLHelpers.h"
 
 #include "gfxPlatform.h"
-#include "gfx2DGlue.h"
 #include "gfxPrefs.h"
 
 #define DEBUG_GRALLOC
@@ -64,12 +63,9 @@ SharedSurface_Gralloc::Create(GLContext* prodGL,
     gfxContentType type = hasAlpha ? gfxContentType::COLOR_ALPHA
                                    : gfxContentType::COLOR;
 
-    auto platform = gfxPlatform::GetPlatform();
-    gfxImageFormat format = platform->OptimalFormatForContent(type);
-
     typedef GrallocTextureClientOGL ptrT;
     RefPtr<ptrT> grallocTC = new ptrT(allocator,
-                                      gfx::ImageFormatToSurfaceFormat(format),
+                                      gfxPlatform::GetPlatform()->Optimal2DFormatForContent(type),
                                       gfx::BackendType::NONE, // we don't need to use it with a DrawTarget
                                       flags);
 
diff --git a/gfx/gl/SharedSurfaceIO.cpp b/gfx/gl/SharedSurfaceIO.cpp
index 67f83bdc1fe3..e50b8d8f0c32 100644
--- a/gfx/gl/SharedSurfaceIO.cpp
+++ b/gfx/gl/SharedSurfaceIO.cpp
@@ -220,5 +220,5 @@ SurfaceFactory_IOSurface::CreateShared(const gfx::IntSize& size)
     return SharedSurface_IOSurface::Create(ioSurf, mGL, hasAlpha);
 }
 
-}
-}
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/gl/SharedSurfaceIO.h b/gfx/gl/SharedSurfaceIO.h
index 88a495ad616f..3976b5787f05 100644
--- a/gfx/gl/SharedSurfaceIO.h
+++ b/gfx/gl/SharedSurfaceIO.h
@@ -92,7 +92,8 @@ protected:
     virtual UniquePtr<SharedSurface> CreateShared(const gfx::IntSize& size) override;
 };
 
-} /* namespace gfx */
+} // namespace gl
+
 } /* namespace mozilla */
 
 #endif /* SHARED_SURFACEIO_H_ */
diff --git a/gfx/gl/SkiaGLGlue.h b/gfx/gl/SkiaGLGlue.h
index 82b125c867d6..b6f109aa6dd3 100755
--- a/gfx/gl/SkiaGLGlue.h
+++ b/gfx/gl/SkiaGLGlue.h
@@ -41,8 +41,8 @@ private:
   mozilla::gfx::RefPtrSkia<GrContext> mGrContext;
 };
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #else
 
diff --git a/gfx/gl/SurfaceTypes.h b/gfx/gl/SurfaceTypes.h
index 7d3564093b4e..ba82b4a7c77f 100644
--- a/gfx/gl/SurfaceTypes.h
+++ b/gfx/gl/SurfaceTypes.h
@@ -13,7 +13,7 @@
 namespace mozilla {
 namespace layers {
 class ISurfaceAllocator;
-}
+} // namespace layers
 
 namespace gl {
 
@@ -89,7 +89,8 @@ enum class AttachmentType : uint8_t {
     Max
 };
 
-} /* namespace gfx */
+} // namespace gl
+
 } /* namespace mozilla */
 
 #endif /* SURFACE_TYPES_H_ */
diff --git a/gfx/gl/TextureGarbageBin.h b/gfx/gl/TextureGarbageBin.h
index 8419fe8b86a0..9218c4f265a4 100644
--- a/gfx/gl/TextureGarbageBin.h
+++ b/gfx/gl/TextureGarbageBin.h
@@ -41,7 +41,7 @@ public:
     void EmptyGarbage();
 };
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif // TEXTUREGARBAGEBIN_H_
diff --git a/gfx/gl/TextureImageCGL.h b/gfx/gl/TextureImageCGL.h
index 471b62732a02..a2b489c3a396 100644
--- a/gfx/gl/TextureImageCGL.h
+++ b/gfx/gl/TextureImageCGL.h
@@ -54,7 +54,7 @@ TileGenFuncCGL(GLContext *gl,
                TextureImage::Flags aFlags,
                TextureImage::ImageFormat aImageFormat);
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif
diff --git a/gfx/gl/TextureImageCGL.mm b/gfx/gl/TextureImageCGL.mm
index c8bee830e640..abb24d4f72f4 100644
--- a/gfx/gl/TextureImageCGL.mm
+++ b/gfx/gl/TextureImageCGL.mm
@@ -107,5 +107,5 @@ TileGenFuncCGL(GLContext *gl,
     return teximage.forget();
 }
 
-}
-}
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/gl/TextureImageEGL.cpp b/gfx/gl/TextureImageEGL.cpp
index 9056a25b3caf..b60110dea93c 100644
--- a/gfx/gl/TextureImageEGL.cpp
+++ b/gfx/gl/TextureImageEGL.cpp
@@ -8,7 +8,6 @@
 #include "GLContext.h"
 #include "GLUploadHelpers.h"
 #include "gfxPlatform.h"
-#include "gfx2DGlue.h"
 #include "mozilla/gfx/Types.h"
 
 namespace mozilla {
@@ -66,8 +65,8 @@ TextureImageEGL::TextureImageEGL(GLuint aTexture,
     , mBound(false)
 {
     if (mUpdateFormat == gfx::SurfaceFormat::UNKNOWN) {
-        mUpdateFormat = gfx::ImageFormatToSurfaceFormat(
-                gfxPlatform::GetPlatform()->OptimalFormatForContent(GetContentType()));
+        mUpdateFormat =
+                gfxPlatform::GetPlatform()->Optimal2DFormatForContent(GetContentType());
     }
 
     if (mUpdateFormat == gfx::SurfaceFormat::R5G6B5) {
@@ -343,5 +342,5 @@ TileGenFuncEGL(GLContext *gl,
   return teximage.forget();
 }
 
-}
-}
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/gl/TextureImageEGL.h b/gfx/gl/TextureImageEGL.h
index d36fa5b3aacc..472718e2efd2 100644
--- a/gfx/gl/TextureImageEGL.h
+++ b/gfx/gl/TextureImageEGL.h
@@ -92,7 +92,7 @@ TileGenFuncEGL(GLContext *gl,
                TextureImage::Flags aFlags,
                TextureImage::ImageFormat aImageFormat);
 
-}
-}
+} // namespace gl
+} // namespace mozilla
 
 #endif // TEXTUREIMAGEEGL_H_
diff --git a/gfx/ipc/SharedDIB.cpp b/gfx/ipc/SharedDIB.cpp
index 26655288be58..ec68a61fa22f 100644
--- a/gfx/ipc/SharedDIB.cpp
+++ b/gfx/ipc/SharedDIB.cpp
@@ -73,5 +73,5 @@ SharedDIB::ShareToProcess(base::ProcessId aTargetPid, Handle *aNewHandle)
   return NS_OK;
 }
 
-} // gfx
-} // mozilla
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/ipc/SharedDIB.h b/gfx/ipc/SharedDIB.h
index 74e604838460..b6df420760ab 100644
--- a/gfx/ipc/SharedDIB.h
+++ b/gfx/ipc/SharedDIB.h
@@ -42,7 +42,7 @@ protected:
   base::SharedMemory *mShMem;
 };
 
-} // gfx
-} // mozilla
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/AtomicRefCountedWithFinalize.h b/gfx/layers/AtomicRefCountedWithFinalize.h
index 3e843fdfcd23..5e9483df6d75 100644
--- a/gfx/layers/AtomicRefCountedWithFinalize.h
+++ b/gfx/layers/AtomicRefCountedWithFinalize.h
@@ -27,7 +27,7 @@ class RefSet;
 
 template<typename T>
 class RefQueue;
-}
+} // namespace gl
 
 template<typename T>
 class AtomicRefCountedWithFinalize
diff --git a/gfx/layers/AxisPhysicsMSDModel.cpp b/gfx/layers/AxisPhysicsMSDModel.cpp
index 486122295f93..f200ad48848d 100644
--- a/gfx/layers/AxisPhysicsMSDModel.cpp
+++ b/gfx/layers/AxisPhysicsMSDModel.cpp
@@ -96,5 +96,5 @@ AxisPhysicsMSDModel::IsFinished()
     && fabs(GetVelocity()) <= kFinishVelocity;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/AxisPhysicsMSDModel.h b/gfx/layers/AxisPhysicsMSDModel.h
index 59354651846f..42cc64f2bb2e 100644
--- a/gfx/layers/AxisPhysicsMSDModel.h
+++ b/gfx/layers/AxisPhysicsMSDModel.h
@@ -80,7 +80,7 @@ private:
 };
 
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/AxisPhysicsModel.cpp b/gfx/layers/AxisPhysicsModel.cpp
index b34ed8ff1ec7..3ae686d16dcc 100644
--- a/gfx/layers/AxisPhysicsModel.cpp
+++ b/gfx/layers/AxisPhysicsModel.cpp
@@ -117,5 +117,5 @@ AxisPhysicsModel::LinearInterpolate(double aV1, double aV2, double aBlend)
   return aV1 * (1.0 - aBlend) + aV2 * aBlend;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/AxisPhysicsModel.h b/gfx/layers/AxisPhysicsModel.h
index 5a052b7f18d9..b1cf59b4583d 100644
--- a/gfx/layers/AxisPhysicsModel.h
+++ b/gfx/layers/AxisPhysicsModel.h
@@ -125,7 +125,7 @@ private:
 };
 
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/Compositor.cpp b/gfx/layers/Compositor.cpp
index 3a430b28ca0a..c4425312cbcd 100644
--- a/gfx/layers/Compositor.cpp
+++ b/gfx/layers/Compositor.cpp
@@ -14,7 +14,7 @@
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 
 namespace layers {
 
diff --git a/gfx/layers/Compositor.h b/gfx/layers/Compositor.h
index 5960ecff6428..6791e87566b4 100644
--- a/gfx/layers/Compositor.h
+++ b/gfx/layers/Compositor.h
@@ -113,7 +113,7 @@ namespace gfx {
 class Matrix;
 class Matrix4x4;
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace layers {
 
diff --git a/gfx/layers/CopyableCanvasLayer.cpp b/gfx/layers/CopyableCanvasLayer.cpp
index b4a3fa34f8a9..be171b4bcb23 100644
--- a/gfx/layers/CopyableCanvasLayer.cpp
+++ b/gfx/layers/CopyableCanvasLayer.cpp
@@ -191,5 +191,5 @@ CopyableCanvasLayer::DiscardTempSurface()
   mCachedTempSurface = nullptr;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/CopyableCanvasLayer.h b/gfx/layers/CopyableCanvasLayer.h
index 2c3275b9a410..ae291bdf07db 100644
--- a/gfx/layers/CopyableCanvasLayer.h
+++ b/gfx/layers/CopyableCanvasLayer.h
@@ -24,7 +24,7 @@ namespace mozilla {
 
 namespace gl {
 class SharedSurface;
-}
+} // namespace gl
 
 namespace layers {
 
@@ -68,7 +68,7 @@ protected:
   void DiscardTempSurface();
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/D3D11ShareHandleImage.cpp b/gfx/layers/D3D11ShareHandleImage.cpp
index bfc342acc1a5..f6eab1e4589f 100644
--- a/gfx/layers/D3D11ShareHandleImage.cpp
+++ b/gfx/layers/D3D11ShareHandleImage.cpp
@@ -140,5 +140,5 @@ D3D11ShareHandleImage::GetTexture() const {
   return mTexture;
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/D3D9SurfaceImage.cpp b/gfx/layers/D3D9SurfaceImage.cpp
index 947023949f99..b25567f0e52f 100644
--- a/gfx/layers/D3D9SurfaceImage.cpp
+++ b/gfx/layers/D3D9SurfaceImage.cpp
@@ -272,5 +272,5 @@ D3D9SurfaceImage::GetAsSourceSurface()
   return surface.forget();
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/DirectedGraph.h b/gfx/layers/DirectedGraph.h
index 8c6d9cc1d8f9..272e16c1fa22 100644
--- a/gfx/layers/DirectedGraph.h
+++ b/gfx/layers/DirectedGraph.h
@@ -110,7 +110,7 @@ private:
   nsTArray<Edge> mEdges;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // GFX_DIRECTEDGRAPH_H
diff --git a/gfx/layers/FrameMetrics.cpp b/gfx/layers/FrameMetrics.cpp
new file mode 100644
index 000000000000..a4cf2b579a64
--- /dev/null
+++ b/gfx/layers/FrameMetrics.cpp
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "FrameMetrics.h"
+#include "gfxPrefs.h"
+
+namespace mozilla {
+namespace layers {
+
+const FrameMetrics::ViewID FrameMetrics::NULL_SCROLL_ID = 0;
+const FrameMetrics FrameMetrics::sNullMetrics;
+
+void
+FrameMetrics::SetUsesContainerScrolling(bool aValue) {
+  MOZ_ASSERT_IF(aValue, gfxPrefs::LayoutUseContainersForRootFrames());
+  mUsesContainerScrolling = aValue;
+}
+
+}
+}
\ No newline at end of file
diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h
index 09ce3d3489fd..b9957596bc65 100644
--- a/gfx/layers/FrameMetrics.h
+++ b/gfx/layers/FrameMetrics.h
@@ -14,7 +14,6 @@
 #include "mozilla/gfx/ScaleFactor.h"    // for ScaleFactor
 #include "mozilla/gfx/Logging.h"        // for Log
 #include "gfxColor.h"
-#include "gfxPrefs.h"                   // for LayoutUseContainersForRootFrames
 #include "nsString.h"
 
 namespace IPC {
@@ -540,10 +539,9 @@ public:
     return mIsLayersIdRoot;
   }
 
-  void SetUsesContainerScrolling(bool aValue) {
-    MOZ_ASSERT_IF(aValue, gfxPrefs::LayoutUseContainersForRootFrames());
-    mUsesContainerScrolling = aValue;
-  }
+  // Implemented out of line because the implementation needs gfxPrefs.h
+  // and we don't want to include that from FrameMetrics.h.
+  void SetUsesContainerScrolling(bool aValue);
   bool UsesContainerScrolling() const {
     return mUsesContainerScrolling;
   }
@@ -881,7 +879,7 @@ struct ZoomConstraints {
 
 typedef Maybe<ZoomConstraints> MaybeZoomConstraints;
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_FRAMEMETRICS_H */
diff --git a/gfx/layers/GLImages.cpp b/gfx/layers/GLImages.cpp
index 37117816ee1f..673228990d7b 100644
--- a/gfx/layers/GLImages.cpp
+++ b/gfx/layers/GLImages.cpp
@@ -82,5 +82,5 @@ GLImage::GetAsSourceSurface()
   return source.forget();
 }
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/GLImages.h b/gfx/layers/GLImages.h
index c47d0f132216..2e887b8c1b42 100644
--- a/gfx/layers/GLImages.h
+++ b/gfx/layers/GLImages.h
@@ -16,7 +16,7 @@
 namespace mozilla {
 namespace gl {
 class AndroidSurfaceTexture;
-}
+} // namespace gl
 namespace layers {
 
 class GLImage : public Image {
@@ -78,7 +78,7 @@ private:
 
 #endif // MOZ_WIDGET_ANDROID
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif // GFX_GLIMAGES_H
diff --git a/gfx/layers/GrallocImages.h b/gfx/layers/GrallocImages.h
index 14b52e8d8cd9..121015e0a958 100644
--- a/gfx/layers/GrallocImages.h
+++ b/gfx/layers/GrallocImages.h
@@ -129,6 +129,7 @@ private:
 
 } // namespace layers
 } // namespace mozilla
+
 #endif
 
 #endif /* GRALLOCIMAGES_H */
diff --git a/gfx/layers/IMFYCbCrImage.cpp b/gfx/layers/IMFYCbCrImage.cpp
index 73aafcc840d9..f9ad80030549 100644
--- a/gfx/layers/IMFYCbCrImage.cpp
+++ b/gfx/layers/IMFYCbCrImage.cpp
@@ -299,6 +299,5 @@ IMFYCbCrImage::GetTextureClient(CompositableClient* aClient)
   return mTextureClient;
 }
 
-
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ImageContainer.cpp b/gfx/layers/ImageContainer.cpp
index 8f95ff0641c4..d9b5fb79647c 100644
--- a/gfx/layers/ImageContainer.cpp
+++ b/gfx/layers/ImageContainer.cpp
@@ -686,5 +686,5 @@ ImageContainer::AllocateProducerID()
   return ++sProducerID;
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ImageDataSerializer.cpp b/gfx/layers/ImageDataSerializer.cpp
index 89a8158c093a..f8ba25b18c6f 100644
--- a/gfx/layers/ImageDataSerializer.cpp
+++ b/gfx/layers/ImageDataSerializer.cpp
@@ -44,7 +44,7 @@ struct SurfaceBufferInfo
     return GetAlignedStride<16>(sizeof(SurfaceBufferInfo));
   }
 };
-} // anonymous namespace
+} // namespace
 
 static SurfaceBufferInfo*
 GetBufferInfo(uint8_t* aData, size_t aDataSize)
diff --git a/gfx/layers/ImageLayers.cpp b/gfx/layers/ImageLayers.cpp
index 1fe0672a6b74..d02ec48466f5 100644
--- a/gfx/layers/ImageLayers.cpp
+++ b/gfx/layers/ImageLayers.cpp
@@ -60,5 +60,5 @@ void ImageLayer::ComputeEffectiveTransforms(const gfx::Matrix4x4& aTransformToSu
   ComputeEffectiveTransformForMaskLayers(aTransformToSurface);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h
index 8007f8eba5c1..1fb471ff819a 100644
--- a/gfx/layers/ImageLayers.h
+++ b/gfx/layers/ImageLayers.h
@@ -21,7 +21,7 @@ class ImageContainer;
 
 namespace layerscope {
 class LayersPacket;
-}
+} // namespace layerscope
 
 /**
  * A Layer which renders an Image.
@@ -102,7 +102,7 @@ protected:
   gfx::Matrix4x4 mEffectiveTransformForBuffer;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_IMAGELAYER_H */
diff --git a/gfx/layers/ImageTypes.h b/gfx/layers/ImageTypes.h
index 0d789e1dc8e5..4509fd14afee 100644
--- a/gfx/layers/ImageTypes.h
+++ b/gfx/layers/ImageTypes.h
@@ -97,6 +97,6 @@ enum class StereoMode {
   TOP_BOTTOM
 };
 
-} // namespace
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/LayerMetricsWrapper.h b/gfx/layers/LayerMetricsWrapper.h
index 19d8e82124ff..4c35b7bbc135 100644
--- a/gfx/layers/LayerMetricsWrapper.h
+++ b/gfx/layers/LayerMetricsWrapper.h
@@ -429,7 +429,7 @@ private:
   uint32_t mIndex;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_LAYERMETRICSWRAPPER_H */
diff --git a/gfx/layers/LayerScope.cpp b/gfx/layers/LayerScope.cpp
index 5b8075565bbc..6f396c9030a3 100644
--- a/gfx/layers/LayerScope.cpp
+++ b/gfx/layers/LayerScope.cpp
@@ -1743,5 +1743,5 @@ LayerScopeAutoFrame::EndFrame()
     gLayerScopeManager.GetSocketManager()->DispatchDebugData();
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/LayerScope.h b/gfx/layers/LayerScope.h
index a4f8e80fc677..42e778a4d888 100644
--- a/gfx/layers/LayerScope.h
+++ b/gfx/layers/LayerScope.h
@@ -56,7 +56,7 @@ private:
     static void EndFrame();
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_LAYERSCOPE_H */
diff --git a/gfx/layers/LayerSorter.cpp b/gfx/layers/LayerSorter.cpp
index e2841ca63b6c..c6e3d97009ba 100644
--- a/gfx/layers/LayerSorter.cpp
+++ b/gfx/layers/LayerSorter.cpp
@@ -353,5 +353,5 @@ void SortLayersBy3DZOrder(nsTArray<Layer*>& aLayers)
   aLayers.AppendElements(sortedList);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/LayerSorter.h b/gfx/layers/LayerSorter.h
index 2f0ff5f5d95a..b9f776e835d2 100644
--- a/gfx/layers/LayerSorter.h
+++ b/gfx/layers/LayerSorter.h
@@ -15,6 +15,7 @@ class Layer;
 
 void SortLayersBy3DZOrder(nsTArray<Layer*>& aLayers);
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif /* GFX_LAYERSORTER_H */
diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
index 61a21a228cba..544120a5b000 100644
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -49,8 +49,6 @@ FILEOrDefault(FILE* aFile)
 }
 
 typedef FrameMetrics::ViewID ViewID;
-const ViewID FrameMetrics::NULL_SCROLL_ID = 0;
-const FrameMetrics FrameMetrics::sNullMetrics;
 
 using namespace mozilla::gfx;
 
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 1d7b9f276d6b..8917699cdf7f 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -60,15 +60,15 @@ class StyleAnimationValue;
 
 namespace gl {
 class GLContext;
-}
+} // namespace gl
 
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace dom {
 class OverfillCallback;
-}
+} // namespace dom
 
 namespace layers {
 
@@ -97,7 +97,7 @@ class PersistentBufferProvider;
 
 namespace layerscope {
 class LayersPacket;
-}
+} // namespace layerscope
 
 #define MOZ_LAYER_DECL_NAME(n, e)                              \
   virtual const char* Name() const override { return n; }  \
diff --git a/gfx/layers/LayersLogging.cpp b/gfx/layers/LayersLogging.cpp
index 40798de42609..da2843085c5e 100644
--- a/gfx/layers/LayersLogging.cpp
+++ b/gfx/layers/LayersLogging.cpp
@@ -342,8 +342,8 @@ AppendToString(std::stringstream& aStream, mozilla::gfx::SurfaceFormat format,
   aStream << sfx;
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 void
 print_stderr(std::stringstream& aStr)
diff --git a/gfx/layers/LayersLogging.h b/gfx/layers/LayersLogging.h
index 648cd3ba412a..33eb4dbbfe36 100644
--- a/gfx/layers/LayersLogging.h
+++ b/gfx/layers/LayersLogging.h
@@ -22,7 +22,7 @@ namespace mozilla {
 namespace gfx {
 class Matrix4x4;
 template <class units> struct RectTyped;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -220,8 +220,8 @@ Stringify(const T& obj)
   return ss.str();
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 // versions of printf_stderr and fprintf_stderr that deal with line
 // truncation on android by printing individual lines out of the
diff --git a/gfx/layers/LayersTypes.cpp b/gfx/layers/LayersTypes.cpp
index f8ad2ae897ec..d94abb38eb06 100644
--- a/gfx/layers/LayersTypes.cpp
+++ b/gfx/layers/LayersTypes.cpp
@@ -54,5 +54,5 @@ LayerRenderState::LayerRenderState(android::GraphicBuffer* aSurface,
 {}
 #endif
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/LayersTypes.h b/gfx/layers/LayersTypes.h
index be1e8ef414f7..35d87a4942f4 100644
--- a/gfx/layers/LayersTypes.h
+++ b/gfx/layers/LayersTypes.h
@@ -29,7 +29,7 @@
 
 namespace android {
 class MOZ_EXPORT GraphicBuffer;
-}
+} // namespace android
 
 namespace mozilla {
 namespace layers {
@@ -263,7 +263,7 @@ operator|=(EventRegionsOverride& a, EventRegionsOverride b)
   return a;
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_LAYERSTYPES_H */
diff --git a/gfx/layers/MacIOSurfaceImage.h b/gfx/layers/MacIOSurfaceImage.h
index 53569ba93637..31d33a2c1861 100644
--- a/gfx/layers/MacIOSurfaceImage.h
+++ b/gfx/layers/MacIOSurfaceImage.h
@@ -35,7 +35,7 @@ private:
   RefPtr<TextureClient> mTextureClient;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif // GFX_SHAREDTEXTUREIMAGE_H
diff --git a/gfx/layers/PersistentBufferProvider.cpp b/gfx/layers/PersistentBufferProvider.cpp
index 9e7fe379e2b4..368921bf07ac 100644
--- a/gfx/layers/PersistentBufferProvider.cpp
+++ b/gfx/layers/PersistentBufferProvider.cpp
@@ -22,5 +22,5 @@ PersistentBufferProviderBasic::PersistentBufferProviderBasic(LayerManager* aMana
   mDrawTarget = gfxPlatform::GetPlatform()->CreateDrawTargetForBackend(aBackend, aSize, aFormat);
 }
 
-}
-}
\ No newline at end of file
+} // namespace layers
+} // namespace mozilla
\ No newline at end of file
diff --git a/gfx/layers/PersistentBufferProvider.h b/gfx/layers/PersistentBufferProvider.h
index 72b88b75ea08..45d75e6d750c 100644
--- a/gfx/layers/PersistentBufferProvider.h
+++ b/gfx/layers/PersistentBufferProvider.h
@@ -69,6 +69,7 @@ private:
   RefPtr<gfx::DrawTarget> mDrawTarget;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif
diff --git a/gfx/layers/ReadbackLayer.h b/gfx/layers/ReadbackLayer.h
index f9de30bb4f34..a8dfd17d4e96 100644
--- a/gfx/layers/ReadbackLayer.h
+++ b/gfx/layers/ReadbackLayer.h
@@ -27,7 +27,7 @@ class ReadbackProcessor;
 
 namespace layerscope {
 class LayersPacket;
-}
+} // namespace layerscope
 
 /**
  * A ReadbackSink receives a stream of updates to a rectangle of pixels.
@@ -199,6 +199,7 @@ protected:
   gfxRGBA      mBackgroundColor;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif /* GFX_READBACKLAYER_H */
diff --git a/gfx/layers/ReadbackProcessor.cpp b/gfx/layers/ReadbackProcessor.cpp
index 732ab1155262..f70e1666bea7 100644
--- a/gfx/layers/ReadbackProcessor.cpp
+++ b/gfx/layers/ReadbackProcessor.cpp
@@ -185,5 +185,5 @@ ReadbackProcessor::~ReadbackProcessor()
   }
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ReadbackProcessor.h b/gfx/layers/ReadbackProcessor.h
index 96dc3ed4c61e..4ca78205ec2d 100644
--- a/gfx/layers/ReadbackProcessor.h
+++ b/gfx/layers/ReadbackProcessor.h
@@ -75,6 +75,7 @@ protected:
   nsTArray<Update> mAllUpdates;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif /* GFX_READBACKPROCESSOR_H */
diff --git a/gfx/layers/RenderTrace.h b/gfx/layers/RenderTrace.h
index ac057944f144..d7c28fddf4aa 100644
--- a/gfx/layers/RenderTrace.h
+++ b/gfx/layers/RenderTrace.h
@@ -69,7 +69,7 @@ inline void renderTraceEventEnd(const char *aColor)
 
 #endif // MOZ_RENDERTRACE
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif //GFX_RENDERTRACE_H
diff --git a/gfx/layers/RotatedBuffer.cpp b/gfx/layers/RotatedBuffer.cpp
index 871e735cc822..86b817c9892f 100644
--- a/gfx/layers/RotatedBuffer.cpp
+++ b/gfx/layers/RotatedBuffer.cpp
@@ -786,6 +786,6 @@ RotatedContentBuffer::GetSourceSurface(ContextSource aSource) const
   }
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
diff --git a/gfx/layers/RotatedBuffer.h b/gfx/layers/RotatedBuffer.h
index d19913478e54..0e2ecaaf3d0f 100644
--- a/gfx/layers/RotatedBuffer.h
+++ b/gfx/layers/RotatedBuffer.h
@@ -22,7 +22,7 @@
 namespace mozilla {
 namespace gfx {
 class Matrix;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -425,7 +425,7 @@ protected:
   BufferSizePolicy      mBufferSizePolicy;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* ROTATEDBUFFER_H_ */
diff --git a/gfx/layers/TextureDIB.cpp b/gfx/layers/TextureDIB.cpp
index 8b39fcefb56b..d12bb63241e6 100644
--- a/gfx/layers/TextureDIB.cpp
+++ b/gfx/layers/TextureDIB.cpp
@@ -292,8 +292,7 @@ DIBTextureHost::DIBTextureHost(TextureFlags aFlags,
   MOZ_ASSERT(mSurface);
 
   mSize = mSurface->GetSize();
-  mFormat = ImageFormatToSurfaceFormat(
-    gfxPlatform::GetPlatform()->OptimalFormatForContent(mSurface->GetContentType()));
+  mFormat = mSurface->GetSurfaceFormat();
 }
 
 void
diff --git a/gfx/layers/TiledLayerBuffer.h b/gfx/layers/TiledLayerBuffer.h
index ba00ada6d769..1c741184f358 100644
--- a/gfx/layers/TiledLayerBuffer.h
+++ b/gfx/layers/TiledLayerBuffer.h
@@ -215,7 +215,7 @@ TiledLayerBuffer<Derived, Tile>::Dump(std::stringstream& aStream,
   }
 }
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif // GFX_TILEDLAYERBUFFER_H
diff --git a/gfx/layers/TransactionIdAllocator.h b/gfx/layers/TransactionIdAllocator.h
index 266775ce2186..25e4d924d9db 100644
--- a/gfx/layers/TransactionIdAllocator.h
+++ b/gfx/layers/TransactionIdAllocator.h
@@ -52,8 +52,8 @@ public:
   virtual mozilla::TimeStamp GetTransactionStart() = 0;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 
 #endif /* GFX_TRANSACTION_ID_ALLOCATOR_H */
diff --git a/gfx/layers/YCbCrImageDataSerializer.cpp b/gfx/layers/YCbCrImageDataSerializer.cpp
index 7ba484ecd4b9..9ef0034e7d5d 100644
--- a/gfx/layers/YCbCrImageDataSerializer.cpp
+++ b/gfx/layers/YCbCrImageDataSerializer.cpp
@@ -304,5 +304,5 @@ YCbCrImageDataDeserializer::ToDataSourceSurface()
 }
 
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/YCbCrImageDataSerializer.h b/gfx/layers/YCbCrImageDataSerializer.h
index 0fd7b507eb61..ec55a85c5d6e 100644
--- a/gfx/layers/YCbCrImageDataSerializer.h
+++ b/gfx/layers/YCbCrImageDataSerializer.h
@@ -16,7 +16,7 @@
 namespace mozilla {
 namespace gfx {
 class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -180,7 +180,7 @@ public:
   already_AddRefed<gfx::DataSourceSurface> ToDataSourceSurface();
 };
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/apz/public/GeckoContentController.h b/gfx/layers/apz/public/GeckoContentController.h
index f998a4442e72..25c4ec50ab8a 100644
--- a/gfx/layers/apz/public/GeckoContentController.h
+++ b/gfx/layers/apz/public/GeckoContentController.h
@@ -161,7 +161,7 @@ protected:
   virtual ~GeckoContentController() {}
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_GeckoContentController_h
diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index 4ff337d5ba61..257f2705b179 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -1841,5 +1841,5 @@ APZCTreeManager::CommonAncestor(AsyncPanZoomController* aApzc1, AsyncPanZoomCont
   return ancestor.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h
index f27abd47db24..eef27b92c9a9 100644
--- a/gfx/layers/apz/src/APZCTreeManager.h
+++ b/gfx/layers/apz/src/APZCTreeManager.h
@@ -529,7 +529,7 @@ private:
   static float sDPI;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_PanZoomController_h
diff --git a/gfx/layers/apz/src/APZUtils.h b/gfx/layers/apz/src/APZUtils.h
index f3dd1004c1f4..ad8d157371b1 100644
--- a/gfx/layers/apz/src/APZUtils.h
+++ b/gfx/layers/apz/src/APZUtils.h
@@ -53,7 +53,7 @@ static bool IsZero(const gfx::PointTyped<Units>& aPoint)
       && FuzzyEqualsAdditive(aPoint.y, 0.0f, COORDINATE_EPSILON);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_APZUtils_h
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index 1906f04f5f9a..a9c409329ff1 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -3314,5 +3314,5 @@ void AsyncPanZoomController::ShareCompositorFrameMetrics() {
   }
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index d6bbf8ab9c3e..a99ba876b384 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -36,7 +36,7 @@ namespace ipc {
 
 class SharedMemoryBasic;
 
-}
+} // namespace ipc
 
 namespace layers {
 
@@ -1117,7 +1117,7 @@ private:
   bool mAsyncTransformAppliedToContent;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_PanZoomController_h
diff --git a/gfx/layers/apz/src/Axis.cpp b/gfx/layers/apz/src/Axis.cpp
index 3c85268ce54a..ea526632e11a 100644
--- a/gfx/layers/apz/src/Axis.cpp
+++ b/gfx/layers/apz/src/Axis.cpp
@@ -634,5 +634,5 @@ const char* AxisY::Name() const
   return "Y";
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/src/Axis.h b/gfx/layers/apz/src/Axis.h
index 1961c6eea55a..c25c8008a603 100644
--- a/gfx/layers/apz/src/Axis.h
+++ b/gfx/layers/apz/src/Axis.h
@@ -310,7 +310,7 @@ public:
   virtual const char* Name() const override;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/apz/src/GestureEventListener.cpp b/gfx/layers/apz/src/GestureEventListener.cpp
index 024c92287584..1088d8cb2241 100644
--- a/gfx/layers/apz/src/GestureEventListener.cpp
+++ b/gfx/layers/apz/src/GestureEventListener.cpp
@@ -505,5 +505,5 @@ void GestureEventListener::CreateMaxTapTimeoutTask()
     MAX_TAP_TIME);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/src/GestureEventListener.h b/gfx/layers/apz/src/GestureEventListener.h
index 751177cee9f0..516702432a44 100644
--- a/gfx/layers/apz/src/GestureEventListener.h
+++ b/gfx/layers/apz/src/GestureEventListener.h
@@ -225,7 +225,7 @@ private:
 
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/apz/src/HitTestingTreeNode.h b/gfx/layers/apz/src/HitTestingTreeNode.h
index 08f1195681b5..306d7f9475f7 100644
--- a/gfx/layers/apz/src/HitTestingTreeNode.h
+++ b/gfx/layers/apz/src/HitTestingTreeNode.h
@@ -136,7 +136,7 @@ private:
   EventRegionsOverride mOverride;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_HitTestingTreeNode_h
diff --git a/gfx/layers/apz/src/InputQueue.h b/gfx/layers/apz/src/InputQueue.h
index eb216497c79d..c8735e8bd4e0 100644
--- a/gfx/layers/apz/src/InputQueue.h
+++ b/gfx/layers/apz/src/InputQueue.h
@@ -154,7 +154,7 @@ private:
   nsTArray<UniquePtr<CancelableBlockState>> mInputBlockQueue;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_InputQueue_h
diff --git a/gfx/layers/apz/src/OverscrollHandoffState.h b/gfx/layers/apz/src/OverscrollHandoffState.h
index a32818a3f24a..6ece054c83c8 100644
--- a/gfx/layers/apz/src/OverscrollHandoffState.h
+++ b/gfx/layers/apz/src/OverscrollHandoffState.h
@@ -163,7 +163,7 @@ struct OverscrollHandoffState {
 // Don't pollute other files with this macro for now.
 #undef NS_INLINE_DECL_THREADSAFE_MUTABLE_REFCOUNTING
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* mozilla_layers_OverscrollHandoffChain_h */
diff --git a/gfx/layers/apz/src/TaskThrottler.cpp b/gfx/layers/apz/src/TaskThrottler.cpp
index 4bb53892f617..59de97b754f7 100644
--- a/gfx/layers/apz/src/TaskThrottler.cpp
+++ b/gfx/layers/apz/src/TaskThrottler.cpp
@@ -74,5 +74,5 @@ TaskThrottler::TimeSinceLastRequest(const TimeStamp& aTimeStamp)
   return aTimeStamp - mStartTime;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/src/TaskThrottler.h b/gfx/layers/apz/src/TaskThrottler.h
index 9886a6eeaa43..9ad07dfd3435 100644
--- a/gfx/layers/apz/src/TaskThrottler.h
+++ b/gfx/layers/apz/src/TaskThrottler.h
@@ -17,7 +17,7 @@
 
 namespace tracked_objects {
 class Location;
-}
+} // namespace tracked_objects
 
 namespace mozilla {
 namespace layers {
@@ -109,7 +109,7 @@ private:
   RollingMean<TimeDuration, TimeDuration> mMean;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_dom_TaskThrottler_h
diff --git a/gfx/layers/apz/testutil/APZTestData.cpp b/gfx/layers/apz/testutil/APZTestData.cpp
index f4eb51c65fc0..3c9440b64610 100644
--- a/gfx/layers/apz/testutil/APZTestData.cpp
+++ b/gfx/layers/apz/testutil/APZTestData.cpp
@@ -62,5 +62,5 @@ APZTestData::ToJS(JS::MutableHandleValue aOutValue, JSContext* aContext) const
   return dom::ToJSValue(aContext, result, aOutValue);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/testutil/APZTestData.h b/gfx/layers/apz/testutil/APZTestData.h
index e31d73017949..87ad485cb128 100644
--- a/gfx/layers/apz/testutil/APZTestData.h
+++ b/gfx/layers/apz/testutil/APZTestData.h
@@ -127,8 +127,8 @@ private:
   SequenceNumber mPaintSequenceNumber;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 namespace IPC {
 
@@ -162,7 +162,7 @@ template <>
 struct ParamTraits<mozilla::layers::APZTestData::DataStore>
   : ParamTraits<mozilla::layers::APZTestData::DataStoreBase> {};
 
-}
+} // namespace IPC
 
 
 #endif /* mozilla_layers_APZTestData_h */
diff --git a/gfx/layers/apz/util/APZCCallbackHelper.cpp b/gfx/layers/apz/util/APZCCallbackHelper.cpp
index f650d43b41d8..597615d52ff3 100644
--- a/gfx/layers/apz/util/APZCCallbackHelper.cpp
+++ b/gfx/layers/apz/util/APZCCallbackHelper.cpp
@@ -7,18 +7,21 @@
 
 #include "ContentHelper.h"
 #include "gfxPlatform.h" // For gfxPlatform::UseTiling
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/layers/LayerTransactionChild.h"
 #include "mozilla/layers/ShadowLayers.h"
+#include "mozilla/TouchEvents.h"
 #include "nsIScrollableFrame.h"
 #include "nsLayoutUtils.h"
-#include "nsIDOMElement.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIDOMWindow.h"
 #include "nsRefreshDriver.h"
+#include "nsString.h"
 #include "nsView.h"
+#include "Layers.h"
 
 #define APZCCH_LOG(...)
 // #define APZCCH_LOG(...) printf_stderr("APZCCH: " __VA_ARGS__)
@@ -754,6 +757,6 @@ APZCCallbackHelper::NotifyFlushComplete()
   observerService->NotifyObservers(nullptr, "apz-repaints-flushed", nullptr);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
diff --git a/gfx/layers/apz/util/APZCCallbackHelper.h b/gfx/layers/apz/util/APZCCallbackHelper.h
index 03de75c1b647..26502de32813 100644
--- a/gfx/layers/apz/util/APZCCallbackHelper.h
+++ b/gfx/layers/apz/util/APZCCallbackHelper.h
@@ -13,8 +13,11 @@
 
 class nsIContent;
 class nsIDocument;
+class nsIPresShell;
 class nsIWidget;
 template<class T> struct already_AddRefed;
+template<class T> class nsCOMPtr;
+template<class T> class nsRefPtr;
 
 namespace mozilla {
 namespace layers {
@@ -161,7 +164,7 @@ public:
     static void NotifyFlushComplete();
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* mozilla_layers_APZCCallbackHelper_h */
diff --git a/gfx/layers/apz/util/APZEventState.cpp b/gfx/layers/apz/util/APZEventState.cpp
index b1f8ce585b86..656d29e13ddb 100644
--- a/gfx/layers/apz/util/APZEventState.cpp
+++ b/gfx/layers/apz/util/APZEventState.cpp
@@ -7,14 +7,22 @@
 
 #include "ActiveElementManager.h"
 #include "APZCCallbackHelper.h"
+#include "gfxPrefs.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TouchEvents.h"
+#include "mozilla/layers/APZCCallbackHelper.h"
 #include "nsCOMPtr.h"
 #include "nsDocShell.h"
+#include "nsIDOMMouseEvent.h"
 #include "nsIDOMWindowUtils.h"
+#include "nsIScrollableFrame.h"
+#include "nsIScrollbarMediator.h"
 #include "nsITimer.h"
 #include "nsIWeakReferenceUtils.h"
 #include "nsIWidget.h"
+#include "nsLayoutUtils.h"
+#include "nsQueryFrame.h"
 #include "TouchManager.h"
 #include "nsIDOMMouseEvent.h"
 #include "nsLayoutUtils.h"
@@ -74,7 +82,7 @@ WidgetModifiersToDOMModifiers(mozilla::Modifiers aModifiers)
   return result;
 }
 
-}
+} // namespace
 
 namespace mozilla {
 namespace layers {
@@ -408,6 +416,6 @@ APZEventState::GetWidget() const
   return result.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
diff --git a/gfx/layers/apz/util/APZEventState.h b/gfx/layers/apz/util/APZEventState.h
index 5a5dad1cca1b..9a099f4cf670 100644
--- a/gfx/layers/apz/util/APZEventState.h
+++ b/gfx/layers/apz/util/APZEventState.h
@@ -86,7 +86,7 @@ private:
   int mActiveAPZTransforms;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* mozilla_layers_APZEventState_h */
diff --git a/gfx/layers/apz/util/ActiveElementManager.cpp b/gfx/layers/apz/util/ActiveElementManager.cpp
index 5222518a5dc1..57025f3261b4 100644
--- a/gfx/layers/apz/util/ActiveElementManager.cpp
+++ b/gfx/layers/apz/util/ActiveElementManager.cpp
@@ -232,5 +232,5 @@ ActiveElementManager::CancelTask()
   }
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/util/ActiveElementManager.h b/gfx/layers/apz/util/ActiveElementManager.h
index addac185e88b..3b3e1354e284 100644
--- a/gfx/layers/apz/util/ActiveElementManager.h
+++ b/gfx/layers/apz/util/ActiveElementManager.h
@@ -15,7 +15,7 @@ namespace mozilla {
 namespace dom {
 class Element;
 class EventTarget;
-}
+} // namespace dom
 
 namespace layers {
 
@@ -97,7 +97,7 @@ private:
   void CancelTask();
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* mozilla_layers_ActiveElementManager_h */
diff --git a/gfx/layers/apz/util/InputAPZContext.cpp b/gfx/layers/apz/util/InputAPZContext.cpp
index 68f35181bb41..af5bd9f0f431 100644
--- a/gfx/layers/apz/util/InputAPZContext.cpp
+++ b/gfx/layers/apz/util/InputAPZContext.cpp
@@ -65,5 +65,5 @@ InputAPZContext::WasRoutedToChildProcess()
   return sRoutedToChildProcess;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/apz/util/InputAPZContext.h b/gfx/layers/apz/util/InputAPZContext.h
index 748907bc000e..0f232e1cb720 100644
--- a/gfx/layers/apz/util/InputAPZContext.h
+++ b/gfx/layers/apz/util/InputAPZContext.h
@@ -44,7 +44,7 @@ private:
   bool mOldRoutedToChildProcess;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* mozilla_layers_InputAPZContext_h */
diff --git a/gfx/layers/basic/AutoMaskData.h b/gfx/layers/basic/AutoMaskData.h
index be6d318582c2..7bf7f9b3c8b9 100644
--- a/gfx/layers/basic/AutoMaskData.h
+++ b/gfx/layers/basic/AutoMaskData.h
@@ -54,7 +54,7 @@ private:
   AutoMoz2DMaskData& operator=(const AutoMoz2DMaskData&) = delete;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // GFX_AUTOMASKDATA_H_
diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index 656a770b0cc6..080d4b79efa5 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -69,5 +69,5 @@ BasicLayerManager::CreateCanvasLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicCanvasLayer.h b/gfx/layers/basic/BasicCanvasLayer.h
index b7326b5a56cb..3e5d4a19d4a3 100644
--- a/gfx/layers/basic/BasicCanvasLayer.h
+++ b/gfx/layers/basic/BasicCanvasLayer.h
@@ -42,7 +42,7 @@ protected:
   }
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/basic/BasicColorLayer.cpp b/gfx/layers/basic/BasicColorLayer.cpp
index 17ac8e2318e4..d82287447750 100644
--- a/gfx/layers/basic/BasicColorLayer.cpp
+++ b/gfx/layers/basic/BasicColorLayer.cpp
@@ -80,5 +80,5 @@ BasicLayerManager::CreateColorLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp
index b37b045cbbd1..0a7e60eb10d5 100644
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -82,6 +82,12 @@ BasicCompositor::~BasicCompositor()
   MOZ_COUNT_DTOR(BasicCompositor);
 }
 
+bool
+BasicCompositor::Initialize()
+{
+  return mWidget ? mWidget->InitCompositor(this) : false;
+};
+
 int32_t
 BasicCompositor::GetMaxTextureSize() const
 {
@@ -587,5 +593,5 @@ BasicCompositor::EndFrame()
   mRenderTarget = nullptr;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicCompositor.h b/gfx/layers/basic/BasicCompositor.h
index 7a7caf0f5645..8a4f2a639b32 100644
--- a/gfx/layers/basic/BasicCompositor.h
+++ b/gfx/layers/basic/BasicCompositor.h
@@ -46,7 +46,7 @@ protected:
   virtual ~BasicCompositor();
 
 public:
-  virtual bool Initialize() override { return true; };
+  virtual bool Initialize() override;
 
   virtual void Destroy() override;
 
diff --git a/gfx/layers/basic/BasicContainerLayer.cpp b/gfx/layers/basic/BasicContainerLayer.cpp
index e80e27291bd8..7e2abf3a8e2e 100644
--- a/gfx/layers/basic/BasicContainerLayer.cpp
+++ b/gfx/layers/basic/BasicContainerLayer.cpp
@@ -140,5 +140,5 @@ BasicLayerManager::CreateContainerLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicContainerLayer.h b/gfx/layers/basic/BasicContainerLayer.h
index ef825a6efb9c..beca21da3ffa 100644
--- a/gfx/layers/basic/BasicContainerLayer.h
+++ b/gfx/layers/basic/BasicContainerLayer.h
@@ -99,7 +99,8 @@ protected:
     return static_cast<BasicLayerManager*>(mManager);
   }
 };
-}
-}
+
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/basic/BasicImageLayer.cpp b/gfx/layers/basic/BasicImageLayer.cpp
index 402f44e89985..d4d3e46d78cb 100644
--- a/gfx/layers/basic/BasicImageLayer.cpp
+++ b/gfx/layers/basic/BasicImageLayer.cpp
@@ -116,5 +116,5 @@ BasicLayerManager::CreateImageLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicImages.cpp b/gfx/layers/basic/BasicImages.cpp
index 6289e4b5e1b6..bdb04f8f83be 100644
--- a/gfx/layers/basic/BasicImages.cpp
+++ b/gfx/layers/basic/BasicImages.cpp
@@ -180,5 +180,5 @@ BasicLayerManager::GetImageFactory()
   return mFactory.get();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicImplData.h b/gfx/layers/basic/BasicImplData.h
index 2ae747f7119a..f127121de142 100644
--- a/gfx/layers/basic/BasicImplData.h
+++ b/gfx/layers/basic/BasicImplData.h
@@ -130,7 +130,7 @@ protected:
   gfx::CompositionOp mOperator;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp
index 42227fef6a9b..b498da82f12b 100644
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -1008,5 +1008,5 @@ BasicLayerManager::CreateReadbackLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicLayers.h b/gfx/layers/basic/BasicLayers.h
index 8f709757d7b5..6450e6a1d070 100644
--- a/gfx/layers/basic/BasicLayers.h
+++ b/gfx/layers/basic/BasicLayers.h
@@ -195,7 +195,7 @@ protected:
   bool mCompositorMightResample;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_BASICLAYERS_H */
diff --git a/gfx/layers/basic/BasicLayersImpl.cpp b/gfx/layers/basic/BasicLayersImpl.cpp
index 45a948dbd37f..01e9ae8d84f6 100644
--- a/gfx/layers/basic/BasicLayersImpl.cpp
+++ b/gfx/layers/basic/BasicLayersImpl.cpp
@@ -186,5 +186,5 @@ ShouldShadow(Layer* aLayer)
 }
 
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicLayersImpl.h b/gfx/layers/basic/BasicLayersImpl.h
index b9ae4b0ad6c9..2bafd068b461 100644
--- a/gfx/layers/basic/BasicLayersImpl.h
+++ b/gfx/layers/basic/BasicLayersImpl.h
@@ -20,7 +20,7 @@
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -143,7 +143,7 @@ ToData(Layer* aLayer);
 gfx::CompositionOp
 GetEffectiveOperator(Layer* aLayer);
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/basic/BasicPaintedLayer.cpp b/gfx/layers/basic/BasicPaintedLayer.cpp
index 8e10c4ec911b..e11dab7cd2ac 100644
--- a/gfx/layers/basic/BasicPaintedLayer.cpp
+++ b/gfx/layers/basic/BasicPaintedLayer.cpp
@@ -226,5 +226,5 @@ BasicLayerManager::CreatePaintedLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/BasicPaintedLayer.h b/gfx/layers/basic/BasicPaintedLayer.h
index bacfba1a77ce..5095c5ffa15a 100644
--- a/gfx/layers/basic/BasicPaintedLayer.h
+++ b/gfx/layers/basic/BasicPaintedLayer.h
@@ -126,7 +126,7 @@ protected:
   RefPtr<ContentClientBasic> mContentClient;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/basic/MacIOSurfaceTextureHostBasic.cpp b/gfx/layers/basic/MacIOSurfaceTextureHostBasic.cpp
index 46eef0bf6a36..b72f45d6bf6b 100644
--- a/gfx/layers/basic/MacIOSurfaceTextureHostBasic.cpp
+++ b/gfx/layers/basic/MacIOSurfaceTextureHostBasic.cpp
@@ -93,5 +93,5 @@ MacIOSurfaceTextureHostBasic::GetSize() const {
                       mSurface->GetDevicePixelHeight());
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h b/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h
index 83f452ff0e43..19a8a707805d 100644
--- a/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h
+++ b/gfx/layers/basic/MacIOSurfaceTextureHostBasic.h
@@ -87,7 +87,7 @@ protected:
   RefPtr<MacIOSurface> mSurface;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // MOZILLA_GFX_MACIOSURFACETEXTUREHOSTOGL_BASIC_H
diff --git a/gfx/layers/basic/TextureClientX11.cpp b/gfx/layers/basic/TextureClientX11.cpp
index ab9446daa2ad..ff0eefdde84b 100644
--- a/gfx/layers/basic/TextureClientX11.cpp
+++ b/gfx/layers/basic/TextureClientX11.cpp
@@ -118,8 +118,8 @@ TextureClientX11::AllocateForSurface(IntSize aSize, TextureAllocationFlags aText
     gfxDebug() << "Asking for X11 surface of invalid size " << aSize.width << "x" << aSize.height;
     return false;
   }
-  gfxContentType contentType = ContentForFormat(mFormat);
-  nsRefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(aSize, contentType);
+  gfxImageFormat imageFormat = SurfaceFormatToImageFormat(mFormat);
+  nsRefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->CreateOffscreenSurface(aSize, imageFormat);
   if (!surface || surface->GetType() != gfxSurfaceType::Xlib) {
     NS_ERROR("creating Xlib surface failed!");
     return false;
diff --git a/gfx/layers/basic/TextureHostBasic.cpp b/gfx/layers/basic/TextureHostBasic.cpp
index b75ad83d732f..8058e43efca2 100644
--- a/gfx/layers/basic/TextureHostBasic.cpp
+++ b/gfx/layers/basic/TextureHostBasic.cpp
@@ -30,4 +30,4 @@ CreateTextureHostBasic(const SurfaceDescriptor& aDesc,
 }
 
 } // namespace layers
-} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/layers/client/CanvasClient.cpp b/gfx/layers/client/CanvasClient.cpp
index dbeeabfe95e6..f038d53b1873 100644
--- a/gfx/layers/client/CanvasClient.cpp
+++ b/gfx/layers/client/CanvasClient.cpp
@@ -62,14 +62,13 @@ CanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer)
     gfxContentType contentType = isOpaque
                                                 ? gfxContentType::COLOR
                                                 : gfxContentType::COLOR_ALPHA;
-    gfxImageFormat format
-      = gfxPlatform::GetPlatform()->OptimalFormatForContent(contentType);
+    gfx::SurfaceFormat surfaceFormat
+      = gfxPlatform::GetPlatform()->Optimal2DFormatForContent(contentType);
     TextureFlags flags = TextureFlags::DEFAULT;
     if (mTextureFlags & TextureFlags::ORIGIN_BOTTOM_LEFT) {
       flags |= TextureFlags::ORIGIN_BOTTOM_LEFT;
     }
 
-    gfx::SurfaceFormat surfaceFormat = gfx::ImageFormatToSurfaceFormat(format);
     mBuffer = CreateTextureClientForCanvas(surfaceFormat, aSize, flags, aLayer);
     if (!mBuffer) {
       NS_WARNING("Failed to allocate the TextureClient");
diff --git a/gfx/layers/client/CanvasClient.h b/gfx/layers/client/CanvasClient.h
index 14b08a7d32dd..5bdeb7f3f2be 100644
--- a/gfx/layers/client/CanvasClient.h
+++ b/gfx/layers/client/CanvasClient.h
@@ -136,7 +136,7 @@ public:
   }
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/ClientCanvasLayer.cpp b/gfx/layers/client/ClientCanvasLayer.cpp
index 5704f07df191..c6e04bcf3164 100644
--- a/gfx/layers/client/ClientCanvasLayer.cpp
+++ b/gfx/layers/client/ClientCanvasLayer.cpp
@@ -194,5 +194,5 @@ ClientLayerManager::CreateCanvasLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/ClientCanvasLayer.h b/gfx/layers/client/ClientCanvasLayer.h
index 072b1c0b14b3..9167a1d2b3b1 100644
--- a/gfx/layers/client/ClientCanvasLayer.h
+++ b/gfx/layers/client/ClientCanvasLayer.h
@@ -22,7 +22,7 @@
 namespace mozilla {
 namespace gl {
 class SurfaceFactory;
-}
+} // namespace gl
 
 namespace layers {
 
@@ -101,7 +101,8 @@ protected:
   friend class CanvasClient2D;
   friend class CanvasClientSharedSurface;
 };
-}
-}
+
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/ClientColorLayer.cpp b/gfx/layers/client/ClientColorLayer.cpp
index 708ee8a40266..932809ce030e 100644
--- a/gfx/layers/client/ClientColorLayer.cpp
+++ b/gfx/layers/client/ClientColorLayer.cpp
@@ -76,5 +76,5 @@ ClientLayerManager::CreateColorLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/ClientContainerLayer.cpp b/gfx/layers/client/ClientContainerLayer.cpp
index 06bc0e31bc66..4727287e53b2 100644
--- a/gfx/layers/client/ClientContainerLayer.cpp
+++ b/gfx/layers/client/ClientContainerLayer.cpp
@@ -33,5 +33,5 @@ ClientLayerManager::CreateRefLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/ClientContainerLayer.h b/gfx/layers/client/ClientContainerLayer.h
index 0b2f3a0d8079..ac67566e9aaf 100644
--- a/gfx/layers/client/ClientContainerLayer.h
+++ b/gfx/layers/client/ClientContainerLayer.h
@@ -9,7 +9,6 @@
 #include <stdint.h>                     // for uint32_t
 #include "ClientLayerManager.h"         // for ClientLayerManager, etc
 #include "Layers.h"                     // for Layer, ContainerLayer, etc
-#include "gfxPrefs.h"                   // for gfxPrefs
 #include "nsDebug.h"                    // for NS_ASSERTION
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "nsISupportsUtils.h"           // for NS_ADDREF, NS_RELEASE
@@ -182,7 +181,7 @@ private:
   }
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/ClientImageLayer.cpp b/gfx/layers/client/ClientImageLayer.cpp
index 0c147100dc66..bc92c4aac31e 100644
--- a/gfx/layers/client/ClientImageLayer.cpp
+++ b/gfx/layers/client/ClientImageLayer.cpp
@@ -171,5 +171,5 @@ ClientLayerManager::CreateImageLayer()
   return layer.forget();
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/ClientLayerManager.h b/gfx/layers/client/ClientLayerManager.h
index f28412045cad..51d364d141fb 100644
--- a/gfx/layers/client/ClientLayerManager.h
+++ b/gfx/layers/client/ClientLayerManager.h
@@ -424,7 +424,7 @@ CreateShadowFor(ClientLayer* aLayer,
                   &ShadowLayerForwarder::Created ## _type ## Layer)
 
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_CLIENTLAYERMANAGER_H */
diff --git a/gfx/layers/client/ClientPaintedLayer.cpp b/gfx/layers/client/ClientPaintedLayer.cpp
index 160e35e45a13..62e183149a7d 100644
--- a/gfx/layers/client/ClientPaintedLayer.cpp
+++ b/gfx/layers/client/ClientPaintedLayer.cpp
@@ -200,5 +200,5 @@ ClientPaintedLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix)
   }
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/ClientPaintedLayer.h b/gfx/layers/client/ClientPaintedLayer.h
index 54a6e9476a9e..670a1c75fd50 100644
--- a/gfx/layers/client/ClientPaintedLayer.h
+++ b/gfx/layers/client/ClientPaintedLayer.h
@@ -115,7 +115,7 @@ protected:
   RefPtr<ContentClient> mContentClient;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/ClientReadbackLayer.h b/gfx/layers/client/ClientReadbackLayer.h
index a72ea49b9806..5f58486caeff 100644
--- a/gfx/layers/client/ClientReadbackLayer.h
+++ b/gfx/layers/client/ClientReadbackLayer.h
@@ -28,7 +28,7 @@ public:
   virtual void RenderLayer() override {}
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_CLIENTREADBACKLAYER_H */
diff --git a/gfx/layers/client/ClientTiledPaintedLayer.cpp b/gfx/layers/client/ClientTiledPaintedLayer.cpp
index 181fae913947..eb1efd1d330d 100644
--- a/gfx/layers/client/ClientTiledPaintedLayer.cpp
+++ b/gfx/layers/client/ClientTiledPaintedLayer.cpp
@@ -546,5 +546,5 @@ ClientTiledPaintedLayer::PrintInfo(std::stringstream& aStream, const char* aPref
   }
 }
 
-} // mozilla
-} // layers
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/ClientTiledPaintedLayer.h b/gfx/layers/client/ClientTiledPaintedLayer.h
index 40b0ed467d29..db7538de012c 100644
--- a/gfx/layers/client/ClientTiledPaintedLayer.h
+++ b/gfx/layers/client/ClientTiledPaintedLayer.h
@@ -135,7 +135,7 @@ private:
   BasicTiledLayerPaintData mPaintData;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/CompositableClient.h b/gfx/layers/client/CompositableClient.h
index e4ce1c965962..6c895fb0ea2b 100644
--- a/gfx/layers/client/CompositableClient.h
+++ b/gfx/layers/client/CompositableClient.h
@@ -260,7 +260,7 @@ private:
   CompositableClient* mCompositable;
 };
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/ContentClient.cpp b/gfx/layers/client/ContentClient.cpp
index d71b54745ddb..3f0957139fd9 100644
--- a/gfx/layers/client/ContentClient.cpp
+++ b/gfx/layers/client/ContentClient.cpp
@@ -35,7 +35,6 @@
 #ifdef MOZ_WIDGET_GTK
 #include "gfxPlatformGtk.h"
 #endif
-#include "gfx2DGlue.h"
 #include "ReadbackLayer.h"
 
 #include <vector>
@@ -130,12 +129,10 @@ ContentClientBasic::CreateBuffer(ContentType aType,
                                  RefPtr<gfx::DrawTarget>* aWhiteDT)
 {
   MOZ_ASSERT(!(aFlags & BUFFER_COMPONENT_ALPHA));
-  gfxImageFormat format =
-    gfxPlatform::GetPlatform()->OptimalFormatForContent(aType);
 
   *aBlackDT = gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(
     IntSize(aRect.width, aRect.height),
-    ImageFormatToSurfaceFormat(format));
+    gfxPlatform::GetPlatform()->Optimal2DFormatForContent(aType));
 }
 
 void
diff --git a/gfx/layers/client/ContentClient.h b/gfx/layers/client/ContentClient.h
index 60cf329f4445..7a928f98c02d 100644
--- a/gfx/layers/client/ContentClient.h
+++ b/gfx/layers/client/ContentClient.h
@@ -31,7 +31,7 @@
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -404,7 +404,7 @@ public:
   }
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/ImageClient.h b/gfx/layers/client/ImageClient.h
index aa0923f69a8a..3751c7338e4e 100644
--- a/gfx/layers/client/ImageClient.h
+++ b/gfx/layers/client/ImageClient.h
@@ -168,7 +168,7 @@ public:
 };
 #endif
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp
index 374a18385d56..3eb2350cc44a 100644
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -932,5 +932,5 @@ SyncObject::CreateSyncObject(SyncHandle aHandle)
 #endif
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/TextureClient.h b/gfx/layers/client/TextureClient.h
index 34c361e11d83..c0818129214b 100644
--- a/gfx/layers/client/TextureClient.h
+++ b/gfx/layers/client/TextureClient.h
@@ -717,6 +717,7 @@ protected:
   RefPtr<T> mData;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif
diff --git a/gfx/layers/client/TextureClientPool.cpp b/gfx/layers/client/TextureClientPool.cpp
index 16308eb0be07..9a7b9e076e5f 100644
--- a/gfx/layers/client/TextureClientPool.cpp
+++ b/gfx/layers/client/TextureClientPool.cpp
@@ -267,5 +267,5 @@ TextureClientPool::Clear()
   }
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/TextureClientPool.h b/gfx/layers/client/TextureClientPool.h
index 23fcbe861cfe..f314d1f8b47b 100644
--- a/gfx/layers/client/TextureClientPool.h
+++ b/gfx/layers/client/TextureClientPool.h
@@ -118,6 +118,7 @@ private:
   RefPtr<ISurfaceAllocator> mSurfaceAllocator;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif /* MOZILLA_GFX_TEXTURECLIENTPOOL_H */
diff --git a/gfx/layers/client/TextureClientRecycleAllocator.cpp b/gfx/layers/client/TextureClientRecycleAllocator.cpp
index ec9b04a1ded0..85dc924ff4f4 100644
--- a/gfx/layers/client/TextureClientRecycleAllocator.cpp
+++ b/gfx/layers/client/TextureClientRecycleAllocator.cpp
@@ -272,5 +272,5 @@ TextureClientRecycleAllocator::CreateOrRecycleForDrawing(
                                                aAllocFlags);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/client/TextureClientRecycleAllocator.h b/gfx/layers/client/TextureClientRecycleAllocator.h
index 59e252e98989..fb36c66bd9cc 100644
--- a/gfx/layers/client/TextureClientRecycleAllocator.h
+++ b/gfx/layers/client/TextureClientRecycleAllocator.h
@@ -46,6 +46,7 @@ private:
   RefPtr<TextureClientRecycleAllocatorImp> mAllocator;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif /* MOZILLA_GFX_TEXTURECLIENT_RECYCLE_ALLOCATOR_H */
diff --git a/gfx/layers/client/TextureClientSharedSurface.h b/gfx/layers/client/TextureClientSharedSurface.h
index c65543a2706c..55ea098b63dc 100644
--- a/gfx/layers/client/TextureClientSharedSurface.h
+++ b/gfx/layers/client/TextureClientSharedSurface.h
@@ -22,7 +22,7 @@ namespace gl {
 class GLContext;
 class SharedSurface;
 class SurfaceFactory;
-}
+} // namespace gl
 
 namespace layers {
 
diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp
index 59e5b62f59d8..08f2e3331328 100644
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -27,7 +27,6 @@
 #include "gfxReusableSharedImageSurfaceWrapper.h"
 #include "nsExpirationTracker.h"        // for nsExpirationTracker
 #include "nsMathUtils.h"               // for NS_lroundf
-#include "gfx2DGlue.h"
 #include "LayersLogging.h"
 #include "UnitTransforms.h"             // for TransformTo
 #include "mozilla/UniquePtr.h"
@@ -902,15 +901,12 @@ ClientTiledLayerBuffer::PaintThebes(const nsIntRegion& aNewValidRegion,
       PROFILER_LABEL("ClientTiledLayerBuffer", "PaintThebesSingleBufferAlloc",
         js::ProfileEntry::Category::GRAPHICS);
 
-      gfxImageFormat format =
-        gfxPlatform::GetPlatform()->OptimalFormatForContent(
-          GetContentType());
-
       mSinglePaintDrawTarget =
         gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(
           gfx::IntSize(ceilf(bounds.width * mResolution),
                        ceilf(bounds.height * mResolution)),
-          gfx::ImageFormatToSurfaceFormat(format));
+          gfxPlatform::GetPlatform()->Optimal2DFormatForContent(
+            GetContentType()));
 
       if (!mSinglePaintDrawTarget) {
         return;
diff --git a/gfx/layers/client/TiledContentClient.h b/gfx/layers/client/TiledContentClient.h
index 0755c45c5d3c..7bbb85f40350 100644
--- a/gfx/layers/client/TiledContentClient.h
+++ b/gfx/layers/client/TiledContentClient.h
@@ -36,7 +36,6 @@
 #include "mozilla/layers/ISurfaceAllocator.h"
 #include "gfxReusableSurfaceWrapper.h"
 #include "pratom.h"                     // For PR_ATOMIC_INCREMENT/DECREMENT
-#include "gfxPrefs.h"
 
 namespace mozilla {
 namespace layers {
@@ -576,7 +575,7 @@ private:
   ClientTiledLayerBuffer mLowPrecisionTiledBuffer;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/composite/AsyncCompositionManager.h b/gfx/layers/composite/AsyncCompositionManager.h
index fa3ec48cad91..ae5ec6a186c2 100644
--- a/gfx/layers/composite/AsyncCompositionManager.h
+++ b/gfx/layers/composite/AsyncCompositionManager.h
@@ -237,7 +237,7 @@ private:
   AutoResolveRefLayers& operator=(const AutoResolveRefLayers&) = delete;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/composite/CanvasLayerComposite.cpp b/gfx/layers/composite/CanvasLayerComposite.cpp
index e1c39a6b713a..70c5938c9b46 100644
--- a/gfx/layers/composite/CanvasLayerComposite.cpp
+++ b/gfx/layers/composite/CanvasLayerComposite.cpp
@@ -162,5 +162,5 @@ CanvasLayerComposite::PrintInfo(std::stringstream& aStream, const char* aPrefix)
   }
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/CanvasLayerComposite.h b/gfx/layers/composite/CanvasLayerComposite.h
index 9b72dca3a48e..d9d01a14cd1b 100644
--- a/gfx/layers/composite/CanvasLayerComposite.h
+++ b/gfx/layers/composite/CanvasLayerComposite.h
@@ -75,6 +75,7 @@ private:
   RefPtr<CompositableHost> mCompositableHost;
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
+
 #endif /* GFX_CanvasLayerComposite_H */
diff --git a/gfx/layers/composite/ColorLayerComposite.cpp b/gfx/layers/composite/ColorLayerComposite.cpp
index 0b02fb373099..ac12ef645c6d 100644
--- a/gfx/layers/composite/ColorLayerComposite.cpp
+++ b/gfx/layers/composite/ColorLayerComposite.cpp
@@ -46,5 +46,5 @@ ColorLayerComposite::GenEffectChain(EffectChain& aEffect)
       Color(color.r, color.g, color.b, color.a));
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/ColorLayerComposite.h b/gfx/layers/composite/ColorLayerComposite.h
index 9f36e1e0872f..fb019f74f361 100644
--- a/gfx/layers/composite/ColorLayerComposite.h
+++ b/gfx/layers/composite/ColorLayerComposite.h
@@ -59,6 +59,7 @@ public:
   virtual const char* Name() const override { return "ColorLayerComposite"; }
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
+
 #endif /* GFX_ColorLayerComposite_H */
diff --git a/gfx/layers/composite/CompositableHost.h b/gfx/layers/composite/CompositableHost.h
index 4ba0fa63b0db..7a66bd18738b 100644
--- a/gfx/layers/composite/CompositableHost.h
+++ b/gfx/layers/composite/CompositableHost.h
@@ -32,7 +32,7 @@ namespace mozilla {
 namespace gfx {
 class Matrix4x4;
 class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -300,10 +300,10 @@ namespace CompositableMap {
   void Set(uint64_t aID, PCompositableParent* aParent);
   void Erase(uint64_t aID);
   void Clear();
-} // CompositableMap
+} // namespace CompositableMap
 
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/composite/ContainerLayerComposite.cpp b/gfx/layers/composite/ContainerLayerComposite.cpp
index 2c12ca74f222..02bc662f310f 100755
--- a/gfx/layers/composite/ContainerLayerComposite.cpp
+++ b/gfx/layers/composite/ContainerLayerComposite.cpp
@@ -674,6 +674,5 @@ RefLayerComposite::CleanupResources()
   mLastIntermediateSurface = nullptr;
 }
 
-} /* layers */
-} /* mozilla */
-
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/ContainerLayerComposite.h b/gfx/layers/composite/ContainerLayerComposite.h
index 5621d24acc37..656e33b2f847 100644
--- a/gfx/layers/composite/ContainerLayerComposite.h
+++ b/gfx/layers/composite/ContainerLayerComposite.h
@@ -179,7 +179,7 @@ public:
   RefPtr<CompositingRenderTarget> mLastIntermediateSurface;
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_ContainerLayerComposite_H */
diff --git a/gfx/layers/composite/ContentHost.cpp b/gfx/layers/composite/ContentHost.cpp
index 93a99a10c84b..68b2bb2962ea 100644
--- a/gfx/layers/composite/ContentHost.cpp
+++ b/gfx/layers/composite/ContentHost.cpp
@@ -20,7 +20,7 @@
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 using namespace gfx;
 
 namespace layers {
diff --git a/gfx/layers/composite/ContentHost.h b/gfx/layers/composite/ContentHost.h
index d77992834d15..544236fb487d 100644
--- a/gfx/layers/composite/ContentHost.h
+++ b/gfx/layers/composite/ContentHost.h
@@ -36,7 +36,7 @@
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 namespace layers {
 class Compositor;
 class ThebesBufferData;
@@ -218,7 +218,7 @@ public:
                             nsIntRegion* aUpdatedRegionBack);
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/composite/FPSCounter.h b/gfx/layers/composite/FPSCounter.h
index c3a243a22a8c..bf594093dbc9 100644
--- a/gfx/layers/composite/FPSCounter.h
+++ b/gfx/layers/composite/FPSCounter.h
@@ -108,7 +108,7 @@ private:
   RefPtr<DataTextureSource> mFPSTextureSource;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_opengl_FPSCounter_h_
diff --git a/gfx/layers/composite/FrameUniformityData.cpp b/gfx/layers/composite/FrameUniformityData.cpp
index 6027a14706f7..e8bab6adbcc0 100644
--- a/gfx/layers/composite/FrameUniformityData.cpp
+++ b/gfx/layers/composite/FrameUniformityData.cpp
@@ -148,5 +148,5 @@ FrameUniformityData::ToJS(JS::MutableHandleValue aOutValue, JSContext* aContext)
   return dom::ToJSValue(aContext, results, aOutValue);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/FrameUniformityData.h b/gfx/layers/composite/FrameUniformityData.h
index 35a155bf6ee0..2505ac4c16d9 100644
--- a/gfx/layers/composite/FrameUniformityData.h
+++ b/gfx/layers/composite/FrameUniformityData.h
@@ -48,8 +48,8 @@ private:
   std::map<uintptr_t,LayerTransforms*> mFrameTransforms;
 };
 
-} // mozilla
-} // layers
+} // namespace layers
+} // namespace mozilla
 
 namespace IPC {
 template<>
@@ -68,6 +68,6 @@ struct ParamTraits<mozilla::layers::FrameUniformityData>
   }
 };
 
-}// ipc
+} // namespace IPC
 
 #endif // mozilla_layers_FrameUniformityData_h_
diff --git a/gfx/layers/composite/ImageHost.cpp b/gfx/layers/composite/ImageHost.cpp
index 5988825d683a..cc2b93699d7a 100644
--- a/gfx/layers/composite/ImageHost.cpp
+++ b/gfx/layers/composite/ImageHost.cpp
@@ -22,7 +22,7 @@ class nsIntRegion;
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 
 using namespace gfx;
 
diff --git a/gfx/layers/composite/ImageHost.h b/gfx/layers/composite/ImageHost.h
index 9ec973db734f..a8316376901c 100644
--- a/gfx/layers/composite/ImageHost.h
+++ b/gfx/layers/composite/ImageHost.h
@@ -27,7 +27,7 @@ class nsIntRegion;
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 namespace layers {
 
 class Compositor;
@@ -164,7 +164,7 @@ protected:
 
 #endif
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/composite/ImageLayerComposite.cpp b/gfx/layers/composite/ImageLayerComposite.cpp
index 45ce2ea54670..778b6af50377 100644
--- a/gfx/layers/composite/ImageLayerComposite.cpp
+++ b/gfx/layers/composite/ImageLayerComposite.cpp
@@ -188,5 +188,5 @@ ImageLayerComposite::PrintInfo(std::stringstream& aStream, const char* aPrefix)
   }
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/ImageLayerComposite.h b/gfx/layers/composite/ImageLayerComposite.h
index 850dc52fea8c..d6b8c31e6ab5 100644
--- a/gfx/layers/composite/ImageLayerComposite.h
+++ b/gfx/layers/composite/ImageLayerComposite.h
@@ -76,7 +76,7 @@ private:
   RefPtr<CompositableHost> mImageHost;
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_ImageLayerComposite_H */
diff --git a/gfx/layers/composite/LayerManagerComposite.cpp b/gfx/layers/composite/LayerManagerComposite.cpp
index 6ff8dec45ff8..7c571ff96eff 100644
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -1357,5 +1357,5 @@ LayerManagerComposite::PlatformSyncBeforeReplyUpdate()
 
 #endif  // !defined(MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS)
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/LayerManagerComposite.h b/gfx/layers/composite/LayerManagerComposite.h
index fc6544b544d8..35b412373d15 100644
--- a/gfx/layers/composite/LayerManagerComposite.h
+++ b/gfx/layers/composite/LayerManagerComposite.h
@@ -43,7 +43,7 @@ class gfxContext;
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -619,7 +619,7 @@ RenderWithAllMasks(Layer* aLayer, Compositor* aCompositor,
   }
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_LayerManagerComposite_H */
diff --git a/gfx/layers/composite/PaintedLayerComposite.cpp b/gfx/layers/composite/PaintedLayerComposite.cpp
index df861ac25051..4a340ff280de 100644
--- a/gfx/layers/composite/PaintedLayerComposite.cpp
+++ b/gfx/layers/composite/PaintedLayerComposite.cpp
@@ -180,5 +180,5 @@ PaintedLayerComposite::PrintInfo(std::stringstream& aStream, const char* aPrefix
   }
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/PaintedLayerComposite.h b/gfx/layers/composite/PaintedLayerComposite.h
index 18ef5863cd24..c4107d6a9b20 100644
--- a/gfx/layers/composite/PaintedLayerComposite.h
+++ b/gfx/layers/composite/PaintedLayerComposite.h
@@ -86,6 +86,7 @@ private:
   RefPtr<ContentHost> mBuffer;
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
+
 #endif /* GFX_PaintedLayerComposite_H */
diff --git a/gfx/layers/composite/TextRenderer.cpp b/gfx/layers/composite/TextRenderer.cpp
index cb970fb8ec60..a32f1f8ed2b3 100644
--- a/gfx/layers/composite/TextRenderer.cpp
+++ b/gfx/layers/composite/TextRenderer.cpp
@@ -169,5 +169,5 @@ TextRenderer::EnsureInitialized()
   png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/TextRenderer.h b/gfx/layers/composite/TextRenderer.h
index 53ac4e5869f8..7665558eb3b7 100644
--- a/gfx/layers/composite/TextRenderer.h
+++ b/gfx/layers/composite/TextRenderer.h
@@ -44,7 +44,7 @@ private:
   gfx::DataSourceSurface::MappedSurface mMap;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/composite/TextureHost.cpp b/gfx/layers/composite/TextureHost.cpp
index 88afad117564..a9544fdb42c8 100644
--- a/gfx/layers/composite/TextureHost.cpp
+++ b/gfx/layers/composite/TextureHost.cpp
@@ -870,5 +870,5 @@ TextureParent::RecvRecycleTexture(const TextureFlags& aTextureFlags)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/TextureHost.h b/gfx/layers/composite/TextureHost.h
index 4a691dfe50e9..94532bf298d5 100644
--- a/gfx/layers/composite/TextureHost.h
+++ b/gfx/layers/composite/TextureHost.h
@@ -33,7 +33,7 @@
 namespace mozilla {
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 
 namespace layers {
 
@@ -745,7 +745,7 @@ CreateBackendIndependentTextureHost(const SurfaceDescriptor& aDesc,
                                     ISurfaceAllocator* aDeallocator,
                                     TextureFlags aFlags);
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/composite/TiledContentHost.cpp b/gfx/layers/composite/TiledContentHost.cpp
index cebcb474d324..ab4b65e75d34 100644
--- a/gfx/layers/composite/TiledContentHost.cpp
+++ b/gfx/layers/composite/TiledContentHost.cpp
@@ -607,5 +607,5 @@ TiledContentHost::Dump(std::stringstream& aStream,
   mTiledBuffer.Dump(aStream, aPrefix, aDumpHtml);
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/composite/TiledContentHost.h b/gfx/layers/composite/TiledContentHost.h
index 1c5762b24fad..028c054c82ea 100644
--- a/gfx/layers/composite/TiledContentHost.h
+++ b/gfx/layers/composite/TiledContentHost.h
@@ -34,7 +34,7 @@
 namespace mozilla {
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -289,7 +289,7 @@ private:
   TiledLayerBufferComposite    mLowPrecisionTiledBuffer;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/d3d11/CompositorD3D11.cpp b/gfx/layers/d3d11/CompositorD3D11.cpp
index 3c2c56043657..aca5017b87e9 100644
--- a/gfx/layers/d3d11/CompositorD3D11.cpp
+++ b/gfx/layers/d3d11/CompositorD3D11.cpp
@@ -391,6 +391,10 @@ CompositorD3D11::Initialize()
                                        DXGI_MWA_NO_WINDOW_CHANGES);
   }
 
+  if (!mWidget->InitCompositor(this)) {
+    return false;
+  }
+
   reporter.SetSuccessful();
   return true;
 }
diff --git a/gfx/layers/d3d9/CompositorD3D9.cpp b/gfx/layers/d3d9/CompositorD3D9.cpp
index 514606adaa77..d0af4a56c53a 100644
--- a/gfx/layers/d3d9/CompositorD3D9.cpp
+++ b/gfx/layers/d3d9/CompositorD3D9.cpp
@@ -62,6 +62,10 @@ CompositorD3D9::Initialize()
     return false;
   }
 
+  if (!mWidget->InitCompositor(this)) {
+    return false;
+  }
+
   reporter.SetSuccessful();
   return true;
 }
diff --git a/gfx/layers/d3d9/Nv3DVUtils.h b/gfx/layers/d3d9/Nv3DVUtils.h
index 24c482eb0e0d..f0e240373eda 100644
--- a/gfx/layers/d3d9/Nv3DVUtils.h
+++ b/gfx/layers/d3d9/Nv3DVUtils.h
@@ -80,7 +80,7 @@ private:
 };
 
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_NV3DVUTILS_H */
diff --git a/gfx/layers/d3d9/ReadbackLayerD3D9.h b/gfx/layers/d3d9/ReadbackLayerD3D9.h
index a8398594f283..5d3a7fd1e594 100644
--- a/gfx/layers/d3d9/ReadbackLayerD3D9.h
+++ b/gfx/layers/d3d9/ReadbackLayerD3D9.h
@@ -28,6 +28,7 @@ public:
   virtual void RenderLayer() {}
 };
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
+
 #endif /* GFX_READBACKLAYERD3D9_H */
diff --git a/gfx/layers/ipc/CompositableForwarder.h b/gfx/layers/ipc/CompositableForwarder.h
index 1d6165afc38f..11755b7000b6 100644
--- a/gfx/layers/ipc/CompositableForwarder.h
+++ b/gfx/layers/ipc/CompositableForwarder.h
@@ -198,7 +198,7 @@ protected:
   static mozilla::Atomic<int32_t> sSerialCounter;
 };
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/ipc/CompositableTransactionParent.cpp b/gfx/layers/ipc/CompositableTransactionParent.cpp
index 7a3653609cb5..3060a8c00c03 100644
--- a/gfx/layers/ipc/CompositableTransactionParent.cpp
+++ b/gfx/layers/ipc/CompositableTransactionParent.cpp
@@ -269,6 +269,6 @@ CompositableParentManager::SendPendingAsyncMessages()
   mPendingAsyncMessage.clear();
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
diff --git a/gfx/layers/ipc/CompositableTransactionParent.h b/gfx/layers/ipc/CompositableTransactionParent.h
index 958923c87e9d..00d11c11f5c2 100644
--- a/gfx/layers/ipc/CompositableTransactionParent.h
+++ b/gfx/layers/ipc/CompositableTransactionParent.h
@@ -59,7 +59,7 @@ protected:
   std::vector<AsyncParentMessageData> mPendingAsyncMessage;
 };
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/ipc/CompositorBench.cpp b/gfx/layers/ipc/CompositorBench.cpp
index 47f591ebf447..2c0f893dad2a 100644
--- a/gfx/layers/ipc/CompositorBench.cpp
+++ b/gfx/layers/ipc/CompositorBench.cpp
@@ -445,5 +445,6 @@ void CompositorBench(Compositor* aCompositor, const gfx::Rect& aScreenRect)
 
 } // namespace layers
 } // namespace mozilla
+
 #endif
 
diff --git a/gfx/layers/ipc/CompositorBench.h b/gfx/layers/ipc/CompositorBench.h
index d02c9540e38d..c8e17cef4113 100644
--- a/gfx/layers/ipc/CompositorBench.h
+++ b/gfx/layers/ipc/CompositorBench.h
@@ -23,8 +23,8 @@ void CompositorBench(Compositor* aCompositor, const gfx::Rect& aScreenRect);
 static inline void CompositorBench(Compositor* aCompositor, const gfx::Rect& aScreenRect) {}
 #endif
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif
 
diff --git a/gfx/layers/ipc/CompositorChild.h b/gfx/layers/ipc/CompositorChild.h
index 7e8896e5df10..1710957dc794 100644
--- a/gfx/layers/ipc/CompositorChild.h
+++ b/gfx/layers/ipc/CompositorChild.h
@@ -24,7 +24,7 @@ namespace mozilla {
 
 namespace dom {
   class TabChild;
-}
+} // namespace dom
 
 namespace layers {
 
@@ -204,7 +204,7 @@ private:
   bool mCanSend;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_CompositorChild_h
diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h
index da76c9484867..ef6bf5d18ed3 100644
--- a/gfx/layers/ipc/CompositorParent.h
+++ b/gfx/layers/ipc/CompositorParent.h
@@ -44,7 +44,7 @@ class nsIWidget;
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -502,7 +502,7 @@ protected:
   DISALLOW_EVIL_CONSTRUCTORS(CompositorParent);
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_CompositorParent_h
diff --git a/gfx/layers/ipc/ISurfaceAllocator.h b/gfx/layers/ipc/ISurfaceAllocator.h
index c2a414936c77..c65860e8da34 100644
--- a/gfx/layers/ipc/ISurfaceAllocator.h
+++ b/gfx/layers/ipc/ISurfaceAllocator.h
@@ -33,10 +33,10 @@
 namespace mozilla {
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 namespace gfx {
 class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -229,7 +229,7 @@ private:
   static mozilla::Atomic<size_t> sAmount;
 };
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp
index 7130574f7cef..2826a29269c7 100644
--- a/gfx/layers/ipc/ImageBridgeChild.cpp
+++ b/gfx/layers/ipc/ImageBridgeChild.cpp
@@ -44,7 +44,7 @@
 namespace mozilla {
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 
 namespace layers {
 
@@ -999,5 +999,5 @@ void ImageBridgeChild::SendPendingAsyncMessges()
 {
 }
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ipc/ImageBridgeChild.h b/gfx/layers/ipc/ImageBridgeChild.h
index 45ec3adbd71e..8d4f6c087b01 100644
--- a/gfx/layers/ipc/ImageBridgeChild.h
+++ b/gfx/layers/ipc/ImageBridgeChild.h
@@ -23,12 +23,12 @@ class MessageLoop;
 
 namespace base {
 class Thread;
-}
+} // namespace base
 
 namespace mozilla {
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 
 namespace layers {
 
@@ -310,7 +310,7 @@ protected:
   bool mShuttingDown;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/ipc/ImageBridgeParent.cpp b/gfx/layers/ipc/ImageBridgeParent.cpp
index 04178abc6dcc..1b488c2f863c 100644
--- a/gfx/layers/ipc/ImageBridgeParent.cpp
+++ b/gfx/layers/ipc/ImageBridgeParent.cpp
@@ -490,5 +490,5 @@ ImageBridgeParent::SendPendingAsyncMessages(base::ProcessId aChildProcessId)
   imageBridge->SendPendingAsyncMessages();
 }
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ipc/ImageBridgeParent.h b/gfx/layers/ipc/ImageBridgeParent.h
index 3a647fca51e1..bf9c9e4ebf4b 100644
--- a/gfx/layers/ipc/ImageBridgeParent.h
+++ b/gfx/layers/ipc/ImageBridgeParent.h
@@ -24,12 +24,12 @@ class MessageLoop;
 
 namespace base {
 class Thread;
-}
+} // namespace base
 
 namespace mozilla {
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 
 namespace layers {
 
@@ -171,7 +171,7 @@ private:
   nsRefPtr<CompositorThreadHolder> mCompositorThreadHolder;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif // gfx_layers_ipc_ImageBridgeParent_h_
diff --git a/gfx/layers/ipc/ImageContainerParent.cpp b/gfx/layers/ipc/ImageContainerParent.cpp
index e343962831f7..76731faca2c0 100644
--- a/gfx/layers/ipc/ImageContainerParent.cpp
+++ b/gfx/layers/ipc/ImageContainerParent.cpp
@@ -33,5 +33,5 @@ bool ImageContainerParent::RecvAsyncDelete()
   return true;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ipc/LayerTransactionChild.cpp b/gfx/layers/ipc/LayerTransactionChild.cpp
index a7b38cc4f27c..50ff57a187c3 100644
--- a/gfx/layers/ipc/LayerTransactionChild.cpp
+++ b/gfx/layers/ipc/LayerTransactionChild.cpp
@@ -138,5 +138,5 @@ LayerTransactionChild::DeallocPTextureChild(PTextureChild* actor)
   return TextureClient::DestroyIPDLActor(actor);
 }
 
-}  // namespace layers
-}  // namespace mozilla
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ipc/LayerTransactionChild.h b/gfx/layers/ipc/LayerTransactionChild.h
index f94810ffc138..fc8e64740286 100644
--- a/gfx/layers/ipc/LayerTransactionChild.h
+++ b/gfx/layers/ipc/LayerTransactionChild.h
@@ -20,7 +20,7 @@ namespace mozilla {
 namespace layout {
 class RenderFrameChild;
 class ShadowLayerForwarder;
-}
+} // namespace layout
 
 namespace layers {
 
diff --git a/gfx/layers/ipc/LayerTransactionParent.cpp b/gfx/layers/ipc/LayerTransactionParent.cpp
index 43cf661fa3ed..97e2b4a9995d 100644
--- a/gfx/layers/ipc/LayerTransactionParent.cpp
+++ b/gfx/layers/ipc/LayerTransactionParent.cpp
@@ -13,6 +13,7 @@
 #include "Layers.h"                     // for Layer, ContainerLayer, etc
 #include "ShadowLayerParent.h"          // for ShadowLayerParent
 #include "CompositableTransactionParent.h"  // for EditReplyVector
+#include "gfxPrefs.h"
 #include "mozilla/gfx/BasePoint3D.h"    // for BasePoint3D
 #include "mozilla/layers/CanvasLayerComposite.h"
 #include "mozilla/layers/ColorLayerComposite.h"
@@ -50,7 +51,7 @@ using mozilla::layout::RenderFrameParent;
 namespace mozilla {
 namespace gfx {
 class VRHMDInfo;
-}
+} // namespace gfx
 
 namespace layers {
 
diff --git a/gfx/layers/ipc/LayerTransactionParent.h b/gfx/layers/ipc/LayerTransactionParent.h
index 2b0b5a932022..8e835f7d1de5 100644
--- a/gfx/layers/ipc/LayerTransactionParent.h
+++ b/gfx/layers/ipc/LayerTransactionParent.h
@@ -21,11 +21,11 @@ namespace mozilla {
 
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 
 namespace layout {
 class RenderFrameParent;
-}
+} // namespace layout
 
 namespace layers {
 
diff --git a/gfx/layers/ipc/ShadowLayerChild.cpp b/gfx/layers/ipc/ShadowLayerChild.cpp
index 8fd162e4aee7..b52c229af35e 100644
--- a/gfx/layers/ipc/ShadowLayerChild.cpp
+++ b/gfx/layers/ipc/ShadowLayerChild.cpp
@@ -34,5 +34,5 @@ ShadowLayerChild::ActorDestroy(ActorDestroyReason why)
   }
 }
 
-}  // namespace layers
-}  // namespace mozilla
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ipc/ShadowLayerUtils.h b/gfx/layers/ipc/ShadowLayerUtils.h
index 868dd78431f3..863b5385fccc 100644
--- a/gfx/layers/ipc/ShadowLayerUtils.h
+++ b/gfx/layers/ipc/ShadowLayerUtils.h
@@ -24,7 +24,8 @@ namespace mozilla { namespace layers {
 struct SurfaceDescriptorX11 {
   bool operator==(const SurfaceDescriptorX11&) const { return false; }
 };
-} }
+} // namespace layers
+} // namespace mozilla
 #endif
 
 #if defined(MOZ_WIDGET_GONK)
@@ -38,7 +39,8 @@ struct MagicGrallocBufferHandle {
 struct GrallocBufferRef {
   bool operator==(const GrallocBufferRef&) const { return false; }
 };
-} }
+} // namespace layers
+} // namespace mozilla
 #endif
 
 namespace IPC {
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index 9189ee6757af..f202dd306b2c 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -35,7 +35,7 @@
 namespace mozilla {
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 
 namespace layers {
 
diff --git a/gfx/layers/ipc/ShadowLayersManager.h b/gfx/layers/ipc/ShadowLayersManager.h
index a17c5828824b..f0240e0fe768 100644
--- a/gfx/layers/ipc/ShadowLayersManager.h
+++ b/gfx/layers/ipc/ShadowLayersManager.h
@@ -44,7 +44,7 @@ public:
                                         const nsTArray<ScrollableLayerGuid>& aTargets) = 0;
 };
 
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 #endif // mozilla_layers_ShadowLayersManager_h
diff --git a/gfx/layers/ipc/SharedBufferManagerChild.h b/gfx/layers/ipc/SharedBufferManagerChild.h
index d0ebb6211d45..9af89f1dbd59 100644
--- a/gfx/layers/ipc/SharedBufferManagerChild.h
+++ b/gfx/layers/ipc/SharedBufferManagerChild.h
@@ -14,7 +14,7 @@
 
 namespace base {
 class Thread;
-}
+} // namespace base
 
 namespace mozilla {
 #ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
diff --git a/gfx/layers/ipc/SharedBufferManagerParent.h b/gfx/layers/ipc/SharedBufferManagerParent.h
index b00a5ebf3e21..2fb064495533 100644
--- a/gfx/layers/ipc/SharedBufferManagerParent.h
+++ b/gfx/layers/ipc/SharedBufferManagerParent.h
@@ -22,7 +22,7 @@ class GraphicBuffer;
 
 namespace base {
 class Thread;
-}
+} // namespace base
 
 namespace mozilla {
 #ifdef MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
diff --git a/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp b/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp
index 6365d0102c66..a697ad14fd22 100644
--- a/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp
+++ b/gfx/layers/ipc/SharedPlanarYCbCrImage.cpp
@@ -228,5 +228,5 @@ SharedPlanarYCbCrImage::Allocate(PlanarYCbCrData& aData)
   return mBufferSize > 0;
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/ipc/SharedPlanarYCbCrImage.h b/gfx/layers/ipc/SharedPlanarYCbCrImage.h
index b91ad5a35e61..b8b4162c7314 100644
--- a/gfx/layers/ipc/SharedPlanarYCbCrImage.h
+++ b/gfx/layers/ipc/SharedPlanarYCbCrImage.h
@@ -58,7 +58,7 @@ private:
   RefPtr<ImageClient> mCompositable;
 };
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index 13f9816dfa1f..d21a33276963 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -293,6 +293,7 @@ UNIFIED_SOURCES += [
     'Compositor.cpp',
     'CopyableCanvasLayer.cpp',
     'Effects.cpp',
+    'FrameMetrics.cpp',
     'GLImages.cpp',
     'ImageDataSerializer.cpp',
     'ImageLayers.cpp',
diff --git a/gfx/layers/opengl/CompositingRenderTargetOGL.cpp b/gfx/layers/opengl/CompositingRenderTargetOGL.cpp
index 3803547560e1..f23159e6531a 100644
--- a/gfx/layers/opengl/CompositingRenderTargetOGL.cpp
+++ b/gfx/layers/opengl/CompositingRenderTargetOGL.cpp
@@ -115,5 +115,5 @@ CompositingRenderTargetOGL::InitializeImpl()
 
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/CompositingRenderTargetOGL.h b/gfx/layers/opengl/CompositingRenderTargetOGL.h
index e293d076a3f8..f91ba27c40db 100644
--- a/gfx/layers/opengl/CompositingRenderTargetOGL.h
+++ b/gfx/layers/opengl/CompositingRenderTargetOGL.h
@@ -26,10 +26,10 @@
 namespace mozilla {
 namespace gl {
   class BindableTexture;
-}
+} // namespace gl
 namespace gfx {
   class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -172,7 +172,7 @@ private:
   GLuint mFBO;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_SURFACEOGL_H */
diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
index 731b45eef133..c1447cfebde4 100644
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -1747,5 +1747,5 @@ PerFrameTexturePoolOGL::EndFrame()
   mCreatedTextures.Clear();
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/CompositorOGL.h b/gfx/layers/opengl/CompositorOGL.h
index 80fba5e7a8f5..f98eb98c2256 100644
--- a/gfx/layers/opengl/CompositorOGL.h
+++ b/gfx/layers/opengl/CompositorOGL.h
@@ -39,7 +39,7 @@ namespace mozilla {
 
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 
 namespace layers {
 
@@ -462,7 +462,7 @@ private:
   CompositorOGLVRObjects mVR;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_COMPOSITOROGL_H */
diff --git a/gfx/layers/opengl/CompositorOGLVR.cpp b/gfx/layers/opengl/CompositorOGLVR.cpp
index 772aa3a3a7e7..c47345225872 100644
--- a/gfx/layers/opengl/CompositorOGLVR.cpp
+++ b/gfx/layers/opengl/CompositorOGLVR.cpp
@@ -338,5 +338,5 @@ CompositorOGL::DrawVRDistortion(const gfx::Rect& aRect,
   gl()->fDisableVertexAttribArray(mVR.mAGenericAttribs);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/GLBlitTextureImageHelper.cpp b/gfx/layers/opengl/GLBlitTextureImageHelper.cpp
index 7b647dbf705b..6a63d0703b45 100644
--- a/gfx/layers/opengl/GLBlitTextureImageHelper.cpp
+++ b/gfx/layers/opengl/GLBlitTextureImageHelper.cpp
@@ -278,5 +278,5 @@ GLBlitTextureImageHelper::UseBlitProgram()
     gl->fUniform1i(gl->fGetUniformLocation(mBlitProgram, "uSrcTexture"), 0);
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/GLBlitTextureImageHelper.h b/gfx/layers/opengl/GLBlitTextureImageHelper.h
index 1a0703145356..91cb1bf857ef 100644
--- a/gfx/layers/opengl/GLBlitTextureImageHelper.h
+++ b/gfx/layers/opengl/GLBlitTextureImageHelper.h
@@ -16,7 +16,7 @@ namespace mozilla {
 namespace gl {
     class GLContext;
     class TextureImage;
-}
+} // namespace gl
 namespace layers {
 
 class CompositorOGL;
@@ -65,7 +65,7 @@ public:
                           gl::TextureImage *aDst, const gfx::IntRect& aDstRect);
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // GLBLITTEXTUREIMAGEHELPER_H_
diff --git a/gfx/layers/opengl/GLManager.cpp b/gfx/layers/opengl/GLManager.cpp
index 8eae72426ff7..e748cfc8efb3 100644
--- a/gfx/layers/opengl/GLManager.cpp
+++ b/gfx/layers/opengl/GLManager.cpp
@@ -70,5 +70,5 @@ GLManager::CreateGLManager(LayerManagerComposite* aManager)
   return nullptr;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/GLManager.h b/gfx/layers/opengl/GLManager.h
index 9f2dd40c1ad3..7c872758e963 100644
--- a/gfx/layers/opengl/GLManager.h
+++ b/gfx/layers/opengl/GLManager.h
@@ -12,7 +12,7 @@
 namespace mozilla {
 namespace gl {
 class GLContext;
-}
+} // namespace gl
 
 namespace layers {
 
@@ -38,6 +38,7 @@ public:
                                const gfx::Rect& aTextureRect) = 0;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
+
 #endif
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp
index a2b41d9ccd12..159b41291fc7 100644
--- a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp
+++ b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp
@@ -82,5 +82,6 @@ MacIOSurfaceTextureClientOGL::GetAsSurface()
   RefPtr<gfx::SourceSurface> surf = mSurface->GetAsSurface();
   return surf->GetDataSurface();
 }
-}
-}
+
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h
index e7ab59a00a33..5a0c03825d36 100644
--- a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h
+++ b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h
@@ -54,7 +54,7 @@ protected:
   bool mIsLocked;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // MOZILLA_GFX_MACIOSURFACETEXTURECLIENTOGL_H
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp
index 6bf3d8ed8364..687374b2697f 100644
--- a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp
+++ b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp
@@ -123,5 +123,5 @@ MacIOSurfaceTextureSourceOGL::gl() const
   return mCompositor ? mCompositor->gl() : nullptr;
 }
 
-}
-}
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h
index 574dfe5d9bca..14fa2ff15ff3 100644
--- a/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h
+++ b/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h
@@ -99,7 +99,7 @@ protected:
   RefPtr<MacIOSurface> mSurface;
 };
 
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 #endif // MOZILLA_GFX_MACIOSURFACETEXTUREHOSTOGL_H
diff --git a/gfx/layers/opengl/OGLShaderProgram.cpp b/gfx/layers/opengl/OGLShaderProgram.cpp
index 796a4276c6fb..c877230bd094 100644
--- a/gfx/layers/opengl/OGLShaderProgram.cpp
+++ b/gfx/layers/opengl/OGLShaderProgram.cpp
@@ -652,5 +652,5 @@ ShaderProgramOGL::SetBlurRadius(float aRX, float aRY)
   SetArrayUniform(KnownUniform::BlurGaussianKernel, GAUSSIAN_KERNEL_HALF_WIDTH, gaussianKernel);
 }
 
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/OGLShaderProgram.h b/gfx/layers/opengl/OGLShaderProgram.h
index 053229980135..170c9dea3e7c 100644
--- a/gfx/layers/opengl/OGLShaderProgram.h
+++ b/gfx/layers/opengl/OGLShaderProgram.h
@@ -581,8 +581,7 @@ protected:
   }
 };
 
-
-} /* layers */
-} /* mozilla */
+} // namespace layers
+} // namespace mozilla
 
 #endif /* GFX_OGLSHADERPROGRAM_H */
diff --git a/gfx/layers/opengl/TextureClientOGL.cpp b/gfx/layers/opengl/TextureClientOGL.cpp
index ac90edd69409..fe2322725566 100644
--- a/gfx/layers/opengl/TextureClientOGL.cpp
+++ b/gfx/layers/opengl/TextureClientOGL.cpp
@@ -132,5 +132,5 @@ SurfaceTextureClient::Unlock()
 
 #endif // MOZ_WIDGET_ANDROID
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/TextureClientOGL.h b/gfx/layers/opengl/TextureClientOGL.h
index 42fe46d8caef..dd0dd7729b95 100644
--- a/gfx/layers/opengl/TextureClientOGL.h
+++ b/gfx/layers/opengl/TextureClientOGL.h
@@ -119,7 +119,7 @@ protected:
 
 #endif // MOZ_WIDGET_ANDROID
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif
diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp
index 98ac68b5eb4a..34d200bab6ff 100644
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -631,5 +631,5 @@ EGLImageTextureHost::GetFormat() const
   return mTextureSource->GetFormat();
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h
index 5813f945f0df..fe3e9990e7bd 100644
--- a/gfx/layers/opengl/TextureHostOGL.h
+++ b/gfx/layers/opengl/TextureHostOGL.h
@@ -36,11 +36,11 @@ class nsIntRegion;
 namespace mozilla {
 namespace gfx {
 class DataSourceSurface;
-}
+} // namespace gfx
 
 namespace gl {
 class AndroidSurfaceTexture;
-}
+} // namespace gl
 
 namespace layers {
 
@@ -467,7 +467,7 @@ protected:
   RefPtr<EGLImageTextureSource> mTextureSource;
 };
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_TEXTUREOGL_H */
diff --git a/gfx/layers/opengl/TexturePoolOGL.cpp b/gfx/layers/opengl/TexturePoolOGL.cpp
index aa7f27dff042..8ee3b4cbbc2d 100644
--- a/gfx/layers/opengl/TexturePoolOGL.cpp
+++ b/gfx/layers/opengl/TexturePoolOGL.cpp
@@ -119,5 +119,5 @@ void TexturePoolOGL::Shutdown()
   delete sTextures;
 }
 
-} // gl
-} // mozilla
+} // namespace gl
+} // namespace mozilla
diff --git a/gfx/layers/opengl/TexturePoolOGL.h b/gfx/layers/opengl/TexturePoolOGL.h
index 1259c5841372..136364e8c9f1 100644
--- a/gfx/layers/opengl/TexturePoolOGL.h
+++ b/gfx/layers/opengl/TexturePoolOGL.h
@@ -34,7 +34,7 @@ public:
   static void Shutdown();
 };
 
-} // gl
-} // mozilla
+} // namespace gl
+} // namespace mozilla
 
 #endif // GFX_TEXTUREPOOLOGL_H
diff --git a/gfx/src/AppUnits.h b/gfx/src/AppUnits.h
index bb3727b88327..e0ad6dc52df8 100644
--- a/gfx/src/AppUnits.h
+++ b/gfx/src/AppUnits.h
@@ -11,5 +11,5 @@
 namespace mozilla {
 inline int32_t AppUnitsPerCSSPixel() { return 60; }
 inline int32_t AppUnitsPerCSSInch() { return 96 * AppUnitsPerCSSPixel(); }
-}
+} // namespace mozilla
 #endif /* _NS_APPUNITS_H_ */
diff --git a/gfx/src/FilterSupport.cpp b/gfx/src/FilterSupport.cpp
index bce9c3a629bf..83ed3e840452 100644
--- a/gfx/src/FilterSupport.cpp
+++ b/gfx/src/FilterSupport.cpp
@@ -252,7 +252,7 @@ namespace FilterWrappers {
     return nullptr;
   }
 
-}
+} // namespace FilterWrappers
 
 // A class that wraps a FilterNode and handles conversion between different
 // color models. Create FilterCachedColorModels with your original filter and
@@ -2076,7 +2076,7 @@ namespace {
     const Map& map;
     bool matches;
   };
-}
+} // namespace
 
 static PLDHashOperator
 CheckAttributeEquality(const uint32_t& aAttributeName,
@@ -2111,7 +2111,7 @@ namespace {
     AttributeMap::AttributeHandleCallback handler;
     void* userData;
   };
-}
+} // namespace
 
 static PLDHashOperator
 PassAttributeToHandleCallback(const uint32_t& aAttributeName,
@@ -2196,5 +2196,5 @@ AttributeMap::Set(AttributeName aName, const float* aValues, int32_t aLength)
   mMap.Put(aName, new Attribute(aValues, aLength));
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/src/FilterSupport.h b/gfx/src/FilterSupport.h
index 44724ca81fa0..baaf898c57d4 100644
--- a/gfx/src/FilterSupport.h
+++ b/gfx/src/FilterSupport.h
@@ -470,7 +470,7 @@ public:
                                 const nsTArray<nsIntRegion>& aInputExtents);
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif // __FilterSupport_h
diff --git a/gfx/src/RegionTyped.h b/gfx/src/RegionTyped.h
index 75475117629f..dab5481461a1 100644
--- a/gfx/src/RegionTyped.h
+++ b/gfx/src/RegionTyped.h
@@ -45,9 +45,9 @@ private:
   explicit IntRegionTyped(const nsRegion& aRegion) : Super(aRegion) {}
 };
 
-}
+} // namespace gfx
 
-}
+} // namespace mozilla
 
 
 
diff --git a/gfx/src/gfxCrashReporterUtils.cpp b/gfx/src/gfxCrashReporterUtils.cpp
index b7321e95e764..79f013861888 100644
--- a/gfx/src/gfxCrashReporterUtils.cpp
+++ b/gfx/src/gfxCrashReporterUtils.cpp
@@ -112,6 +112,6 @@ ScopedGfxFeatureReporter::WriteAppNote(char statusChar)
 
 namespace mozilla {
 void ScopedGfxFeatureReporter::WriteAppNote(char) {}
-}
+} // namespace mozilla
 
 #endif
diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
index dfb0a84da087..5c675cd5e15e 100644
--- a/gfx/src/nsFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -105,7 +105,7 @@ public:
     }
 };
 
-} // anon namespace
+} // namespace
 
 nsFontMetrics::nsFontMetrics()
     : mDeviceContext(nullptr), mP2A(0), mTextRunRTL(false)
diff --git a/gfx/src/nsRegion.cpp b/gfx/src/nsRegion.cpp
index f00a8b1122c4..d60a5c7cd408 100644
--- a/gfx/src/nsRegion.cpp
+++ b/gfx/src/nsRegion.cpp
@@ -1014,7 +1014,7 @@ namespace {
 
     return max;
   }
-}
+} // namespace
 
 nsRect nsRegion::GetLargestRectangle (const nsRect& aContainingRect) const {
   nsRect bestRect;
diff --git a/gfx/src/nsRegion.h b/gfx/src/nsRegion.h
index 7359be2cdc94..3f55661f544e 100644
--- a/gfx/src/nsRegion.h
+++ b/gfx/src/nsRegion.h
@@ -818,8 +818,8 @@ private:
   }
 };
 
-}  // namespace mozilla::gfx
-}  // namespace mozilla
+} // namespace gfx
+} // namespace mozilla
 
 class NS_GFX nsIntRegion : public mozilla::gfx::BaseIntRegion<nsIntRegion, mozilla::gfx::IntRect, nsIntPoint, nsIntMargin>
 {
diff --git a/gfx/src/nsRenderingContext.h b/gfx/src/nsRenderingContext.h
index 54d0f956eeec..ff706c10b790 100644
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@@ -14,8 +14,8 @@
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 class MOZ_STACK_CLASS nsRenderingContext final
 {
diff --git a/gfx/tests/gtest/TestTextures.cpp b/gfx/tests/gtest/TestTextures.cpp
index 56abd69877b1..3d50550855b7 100644
--- a/gfx/tests/gtest/TestTextures.cpp
+++ b/gfx/tests/gtest/TestTextures.cpp
@@ -257,8 +257,8 @@ void TestTextureClientYCbCr(TextureClient* client, PlanarYCbCrData& ycbcrData) {
   }
 }
 
-} // namespace
-} // namespace
+} // namespace layers
+} // namespace mozilla
 
 TEST(Layers, TextureSerialization) {
   // the test is run on all the following image formats
diff --git a/gfx/thebes/ContextStateTracker.cpp b/gfx/thebes/ContextStateTracker.cpp
index e33a4a31843d..e3659e5fc3df 100644
--- a/gfx/thebes/ContextStateTracker.cpp
+++ b/gfx/thebes/ContextStateTracker.cpp
@@ -133,5 +133,5 @@ ContextStateTrackerOGL::DestroyOGL(GLContext* aGL)
   }
 }
 
-}
+} // namespace mozilla
 
diff --git a/gfx/thebes/ContextStateTracker.h b/gfx/thebes/ContextStateTracker.h
index 569a1121f309..01cd3c5b24be 100644
--- a/gfx/thebes/ContextStateTracker.h
+++ b/gfx/thebes/ContextStateTracker.h
@@ -14,7 +14,7 @@
 namespace mozilla {
 namespace gl {
 class GLContext;
-}
+} // namespace gl
 
 /**
  * This class tracks the state of the context for debugging and profiling.
@@ -78,6 +78,7 @@ private:
   void Flush(GLContext* aGL);
 };
 
-}
+} // namespace mozilla
+
 #endif
 
diff --git a/gfx/thebes/gfx2DGlue.h b/gfx/thebes/gfx2DGlue.h
index 3bdc3f5ddf73..9c64ff6f1be6 100644
--- a/gfx/thebes/gfx2DGlue.h
+++ b/gfx/thebes/gfx2DGlue.h
@@ -356,7 +356,7 @@ To3DMatrix(const Matrix4x4& aIn)
   return m;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index e6403cfdda01..2587f979b9eb 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -13,6 +13,7 @@
 #include "nsISupportsImpl.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Logging.h"
+#include "mozilla/gfx/HelpersCairo.h"
 #include "gfx2DGlue.h"
 
 #include "gfxASurface.h"
@@ -699,6 +700,15 @@ gfxASurface::GetSize() const
   return IntSize(-1, -1);
 }
 
+SurfaceFormat
+gfxASurface::GetSurfaceFormat() const
+{
+    if (!mSurfaceValid) {
+      return SurfaceFormat::UNKNOWN;
+    }
+    return GfxFormatForCairoSurface(mSurface);
+}
+
 already_AddRefed<gfxImageSurface>
 gfxASurface::GetAsImageSurface()
 {
diff --git a/gfx/thebes/gfxASurface.h b/gfx/thebes/gfxASurface.h
index 21c0f7c04664..bee57feb07c3 100644
--- a/gfx/thebes/gfxASurface.h
+++ b/gfx/thebes/gfxASurface.h
@@ -169,6 +169,8 @@ public:
 
     virtual const mozilla::gfx::IntSize GetSize() const;
 
+    virtual mozilla::gfx::SurfaceFormat GetSurfaceFormat() const;
+
     void SetOpaqueRect(const gfxRect& aRect);
 
     const gfxRect& GetOpaqueRect() {
diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
index 464748ba8245..a8df49057031 100644
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -128,11 +128,11 @@ gfxAndroidPlatform::~gfxAndroidPlatform()
 }
 
 already_AddRefed<gfxASurface>
-gfxAndroidPlatform::CreateOffscreenSurface(const IntSize& size,
-                                           gfxContentType contentType)
+gfxAndroidPlatform::CreateOffscreenSurface(const IntSize& aSize,
+                                           gfxImageFormat aFormat)
 {
     nsRefPtr<gfxASurface> newSurface;
-    newSurface = new gfxImageSurface(size, OptimalFormatForContent(contentType));
+    newSurface = new gfxImageSurface(aSize, aFormat);
 
     return newSurface.forget();
 }
diff --git a/gfx/thebes/gfxAndroidPlatform.h b/gfx/thebes/gfxAndroidPlatform.h
index a71fbe501737..20333531428c 100644
--- a/gfx/thebes/gfxAndroidPlatform.h
+++ b/gfx/thebes/gfxAndroidPlatform.h
@@ -31,8 +31,8 @@ public:
     }
 
     virtual already_AddRefed<gfxASurface>
-    CreateOffscreenSurface(const IntSize& size,
-                           gfxContentType contentType);
+    CreateOffscreenSurface(const IntSize& aSize,
+                           gfxImageFormat aFormat);
     
     virtual gfxImageFormat GetOffscreenFormat() { return mOffscreenFormat; }
     
diff --git a/gfx/thebes/gfxBlur.h b/gfx/thebes/gfxBlur.h
index c170e8ad6449..57466d7d4fdc 100644
--- a/gfx/thebes/gfxBlur.h
+++ b/gfx/thebes/gfxBlur.h
@@ -23,8 +23,8 @@ namespace mozilla {
     struct RectCornerRadii;
     class SourceSurface;
     class DrawTarget;
-  }
-}
+  } // namespace gfx
+} // namespace mozilla
 
 /**
  * Implementation of a triple box blur approximation of a Gaussian blur.
diff --git a/gfx/thebes/gfxContext.h b/gfx/thebes/gfxContext.h
index 998b1f73bf93..ecb414d0e646 100644
--- a/gfx/thebes/gfxContext.h
+++ b/gfx/thebes/gfxContext.h
@@ -25,8 +25,8 @@ template <typename T> class FallibleTArray;
 namespace mozilla {
 namespace gfx {
 struct RectCornerRadii;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 class ClipExporter;
 
diff --git a/gfx/thebes/gfxFailure.h b/gfx/thebes/gfxFailure.h
index 471b0c95939d..b35ffba39865 100644
--- a/gfx/thebes/gfxFailure.h
+++ b/gfx/thebes/gfxFailure.h
@@ -19,7 +19,7 @@ namespace mozilla {
             nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
             gfxInfo->LogFailure(failure);
         }
-    }
-}
+    } // namespace gfx
+} // namespace mozilla
 
 #endif // gfxFailure_h_
diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index de4522566657..ea931ec3d0c8 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -65,8 +65,8 @@ struct gfxTextRunDrawCallbacks;
 namespace mozilla {
 namespace gfx {
 class GlyphRenderingOptions;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 struct gfxFontStyle {
     gfxFontStyle();
diff --git a/gfx/thebes/gfxFontMissingGlyphs.h b/gfx/thebes/gfxFontMissingGlyphs.h
index d47765c51123..1814a89a747a 100644
--- a/gfx/thebes/gfxFontMissingGlyphs.h
+++ b/gfx/thebes/gfxFontMissingGlyphs.h
@@ -13,8 +13,8 @@ namespace mozilla {
 namespace gfx {
 class DrawTarget;
 class Pattern;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 /**
  * This class should not be instantiated. It's just a container
diff --git a/gfx/thebes/gfxGradientCache.cpp b/gfx/thebes/gfxGradientCache.cpp
index 9c4cfefe50ba..29aeeb88d6e4 100644
--- a/gfx/thebes/gfxGradientCache.cpp
+++ b/gfx/thebes/gfxGradientCache.cpp
@@ -230,5 +230,5 @@ gfxGradientCache::Shutdown()
   gGradientCache = nullptr;
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/thebes/gfxGradientCache.h b/gfx/thebes/gfxGradientCache.h
index b4c3478ac7e3..ccf537cc3d05 100644
--- a/gfx/thebes/gfxGradientCache.h
+++ b/gfx/thebes/gfxGradientCache.h
@@ -30,7 +30,7 @@ public:
     static void Shutdown();
 };
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif
diff --git a/gfx/thebes/gfxImageSurface.h b/gfx/thebes/gfxImageSurface.h
index 26193cd41a86..0d96f1613243 100644
--- a/gfx/thebes/gfxImageSurface.h
+++ b/gfx/thebes/gfxImageSurface.h
@@ -20,8 +20,8 @@ namespace mozilla {
 namespace gfx {
 class DataSourceSurface;
 class SourceSurface;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 /**
  * A raw image buffer. The format can be set in the constructor. Its main
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index 8004c06ac72f..c7cde8d7794d 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -116,8 +116,8 @@ namespace layers {
 void InitGralloc();
 #endif
 void ShutdownTileCache();
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 using namespace mozilla;
 using namespace mozilla::layers;
@@ -510,7 +510,7 @@ gfxPlatform::Init()
 
     gPlatform->mScreenReferenceSurface =
         gPlatform->CreateOffscreenSurface(IntSize(1, 1),
-                                          gfxContentType::COLOR_ALPHA);
+                                          gfxImageFormat::ARGB32);
     if (!gPlatform->mScreenReferenceSurface) {
         NS_RUNTIMEABORT("Could not initialize mScreenReferenceSurface");
     }
@@ -722,7 +722,7 @@ cairo_user_data_key_t kDrawTarget;
 already_AddRefed<DrawTarget>
 gfxPlatform::CreateDrawTargetForSurface(gfxASurface *aSurface, const IntSize& aSize)
 {
-  SurfaceFormat format = Optimal2DFormatForContent(aSurface->GetContentType());
+  SurfaceFormat format = aSurface->GetSurfaceFormat();
   RefPtr<DrawTarget> drawTarget = Factory::CreateDrawTargetForCairoSurface(aSurface->CairoSurface(), aSize, &format);
   if (!drawTarget) {
     gfxWarning() << "gfxPlatform::CreateDrawTargetForSurface failed in CreateDrawTargetForCairoSurface";
@@ -815,14 +815,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
     // function will be called for the old user data.
   }
 
-  SurfaceFormat format;
-  if (aSurface->GetContentType() == gfxContentType::ALPHA) {
-    format = SurfaceFormat::A8;
-  } else if (aSurface->GetContentType() == gfxContentType::COLOR) {
-    format = SurfaceFormat::B8G8R8X8;
-  } else {
-    format = SurfaceFormat::B8G8R8A8;
-  }
+  SurfaceFormat format = aSurface->GetSurfaceFormat();
 
   if (aTarget->GetBackendType() == BackendType::CAIRO) {
     // If we're going to be used with a CAIRO DrawTarget, then just create a
@@ -1140,8 +1133,7 @@ gfxPlatform::CreateDrawTargetForBackend(BackendType aBackend, const IntSize& aSi
   // CreateOffscreenSurface() and CreateDrawTargetForSurface() for all
   // backends).
   if (aBackend == BackendType::CAIRO) {
-    nsRefPtr<gfxASurface> surf = CreateOffscreenSurface(aSize,
-                                                        ContentForFormat(aFormat));
+    nsRefPtr<gfxASurface> surf = CreateOffscreenSurface(aSize, SurfaceFormatToImageFormat(aFormat));
     if (!surf || surf->CairoStatus()) {
       return nullptr;
     }
@@ -2360,3 +2352,15 @@ gfxPlatform::AsyncPanZoomEnabled()
 #endif
   return gfxPrefs::AsyncPanZoomEnabledDoNotUseDirectly();
 }
+
+/*virtual*/ bool
+gfxPlatform::UseProgressivePaint()
+{
+  return gfxPrefs::ProgressivePaintDoNotUseDirectly();
+}
+
+/*static*/ bool
+gfxPlatform::PerfWarnings()
+{
+  return gfxPrefs::PerfWarnings();
+}
diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h
index f183784749f3..3ae97315003b 100644
--- a/gfx/thebes/gfxPlatform.h
+++ b/gfx/thebes/gfxPlatform.h
@@ -13,7 +13,6 @@
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 
-#include "gfxPrefs.h"
 #include "gfxTypes.h"
 #include "gfxFontFamilyList.h"
 #include "gfxBlur.h"
@@ -42,7 +41,7 @@ class SRGBOverrideObserver;
 namespace mozilla {
 namespace gl {
 class SkiaGLGlue;
-}
+} // namespace gl
 namespace gfx {
 class DrawTarget;
 class SourceSurface;
@@ -56,12 +55,13 @@ BackendTypeBit(BackendType b)
 {
   return 1 << uint8_t(b);
 }
-}
-}
+
+} // namespace gfx
+} // namespace mozilla
 
 #define MOZ_PERFORMANCE_WARNING(module, ...) \
   do { \
-    if (gfxPrefs::PerfWarnings()) { \
+    if (gfxPlatform::PerfWarnings()) { \
       printf_stderr("[" module "] " __VA_ARGS__); \
     } \
   } while (0)
@@ -174,8 +174,8 @@ public:
      * and image format.
      */
     virtual already_AddRefed<gfxASurface>
-      CreateOffscreenSurface(const IntSize& size,
-                             gfxContentType contentType) = 0;
+      CreateOffscreenSurface(const IntSize& aSize,
+                             gfxImageFormat aFormat) = 0;
 
     /**
      * Beware that these methods may return DrawTargets which are not fully supported
@@ -260,7 +260,7 @@ public:
 
     /// These should be used instead of directly accessing the preference,
     /// as different platforms may override the behaviour.
-    virtual bool UseProgressivePaint() { return gfxPrefs::ProgressivePaintDoNotUseDirectly(); }
+    virtual bool UseProgressivePaint();
 
     static bool AsyncPanZoomEnabled();
 
@@ -619,6 +619,12 @@ public:
                                  const mozilla::gfx::IntSize& aSize,
                                  mozilla::gfx::SurfaceFormat aFormat);
 
+    /**
+     * Wrapper around gfxPrefs::PerfWarnings().
+     * Extracted into a function to avoid including gfxPrefs.h from this file.
+     */
+    static bool PerfWarnings();
+
 protected:
     gfxPlatform();
     virtual ~gfxPlatform();
diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index bda072ff1823..bebbc0dd8660 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -98,12 +98,11 @@ gfxPlatformGtk::FlushContentDrawing()
 }
 
 already_AddRefed<gfxASurface>
-gfxPlatformGtk::CreateOffscreenSurface(const IntSize& size,
-                                       gfxContentType contentType)
+gfxPlatformGtk::CreateOffscreenSurface(const IntSize& aSize,
+                                       gfxImageFormat aFormat)
 {
     nsRefPtr<gfxASurface> newSurface;
     bool needsClear = true;
-    gfxImageFormat imageFormat = OptimalFormatForContent(contentType);
 #ifdef MOZ_X11
     // XXX we really need a different interface here, something that passes
     // in more context, including the display and/or target surface type that
@@ -116,16 +115,16 @@ gfxPlatformGtk::CreateOffscreenSurface(const IntSize& size,
             Screen *screen = gdk_x11_screen_get_xscreen(gdkScreen);
             XRenderPictFormat* xrenderFormat =
                 gfxXlibSurface::FindRenderFormat(DisplayOfScreen(screen),
-                                                 imageFormat);
+                                                 aFormat);
 
             if (xrenderFormat) {
                 newSurface = gfxXlibSurface::Create(screen, xrenderFormat,
-                                                    size);
+                                                    aSize);
             }
         } else {
             // We're not going to use XRender, so we don't need to
             // search for a render format
-            newSurface = new gfxImageSurface(size, imageFormat);
+            newSurface = new gfxImageSurface(aSize, aFormat);
             // The gfxImageSurface ctor zeroes this for us, no need to
             // waste time clearing again
             needsClear = false;
@@ -137,7 +136,7 @@ gfxPlatformGtk::CreateOffscreenSurface(const IntSize& size,
         // We couldn't create a native surface for whatever reason;
         // e.g., no display, no RENDER, bad size, etc.
         // Fall back to image surface for the data.
-        newSurface = new gfxImageSurface(size, imageFormat);
+        newSurface = new gfxImageSurface(aSize, aFormat);
     }
 
     if (newSurface->CairoStatus()) {
diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h
index 5dc9378f14a0..1237163f0c65 100644
--- a/gfx/thebes/gfxPlatformGtk.h
+++ b/gfx/thebes/gfxPlatformGtk.h
@@ -29,8 +29,8 @@ public:
     }
 
     virtual already_AddRefed<gfxASurface>
-      CreateOffscreenSurface(const IntSize& size,
-                             gfxContentType contentType) override;
+      CreateOffscreenSurface(const IntSize& aSize,
+                             gfxImageFormat aFormat) override;
 
     virtual already_AddRefed<mozilla::gfx::ScaledFont>
       GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont) override;
diff --git a/gfx/thebes/gfxPlatformMac.cpp b/gfx/thebes/gfxPlatformMac.cpp
index 0cdb2318e864..f6440feb7980 100644
--- a/gfx/thebes/gfxPlatformMac.cpp
+++ b/gfx/thebes/gfxPlatformMac.cpp
@@ -116,11 +116,11 @@ gfxPlatformMac::CreatePlatformFontList()
 }
 
 already_AddRefed<gfxASurface>
-gfxPlatformMac::CreateOffscreenSurface(const IntSize& size,
-                                       gfxContentType contentType)
+gfxPlatformMac::CreateOffscreenSurface(const IntSize& aSize,
+                                       gfxImageFormat aFormat)
 {
     nsRefPtr<gfxASurface> newSurface =
-      new gfxQuartzSurface(size, OptimalFormatForContent(contentType));
+      new gfxQuartzSurface(aSize, aFormat);
     return newSurface.forget();
 }
 
diff --git a/gfx/thebes/gfxPlatformMac.h b/gfx/thebes/gfxPlatformMac.h
index efd790ef1d79..1cf60cc03589 100644
--- a/gfx/thebes/gfxPlatformMac.h
+++ b/gfx/thebes/gfxPlatformMac.h
@@ -13,8 +13,8 @@ namespace mozilla {
 namespace gfx {
 class DrawTarget;
 class VsyncSource;
-} // gfx
-} // mozilla
+} // namespace gfx
+} // namespace mozilla
 
 class gfxPlatformMac : public gfxPlatform {
 public:
@@ -26,8 +26,8 @@ public:
     }
 
     virtual already_AddRefed<gfxASurface>
-      CreateOffscreenSurface(const IntSize& size,
-                             gfxContentType contentType) override;
+      CreateOffscreenSurface(const IntSize& aSize,
+                             gfxImageFormat aFormat) override;
 
     already_AddRefed<mozilla::gfx::ScaledFont>
       GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont) override;
diff --git a/gfx/thebes/gfxQtPlatform.cpp b/gfx/thebes/gfxQtPlatform.cpp
index 81b83eda26ce..8fcdcad32bb3 100644
--- a/gfx/thebes/gfxQtPlatform.cpp
+++ b/gfx/thebes/gfxQtPlatform.cpp
@@ -89,13 +89,11 @@ gfxQtPlatform::GetXScreen(QWindow* aWindow)
 #endif
 
 already_AddRefed<gfxASurface>
-gfxQtPlatform::CreateOffscreenSurface(const IntSize& size,
-                                      gfxContentType contentType)
+gfxQtPlatform::CreateOffscreenSurface(const IntSize& aSize,
+                                      gfxImageFormat aFormat)
 {
-    gfxImageFormat imageFormat = OptimalFormatForContent(contentType);
-
     nsRefPtr<gfxASurface> newSurface =
-        new gfxImageSurface(size, imageFormat);
+        new gfxImageSurface(aSize, aFormat);
 
     return newSurface.forget();
 }
diff --git a/gfx/thebes/gfxQtPlatform.h b/gfx/thebes/gfxQtPlatform.h
index 4322bf228bdd..921de5ef70a8 100644
--- a/gfx/thebes/gfxQtPlatform.h
+++ b/gfx/thebes/gfxQtPlatform.h
@@ -27,8 +27,8 @@ public:
     }
 
     virtual already_AddRefed<gfxASurface>
-      CreateOffscreenSurface(const IntSize& size,
-                             gfxContentType contentType) override;
+      CreateOffscreenSurface(const IntSize& aSize,
+                             gfxImageFormat aFormat) override;
 
     virtual already_AddRefed<mozilla::gfx::ScaledFont>
       GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont) override;
diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h
index 86a641712a95..3bf1dacc78ff 100644
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -34,8 +34,8 @@ namespace mozilla {
             eCornerBottomLeft = 3,
             eNumCorners = 4
         };
-    }
-}
+    } // namespace css
+} // namespace mozilla
 #define NS_CORNER_TOP_LEFT mozilla::css::eCornerTopLeft
 #define NS_CORNER_TOP_RIGHT mozilla::css::eCornerTopRight
 #define NS_CORNER_BOTTOM_RIGHT mozilla::css::eCornerBottomRight
diff --git a/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h b/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h
index 78a11b3faedf..4b30b23899bd 100644
--- a/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h
+++ b/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h
@@ -13,11 +13,11 @@ class gfxSharedImageSurface;
 namespace mozilla {
 namespace ipc {
 class Shmem;
-}
+} // namespace ipc
 namespace layers {
 class ISurfaceAllocator;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 /**
  * A cross-process capable implementation of gfxReusableSurfaceWrapper based
diff --git a/gfx/thebes/gfxSVGGlyphs.h b/gfx/thebes/gfxSVGGlyphs.h
index 7d0b88f672d2..17d19ba3e81b 100644
--- a/gfx/thebes/gfxSVGGlyphs.h
+++ b/gfx/thebes/gfxSVGGlyphs.h
@@ -26,8 +26,8 @@ class gfxTextContextPaint;
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * Wraps an SVG document contained in the SVG table of an OpenType font.
diff --git a/gfx/thebes/gfxUtils.h b/gfx/thebes/gfxUtils.h
index 68d9772f86e2..e0d7b3d898b6 100644
--- a/gfx/thebes/gfxUtils.h
+++ b/gfx/thebes/gfxUtils.h
@@ -24,11 +24,11 @@ class nsIPresShell;
 namespace mozilla {
 namespace layers {
 struct PlanarYCbCrData;
-}
+} // namespace layers
 namespace image {
 class ImageRegion;
-}
-}
+} // namespace image
+} // namespace mozilla
 
 class gfxUtils {
 public:
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index fb00210fbe29..581d3eb893f7 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -723,20 +723,18 @@ gfxWindowsPlatform::CreatePlatformFontList()
 }
 
 already_AddRefed<gfxASurface>
-gfxWindowsPlatform::CreateOffscreenSurface(const IntSize& size,
-                                           gfxContentType contentType)
+gfxWindowsPlatform::CreateOffscreenSurface(const IntSize& aSize,
+                                           gfxImageFormat aFormat)
 {
     nsRefPtr<gfxASurface> surf = nullptr;
 
 #ifdef CAIRO_HAS_WIN32_SURFACE
     if (mRenderMode == RENDER_GDI || mRenderMode == RENDER_DIRECT2D)
-        surf = new gfxWindowsSurface(size,
-                                     OptimalFormatForContent(contentType));
+        surf = new gfxWindowsSurface(aSize, aFormat);
 #endif
 
     if (!surf || surf->CairoStatus()) {
-        surf = new gfxImageSurface(size,
-                                   OptimalFormatForContent(contentType));
+        surf = new gfxImageSurface(aSize, aFormat);
     }
 
     return surf.forget();
diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index d58747e2bdac..aab192ddf93e 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -115,8 +115,8 @@ public:
     virtual gfxPlatformFontList* CreatePlatformFontList();
 
     virtual already_AddRefed<gfxASurface>
-      CreateOffscreenSurface(const IntSize& size,
-                             gfxContentType contentType) override;
+      CreateOffscreenSurface(const IntSize& aSize,
+                             gfxImageFormat aFormat) override;
 
     virtual already_AddRefed<mozilla::gfx::ScaledFont>
       GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont);
diff --git a/gfx/vr/gfxVRCardboard.cpp b/gfx/vr/gfxVRCardboard.cpp
index c010fce9d766..ab291a016244 100644
--- a/gfx/vr/gfxVRCardboard.cpp
+++ b/gfx/vr/gfxVRCardboard.cpp
@@ -76,7 +76,7 @@ RemapMatrixForOrientation(ScreenOrientation screenConfig, const Matrix4x4& aMatr
   return out;
 }
 
-}
+} // namespace
 
 HMDInfoCardboard::HMDInfoCardboard()
   : VRHMDInfo(VRHMDType::Cardboard)
diff --git a/gfx/vr/gfxVROculus.cpp b/gfx/vr/gfxVROculus.cpp
index 0d103eba3007..ea3f88004491 100644
--- a/gfx/vr/gfxVROculus.cpp
+++ b/gfx/vr/gfxVROculus.cpp
@@ -234,7 +234,7 @@ FromFovPort(const ovrFovPort& aFOV)
   return fovInfo;
 }
 
-} // anonymous namespace
+} // namespace
 
 HMDInfoOculus::HMDInfoOculus(ovrHmd aHMD)
   : VRHMDInfo(VRHMDType::Oculus)
diff --git a/gfx/ycbcr/YCbCrUtils.cpp b/gfx/ycbcr/YCbCrUtils.cpp
index 26fb95f03411..ea3fb7c8f446 100644
--- a/gfx/ycbcr/YCbCrUtils.cpp
+++ b/gfx/ycbcr/YCbCrUtils.cpp
@@ -152,5 +152,5 @@ ConvertYCbCrToRGB(const layers::PlanarYCbCrData& aData,
   }
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/ycbcr/YCbCrUtils.h b/gfx/ycbcr/YCbCrUtils.h
index 1e83f4426ff2..1cd2e1c4fd77 100644
--- a/gfx/ycbcr/YCbCrUtils.h
+++ b/gfx/ycbcr/YCbCrUtils.h
@@ -24,7 +24,7 @@ ConvertYCbCrToRGB(const layers::PlanarYCbCrData& aData,
                   unsigned char* aDestBuffer,
                   int32_t aStride);
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 #endif /* MOZILLA_GFX_UTILS_H_ */
diff --git a/gfx/ycbcr/ycbcr_to_rgb565.h b/gfx/ycbcr/ycbcr_to_rgb565.h
index 4d9d6b5f00b1..d630e0e98434 100644
--- a/gfx/ycbcr/ycbcr_to_rgb565.h
+++ b/gfx/ycbcr/ycbcr_to_rgb565.h
@@ -65,8 +65,8 @@ NS_GFX_(bool) IsScaleYCbCrToRGB565Fast(int source_x0,
                                        ScaleFilter filter);
 #endif // HAVE_YCBCR_TO_RGB565
 
-}  // namespace gfx
+} // namespace gfx
 
-}  // namespace mozilla
+} // namespace mozilla
 
 #endif // MEDIA_BASE_YCBCR_TO_RGB565_H_
diff --git a/gfx/ycbcr/yuv_convert.cpp b/gfx/ycbcr/yuv_convert.cpp
index 8b35e989082a..14d64c3754b0 100644
--- a/gfx/ycbcr/yuv_convert.cpp
+++ b/gfx/ycbcr/yuv_convert.cpp
@@ -353,5 +353,5 @@ NS_GFX_(void) ScaleYCbCrToRGB32(const uint8* y_buf,
     EMMS();
 }
 
-}  // namespace gfx
-}  // namespace mozilla
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/ycbcr/yuv_convert.h b/gfx/ycbcr/yuv_convert.h
index b5e8c91de396..b041fed8853b 100644
--- a/gfx/ycbcr/yuv_convert.h
+++ b/gfx/ycbcr/yuv_convert.h
@@ -75,7 +75,7 @@ NS_GFX_(void) ScaleYCbCrToRGB32(const uint8* yplane,
                                 Rotate view_rotate,
                                 ScaleFilter filter);
 
-}  // namespace gfx
-}  // namespace mozilla
+} // namespace gfx
+} // namespace mozilla
  
 #endif  // MEDIA_BASE_YUV_CONVERT_H_
diff --git a/gfx/ycbcr/yuv_convert_mmx.cpp b/gfx/ycbcr/yuv_convert_mmx.cpp
index 1704c3ee6d53..b5353e5008a3 100644
--- a/gfx/ycbcr/yuv_convert_mmx.cpp
+++ b/gfx/ycbcr/yuv_convert_mmx.cpp
@@ -41,5 +41,5 @@ void FilterRows_MMX(uint8* ybuf, const uint8* y0_ptr, const uint8* y1_ptr,
   } while (dest64 < end64);
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/ycbcr/yuv_convert_sse2.cpp b/gfx/ycbcr/yuv_convert_sse2.cpp
index 98fecb3a46fd..25fe20639db7 100644
--- a/gfx/ycbcr/yuv_convert_sse2.cpp
+++ b/gfx/ycbcr/yuv_convert_sse2.cpp
@@ -43,5 +43,5 @@ void FilterRows_SSE2(uint8* ybuf, const uint8* y0_ptr, const uint8* y1_ptr,
   } while (dest128 < end128);
 }
 
-}
-}
+} // namespace gfx
+} // namespace mozilla
diff --git a/hal/Hal.cpp b/hal/Hal.cpp
index a0150b9fa6df..316de7e69ceb 100644
--- a/hal/Hal.cpp
+++ b/hal/Hal.cpp
@@ -110,7 +110,7 @@ void InitLastIDToVibrate()
   ClearOnShutdown(&gLastIDToVibrate);
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 Vibrate(const nsTArray<uint32_t>& pattern, nsIDOMWindow* window)
diff --git a/hal/HalSensor.h b/hal/HalSensor.h
index 71365a9b68c2..551c4271d539 100644
--- a/hal/HalSensor.h
+++ b/hal/HalSensor.h
@@ -50,8 +50,8 @@ class SensorAccuracy;
 
 typedef Observer<SensorAccuracy> ISensorAccuracyObserver;
 
-}
-}
+} // namespace hal
+} // namespace mozilla
 
 #include "ipc/IPCMessageUtils.h"
 
diff --git a/hal/HalWakeLock.cpp b/hal/HalWakeLock.cpp
index 83c0aa509aa5..1848e0942430 100644
--- a/hal/HalWakeLock.cpp
+++ b/hal/HalWakeLock.cpp
@@ -164,7 +164,7 @@ Init()
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
@@ -283,5 +283,5 @@ GetWakeLockInfo(const nsAString& aTopic, WakeLockInformation* aWakeLockInfo)
   *aWakeLockInfo = WakeLockInfoFromLockCount(aTopic, totalCount);
 }
 
-} // hal_impl
-} // mozilla
+} // namespace hal_impl
+} // namespace mozilla
diff --git a/hal/HalWakeLock.h b/hal/HalWakeLock.h
index 0462f30cba47..7ee6327d8009 100644
--- a/hal/HalWakeLock.h
+++ b/hal/HalWakeLock.h
@@ -20,7 +20,7 @@ enum WakeLockState {
  */
 WakeLockState ComputeWakeLockState(int aNumLocks, int aNumHidden);
 
-} // hal
-} // mozilla
+} // namespace hal
+} // namespace mozilla
 
 #endif /* __HAL_WAKELOCK_H_ */
diff --git a/hal/cocoa/CocoaBattery.cpp b/hal/cocoa/CocoaBattery.cpp
index 0a4f16a84f5f..6f1b7b1dcab9 100644
--- a/hal/cocoa/CocoaBattery.cpp
+++ b/hal/cocoa/CocoaBattery.cpp
@@ -129,7 +129,7 @@ SingletonDestroyer::Observe(nsISupports*, const char* aTopic, const char16_t*)
   MacPowerInformationService::Shutdown();
   return NS_OK;
 }
-} // anonymous namespace
+} // namespace
 
 /* static */ MacPowerInformationService*
 MacPowerInformationService::GetInstance()
diff --git a/hal/cocoa/CocoaSensor.mm b/hal/cocoa/CocoaSensor.mm
index 2c8130fb0039..ad203073c3ed 100644
--- a/hal/cocoa/CocoaSensor.mm
+++ b/hal/cocoa/CocoaSensor.mm
@@ -145,5 +145,5 @@ DisableSensorNotifications(SensorType aSensor)
     NS_RELEASE(sUpdateTimer);
   }
 }
-} // hal_impl
-} // mozilla
+} // namespace hal_impl
+} // namespace mozilla
diff --git a/hal/fallback/FallbackAlarm.cpp b/hal/fallback/FallbackAlarm.cpp
index aac6198f10c5..9ec5c48e17ba 100644
--- a/hal/fallback/FallbackAlarm.cpp
+++ b/hal/fallback/FallbackAlarm.cpp
@@ -75,5 +75,5 @@ SetAlarm(int32_t aSeconds, int32_t aNanoseconds)
   return true;
 }
 
-} // hal_impl
+} // namespace hal_impl
 } // namespace mozilla
diff --git a/hal/fallback/FallbackFMRadio.cpp b/hal/fallback/FallbackFMRadio.cpp
index f2e9e4dae82f..59f5081a034a 100644
--- a/hal/fallback/FallbackFMRadio.cpp
+++ b/hal/fallback/FallbackFMRadio.cpp
@@ -67,5 +67,5 @@ void
 DisableRDS()
 {}
 
-} // hal_impl
+} // namespace hal_impl
 } // namespace mozilla
diff --git a/hal/fallback/FallbackPower.cpp b/hal/fallback/FallbackPower.cpp
index 20037b44c554..0a53e89adc98 100644
--- a/hal/fallback/FallbackPower.cpp
+++ b/hal/fallback/FallbackPower.cpp
@@ -21,5 +21,5 @@ void
 StartForceQuitWatchdog(hal::ShutdownMode aMode, int32_t aTimeoutSecs)
 {}
 
-} // hal_impl
+} // namespace hal_impl
 } // namespace mozilla
diff --git a/hal/fallback/FallbackProcessPriority.cpp b/hal/fallback/FallbackProcessPriority.cpp
index 3c85f75d29aa..b03b1542e1be 100644
--- a/hal/fallback/FallbackProcessPriority.cpp
+++ b/hal/fallback/FallbackProcessPriority.cpp
@@ -17,5 +17,5 @@ SetProcessPriority(int aPid, ProcessPriority aPriority, uint32_t aLRU)
           aPid, ProcessPriorityToString(aPriority), aLRU);
 }
 
-} // hal_impl
+} // namespace hal_impl
 } // namespace mozilla
diff --git a/hal/fallback/FallbackScreenConfiguration.cpp b/hal/fallback/FallbackScreenConfiguration.cpp
index 0c01821976c7..e8905e77a955 100644
--- a/hal/fallback/FallbackScreenConfiguration.cpp
+++ b/hal/fallback/FallbackScreenConfiguration.cpp
@@ -59,5 +59,5 @@ UnlockScreenOrientation()
 {
 }
 
-} // hal_impl
-} // mozilla
+} // namespace hal_impl
+} // namespace mozilla
diff --git a/hal/fallback/FallbackScreenPower.cpp b/hal/fallback/FallbackScreenPower.cpp
index 72d843fd2498..2a7ad276fe6d 100644
--- a/hal/fallback/FallbackScreenPower.cpp
+++ b/hal/fallback/FallbackScreenPower.cpp
@@ -37,5 +37,5 @@ void
 SetScreenBrightness(double aBrightness)
 {}
 
-} // hal_impl
+} // namespace hal_impl
 } // namespace mozilla
diff --git a/hal/fallback/FallbackThreadPriority.cpp b/hal/fallback/FallbackThreadPriority.cpp
index d6baeb948b67..dce5dfa82c6f 100644
--- a/hal/fallback/FallbackThreadPriority.cpp
+++ b/hal/fallback/FallbackThreadPriority.cpp
@@ -25,5 +25,5 @@ SetThreadPriority(PlatformThreadId aThreadId,
           aThreadId, ThreadPriorityToString(aPriority));
 }
 
-} // hal_impl
+} // namespace hal_impl
 } // namespace mozilla
diff --git a/hal/fallback/FallbackVibration.cpp b/hal/fallback/FallbackVibration.cpp
index 94503132d623..ffabe9efea88 100644
--- a/hal/fallback/FallbackVibration.cpp
+++ b/hal/fallback/FallbackVibration.cpp
@@ -19,5 +19,5 @@ void
 CancelVibrate(const hal::WindowIdentifier &)
 {}
 
-} // hal_impl
+} // namespace hal_impl
 } // namespace mozilla
diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp
index aa1d7c1472db..0ad781f0faad 100644
--- a/hal/gonk/GonkHal.cpp
+++ b/hal/gonk/GonkHal.cpp
@@ -395,7 +395,7 @@ EnsureVibratorThreadInitialized()
   NS_NewThread(getter_AddRefs(thread), sVibratorRunnable);
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 Vibrate(const nsTArray<uint32_t> &pattern, const hal::WindowIdentifier &)
@@ -472,7 +472,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 class BatteryObserver final : public IUeventObserver
 {
@@ -745,7 +745,7 @@ bool sCpuSleepAllowed = true;
 // when reading or writing this variable to ensure thread-safe.
 int32_t sInternalLockCpuCount = 0;
 
-} // anonymous namespace
+} // namespace
 
 bool
 GetScreenEnabled()
@@ -2017,7 +2017,7 @@ private:
   hal::ThreadPriority mThreadPriority;
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 SetCurrentThreadPriority(ThreadPriority aThreadPriority)
diff --git a/hal/sandbox/SandboxHal.h b/hal/sandbox/SandboxHal.h
index 66d5434f8ce4..0da2d41fbf18 100644
--- a/hal/sandbox/SandboxHal.h
+++ b/hal/sandbox/SandboxHal.h
@@ -17,7 +17,7 @@ PHalChild* CreateHalChild();
 
 PHalParent* CreateHalParent();
 
-}
-}
+} // namespace hal_sandbox
+} // namespace mozilla
 
 #endif  // mozilla_SandboxHal_h
diff --git a/image/Decoder.h b/image/Decoder.h
index a7892a9ac001..d6deafb7c962 100644
--- a/image/Decoder.h
+++ b/image/Decoder.h
@@ -18,7 +18,7 @@ namespace mozilla {
 
 namespace Telemetry {
   enum ID : uint32_t;
-}
+} // namespace Telemetry
 
 namespace image {
 
diff --git a/image/ImageRegion.h b/image/ImageRegion.h
index d9b3b9e1c50a..71dadb346c34 100644
--- a/image/ImageRegion.h
+++ b/image/ImageRegion.h
@@ -152,7 +152,7 @@ private:
   bool    mIsRestricted;
 };
 
-}  // namespace image
-}  // namespace mozilla
+} // namespace image
+} // namespace mozilla
 
 #endif // mozilla_image_ImageRegion_h
diff --git a/image/RasterImage.h b/image/RasterImage.h
index 1fcbceea9010..ceaed610f02e 100644
--- a/image/RasterImage.h
+++ b/image/RasterImage.h
@@ -125,7 +125,7 @@ namespace mozilla {
 namespace layers {
 class ImageContainer;
 class Image;
-}
+} // namespace layers
 
 namespace image {
 
diff --git a/image/SVGDocumentWrapper.h b/image/SVGDocumentWrapper.h
index beb1de740071..7d7586ae37e9 100644
--- a/image/SVGDocumentWrapper.h
+++ b/image/SVGDocumentWrapper.h
@@ -30,7 +30,7 @@ class nsIFrame;
 namespace mozilla {
 namespace dom {
 class SVGSVGElement;
-}
+} // namespace dom
 
 namespace image {
 
diff --git a/image/imgLoader.h b/image/imgLoader.h
index 776b32e6978a..2f188aee3146 100644
--- a/image/imgLoader.h
+++ b/image/imgLoader.h
@@ -35,8 +35,8 @@ class imgMemoryReporter;
 namespace mozilla {
 namespace image {
 class ImageURL;
-}
-}
+} // namespace image
+} // namespace mozilla
 
 class imgCacheEntry
 {
diff --git a/image/imgRequest.cpp b/image/imgRequest.cpp
index c9b89229388b..2350a036b360 100644
--- a/image/imgRequest.cpp
+++ b/image/imgRequest.cpp
@@ -631,7 +631,7 @@ imgRequest::SetCacheValidation(imgCacheEntry* aCacheEntry, nsIRequest* aRequest)
   }
 }
 
-namespace { // anon
+namespace {
 
 already_AddRefed<nsIApplicationCache>
 GetApplicationCache(nsIRequest* aRequest)
@@ -659,7 +659,7 @@ GetApplicationCache(nsIRequest* aRequest)
   return appCache.forget();
 }
 
-} // anon
+} // namespace
 
 bool
 imgRequest::CacheChanged(nsIRequest* aNewRequest)
diff --git a/intl/locale/nsUConvPropertySearch.cpp b/intl/locale/nsUConvPropertySearch.cpp
index 8c1bd7a529e5..d9e58d0f9b4e 100644
--- a/intl/locale/nsUConvPropertySearch.cpp
+++ b/intl/locale/nsUConvPropertySearch.cpp
@@ -18,7 +18,7 @@ struct PropertyComparator
   }
 };
 
-}
+} // namespace
 
 // static
 nsresult
diff --git a/intl/uconv/nsUTF8ToUnicode.cpp b/intl/uconv/nsUTF8ToUnicode.cpp
index 10a5371c9016..d4e28b04dfcb 100644
--- a/intl/uconv/nsUTF8ToUnicode.cpp
+++ b/intl/uconv/nsUTF8ToUnicode.cpp
@@ -157,8 +157,8 @@ namespace SSE2 {
 
 void Convert_ascii_run(const char *&src, char16_t *&dst, int32_t len);
 
-}
-}
+} // namespace SSE2
+} // namespace mozilla
 #endif
 
 static inline void
diff --git a/ipc/glue/BackgroundChildImpl.cpp b/ipc/glue/BackgroundChildImpl.cpp
index 6f02d971b5f7..ef30c6c19528 100644
--- a/ipc/glue/BackgroundChildImpl.cpp
+++ b/ipc/glue/BackgroundChildImpl.cpp
@@ -46,7 +46,7 @@ public:
   Recv__delete__(const nsCString& aTestArg) override;
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
diff --git a/ipc/glue/BackgroundImpl.cpp b/ipc/glue/BackgroundImpl.cpp
index 298cafe1353d..1817aad0d287 100644
--- a/ipc/glue/BackgroundImpl.cpp
+++ b/ipc/glue/BackgroundImpl.cpp
@@ -784,7 +784,7 @@ private:
   NS_DECL_NSIRUNNABLE
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
diff --git a/ipc/glue/BackgroundParentImpl.cpp b/ipc/glue/BackgroundParentImpl.cpp
index 90b424a2762e..d787f2500464 100644
--- a/ipc/glue/BackgroundParentImpl.cpp
+++ b/ipc/glue/BackgroundParentImpl.cpp
@@ -78,7 +78,7 @@ public:
   ActorDestroy(ActorDestroyReason aWhy) override;
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
@@ -292,7 +292,7 @@ private:
   nsCString mFilter;
 };
 
-}
+} // namespace
 
 auto
 BackgroundParentImpl::AllocPUDPSocketParent(const OptionalPrincipalInfo& /* unused */,
@@ -431,7 +431,7 @@ private:
   nsCOMPtr<nsIThread> mBackgroundThread;
 };
 
-} // anonymous namespace
+} // namespace
 
 bool
 BackgroundParentImpl::RecvPBroadcastChannelConstructor(
diff --git a/ipc/glue/BackgroundParentImpl.h b/ipc/glue/BackgroundParentImpl.h
index d60ce1907c9a..b1fddf32a9ec 100644
--- a/ipc/glue/BackgroundParentImpl.h
+++ b/ipc/glue/BackgroundParentImpl.h
@@ -12,7 +12,7 @@ namespace mozilla {
 
 namespace layout {
 class VsyncParent;
-}
+} // namespace layout
 
 namespace ipc {
 
diff --git a/ipc/glue/BackgroundUtils.h b/ipc/glue/BackgroundUtils.h
index e4b350e42846..8848f313b74e 100644
--- a/ipc/glue/BackgroundUtils.h
+++ b/ipc/glue/BackgroundUtils.h
@@ -36,12 +36,12 @@ struct ParamTraits<mozilla::OriginAttributes>
   }
 };
 
-} // IPC namespace
+} // namespace IPC
 
 namespace mozilla {
 namespace net {
 class LoadInfoArgs;
-}
+} // namespace net
 
 namespace ipc {
 
diff --git a/ipc/glue/CrossProcessMutex.h b/ipc/glue/CrossProcessMutex.h
index 359d38a78355..77e8f117a1e8 100644
--- a/ipc/glue/CrossProcessMutex.h
+++ b/ipc/glue/CrossProcessMutex.h
@@ -19,7 +19,7 @@
 namespace IPC {
 template<typename T>
 struct ParamTraits;
-}
+} // namespace IPC
 
 //
 // Provides:
@@ -110,5 +110,6 @@ private:
 typedef BaseAutoLock<CrossProcessMutex> CrossProcessMutexAutoLock;
 typedef BaseAutoUnlock<CrossProcessMutex> CrossProcessMutexAutoUnlock;
 
-}
+} // namespace mozilla
+
 #endif
diff --git a/ipc/glue/CrossProcessMutex_posix.cpp b/ipc/glue/CrossProcessMutex_posix.cpp
index b3e17b774b97..b5b8aa5433db 100644
--- a/ipc/glue/CrossProcessMutex_posix.cpp
+++ b/ipc/glue/CrossProcessMutex_posix.cpp
@@ -19,7 +19,7 @@ struct MutexData {
   mozilla::Atomic<int32_t> mCount;
 };
 
-}
+} // namespace
 
 namespace mozilla {
 
@@ -149,4 +149,4 @@ CrossProcessMutex::ShareToProcess(base::ProcessId aTargetPid)
   return result;
 }
 
-}
+} // namespace mozilla
diff --git a/ipc/glue/IOThreadChild.h b/ipc/glue/IOThreadChild.h
index 7547f9f46211..c8420b187e84 100644
--- a/ipc/glue/IOThreadChild.h
+++ b/ipc/glue/IOThreadChild.h
@@ -43,7 +43,7 @@ private:
   DISALLOW_EVIL_CONSTRUCTORS(IOThreadChild);
 };
 
-}  // namespace plugins
-}  // namespace mozilla
+} // namespace ipc
+} // namespace mozilla
 
 #endif  // ifndef dom_plugins_IOThreadChild_h
diff --git a/ipc/glue/InputStreamUtils.cpp b/ipc/glue/InputStreamUtils.cpp
index cd999be042c1..9e66cf723e18 100644
--- a/ipc/glue/InputStreamUtils.cpp
+++ b/ipc/glue/InputStreamUtils.cpp
@@ -31,7 +31,7 @@ NS_DEFINE_CID(kBufferedInputStreamCID, NS_BUFFEREDINPUTSTREAM_CID);
 NS_DEFINE_CID(kMIMEInputStreamCID, NS_MIMEINPUTSTREAM_CID);
 NS_DEFINE_CID(kMultiplexInputStreamCID, NS_MULTIPLEXINPUTSTREAM_CID);
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
index e93b61a2b82b..6e277b31e7eb 100644
--- a/ipc/glue/MessageChannel.cpp
+++ b/ipc/glue/MessageChannel.cpp
@@ -298,7 +298,7 @@ private:
     bool mBlocked;
 };
 
-} /* namespace {} */
+} // namespace
 
 MessageChannel::MessageChannel(MessageListener *aListener)
   : mListener(aListener),
@@ -2043,5 +2043,5 @@ CancelCPOWs()
     }
 }
 
-} // ipc
-} // mozilla
+} // namespace ipc
+} // namespace mozilla
diff --git a/ipc/glue/ProtocolUtils.h b/ipc/glue/ProtocolUtils.h
index 03739365b248..489a7c699234 100644
--- a/ipc/glue/ProtocolUtils.h
+++ b/ipc/glue/ProtocolUtils.h
@@ -46,16 +46,17 @@ enum {
 
     // kuint16max - 1 is used by ipc_channel.h.
 };
-}
+
+} // namespace
 
 namespace mozilla {
 namespace dom {
 class ContentParent;
-}
+} // namespace dom
 
 namespace net {
 class NeckoParent;
-}
+} // namespace net
 
 namespace ipc {
 
diff --git a/ipc/glue/SharedMemory.h b/ipc/glue/SharedMemory.h
index 9be7772d00dc..6a36aed7e96f 100644
--- a/ipc/glue/SharedMemory.h
+++ b/ipc/glue/SharedMemory.h
@@ -22,13 +22,13 @@ enum Rights {
   RightsRead = 1 << 0,
   RightsWrite = 1 << 1
 };
-}
+} // namespace
 
 namespace mozilla {
 
 namespace ipc {
 class SharedMemory;
-}
+} // namespace ipc
 
 namespace ipc {
 
diff --git a/ipc/glue/Shmem.h b/ipc/glue/Shmem.h
index 8cccbb3e2c7c..6e7cd0f99a28 100644
--- a/ipc/glue/Shmem.h
+++ b/ipc/glue/Shmem.h
@@ -57,7 +57,7 @@
 namespace mozilla {
 namespace layers {
 class ShadowLayerForwarder;
-}
+} // namespace layers
 
 namespace ipc {
 
diff --git a/ipc/glue/StringUtil.cpp b/ipc/glue/StringUtil.cpp
index 6c50c2ed3f60..3acc807e19d7 100644
--- a/ipc/glue/StringUtil.cpp
+++ b/ipc/glue/StringUtil.cpp
@@ -41,7 +41,8 @@ GhettoStringConvert(const FromType& in)
       out[i] = static_cast<typename ToType::value_type>(in[i]);
   return out;
 }
-}
+
+} // namespace base
 
 // Implement functions that were in the chromium ICU library, which
 // we're not taking.
@@ -88,4 +89,4 @@ std::wstring SysNativeMBToWide(const StringPiece& native_mb) {
 }
 #endif
 
-}  // namespace base
+} // namespace base
diff --git a/ipc/glue/URIUtils.cpp b/ipc/glue/URIUtils.cpp
index 0f12bb116951..b5acc94cf317 100644
--- a/ipc/glue/URIUtils.cpp
+++ b/ipc/glue/URIUtils.cpp
@@ -30,7 +30,7 @@ NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
 NS_DEFINE_CID(kJARURICID, NS_JARURI_CID);
 NS_DEFINE_CID(kIconURICID, NS_MOZICONURI_CID);
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp
index 82a1567b5e9d..3f7afaaa1865 100644
--- a/ipc/glue/WindowsMessageLoop.cpp
+++ b/ipc/glue/WindowsMessageLoop.cpp
@@ -435,7 +435,7 @@ ProcessOrDeferMessage(HWND hwnd,
   return res;
 }
 
-} // anonymous namespace
+} // namespace
 
 // We need the pointer value of this in PluginInstanceChild.
 LRESULT CALLBACK
@@ -680,7 +680,7 @@ TimeoutHasExpired(const TimeoutData& aData)
   return now >= aData.targetTicks;
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
diff --git a/ipc/glue/nsIIPCSerializableURI.h b/ipc/glue/nsIIPCSerializableURI.h
index 7f9ab41ed500..ebbe89b2c05a 100644
--- a/ipc/glue/nsIIPCSerializableURI.h
+++ b/ipc/glue/nsIIPCSerializableURI.h
@@ -11,8 +11,8 @@
 namespace mozilla {
 namespace ipc {
 class URIParams;
-}
-}
+} // namespace ipc
+} // namespace mozilla
 
 #define NS_IIPCSERIALIZABLEURI_IID \
   {0xfee3437d, 0x3daf, 0x411f, {0xb0, 0x1d, 0xdc, 0xd4, 0x88, 0x55, 0xe3, 0xd}}
diff --git a/ipc/netd/Netd.cpp b/ipc/netd/Netd.cpp
index 4f4f30e0f2dd..8eeb7307bd7c 100644
--- a/ipc/netd/Netd.cpp
+++ b/ipc/netd/Netd.cpp
@@ -80,7 +80,7 @@ InitRndisAddress()
   return true;
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
diff --git a/ipc/ril/Ril.cpp b/ipc/ril/Ril.cpp
index 2a13c868b10a..66c7a8d4c39c 100644
--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -193,7 +193,7 @@ DispatchRILEvent::RunTask(JSContext* aCx)
   return JS_CallFunctionName(aCx, obj, "onRILMessage", args, &rval);
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace ipc {
diff --git a/js/ductwork/debugger/JSDebugger.cpp b/js/ductwork/debugger/JSDebugger.cpp
index b3fdd2686755..ddae7ef836ee 100644
--- a/js/ductwork/debugger/JSDebugger.cpp
+++ b/js/ductwork/debugger/JSDebugger.cpp
@@ -62,8 +62,8 @@ JSDebugger::AddClass(JS::Handle<JS::Value> global, JSContext* cx)
   return NS_OK;
 }
 
-}
-}
+} // namespace jsdebugger
+} // namespace mozilla
 
 NS_DEFINE_NAMED_CID(JSDEBUGGER_CID);
 
diff --git a/js/ductwork/debugger/JSDebugger.h b/js/ductwork/debugger/JSDebugger.h
index 36a5cdb049a5..ce5ab81ad80e 100644
--- a/js/ductwork/debugger/JSDebugger.h
+++ b/js/ductwork/debugger/JSDebugger.h
@@ -24,7 +24,7 @@ private:
   ~JSDebugger();
 };
 
-}
-}
+} // namespace jsdebugger
+} // namespace mozilla
 
 #endif /* JSDebugger_h */
diff --git a/js/ipc/CrossProcessObjectWrappers.h b/js/ipc/CrossProcessObjectWrappers.h
index e55ba0e49f5d..f5b682482faf 100644
--- a/js/ipc/CrossProcessObjectWrappers.h
+++ b/js/ipc/CrossProcessObjectWrappers.h
@@ -24,7 +24,7 @@ namespace mozilla {
 
 namespace dom {
 class CPOWManagerGetter;
-}
+} // namespace dom
 
 namespace jsipc {
 
diff --git a/js/ipc/JavaScriptChild.h b/js/ipc/JavaScriptChild.h
index 7d39450d0ef4..474064b65196 100644
--- a/js/ipc/JavaScriptChild.h
+++ b/js/ipc/JavaScriptChild.h
@@ -34,7 +34,7 @@ class JavaScriptChild : public JavaScriptBase<PJavaScriptChild>
     bool ok(ReturnStatus* rs);
 };
 
-} // mozilla
-} // jsipc
+} // namespace jsipc
+} // namespace mozilla
 
 #endif
diff --git a/js/ipc/JavaScriptLogging.h b/js/ipc/JavaScriptLogging.h
index 25ecfe13b5f0..187579a4b5b4 100644
--- a/js/ipc/JavaScriptLogging.h
+++ b/js/ipc/JavaScriptLogging.h
@@ -225,7 +225,7 @@ class Logging
     JSContext* cx;
 };
 
-}
-}
+} // namespace jsipc
+} // namespace mozilla
 
 #endif
diff --git a/js/ipc/JavaScriptParent.h b/js/ipc/JavaScriptParent.h
index 5becfad5f5f3..b0fe4025508e 100644
--- a/js/ipc/JavaScriptParent.h
+++ b/js/ipc/JavaScriptParent.h
@@ -33,8 +33,8 @@ class JavaScriptParent : public JavaScriptBase<PJavaScriptParent>
     virtual JSObject* scopeForTargetObjects() override;
 };
 
-} // jsipc
-} // mozilla
+} // namespace jsipc
+} // namespace mozilla
 
 #endif // mozilla_jsipc_JavaScriptWrapper_h__
 
diff --git a/js/ipc/WrapperAnswer.h b/js/ipc/WrapperAnswer.h
index 4f6fb3f3decc..4c01a200b2f2 100644
--- a/js/ipc/WrapperAnswer.h
+++ b/js/ipc/WrapperAnswer.h
@@ -14,7 +14,7 @@ namespace mozilla {
 
 namespace dom {
 class AutoJSAPI;
-}
+} // namespace dom
 
 namespace jsipc {
 
@@ -72,7 +72,7 @@ class WrapperAnswer : public virtual JavaScriptShared
     bool ok(ReturnStatus* rs, const JS::ObjectOpResult& result);
 };
 
-} // mozilla
-} // jsipc
+} // namespace jsipc
+} // namespace mozilla
 
 #endif
diff --git a/js/ipc/WrapperOwner.h b/js/ipc/WrapperOwner.h
index 17614a6ed28c..b35db385129e 100644
--- a/js/ipc/WrapperOwner.h
+++ b/js/ipc/WrapperOwner.h
@@ -153,7 +153,7 @@ class WrapperOwner : public virtual JavaScriptShared
                                    ReturnStatus* rs, bool* instanceof) = 0;
 };
 
-} // jsipc
-} // mozilla
+} // namespace jsipc
+} // namespace mozilla
 
 #endif // mozilla_jsipc_WrapperOwner_h__
diff --git a/js/public/CharacterEncoding.h b/js/public/CharacterEncoding.h
index 5ad7f882523b..47638161c54b 100644
--- a/js/public/CharacterEncoding.h
+++ b/js/public/CharacterEncoding.h
@@ -14,7 +14,7 @@
 
 namespace js {
 class ExclusiveContext;
-}
+} // namespace js
 
 class JSFlatString;
 
diff --git a/js/public/Class.h b/js/public/Class.h
index f68b5c407198..96148c22e11c 100644
--- a/js/public/Class.h
+++ b/js/public/Class.h
@@ -214,7 +214,7 @@ class ObjectOpResult
     }
 };
 
-}
+} // namespace JS
 
 // JSClass operation signatures.
 
diff --git a/js/public/Debug.h b/js/public/Debug.h
index a9c341b5476a..1abcfdaf9c45 100644
--- a/js/public/Debug.h
+++ b/js/public/Debug.h
@@ -23,7 +23,7 @@
 
 namespace js {
 class Debugger;
-}
+} // namespace js
 
 namespace JS {
 
diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h
index 72afdada0105..a2dcdb41db91 100644
--- a/js/public/GCAPI.h
+++ b/js/public/GCAPI.h
@@ -15,11 +15,11 @@
 namespace js {
 namespace gc {
 class GCRuntime;
-}
+} // namespace gc
 namespace gcstats {
 struct Statistics;
-}
-}
+} // namespace gcstats
+} // namespace js
 
 typedef enum JSGCMode {
     /* Perform only global GCs. */
diff --git a/js/public/HashTable.h b/js/public/HashTable.h
index 42c8d253c78f..c8ad21d95ba4 100644
--- a/js/public/HashTable.h
+++ b/js/public/HashTable.h
@@ -28,7 +28,7 @@ template <class, class> class HashMapEntry;
 namespace detail {
     template <class T> class HashTableEntry;
     template <class T, class HashPolicy, class AllocPolicy> class HashTable;
-}
+} // namespace detail
 
 /*****************************************************************************/
 
@@ -1696,7 +1696,7 @@ class HashTable : private AllocPolicy
 #undef METER
 };
 
-}  // namespace detail
-}  // namespace js
+} // namespace detail
+} // namespace js
 
 #endif  /* js_HashTable_h */
diff --git a/js/public/Id.h b/js/public/Id.h
index 2044340c1f01..ed8e597b483b 100644
--- a/js/public/Id.h
+++ b/js/public/Id.h
@@ -191,6 +191,6 @@ DispatchIdTyped(F f, jsid& id, Args&&... args)
 
 #undef id
 
-}
+} // namespace js
 
 #endif /* js_Id_h */
diff --git a/js/public/Principals.h b/js/public/Principals.h
index 33e5cfa2af4a..db7affe165f5 100644
--- a/js/public/Principals.h
+++ b/js/public/Principals.h
@@ -17,7 +17,7 @@
 
 namespace js {
     struct PerformanceGroup;
-}
+} // namespace js
 
 struct JSPrincipals {
     /* Don't call "destroy"; use reference counting macros below. */
diff --git a/js/public/ProfilingFrameIterator.h b/js/public/ProfilingFrameIterator.h
index 458be2333d00..67530426214f 100644
--- a/js/public/ProfilingFrameIterator.h
+++ b/js/public/ProfilingFrameIterator.h
@@ -24,8 +24,8 @@ namespace js {
         class JitActivation;
         class JitProfilingFrameIterator;
         class JitcodeGlobalEntry;
-    }
-}
+    } // namespace jit
+} // namespace js
 
 namespace JS {
 
diff --git a/js/public/TracingAPI.h b/js/public/TracingAPI.h
index af0182112e36..d66381eb65b8 100644
--- a/js/public/TracingAPI.h
+++ b/js/public/TracingAPI.h
@@ -339,7 +339,7 @@ JS_TraceRuntime(JSTracer* trc);
 
 namespace JS {
 typedef js::HashSet<Zone*, js::DefaultHasher<Zone*>, js::SystemAllocPolicy> ZoneSet;
-}
+} // namespace JS
 
 // Trace every value within |zones| that is wrapped by a cross-compartment
 // wrapper from a zone that is not an element of |zones|.
diff --git a/js/public/UbiNode.h b/js/public/UbiNode.h
index 3bda6e33e5c9..203482a0841c 100644
--- a/js/public/UbiNode.h
+++ b/js/public/UbiNode.h
@@ -145,13 +145,13 @@ namespace ubi {
 class Edge;
 class EdgeRange;
 
-}
-}
+} // namespace ubi
+} // namespace JS
 
 namespace mozilla {
 template<>
 class DefaultDelete<JS::ubi::EdgeRange> : public JS::DeletePolicy<JS::ubi::EdgeRange> { };
-}
+} // namespace mozilla
 
 namespace JS {
 namespace ubi {
diff --git a/js/public/Value.h b/js/public/Value.h
index d933d6be5c8f..19a18ee698c7 100644
--- a/js/public/Value.h
+++ b/js/public/Value.h
@@ -1628,7 +1628,7 @@ SameType(const Value& lhs, const Value& rhs)
 
 namespace JS {
 JS_PUBLIC_API(void) HeapValuePostBarrier(Value* valuep, const Value& prev, const Value& next);
-}
+} // namespace JS
 
 namespace js {
 
@@ -1967,7 +1967,7 @@ extern JS_PUBLIC_DATA(const HandleValue) UndefinedHandleValue;
 extern JS_PUBLIC_DATA(const HandleValue) TrueHandleValue;
 extern JS_PUBLIC_DATA(const HandleValue) FalseHandleValue;
 
-}
+} // namespace JS
 
 #undef JS_VALUE_IS_CONSTEXPR
 #undef JS_RETURN_LAYOUT_FROM_BITS
diff --git a/js/src/NamespaceImports.h b/js/src/NamespaceImports.h
index 8a792a692a07..a2e792cf2321 100644
--- a/js/src/NamespaceImports.h
+++ b/js/src/NamespaceImports.h
@@ -48,7 +48,7 @@ class MOZ_STACK_CLASS SourceBufferHolder;
 class HandleValueArray;
 
 class ObjectOpResult;
-}
+} // namespace JS
 
 // Do the importing.
 namespace js {
diff --git a/js/src/asmjs/AsmJSFrameIterator.h b/js/src/asmjs/AsmJSFrameIterator.h
index f2fa9d9cbf03..997b04721859 100644
--- a/js/src/asmjs/AsmJSFrameIterator.h
+++ b/js/src/asmjs/AsmJSFrameIterator.h
@@ -123,7 +123,7 @@ namespace AsmJSExit
         MOZ_ASSERT(ExtractReasonKind(reason) == Reason_Builtin);
         return BuiltinKind(uint16_t(reason >> 16));
     }
-}
+} // namespace AsmJSExit
 
 // Iterates over the frames of a single AsmJSActivation, given an
 // asynchrously-interrupted thread's state. If the activation's
diff --git a/js/src/asmjs/AsmJSModule.cpp b/js/src/asmjs/AsmJSModule.cpp
index 53101b5595a0..446fbdd46bdb 100644
--- a/js/src/asmjs/AsmJSModule.cpp
+++ b/js/src/asmjs/AsmJSModule.cpp
@@ -964,7 +964,7 @@ class MOZ_STACK_CLASS AutoMutateCode
     }
 };
 
-}; // anonymous namespace
+} // namespace
 
 bool
 AsmJSModule::detachHeap(JSContext* cx)
diff --git a/js/src/asmjs/AsmJSModule.h b/js/src/asmjs/AsmJSModule.h
index 71464bfba33c..0712e0450eb4 100644
--- a/js/src/asmjs/AsmJSModule.h
+++ b/js/src/asmjs/AsmJSModule.h
@@ -1631,6 +1631,6 @@ class AsmJSModuleObject : public NativeObject
     static const Class class_;
 };
 
-}  // namespace js
+} // namespace js
 
 #endif /* asmjs_AsmJSModule_h */
diff --git a/js/src/asmjs/AsmJSValidate.cpp b/js/src/asmjs/AsmJSValidate.cpp
index d30dccd271ae..74c0163a701a 100644
--- a/js/src/asmjs/AsmJSValidate.cpp
+++ b/js/src/asmjs/AsmJSValidate.cpp
@@ -987,7 +987,8 @@ class Signature
     RetType retType() const { return retType_; }
 };
 
-} /* namespace anonymous */
+} // namespace
+
 
 static
 bool operator==(const Signature& lhs, const Signature& rhs)
@@ -7022,7 +7023,7 @@ class CheckSimdReplaceLaneArgs
     }
 };
 
-} // anonymous namespace
+} // namespace
 
 static void
 SwitchPackOp(FunctionBuilder& f, AsmJSSimdType type, I32X4 i32x4, F32X4 f32x4)
@@ -7291,7 +7292,7 @@ CheckSimdCast(FunctionBuilder& f, ParseNode* call, AsmJSSimdType fromType, AsmJS
     return true;
 }
 
-}
+} // namespace
 
 template<class T>
 inline bool
diff --git a/js/src/asmjs/AsmJSValidate.h b/js/src/asmjs/AsmJSValidate.h
index 86463061b636..c6aff6449f97 100644
--- a/js/src/asmjs/AsmJSValidate.h
+++ b/js/src/asmjs/AsmJSValidate.h
@@ -37,7 +37,7 @@ namespace frontend {
     template <typename ParseHandler> struct ParseContext;
     class FullParseHandler;
     class ParseNode;
-}
+} // namespace frontend
 
 typedef frontend::Parser<frontend::FullParseHandler> AsmJSParser;
 typedef frontend::ParseContext<frontend::FullParseHandler> AsmJSParseContext;
diff --git a/js/src/builtin/Eval.h b/js/src/builtin/Eval.h
index 1cfc56c74faf..50e2620c22cd 100644
--- a/js/src/builtin/Eval.h
+++ b/js/src/builtin/Eval.h
@@ -37,5 +37,6 @@ DirectEvalStringFromIon(JSContext* cx,
 extern bool
 IsAnyBuiltinEval(JSFunction* fun);
 
-}  // namespace js
+} // namespace js
+
 #endif /* builtin_Eval_h */
diff --git a/js/src/builtin/MapObject.cpp b/js/src/builtin/MapObject.cpp
index 58a0212baa07..973823d26ed3 100644
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -674,7 +674,7 @@ class OrderedHashTable
     OrderedHashTable(const OrderedHashTable&) = delete;
 };
 
-}  // namespace detail
+} // namespace detail
 
 template <class Key, class Value, class OrderedHashPolicy, class AllocPolicy>
 class OrderedHashMap
@@ -774,7 +774,7 @@ class OrderedHashSet
     }
 };
 
-}  // namespace js
+} // namespace js
 
 
 /*** HashableValue *******************************************************************************/
diff --git a/js/src/builtin/Object.cpp b/js/src/builtin/Object.cpp
index d19766b94c9f..51ef738be001 100644
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -992,7 +992,7 @@ ProtoGetter(JSContext* cx, unsigned argc, Value* vp)
 
 namespace js {
 size_t sSetProtoCalled = 0;
-}
+} // namespace js
 
 static bool
 ProtoSetter(JSContext* cx, unsigned argc, Value* vp)
diff --git a/js/src/builtin/Object.h b/js/src/builtin/Object.h
index d6dc90424a3d..2efd552fe23f 100644
--- a/js/src/builtin/Object.h
+++ b/js/src/builtin/Object.h
@@ -14,7 +14,7 @@
 namespace JS {
 class CallArgs;
 class Value;
-}
+} // namespace JS
 
 namespace js {
 
diff --git a/js/src/builtin/SIMD.cpp b/js/src/builtin/SIMD.cpp
index be80de69919e..dfc46906b806 100644
--- a/js/src/builtin/SIMD.cpp
+++ b/js/src/builtin/SIMD.cpp
@@ -223,7 +223,7 @@ class Float64x2Defn {
     static const JSFunctionSpec Methods[];
 };
 
-}
+} // namespace
 
 const JSFunctionSpec Float32x4Defn::TypeDescriptorMethods[] = {
     JS_SELF_HOSTED_FN("toSource", "DescrToSource", 0, 0),
@@ -675,7 +675,8 @@ struct ShiftRightLogical {
         return uint32_t(bits) >= sizeof(T) * 8 ? 0 : uint32_t(v) >> bits;
     }
 };
-}
+
+} // namespace js
 
 template<typename Out>
 static bool
@@ -1038,31 +1039,6 @@ Bool(JSContext* cx, unsigned argc, Value* vp)
     return StoreResult<V>(cx, args, result);
 }
 
-template<typename In>
-static bool
-Clamp(JSContext* cx, unsigned argc, Value* vp)
-{
-    typedef typename In::Elem InElem;
-    CallArgs args = CallArgsFromVp(argc, vp);
-    if (args.length() != 3 || !IsVectorObject<In>(args[0]) ||
-        !IsVectorObject<In>(args[1]) || !IsVectorObject<In>(args[2]))
-    {
-        return ErrorBadArgs(cx);
-    }
-
-    InElem* val = TypedObjectMemory<InElem*>(args[0]);
-    InElem* lowerLimit = TypedObjectMemory<InElem*>(args[1]);
-    InElem* upperLimit = TypedObjectMemory<InElem*>(args[2]);
-
-    InElem result[In::lanes];
-    for (unsigned i = 0; i < In::lanes; i++) {
-        result[i] = val[i] < lowerLimit[i] ? lowerLimit[i] : val[i];
-        result[i] = result[i] > upperLimit[i] ? upperLimit[i] : result[i];
-    }
-
-    return StoreResult<In>(cx, args, result);
-}
-
 template<typename V, typename MaskType>
 static bool
 SelectBits(JSContext* cx, unsigned argc, Value* vp)
diff --git a/js/src/builtin/SIMD.h b/js/src/builtin/SIMD.h
index e5496e7005f8..0682aacf623e 100644
--- a/js/src/builtin/SIMD.h
+++ b/js/src/builtin/SIMD.h
@@ -61,7 +61,6 @@
   V(xor, (CoercedBinaryFunc<Float32x4, Int32x4, Xor, Float32x4>), 2)
 
 #define FLOAT32X4_TERNARY_FUNCTION_LIST(V)                                            \
-  V(clamp, Clamp<Float32x4>, 3)                                                       \
   V(replaceLane, (ReplaceLane<Float32x4>), 3)                                         \
   V(select, (Select<Float32x4, Int32x4>), 3)                                          \
   V(store,  (Store<Float32x4, 4>), 3)                                                 \
@@ -114,7 +113,6 @@
   V(sub, (BinaryFunc<Float64x2, Sub, Float64x2>), 2)
 
 #define FLOAT64X2_TERNARY_FUNCTION_LIST(V)                                            \
-  V(clamp, Clamp<Float64x2>, 3)                                                       \
   V(replaceLane, (ReplaceLane<Float64x2>), 3)                                         \
   V(select, (Select<Float64x2, Int32x4>), 3)                                          \
   V(store,  (Store<Float64x2, 2>), 3)                                                 \
diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp
index cb992c43c7d7..73cc4d93352c 100644
--- a/js/src/builtin/TypedObject.cpp
+++ b/js/src/builtin/TypedObject.cpp
@@ -2886,7 +2886,7 @@ class MemoryInitVisitor {
     void visitReference(ReferenceTypeDescr& descr, uint8_t* mem);
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 MemoryInitVisitor::visitReference(ReferenceTypeDescr& descr, uint8_t* mem)
@@ -2956,7 +2956,7 @@ class MemoryTracingVisitor {
     void visitReference(ReferenceTypeDescr& descr, uint8_t* mem);
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 MemoryTracingVisitor::visitReference(ReferenceTypeDescr& descr, uint8_t* mem)
@@ -3011,7 +3011,7 @@ struct TraceListVisitor {
     bool fillList(Vector<int32_t>& entries);
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 TraceListVisitor::visitReference(ReferenceTypeDescr& descr, uint8_t* mem)
diff --git a/js/src/builtin/TypedObject.h b/js/src/builtin/TypedObject.h
index bfd52d998907..fff127ab0a9e 100644
--- a/js/src/builtin/TypedObject.h
+++ b/js/src/builtin/TypedObject.h
@@ -123,7 +123,7 @@ enum Kind {
     Array = JS_TYPEREPR_ARRAY_KIND
 };
 
-}
+} // namespace type
 
 ///////////////////////////////////////////////////////////////////////////
 // Typed Prototypes
diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
index b956d198690d..01e1ad4b0575 100644
--- a/js/src/ctypes/CTypes.cpp
+++ b/js/src/ctypes/CTypes.cpp
@@ -253,12 +253,12 @@ namespace CType {
    */
   static JSObject* GetGlobalCTypes(JSContext* cx, JSObject* obj);
 
-}
+} // namespace CType
 
 namespace ABI {
   bool IsABI(JSObject* obj);
   static bool ToSource(JSContext* cx, unsigned argc, jsval* vp);
-}
+} // namespace ABI
 
 namespace PointerType {
   static bool Create(JSContext* cx, unsigned argc, jsval* vp);
@@ -277,7 +277,7 @@ namespace PointerType {
   // The following is not an instance function, since we don't want to expose arbitrary
   // pointer arithmetic at this moment.
   static bool OffsetBy(JSContext* cx, const CallArgs& args, int offset);
-}
+} // namespace PointerType
 
 namespace ArrayType {
   bool IsArrayType(HandleValue v);
@@ -293,7 +293,7 @@ namespace ArrayType {
   static bool Setter(JSContext* cx, HandleObject obj, HandleId idval, MutableHandleValue vp,
                      ObjectOpResult& result);
   static bool AddressOfElement(JSContext* cx, unsigned argc, jsval* vp);
-}
+} // namespace ArrayType
 
 namespace StructType {
   bool IsStruct(HandleValue v);
@@ -311,7 +311,7 @@ namespace StructType {
   static bool FieldSetter(JSContext* cx, unsigned argc, Value* vp);
   static bool AddressOfField(JSContext* cx, unsigned argc, jsval* vp);
   static bool Define(JSContext* cx, unsigned argc, jsval* vp);
-}
+} // namespace StructType
 
 namespace FunctionType {
   static bool Create(JSContext* cx, unsigned argc, jsval* vp);
@@ -326,7 +326,7 @@ namespace FunctionType {
   bool ReturnTypeGetter(JSContext* cx, JS::CallArgs args);
   bool ABIGetter(JSContext* cx, JS::CallArgs args);
   bool IsVariadicGetter(JSContext* cx, JS::CallArgs args);
-}
+} // namespace FunctionType
 
 namespace CClosure {
   static void Trace(JSTracer* trc, JSObject* obj);
@@ -347,7 +347,7 @@ namespace CClosure {
       void** args;
       ClosureInfo* cinfo;
   };
-}
+} // namespace CClosure
 
 namespace CData {
   static void Finalize(JSFreeOp* fop, JSObject* obj);
@@ -367,7 +367,7 @@ namespace CData {
 #if defined(XP_WIN)
   bool LastErrorGetter(JSContext* cx, JS::CallArgs args);
 #endif // defined(XP_WIN)
-}
+} // namespace CData
 
 namespace CDataFinalizer {
   /*
@@ -432,7 +432,7 @@ namespace CDataFinalizer {
     static bool Forget(JSContext* cx, unsigned argc, jsval* vp);
     static bool ToSource(JSContext* cx, unsigned argc, jsval* vp);
     static bool ToString(JSContext* cx, unsigned argc, jsval* vp);
-  }
+  } // namespace Methods
 
   /*
    * Utility functions
@@ -480,7 +480,7 @@ namespace CDataFinalizer {
   static bool GetValue(JSContext* cx, JSObject* obj, MutableHandleValue result);
 
   static JSObject* GetCData(JSContext* cx, JSObject* obj);
- }
+} // namespace CDataFinalizer
 
 
 // Int64Base provides functions common to Int64 and UInt64.
@@ -497,7 +497,7 @@ namespace Int64Base {
                 bool isUnsigned);
 
   static void Finalize(JSFreeOp* fop, JSObject* obj);
-}
+} // namespace Int64Base
 
 namespace Int64 {
   static bool Construct(JSContext* cx, unsigned argc, jsval* vp);
@@ -509,7 +509,7 @@ namespace Int64 {
   static bool Lo(JSContext* cx, unsigned argc, jsval* vp);
   static bool Hi(JSContext* cx, unsigned argc, jsval* vp);
   static bool Join(JSContext* cx, unsigned argc, jsval* vp);
-}
+} // namespace Int64
 
 namespace UInt64 {
   static bool Construct(JSContext* cx, unsigned argc, jsval* vp);
@@ -521,7 +521,7 @@ namespace UInt64 {
   static bool Lo(JSContext* cx, unsigned argc, jsval* vp);
   static bool Hi(JSContext* cx, unsigned argc, jsval* vp);
   static bool Join(JSContext* cx, unsigned argc, jsval* vp);
-}
+} // namespace UInt64
 
 /*******************************************************************************
 ** JSClass definitions and initialization functions
@@ -8502,5 +8502,5 @@ UInt64::Join(JSContext* cx, unsigned argc, jsval* vp)
   return true;
 }
 
-}
-}
+} // namespace ctypes
+} // namespace js
diff --git a/js/src/ctypes/CTypes.h b/js/src/ctypes/CTypes.h
index 336a4bb148cb..01b0e79e51f8 100644
--- a/js/src/ctypes/CTypes.h
+++ b/js/src/ctypes/CTypes.h
@@ -462,13 +462,13 @@ namespace CType {
   JSObject* GetProtoFromCtor(JSObject* obj, CTypeProtoSlot slot);
   JSObject* GetProtoFromType(JSContext* cx, JSObject* obj, CTypeProtoSlot slot);
   const JSCTypesCallbacks* GetCallbacksFromType(JSObject* obj);
-}
+} // namespace CType
 
 namespace PointerType {
   JSObject* CreateInternal(JSContext* cx, HandleObject baseType);
 
   JSObject* GetBaseType(JSObject* obj);
-}
+} // namespace PointerType
 
 typedef mozilla::UniquePtr<ffi_type, JS::DeletePolicy<ffi_type>> UniquePtrFFIType;
 
@@ -480,7 +480,7 @@ namespace ArrayType {
   size_t GetLength(JSObject* obj);
   bool GetSafeLength(JSObject* obj, size_t* result);
   UniquePtrFFIType BuildFFIType(JSContext* cx, JSObject* obj);
-}
+} // namespace ArrayType
 
 namespace StructType {
   bool DefineInternal(JSContext* cx, JSObject* typeObj, JSObject* fieldsObj);
@@ -489,7 +489,7 @@ namespace StructType {
   const FieldInfo* LookupField(JSContext* cx, JSObject* obj, JSFlatString* name);
   JSObject* BuildFieldsArray(JSContext* cx, JSObject* obj);
   UniquePtrFFIType BuildFFIType(JSContext* cx, JSObject* obj);
-}
+} // namespace StructType
 
 namespace FunctionType {
   JSObject* CreateInternal(JSContext* cx, HandleValue abi, HandleValue rtype,
@@ -501,12 +501,12 @@ namespace FunctionType {
   FunctionInfo* GetFunctionInfo(JSObject* obj);
   void BuildSymbolName(JSString* name, JSObject* typeObj,
     AutoCString& result);
-}
+} // namespace FunctionType
 
 namespace CClosure {
   JSObject* Create(JSContext* cx, HandleObject typeObj, HandleObject fnObj,
     HandleObject thisObj, jsval errVal, PRFuncPtr* fnptr);
-}
+} // namespace CClosure
 
 namespace CData {
   JSObject* Create(JSContext* cx, HandleObject typeObj, HandleObject refObj,
@@ -522,17 +522,17 @@ namespace CData {
   bool Cast(JSContext* cx, unsigned argc, jsval* vp);
   // Attached by JSAPI as the function 'ctypes.getRuntime'
   bool GetRuntime(JSContext* cx, unsigned argc, jsval* vp);
-}
+} // namespace CData
 
 namespace Int64 {
   bool IsInt64(JSObject* obj);
-}
+} // namespace Int64
 
 namespace UInt64 {
   bool IsUInt64(JSObject* obj);
-}
+} // namespace UInt64
 
-}
-}
+} // namespace ctypes
+} // namespace js
 
 #endif /* ctypes_CTypes_h */
diff --git a/js/src/ctypes/Library.cpp b/js/src/ctypes/Library.cpp
index c6f80c56b695..3578b2feffc5 100644
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -24,7 +24,7 @@ namespace Library
 
   static bool Close(JSContext* cx, unsigned argc, jsval* vp);
   static bool Declare(JSContext* cx, unsigned argc, jsval* vp);
-}
+} // namespace Library
 
 /*******************************************************************************
 ** JSObject implementation
@@ -369,6 +369,6 @@ Library::Declare(JSContext* cx, unsigned argc, jsval* vp)
   return true;
 }
 
-}
-}
+} // namespace ctypes
+} // namespace js
 
diff --git a/js/src/ctypes/Library.h b/js/src/ctypes/Library.h
index d6e05b8003da..57aa7c8a9777 100644
--- a/js/src/ctypes/Library.h
+++ b/js/src/ctypes/Library.h
@@ -29,9 +29,9 @@ namespace Library
   PRLibrary* GetLibrary(JSObject* obj);
 
   bool Open(JSContext* cx, unsigned argc, JS::Value* vp);
-}
+} // namespace Library
 
-}
-}
+} // namespace ctypes
+} // namespace js
 
 #endif /* ctypes_Library_h */
diff --git a/js/src/devtools/sharkctl.cpp b/js/src/devtools/sharkctl.cpp
index 7408d951696f..7b2dc02ae98b 100644
--- a/js/src/devtools/sharkctl.cpp
+++ b/js/src/devtools/sharkctl.cpp
@@ -202,6 +202,6 @@ Stop()
     connected = false;
 }
 
-}
+} // namespace Shark
 
 #endif
diff --git a/js/src/devtools/sharkctl.h b/js/src/devtools/sharkctl.h
index bbe624691ee0..f09ed8be39ad 100644
--- a/js/src/devtools/sharkctl.h
+++ b/js/src/devtools/sharkctl.h
@@ -17,7 +17,7 @@ namespace Shark {
 bool Start();
 void Stop();
 
-}
+} // namespace Shark
 
 #endif /* __APPLE__ */
 
diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index bf7d97e00515..2da448fcee2b 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -27,6 +27,26 @@ using namespace js;
 using namespace js::frontend;
 using mozilla::Maybe;
 
+class MOZ_STACK_CLASS AutoCompilationTraceLogger
+{
+  public:
+    AutoCompilationTraceLogger(ExclusiveContext* cx, const TraceLoggerTextId id);
+
+  private:
+    TraceLoggerThread* logger;
+    TraceLoggerEvent event;
+    AutoTraceLog scriptLogger;
+    AutoTraceLog typeLogger;
+};
+
+AutoCompilationTraceLogger::AutoCompilationTraceLogger(ExclusiveContext* cx, const TraceLoggerTextId id)
+  : logger(cx->isJSContext() ? TraceLoggerForMainThread(cx->asJSContext()->runtime())
+                             : TraceLoggerForCurrentThread()),
+    event(logger, TraceLogger_AnnotateScripts),
+    scriptLogger(logger, event),
+    typeLogger(logger, id)
+{}
+
 static bool
 CheckLength(ExclusiveContext* cx, SourceBufferHolder& srcBuf)
 {
@@ -223,14 +243,7 @@ frontend::CompileScript(ExclusiveContext* cx, LifoAlloc* alloc, HandleObject sco
 
     RootedString source(cx, source_);
 
-    js::TraceLoggerThread* logger = nullptr;
-    if (cx->isJSContext())
-        logger = TraceLoggerForMainThread(cx->asJSContext()->runtime());
-    else
-        logger = TraceLoggerForCurrentThread();
-    js::TraceLoggerEvent event(logger, TraceLogger_AnnotateScripts, options);
-    js::AutoTraceLog scriptLogger(logger, event);
-    js::AutoTraceLog typeLogger(logger, TraceLogger_ParserCompileScript);
+    AutoCompilationTraceLogger traceLogger(cx, TraceLogger_ParserCompileScript);
 
     /*
      * The scripted callerFrame can only be given for compile-and-go scripts
@@ -472,10 +485,7 @@ frontend::CompileLazyFunction(JSContext* cx, Handle<LazyScript*> lazy, const cha
            .setNoScriptRval(false)
            .setSelfHostingMode(false);
 
-    js::TraceLoggerThread* logger = js::TraceLoggerForMainThread(cx->runtime());
-    js::TraceLoggerEvent event(logger, TraceLogger_AnnotateScripts, options);
-    js::AutoTraceLog scriptLogger(logger, event);
-    js::AutoTraceLog typeLogger(logger, TraceLogger_ParserCompileLazy);
+    AutoCompilationTraceLogger traceLogger(cx, TraceLogger_ParserCompileLazy);
 
     Parser<FullParseHandler> parser(cx, &cx->tempLifoAlloc(), options, chars, length,
                                     /* foldConstants = */ true, nullptr, lazy);
@@ -539,10 +549,7 @@ CompileFunctionBody(JSContext* cx, MutableHandleFunction fun, const ReadOnlyComp
 {
     MOZ_ASSERT(!options.isRunOnce);
 
-    js::TraceLoggerThread* logger = js::TraceLoggerForMainThread(cx->runtime());
-    js::TraceLoggerEvent event(logger, TraceLogger_AnnotateScripts, options);
-    js::AutoTraceLog scriptLogger(logger, event);
-    js::AutoTraceLog typeLogger(logger, TraceLogger_ParserCompileFunction);
+    AutoCompilationTraceLogger traceLogger(cx, TraceLogger_ParserCompileFunction);
 
     // FIXME: make Function pass in two strings and parse them as arguments and
     // ProgramElements respectively.
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index f25fc10438a2..63ef3265eea7 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -1026,7 +1026,7 @@ FullParseHandler::makeAssignment(ParseNode* pn, ParseNode* rhs)
     return lhs;
 }
 
-} // frontend
-} // js
+} // namespace frontend
+} // namespace js
 
 #endif /* frontend_FullParseHandler_h */
diff --git a/js/src/frontend/SourceNotes.h b/js/src/frontend/SourceNotes.h
index 8d1d1d185960..98fe620753f7 100644
--- a/js/src/frontend/SourceNotes.h
+++ b/js/src/frontend/SourceNotes.h
@@ -95,7 +95,7 @@ SN_IS_TERMINATOR(jssrcnote* sn)
     return *sn == SRC_NULL;
 }
 
-}  // namespace js
+} // namespace js
 
 #define SN_TYPE_BITS            5
 #define SN_DELTA_BITS           3
@@ -205,6 +205,6 @@ SrcNoteLength(jssrcnote* sn);
 extern JS_FRIEND_API(ptrdiff_t)
 GetSrcNoteOffset(jssrcnote* sn, unsigned which);
 
-}
+} // namespace js
 
 #endif /* frontend_SourceNotes_h */
diff --git a/js/src/gc/Barrier.h b/js/src/gc/Barrier.h
index 09e9b4edcbc6..4b87262a7908 100644
--- a/js/src/gc/Barrier.h
+++ b/js/src/gc/Barrier.h
@@ -173,7 +173,7 @@ class JSLinearString;
 
 namespace JS {
 class Symbol;
-}
+} // namespace JS
 
 namespace js {
 
@@ -202,7 +202,7 @@ class ObjectGroup;
 
 namespace jit {
 class JitCode;
-}
+} // namespace jit
 
 #ifdef DEBUG
 // Barriers can't be triggered during backend Ion compilation, which may run on
@@ -645,7 +645,7 @@ class BaseShape;
 class UnownedBaseShape;
 namespace jit {
 class JitCode;
-}
+} // namespace jit
 
 typedef PreBarriered<JSObject*> PreBarrieredObject;
 typedef PreBarriered<JSScript*> PreBarrieredScript;
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index d9ac07a392b6..d2a5b34f2cb0 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -32,8 +32,8 @@ struct JSRuntime;
 namespace JS {
 namespace shadow {
 struct Runtime;
-}
-}
+} // namespace shadow
+} // namespace JS
 
 namespace js {
 
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index 24eb46cac676..98514d480a5f 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -1803,8 +1803,8 @@ template void
 StoreBuffer::MonoTypeBuffer<StoreBuffer::SlotsEdge>::trace(StoreBuffer*, TenuringTracer&);
 template void
 StoreBuffer::MonoTypeBuffer<StoreBuffer::CellPtrEdge>::trace(StoreBuffer*, TenuringTracer&);
-} // namespace js
 } // namespace gc
+} // namespace js
 
 void
 js::gc::StoreBuffer::SlotsEdge::trace(TenuringTracer& mover) const
diff --git a/js/src/gc/Marking.h b/js/src/gc/Marking.h
index b57bd86a810a..c30e77158a86 100644
--- a/js/src/gc/Marking.h
+++ b/js/src/gc/Marking.h
@@ -27,10 +27,10 @@ class NativeObject;
 class ObjectGroup;
 namespace gc {
 struct ArenaHeader;
-}
+} // namespace gc
 namespace jit {
 class JitCode;
-}
+} // namespace jit
 
 static const size_t NON_INCREMENTAL_MARK_STACK_BASE_CAPACITY = 4096;
 static const size_t INCREMENTAL_MARK_STACK_BASE_CAPACITY = 32768;
diff --git a/js/src/gc/Nursery.h b/js/src/gc/Nursery.h
index a50bf0bb019a..7c4b4070ddbe 100644
--- a/js/src/gc/Nursery.h
+++ b/js/src/gc/Nursery.h
@@ -23,7 +23,7 @@
 
 namespace JS {
 struct Zone;
-}
+} // namespace JS
 
 namespace js {
 
@@ -44,7 +44,7 @@ struct TenureCountCache;
 
 namespace jit {
 class MacroAssembler;
-}
+} // namespace jit
 
 class TenuringTracer : public JSTracer
 {
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index 4e334fa5127a..f0177fd0ca22 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -357,8 +357,9 @@ struct PersistentRootedMarker
             TraceRoot(trc, r->address(), name);
     }
 };
-}
-}
+
+} // namespace gc
+} // namespace js
 
 void
 js::gc::MarkPersistentRootedChains(JSTracer* trc)
diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index aa55f8aa8a02..0199bf79a470 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -22,7 +22,7 @@ namespace js {
 
 namespace jit {
 class JitZone;
-}
+} // namespace jit
 
 namespace gc {
 
diff --git a/js/src/jit/Bailouts.h b/js/src/jit/Bailouts.h
index 624c9cfa8d78..7966015efbf2 100644
--- a/js/src/jit/Bailouts.h
+++ b/js/src/jit/Bailouts.h
@@ -137,8 +137,8 @@ class BailoutFrameInfo
     SnapshotOffset snapshotOffset() const {
         return snapshotOffset_;
     }
-    const MachineState machineState() const {
-        return machine_;
+    const MachineState* machineState() const {
+        return &machine_;
     }
     size_t topFrameSize() const {
         return topFrameSize_;
diff --git a/js/src/jit/BaselineBailouts.cpp b/js/src/jit/BaselineBailouts.cpp
index f2bee9d22689..176edb443be4 100644
--- a/js/src/jit/BaselineBailouts.cpp
+++ b/js/src/jit/BaselineBailouts.cpp
@@ -412,7 +412,7 @@ class SnapshotIteratorForBailout : public SnapshotIterator
 
   public:
     SnapshotIteratorForBailout(JitActivation* activation, JitFrameIterator& iter)
-      : SnapshotIterator(iter),
+      : SnapshotIterator(iter, activation->bailoutData()->machineState()),
         activation_(activation),
         iter_(iter)
     {
diff --git a/js/src/jit/BitSet.h b/js/src/jit/BitSet.h
index cacfb5e393da..94bfa2335151 100644
--- a/js/src/jit/BitSet.h
+++ b/js/src/jit/BitSet.h
@@ -176,7 +176,7 @@ class BitSet::Iterator
     }
 };
 
-}
-}
+} // namespace jit
+} // namespace js
 
 #endif /* jit_BitSet_h */
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
index aa51208aa20a..e065b648ebda 100644
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -8395,7 +8395,7 @@ CodeGenerator::visitGetPropertyIC(OutOfLineUpdateCache* ool, DataPtr<GetProperty
 }
 
 void
-CodeGenerator::addGetElementCache(LInstruction* ins, Register obj, ConstantOrRegister index,
+CodeGenerator::addGetElementCache(LInstruction* ins, Register obj, TypedOrValueRegister index,
                                   TypedOrValueRegister output, bool monitoredResult,
                                   bool allowDoubleResult, jsbytecode* profilerLeavePc)
 {
@@ -8409,7 +8409,7 @@ void
 CodeGenerator::visitGetElementCacheV(LGetElementCacheV* ins)
 {
     Register obj = ToRegister(ins->object());
-    ConstantOrRegister index = TypedOrValueRegister(ToValue(ins, LGetElementCacheV::Index));
+    TypedOrValueRegister index = TypedOrValueRegister(ToValue(ins, LGetElementCacheV::Index));
     TypedOrValueRegister output = TypedOrValueRegister(GetValueOutput(ins));
     const MGetElementCache* mir = ins->mir();
 
@@ -8421,7 +8421,7 @@ void
 CodeGenerator::visitGetElementCacheT(LGetElementCacheT* ins)
 {
     Register obj = ToRegister(ins->object());
-    ConstantOrRegister index = TypedOrValueRegister(MIRType_Int32, ToAnyRegister(ins->index()));
+    TypedOrValueRegister index = TypedOrValueRegister(MIRType_Int32, ToAnyRegister(ins->index()));
     TypedOrValueRegister output(ins->mir()->type(), ToAnyRegister(ins->output()));
     const MGetElementCache* mir = ins->mir();
 
diff --git a/js/src/jit/CodeGenerator.h b/js/src/jit/CodeGenerator.h
index dc05fe550aec..29e521fb7b03 100644
--- a/js/src/jit/CodeGenerator.h
+++ b/js/src/jit/CodeGenerator.h
@@ -391,7 +391,7 @@ class CodeGenerator : public CodeGeneratorSpecific
     void addGetPropertyCache(LInstruction* ins, LiveRegisterSet liveRegs, Register objReg,
                              PropertyName* name, TypedOrValueRegister output,
                              bool monitoredResult, jsbytecode* profilerLeavePc);
-    void addGetElementCache(LInstruction* ins, Register obj, ConstantOrRegister index,
+    void addGetElementCache(LInstruction* ins, Register obj, TypedOrValueRegister index,
                             TypedOrValueRegister output, bool monitoredResult,
                             bool allowDoubleResult, jsbytecode* profilerLeavePc);
     void addSetPropertyCache(LInstruction* ins, LiveRegisterSet liveRegs, Register objReg,
diff --git a/js/src/jit/ExecutableAllocator.h b/js/src/jit/ExecutableAllocator.h
index 9c015ea86438..0eaba41ab26e 100644
--- a/js/src/jit/ExecutableAllocator.h
+++ b/js/src/jit/ExecutableAllocator.h
@@ -61,7 +61,7 @@ extern  "C" void sync_instruction_memory(caddr_t v, u_int len);
 
 namespace JS {
     struct CodeSizes;
-}
+} // namespace JS
 
 namespace js {
 namespace jit {
diff --git a/js/src/jit/IonCaches.cpp b/js/src/jit/IonCaches.cpp
index 2bca5fc88022..734ae5a8b141 100644
--- a/js/src/jit/IonCaches.cpp
+++ b/js/src/jit/IonCaches.cpp
@@ -3392,7 +3392,7 @@ bool
 GetElementIC::attachGetProp(JSContext* cx, HandleScript outerScript, IonScript* ion,
                             HandleObject obj, const Value& idval, HandlePropertyName name)
 {
-    MOZ_ASSERT(index().reg().hasValue());
+    MOZ_ASSERT(index().hasValue());
 
     RootedNativeObject baseHolder(cx);
     RootedShape shape(cx);
@@ -3438,7 +3438,7 @@ GetElementIC::attachGetProp(JSContext* cx, HandleScript outerScript, IonScript*
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
 
     // Ensure the index is a string.
-    ValueOperand val = index().reg().valueReg();
+    ValueOperand val = index().valueReg();
     masm.branchTestString(Assembler::NotEqual, val, &failures);
 
     Register scratch = output().valueReg().scratchReg();
@@ -3520,7 +3520,7 @@ GetElementIC::canAttachDenseElement(JSObject* obj, const Value& idval)
 static bool
 GenerateDenseElement(JSContext* cx, MacroAssembler& masm, IonCache::StubAttacher& attacher,
                      JSObject* obj, const Value& idval, Register object,
-                     ConstantOrRegister index, TypedOrValueRegister output)
+                     TypedOrValueRegister index, TypedOrValueRegister output)
 {
     MOZ_ASSERT(GetElementIC::canAttachDenseElement(obj, idval));
 
@@ -3535,18 +3535,18 @@ GenerateDenseElement(JSContext* cx, MacroAssembler& masm, IonCache::StubAttacher
     // Ensure the index is an int32 value.
     Register indexReg = InvalidReg;
 
-    if (index.reg().hasValue()) {
+    if (index.hasValue()) {
         indexReg = output.scratchReg().gpr();
         MOZ_ASSERT(indexReg != InvalidReg);
-        ValueOperand val = index.reg().valueReg();
+        ValueOperand val = index.valueReg();
 
         masm.branchTestInt32(Assembler::NotEqual, val, &failures);
 
         // Unbox the index.
         masm.unboxInt32(val, indexReg);
     } else {
-        MOZ_ASSERT(!index.reg().typedReg().isFloat());
-        indexReg = index.reg().typedReg().gpr();
+        MOZ_ASSERT(!index.typedReg().isFloat());
+        indexReg = index.typedReg().gpr();
     }
 
     // Load elements vector.
@@ -3633,7 +3633,7 @@ GetElementIC::canAttachDenseElementHole(JSObject* obj, const Value& idval, Typed
 static bool
 GenerateDenseElementHole(JSContext* cx, MacroAssembler& masm, IonCache::StubAttacher& attacher,
                          IonScript* ion, JSObject* obj, const Value& idval,
-                         Register object, ConstantOrRegister index, TypedOrValueRegister output)
+                         Register object, TypedOrValueRegister index, TypedOrValueRegister output)
 {
     MOZ_ASSERT(GetElementIC::canAttachDenseElementHole(obj, idval, output));
 
@@ -3681,8 +3681,8 @@ GenerateDenseElementHole(JSContext* cx, MacroAssembler& masm, IonCache::StubAtta
     // Ensure the index is an int32 value.
     Register indexReg = scratchReg;
 
-    MOZ_ASSERT(index.reg().hasValue());
-    ValueOperand val = index.reg().valueReg();
+    MOZ_ASSERT(index.hasValue());
+    ValueOperand val = index.valueReg();
 
     masm.branchTestInt32(Assembler::NotEqual, val, &failures);
 
@@ -3788,7 +3788,7 @@ static void
 GenerateGetTypedOrUnboxedArrayElement(JSContext* cx, MacroAssembler& masm,
                                       IonCache::StubAttacher& attacher,
                                       HandleObject array, const Value& idval, Register object,
-                                      ConstantOrRegister index, TypedOrValueRegister output,
+                                      TypedOrValueRegister index, TypedOrValueRegister output,
                                       bool allowDoubleResult)
 {
     MOZ_ASSERT(GetElementIC::canAttachTypedOrUnboxedArrayElement(array, idval, output));
@@ -3801,20 +3801,19 @@ GenerateGetTypedOrUnboxedArrayElement(JSContext* cx, MacroAssembler& masm,
     Register tmpReg = output.scratchReg().gpr();
     MOZ_ASSERT(tmpReg != InvalidReg);
     Register indexReg = tmpReg;
-    MOZ_ASSERT(!index.constant());
     if (idval.isString()) {
         MOZ_ASSERT(GetIndexFromString(idval.toString()) != UINT32_MAX);
 
         // Part 1: Get the string into a register
         Register str;
-        if (index.reg().hasValue()) {
-            ValueOperand val = index.reg().valueReg();
+        if (index.hasValue()) {
+            ValueOperand val = index.valueReg();
             masm.branchTestString(Assembler::NotEqual, val, &failures);
 
             str = masm.extractString(val, indexReg);
         } else {
-            MOZ_ASSERT(!index.reg().typedReg().isFloat());
-            str = index.reg().typedReg().gpr();
+            MOZ_ASSERT(!index.typedReg().isFloat());
+            str = index.typedReg().gpr();
         }
 
         // Part 2: Call to translate the str into index
@@ -3839,15 +3838,15 @@ GenerateGetTypedOrUnboxedArrayElement(JSContext* cx, MacroAssembler& masm,
     } else {
         MOZ_ASSERT(idval.isInt32());
 
-        if (index.reg().hasValue()) {
-            ValueOperand val = index.reg().valueReg();
+        if (index.hasValue()) {
+            ValueOperand val = index.valueReg();
             masm.branchTestInt32(Assembler::NotEqual, val, &failures);
 
             // Unbox the index.
             masm.unboxInt32(val, indexReg);
         } else {
-            MOZ_ASSERT(!index.reg().typedReg().isFloat());
-            indexReg = index.reg().typedReg().gpr();
+            MOZ_ASSERT(!index.typedReg().isFloat());
+            indexReg = index.typedReg().gpr();
         }
     }
 
@@ -3945,20 +3944,19 @@ GetElementIC::attachArgumentsElement(JSContext* cx, HandleScript outerScript, Io
 
     // Decide to what type index the stub should be optimized
     Register indexReg;
-    MOZ_ASSERT(!index().constant());
 
     // Check index against length.
     Label failureRestoreIndex;
-    if (index().reg().hasValue()) {
-        ValueOperand val = index().reg().valueReg();
+    if (index().hasValue()) {
+        ValueOperand val = index().valueReg();
         masm.branchTestInt32(Assembler::NotEqual, val, &failures);
         indexReg = val.scratchReg();
 
         masm.unboxInt32(val, indexReg);
         masm.branch32(Assembler::AboveOrEqual, indexReg, tmpReg, &failureRestoreIndex);
     } else {
-        MOZ_ASSERT(index().reg().type() == MIRType_Int32);
-        indexReg = index().reg().typedReg().gpr();
+        MOZ_ASSERT(index().type() == MIRType_Int32);
+        indexReg = index().typedReg().gpr();
         masm.branch32(Assembler::AboveOrEqual, indexReg, tmpReg, &failures);
     }
     // Save indexReg because it needs to be clobbered to check deleted bit.
@@ -3991,20 +3989,20 @@ GetElementIC::attachArgumentsElement(JSContext* cx, HandleScript outerScript, Io
 
     if (output().hasTyped()) {
         MOZ_ASSERT(!output().typedReg().isFloat());
-        MOZ_ASSERT(index().reg().type() == MIRType_Boolean ||
-                   index().reg().type() == MIRType_Int32 ||
-                   index().reg().type() == MIRType_String ||
-                   index().reg().type() == MIRType_Symbol ||
-                   index().reg().type() == MIRType_Object);
-        masm.branchTestMIRType(Assembler::NotEqual, elemIdx, index().reg().type(),
+        MOZ_ASSERT(index().type() == MIRType_Boolean ||
+                   index().type() == MIRType_Int32 ||
+                   index().type() == MIRType_String ||
+                   index().type() == MIRType_Symbol ||
+                   index().type() == MIRType_Object);
+        masm.branchTestMIRType(Assembler::NotEqual, elemIdx, index().type(),
                                &failureRestoreIndex);
     }
 
     masm.loadTypedOrValue(elemIdx, output());
 
     // indexReg may need to be reconstructed if it was originally a value.
-    if (index().reg().hasValue())
-        masm.tagValue(JSVAL_TYPE_INT32, indexReg, index().reg().valueReg());
+    if (index().hasValue())
+        masm.tagValue(JSVAL_TYPE_INT32, indexReg, index().valueReg());
 
     // Success.
     attacher.jumpRejoin(masm);
@@ -4013,8 +4011,8 @@ GetElementIC::attachArgumentsElement(JSContext* cx, HandleScript outerScript, Io
     masm.bind(&failurePopIndex);
     masm.pop(indexReg);
     masm.bind(&failureRestoreIndex);
-    if (index().reg().hasValue())
-        masm.tagValue(JSVAL_TYPE_INT32, indexReg, index().reg().valueReg());
+    if (index().hasValue())
+        masm.tagValue(JSVAL_TYPE_INT32, indexReg, index().valueReg());
     masm.bind(&failures);
     attacher.jumpNextStub(masm);
 
@@ -4061,9 +4059,8 @@ GetElementIC::update(JSContext* cx, HandleScript outerScript, size_t cacheIndex,
     if (cache.canAttachStub()) {
         if (IsOptimizableArgumentsObjectForGetElem(obj, idval) &&
             !cache.hasArgumentsStub(obj->is<StrictArgumentsObject>()) &&
-            !cache.index().constant() &&
-            (cache.index().reg().hasValue() ||
-             cache.index().reg().type() == MIRType_Int32) &&
+            (cache.index().hasValue() ||
+             cache.index().type() == MIRType_Int32) &&
             (cache.output().hasValue() || !cache.output().typedReg().isFloat()))
         {
             if (!cache.attachArgumentsElement(cx, outerScript, ion, obj))
diff --git a/js/src/jit/IonCaches.h b/js/src/jit/IonCaches.h
index ddedd85c42ef..f9b84ee5bcc4 100644
--- a/js/src/jit/IonCaches.h
+++ b/js/src/jit/IonCaches.h
@@ -615,7 +615,7 @@ class GetElementIC : public IonCache
     LiveRegisterSet liveRegs_;
 
     Register object_;
-    ConstantOrRegister index_;
+    TypedOrValueRegister index_;
     TypedOrValueRegister output_;
 
     bool monitoredResult_ : 1;
@@ -629,7 +629,7 @@ class GetElementIC : public IonCache
     static const size_t MAX_FAILED_UPDATES;
 
   public:
-    GetElementIC(LiveRegisterSet liveRegs, Register object, ConstantOrRegister index,
+    GetElementIC(LiveRegisterSet liveRegs, Register object, TypedOrValueRegister index,
                  TypedOrValueRegister output, bool monitoredResult, bool allowDoubleResult)
       : liveRegs_(liveRegs),
         object_(object),
@@ -651,7 +651,7 @@ class GetElementIC : public IonCache
     Register object() const {
         return object_;
     }
-    ConstantOrRegister index() const {
+    TypedOrValueRegister index() const {
         return index_;
     }
     TypedOrValueRegister output() const {
diff --git a/js/src/jit/IonCode.h b/js/src/jit/IonCode.h
index 910f6786b6ee..10b9aebebc03 100644
--- a/js/src/jit/IonCode.h
+++ b/js/src/jit/IonCode.h
@@ -765,7 +765,7 @@ IsMarked(const jit::VMFunction*)
 namespace JS {
 namespace ubi {
 template<> struct Concrete<js::jit::JitCode> : TracerConcrete<js::jit::JitCode> { };
-}
-}
+} // namespace ubi
+} // namespace JS
 
 #endif /* jit_IonCode_h */
diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index 1358c5687ad1..d73aa99d65c1 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -18,7 +18,7 @@
 
 namespace js {
     class ActivationIterator;
-};
+} // namespace js
 
 namespace js {
 namespace jit {
@@ -410,7 +410,7 @@ class SnapshotIterator
     SnapshotReader snapshot_;
     RecoverReader recover_;
     JitFrameLayout* fp_;
-    MachineState machine_;
+    const MachineState* machine_;
     IonScript* ionScript_;
     RInstructionResults* instructionResults_;
 
@@ -429,17 +429,17 @@ class SnapshotIterator
   private:
     // Read a spilled register from the machine state.
     bool hasRegister(Register reg) const {
-        return machine_.has(reg);
+        return machine_->has(reg);
     }
     uintptr_t fromRegister(Register reg) const {
-        return machine_.read(reg);
+        return machine_->read(reg);
     }
 
     bool hasRegister(FloatRegister reg) const {
-        return machine_.has(reg);
+        return machine_->has(reg);
     }
     double fromRegister(FloatRegister reg) const {
-        return machine_.read(reg);
+        return machine_->read(reg);
     }
 
     // Read an uintptr_t from the stack.
@@ -550,9 +550,7 @@ class SnapshotIterator
     // Connect all informations about the current script in order to recover the
     // content of baseline frames.
 
-    SnapshotIterator(IonScript* ionScript, SnapshotOffset snapshotOffset,
-                     JitFrameLayout* fp, const MachineState& machine);
-    explicit SnapshotIterator(const JitFrameIterator& iter);
+    SnapshotIterator(const JitFrameIterator& iter, const MachineState* machineState);
     SnapshotIterator();
 
     Value read() {
@@ -657,6 +655,9 @@ class InlineFrameIterator
     jsbytecode* pc_;
     uint32_t numActualArgs_;
 
+    // Register state, used by all snapshot iterators.
+    MachineState machine_;
+
     struct Nop {
         void operator()(const Value& v) { }
     };
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index 652a8413822e..f2e5b119b8b1 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -354,12 +354,12 @@ JitFrameIterator::machineState() const
 
     // The MachineState is used by GCs for marking call-sites.
     if (MOZ_UNLIKELY(isBailoutJS()))
-        return activation_->bailoutData()->machineState();
+        return *activation_->bailoutData()->machineState();
 
     SafepointReader reader(ionScript(), safepoint());
     uintptr_t* spill = spillBase();
-
     MachineState machine;
+
     for (GeneralRegisterBackwardIterator iter(reader.allGprSpills()); iter.more(); iter++)
         machine.setRegisterLocation(*iter, --spill);
 
@@ -1177,7 +1177,7 @@ MarkBailoutFrame(JSTracer* trc, const JitFrameIterator& frame)
 
     // The vector of recover instructions is already traced as part of the
     // JitActivation.
-    SnapshotIterator snapIter(frame);
+    SnapshotIterator snapIter(frame, frame.activation()->bailoutData()->machineState());
 
     // For each instruction, we read the allocations without evaluating the
     // recover instruction, nor reconstructing the frame. We are only looking at
@@ -1767,24 +1767,7 @@ RInstructionResults::trace(JSTracer* trc)
 }
 
 
-SnapshotIterator::SnapshotIterator(IonScript* ionScript, SnapshotOffset snapshotOffset,
-                                   JitFrameLayout* fp, const MachineState& machine)
-  : snapshot_(ionScript->snapshots(),
-              snapshotOffset,
-              ionScript->snapshotsRVATableSize(),
-              ionScript->snapshotsListSize()),
-    recover_(snapshot_,
-             ionScript->recovers(),
-             ionScript->recoversSize()),
-    fp_(fp),
-    machine_(machine),
-    ionScript_(ionScript),
-    instructionResults_(nullptr)
-{
-    MOZ_ASSERT(snapshotOffset < ionScript->snapshotsListSize());
-}
-
-SnapshotIterator::SnapshotIterator(const JitFrameIterator& iter)
+SnapshotIterator::SnapshotIterator(const JitFrameIterator& iter, const MachineState* machineState)
   : snapshot_(iter.ionScript()->snapshots(),
               iter.snapshotOffset(),
               iter.ionScript()->snapshotsRVATableSize(),
@@ -1793,7 +1776,7 @@ SnapshotIterator::SnapshotIterator(const JitFrameIterator& iter)
              iter.ionScript()->recovers(),
              iter.ionScript()->recoversSize()),
     fp_(iter.jsFrame()),
-    machine_(iter.machineState()),
+    machine_(machineState),
     ionScript_(iter.ionScript()),
     instructionResults_(nullptr)
 {
@@ -2025,7 +2008,7 @@ SnapshotIterator::floatAllocationPointer(const RValueAllocation& alloc) const
 {
     switch (alloc.mode()) {
       case RValueAllocation::ANY_FLOAT_REG:
-        return machine_.address(alloc.fpuReg());
+        return machine_->address(alloc.fpuReg());
 
       case RValueAllocation::ANY_FLOAT_STACK:
         return (FloatRegisters::RegisterContent*) AddressOfFrameSlot(fp_, alloc.stackOffset());
@@ -2078,7 +2061,7 @@ SnapshotIterator::writeAllocationValuePayload(const RValueAllocation& alloc, Val
         break;
 
       case RValueAllocation::TYPED_REG:
-        machine_.write(alloc.reg2(), payload);
+        machine_->write(alloc.reg2(), payload);
         break;
 
       case RValueAllocation::TYPED_STACK:
@@ -2097,7 +2080,7 @@ SnapshotIterator::writeAllocationValuePayload(const RValueAllocation& alloc, Val
 #if defined(JS_NUNBOX32)
       case RValueAllocation::UNTYPED_REG_REG:
       case RValueAllocation::UNTYPED_STACK_REG:
-        machine_.write(alloc.reg2(), payload);
+        machine_->write(alloc.reg2(), payload);
         break;
 
       case RValueAllocation::UNTYPED_REG_STACK:
@@ -2106,7 +2089,7 @@ SnapshotIterator::writeAllocationValuePayload(const RValueAllocation& alloc, Val
         break;
 #elif defined(JS_PUNBOX64)
       case RValueAllocation::UNTYPED_REG:
-        machine_.write(alloc.reg(), v.asRawBits());
+        machine_->write(alloc.reg(), v.asRawBits());
         break;
 
       case RValueAllocation::UNTYPED_STACK:
@@ -2216,7 +2199,8 @@ SnapshotIterator::initInstructionResults(MaybeReadFallback& fallback)
         // Start a new snapshot at the beginning of the JitFrameIterator.  This
         // SnapshotIterator is used for evaluating the content of all recover
         // instructions.  The result is then saved on the JitActivation.
-        SnapshotIterator s(*fallback.frame);
+        MachineState machine = fallback.frame->machineState();
+        SnapshotIterator s(*fallback.frame, &machine);
         if (!s.computeInstructionResults(cx, results)) {
 
             // If the evaluation failed because of OOMs, then we discard the
@@ -2408,7 +2392,8 @@ InlineFrameIterator::InlineFrameIterator(JSContext* cx, const InlineFrameIterato
     script_(cx)
 {
     if (frame_) {
-        start_ = SnapshotIterator(*frame_);
+        machine_ = iter->machine_;
+        start_ = SnapshotIterator(*frame_, &machine_);
 
         // findNextFrame will iterate to the next frame and init. everything.
         // Therefore to settle on the same frame, we report one frame less readed.
@@ -2425,7 +2410,8 @@ InlineFrameIterator::resetOn(const JitFrameIterator* iter)
     frameCount_ = UINT32_MAX;
 
     if (iter) {
-        start_ = SnapshotIterator(*iter);
+        machine_ = iter->machineState();
+        start_ = SnapshotIterator(*iter, &machine_);
         findNextFrame();
     }
 }
diff --git a/js/src/jit/JitSpewer.h b/js/src/jit/JitSpewer.h
index 285f2885d969..5516e4ef411d 100644
--- a/js/src/jit/JitSpewer.h
+++ b/js/src/jit/JitSpewer.h
@@ -274,7 +274,7 @@ class AutoDisableSpew
     }
 };
 
-} /* ion */
-} /* js */
+} // namespace jit
+} // namespace js
 
 #endif /* jit_JitSpewer_h */
diff --git a/js/src/jit/LIR.h b/js/src/jit/LIR.h
index 2521c2672e70..c6d9a10951b5 100644
--- a/js/src/jit/LIR.h
+++ b/js/src/jit/LIR.h
@@ -1031,7 +1031,7 @@ namespace details {
             return getDef(0);
         }
     };
-}
+} // namespace details
 
 template <size_t Defs, size_t Operands, size_t Temps>
 class LInstructionHelper : public details::LInstructionFixedDefsTempsHelper<Defs, Temps>
diff --git a/js/src/jit/Label.h b/js/src/jit/Label.h
index 39b5ef852949..cba2eff6aa66 100644
--- a/js/src/jit/Label.h
+++ b/js/src/jit/Label.h
@@ -108,6 +108,7 @@ class NonAssertingLabel : public Label
     }
 };
 
-} } // namespace js::jit
+} // namespace jit
+} // namespace js
 
 #endif // jit_Label_h
diff --git a/js/src/jit/LoopUnroller.cpp b/js/src/jit/LoopUnroller.cpp
index 1a82bb6ac168..f31ff5a8c972 100644
--- a/js/src/jit/LoopUnroller.cpp
+++ b/js/src/jit/LoopUnroller.cpp
@@ -51,7 +51,7 @@ struct LoopUnroller
     void go(LoopIterationBound* bound);
 };
 
-} // anonymous namespace
+} // namespace
 
 MDefinition*
 LoopUnroller::getReplacementDefinition(MDefinition* def)
diff --git a/js/src/jit/Recover.h b/js/src/jit/Recover.h
index 5dedbc56c864..4d2d8792676d 100644
--- a/js/src/jit/Recover.h
+++ b/js/src/jit/Recover.h
@@ -807,7 +807,7 @@ RInstruction::toResumePoint() const
     return static_cast<const RResumePoint*>(this);
 }
 
-}
-}
+} // namespace jit
+} // namespace js
 
 #endif /* jit_Recover_h */
diff --git a/js/src/jit/Registers.h b/js/src/jit/Registers.h
index ade485fa44d3..39043651e5ab 100644
--- a/js/src/jit/Registers.h
+++ b/js/src/jit/Registers.h
@@ -112,7 +112,10 @@ class RegisterDump
     }
 };
 
-// Information needed to recover machine register state.
+// Information needed to recover machine register state. This records the
+// location of spilled register and not the content of the spilled
+// registers. Thus we can safely assume that this structure is unchanged, even
+// if the GC pointers mapped by this structure are relocated.
 class MachineState
 {
     mozilla::Array<Registers::RegisterContent*, Registers::Total> regs_;
@@ -120,10 +123,12 @@ class MachineState
 
   public:
     MachineState() {
+#ifndef JS_CODEGEN_NONE
         for (unsigned i = 0; i < Registers::Total; i++)
             regs_[i] = reinterpret_cast<Registers::RegisterContent*>(i + 0x100);
         for (unsigned i = 0; i < FloatRegisters::Total; i++)
             fpregs_[i] = reinterpret_cast<FloatRegisters::RegisterContent*>(i + 0x200);
+#endif
     }
 
     static MachineState FromBailout(RegisterDump::GPRArray& regs, RegisterDump::FPUArray& fpregs);
diff --git a/js/src/jit/Sink.cpp b/js/src/jit/Sink.cpp
index e57afd4e0720..b2c36fae5a6a 100644
--- a/js/src/jit/Sink.cpp
+++ b/js/src/jit/Sink.cpp
@@ -228,5 +228,5 @@ Sink(MIRGenerator* mir, MIRGraph& graph)
     return true;
 }
 
-}
-}
+} // namespace jit
+} // namespace js
diff --git a/js/src/jit/Snapshots.h b/js/src/jit/Snapshots.h
index ace4b565082a..a297d1a2aec2 100644
--- a/js/src/jit/Snapshots.h
+++ b/js/src/jit/Snapshots.h
@@ -555,7 +555,7 @@ class RecoverReader
     }
 };
 
-}
-}
+} // namespace jit
+} // namespace js
 
 #endif /* jit_Snapshot_h */
diff --git a/js/src/jit/TypePolicy.cpp b/js/src/jit/TypePolicy.cpp
index 6db8620a254a..a2b774fb77b1 100644
--- a/js/src/jit/TypePolicy.cpp
+++ b/js/src/jit/TypePolicy.cpp
@@ -1226,8 +1226,8 @@ namespace jit {
     TEMPLATE_TYPE_POLICY_LIST(template<> DEFINE_TYPE_POLICY_SINGLETON_INSTANCES_)
 #undef DEFINE_TYPE_POLICY_SINGLETON_INSTANCES_
 
-}
-}
+} // namespace jit
+} // namespace js
 
 namespace {
 
@@ -1243,7 +1243,7 @@ thisTypeSpecialization()
     MOZ_CRASH("TypeSpecialization lacks definition of thisTypeSpecialization.");
 }
 
-}
+} // namespace
 
 TypePolicy*
 MGetElementCache::thisTypePolicy()
diff --git a/js/src/jit/shared/Assembler-shared.h b/js/src/jit/shared/Assembler-shared.h
index fd42e8f4370e..7950031d444e 100644
--- a/js/src/jit/shared/Assembler-shared.h
+++ b/js/src/jit/shared/Assembler-shared.h
@@ -34,7 +34,7 @@ namespace jit {
 
 namespace Disassembler {
 class HeapAccess;
-};
+} // namespace Disassembler
 
 static const uint32_t Simd128DataSize = 4 * sizeof(int32_t);
 static_assert(Simd128DataSize == 4 * sizeof(int32_t), "SIMD data should be able to contain int32x4");
diff --git a/js/src/jit/x86-shared/MoveEmitter-x86-shared.h b/js/src/jit/x86-shared/MoveEmitter-x86-shared.h
index e422e65e2706..65ff1ff18e13 100644
--- a/js/src/jit/x86-shared/MoveEmitter-x86-shared.h
+++ b/js/src/jit/x86-shared/MoveEmitter-x86-shared.h
@@ -68,7 +68,7 @@ class MoveEmitterX86
 
 typedef MoveEmitterX86 MoveEmitter;
 
-} // ion
-} // js
+} // namespace jit
+} // namespace js
 
 #endif /* jit_MoveEmitter_x86_shared_h */
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 7ff44e961472..e4ab3f1951d2 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -363,7 +363,7 @@ AssertHeapIsIdle(JSContext* cx)
     AssertHeapIsIdle(cx->runtime());
 }
 
-}
+} // namespace js
 
 static void
 AssertHeapIsIdleOrIterating(JSRuntime* rt)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 2ba4b8c00782..de7e53406651 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1594,7 +1594,7 @@ namespace JS {
 extern JS_PUBLIC_API(JSObject*)
 CurrentGlobalOrNull(JSContext* cx);
 
-}
+} // namespace JS
 
 /*
  * Initialize the 'Reflect' object on a global object.
@@ -4043,7 +4043,7 @@ class MOZ_STACK_CLASS JS_PUBLIC_API(AutoSetAsyncStackForNewCalls)
     ~AutoSetAsyncStackForNewCalls();
 };
 
-}
+} // namespace JS
 
 /************************************************************************/
 
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 9a75e49ab507..1c26aafeddea 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -83,12 +83,13 @@ js::GetLengthProperty(JSContext* cx, HandleObject obj, uint32_t* lengthp)
     if (!GetProperty(cx, obj, obj, cx->names().length, &value))
         return false;
 
-    if (value.isInt32()) {
-        *lengthp = uint32_t(value.toInt32()); // uint32_t cast does ToUint32
-        return true;
+    bool overflow;
+    if (!ToLengthClamped(cx, value, lengthp, &overflow)) {
+        if (!overflow)
+            return false;
+        *lengthp = UINT32_MAX;
     }
-
-    return ToUint32(cx, value, lengthp);
+    return true;
 }
 
 /*
@@ -1632,7 +1633,8 @@ enum ComparatorMatchResult {
     Match_RightMinusLeft
 };
 
-} /* namespace anonymous */
+} // namespace
+
 
 /*
  * Specialize behavior for comparator functions with particular common bytecode
diff --git a/js/src/jsbool.h b/js/src/jsbool.h
index 4d94d6a1c9e8..a1c184ab65c7 100644
--- a/js/src/jsbool.h
+++ b/js/src/jsbool.h
@@ -21,6 +21,6 @@ InitBooleanClass(JSContext* cx, js::HandleObject obj);
 extern JSString*
 BooleanToString(js::ExclusiveContext* cx, bool b);
 
-}
+} // namespace js
 
 #endif /* jsbool_h */
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 5f1b7f785335..c1d1b770e2c3 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -26,7 +26,7 @@ namespace js {
 namespace jit {
 class JitContext;
 class DebugModeOSRVolatileJitFrameIterator;
-}
+} // namespace jit
 
 typedef HashSet<JSObject*> ObjectSet;
 typedef HashSet<Shape*> ShapeSet;
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 1bf5df39c3a4..d0ec5ef67c6f 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -22,11 +22,11 @@ namespace js {
 
 namespace jit {
 class JitCompartment;
-}
+} // namespace jit
 
 namespace gc {
 template<class Node> class ComponentFinder;
-}
+} // namespace gc
 
 struct NativeIterator;
 
@@ -216,7 +216,7 @@ class DebugScopes;
 class ObjectWeakMap;
 class WatchpointMap;
 class WeakMapBase;
-}
+} // namespace js
 
 struct JSCompartment
 {
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index ffc636f3f976..607912fe1733 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -492,7 +492,7 @@ js::SetPreserveWrapperCallback(JSRuntime* rt, PreserveWrapperCallback callback)
 namespace js {
 // Defined in vm/GlobalObject.cpp.
 extern size_t sSetProtoCalled;
-}
+} // namespace js
 
 JS_FRIEND_API(size_t)
 JS_SetProtoCalled(JSContext*)
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index c616c7638d24..ccd9856e48dd 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -2531,8 +2531,8 @@ JSID_FROM_BITS(size_t bits)
 namespace js {
 namespace detail {
 bool IdMatchesAtom(jsid id, JSAtom* atom);
-}
-}
+} // namespace detail
+} // namespace js
 
 /*
  * Must not be used on atoms that are representable as integer jsids.
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 0ad8602db1e4..10b570c8f8fb 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -2148,6 +2148,13 @@ js::CloneFunctionAndScript(JSContext* cx, HandleFunction fun, HandleObject paren
     MOZ_ASSERT(NewFunctionScopeIsWellFormed(cx, parent));
     MOZ_ASSERT(!fun->isBoundFunction());
 
+    JSScript::AutoDelazify funScript(cx);
+    if (fun->isInterpreted()) {
+        funScript = fun;
+        if (!funScript)
+            return nullptr;
+    }
+
     RootedFunction clone(cx, NewFunctionClone(cx, fun, SingletonObject, allocKind, proto));
     if (!clone)
         return nullptr;
@@ -2175,17 +2182,6 @@ js::CloneFunctionAndScript(JSContext* cx, HandleFunction fun, HandleObject paren
 #endif
 
     if (clone->isInterpreted()) {
-        // The self-hosting compartment is shared across processes, and
-        // AutoDelazify enters fun->compartment(). We would get races if the
-        // self-hosting compartment has lazy interpreted functions.
-        MOZ_ASSERT_IF(fun->compartment()->isSelfHosting, !fun->isInterpretedLazy());
-        JSScript::AutoDelazify funScript(cx);
-        if (fun->isInterpretedLazy()) {
-            funScript = fun;
-            if (!funScript)
-                return nullptr;
-        }
-
         RootedScript script(cx, fun->nonLazyScript());
         MOZ_ASSERT(script->compartment() == fun->compartment());
         MOZ_ASSERT(cx->compartment() == clone->compartment(),
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index a0b635e821fc..89010fb922b0 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -19,7 +19,7 @@ namespace js {
 class FunctionExtended;
 
 typedef JSNative           Native;
-}
+} // namespace js
 
 struct JSAtomState;
 
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 6bfa616225fc..f0c2f261c975 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -47,7 +47,7 @@ enum ThreadType
 
 namespace gcstats {
 struct Statistics;
-}
+} // namespace gcstats
 
 class Nursery;
 
diff --git a/js/src/jslibmath.h b/js/src/jslibmath.h
index bc33e97ae4c1..52d21797d00f 100644
--- a/js/src/jslibmath.h
+++ b/js/src/jslibmath.h
@@ -71,6 +71,6 @@ NumberMod(double a, double b) {
     return js_fmod(a, b);
 }
 
-}
+} // namespace js
 
 #endif /* jslibmath_h */
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index f3117a47a475..4d6d00139f9c 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -92,19 +92,16 @@ JS_ObjectToOuterObject(JSContext* cx, HandleObject obj)
     return GetOuterObject(cx, obj);
 }
 
-JSObject*
-js::NonNullObject(JSContext* cx, const Value& v)
+void
+js::ReportNotObject(JSContext* cx, const Value& v)
 {
-    if (v.isPrimitive()) {
-        RootedValue value(cx, v);
-        UniquePtr<char[], JS::FreePolicy> bytes =
-            DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, nullptr);
-        if (!bytes)
-            return nullptr;
+    MOZ_ASSERT(!v.isObject());
+
+    RootedValue value(cx, v);
+    UniquePtr<char[], JS::FreePolicy> bytes =
+        DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, nullptr);
+    if (bytes)
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes.get());
-        return nullptr;
-    }
-    return &v.toObject();
 }
 
 const char*
@@ -292,12 +289,9 @@ js::ToPropertyDescriptor(JSContext* cx, HandleValue descval, bool checkAccessors
                          MutableHandle<PropertyDescriptor> desc)
 {
     // step 2
-    if (!descval.isObject()) {
-        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT,
-                             InformalValueTypeName(descval));
+    RootedObject obj(cx, NonNullObject(cx, descval));
+    if (!obj)
         return false;
-    }
-    RootedObject obj(cx, &descval.toObject());
 
     // step 3
     desc.clear();
@@ -548,6 +542,19 @@ js::SetIntegrityLevel(JSContext* cx, HandleObject obj, IntegrityLevel level)
 
         MOZ_ASSERT(nobj->lastProperty()->slotSpan() == last->slotSpan());
         JS_ALWAYS_TRUE(nobj->setLastProperty(cx, last));
+
+        // Ordinarily ArraySetLength handles this, but we're going behind its back
+        // right now, so we must do this manually.
+        //
+        // ArraySetLength also implements the capacity <= length invariant for
+        // arrays with non-writable length.  We don't need to do anything special
+        // for that, because capacity was zeroed out by preventExtensions.  (See
+        // the assertion about getDenseCapacity above.)
+        if (level == IntegrityLevel::Frozen && obj->is<ArrayObject>()) {
+            if (!obj->as<ArrayObject>().maybeCopyElementsForWrite(cx))
+                return false;
+            obj->as<ArrayObject>().getElementsHeader()->setNonwritableArrayLength();
+        }
     } else {
         RootedId id(cx);
         Rooted<PropertyDescriptor> desc(cx);
@@ -586,21 +593,6 @@ js::SetIntegrityLevel(JSContext* cx, HandleObject obj, IntegrityLevel level)
         }
     }
 
-    // Ordinarily ArraySetLength handles this, but we're going behind its back
-    // right now, so we must do this manually.  Neither the custom property
-    // tree mutations nor the DefineProperty call in the above code will do
-    // this for us.
-    //
-    // ArraySetLength also implements the capacity <= length invariant for
-    // arrays with non-writable length.  We don't need to do anything special
-    // for that, because capacity was zeroed out by preventExtensions.  (See
-    // the assertion before the if-else above.)
-    if (level == IntegrityLevel::Frozen && obj->is<ArrayObject>()) {
-        if (!obj->as<ArrayObject>().maybeCopyElementsForWrite(cx))
-            return false;
-        obj->as<ArrayObject>().getElementsHeader()->setNonwritableArrayLength();
-    }
-
     return true;
 }
 
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 48b68deba582..1006eacd61d3 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -29,7 +29,7 @@
 
 namespace JS {
 struct ClassInfo;
-}
+} // namespace JS
 
 namespace js {
 
@@ -39,7 +39,7 @@ class Nursery;
 
 namespace gc {
 class RelocationOverlay;
-}
+} // namespace gc
 
 inline JSObject*
 CastAsObject(GetterOp op)
@@ -1197,7 +1197,7 @@ extern bool
 LookupNameUnqualified(JSContext* cx, HandlePropertyName name, HandleObject scopeChain,
                       MutableHandleObject objp);
 
-}
+} // namespace js
 
 namespace js {
 
@@ -1270,8 +1270,21 @@ XDRObjectLiteral(XDRState<mode>* xdr, MutableHandleObject obj);
 extern bool
 ReportGetterOnlyAssignment(JSContext* cx, bool strict);
 
-extern JSObject*
-NonNullObject(JSContext* cx, const Value& v);
+/*
+ * Report a TypeError: "so-and-so is not an object".
+ * Using NotNullObject is usually less code.
+ */
+extern void
+ReportNotObject(JSContext* cx, const Value& v);
+
+inline JSObject*
+NonNullObject(JSContext* cx, const Value& v)
+{
+    if (v.isObject())
+        return &v.toObject();
+    ReportNotObject(cx, v);
+    return nullptr;
+}
 
 extern const char*
 InformalValueTypeName(const Value& v);
diff --git a/js/src/jsopcode.h b/js/src/jsopcode.h
index 3e828b53a160..581d1307e288 100644
--- a/js/src/jsopcode.h
+++ b/js/src/jsopcode.h
@@ -922,6 +922,6 @@ DumpIonScriptCounts(js::Sprinter* sp, jit::IonScriptCounts* ionCounts);
 
 void
 DumpCompartmentPCCounts(JSContext* cx);
-}
+} // namespace js
 
 #endif /* jsopcode_h */
diff --git a/js/src/jsopcodeinlines.h b/js/src/jsopcodeinlines.h
index 1658251ddbb4..3600db4588af 100644
--- a/js/src/jsopcodeinlines.h
+++ b/js/src/jsopcodeinlines.h
@@ -115,6 +115,6 @@ class BytecodeRange {
     jsbytecode* end;
 };
 
-}
+} // namespace js
 
 #endif /* jsopcodeinlines_h */
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index cb3c72e0e417..38cebd47544f 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -132,8 +132,8 @@ class AutoTraceSession;
 class StoreBuffer;
 void MarkPersistentRootedChains(JSTracer*);
 void FinishPersistentRootedChains(JSRuntime*);
-}
-}
+} // namespace gc
+} // namespace js
 
 namespace JS {
 
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 2930c2cc99e7..538c2aac049a 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -4138,11 +4138,30 @@ void
 JSScript::AutoDelazify::holdScript(JS::HandleFunction fun)
 {
     if (fun) {
-        JSAutoCompartment ac(cx_, fun);
-        script_ = fun->getOrCreateScript(cx_);
-        if (script_) {
-            oldDoNotRelazify_ = script_->doNotRelazify_;
-            script_->setDoNotRelazify(true);
+        if (fun->compartment()->isSelfHosting) {
+            // The self-hosting compartment is shared across runtimes, so we
+            // can't use JSAutoCompartment: it could cause races. Functions in
+            // the self-hosting compartment will never be lazy, so we can safely
+            // assume we don't have to delazify.
+            script_ = fun->nonLazyScript();
+        } else {
+            JSAutoCompartment ac(cx_, fun);
+            script_ = fun->getOrCreateScript(cx_);
+            if (script_) {
+                oldDoNotRelazify_ = script_->doNotRelazify_;
+                script_->setDoNotRelazify(true);
+            }
         }
     }
 }
+
+void
+JSScript::AutoDelazify::dropScript()
+{
+    // Don't touch script_ if it's in the self-hosting compartment, see the
+    // comment in holdScript.
+    if (script_ && !script_->compartment()->isSelfHosting) {
+        script_->setDoNotRelazify(oldDoNotRelazify_);
+        script_ = nullptr;
+    }
+}
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 0f48982970f6..f3757e1d5503 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -27,14 +27,14 @@
 
 namespace JS {
 struct ScriptSourceInfo;
-}
+} // namespace JS
 
 namespace js {
 
 namespace jit {
     struct BaselineScript;
     struct IonScriptCounts;
-}
+} // namespace jit
 
 # define ION_DISABLED_SCRIPT ((js::jit::IonScript*)0x1)
 # define ION_COMPILING_SCRIPT ((js::jit::IonScript*)0x2)
@@ -53,7 +53,7 @@ class NestedScopeObject;
 namespace frontend {
     struct BytecodeEmitter;
     class UpvarCookie;
-}
+} // namespace frontend
 
 namespace detail {
 
@@ -64,7 +64,7 @@ CopyScript(JSContext* cx, HandleObject scriptStaticScope, HandleScript src, Hand
 
 } // namespace detail
 
-}
+} // namespace js
 
 /*
  * Type of try note associated with each catch or finally block, and also with
@@ -1764,14 +1764,7 @@ class JSScript : public js::gc::TenuredCell
 
       private:
         void holdScript(JS::HandleFunction fun);
-
-        void dropScript()
-        {
-            if (script_) {
-                script_->setDoNotRelazify(oldDoNotRelazify_);
-                script_ = nullptr;
-            }
-        }
+        void dropScript();
     };
 };
 
@@ -2310,7 +2303,7 @@ CloneGlobalScript(JSContext* cx, Handle<ScopeObject*> enclosingScope, HandleScri
 namespace JS {
 namespace ubi {
 template<> struct Concrete<js::LazyScript> : TracerConcrete<js::LazyScript> { };
-}
-}
+} // namespace ubi
+} // namespace JS
 
 #endif /* jsscript_h */
diff --git a/js/src/jswatchpoint.h b/js/src/jswatchpoint.h
index edc0c5da110f..541bc5c15024 100644
--- a/js/src/jswatchpoint.h
+++ b/js/src/jswatchpoint.h
@@ -83,6 +83,6 @@ class WatchpointMap {
     Map map;
 };
 
-}
+} // namespace js
 
 #endif /* jswatchpoint_h */
diff --git a/js/src/perf/pm_linux.cpp b/js/src/perf/pm_linux.cpp
index 46efa37e34ad..082bbd7ba8da 100644
--- a/js/src/perf/pm_linux.cpp
+++ b/js/src/perf/pm_linux.cpp
@@ -224,7 +224,7 @@ Impl::stop(PerfMeasurement* counters)
     }
 }
 
-} // anonymous namespace
+} // namespace
 
 
 namespace JS {
diff --git a/js/src/shell/OSObject.cpp b/js/src/shell/OSObject.cpp
index 341ba88ac968..53300db36735 100644
--- a/js/src/shell/OSObject.cpp
+++ b/js/src/shell/OSObject.cpp
@@ -602,5 +602,5 @@ DefineOS(JSContext* cx, HandleObject global, bool fuzzingSafe)
     return true;
 }
 
-}
-}
+} // namespace shell
+} // namespace js
diff --git a/js/src/shell/OSObject.h b/js/src/shell/OSObject.h
index 6b8e0c7ebb7e..745f3c26a3e1 100644
--- a/js/src/shell/OSObject.h
+++ b/js/src/shell/OSObject.h
@@ -26,7 +26,7 @@ enum PathResolutionMode {
 JSString*
 ResolvePath(JSContext* cx, JS::HandleString filenameStr, PathResolutionMode resolveMode);
 
-}
-}
+} // namespace shell
+} // namespace js
 
 #endif /* shell_OSObject_h */
diff --git a/js/src/tests/ecma_5/Array/unshift-01.js b/js/src/tests/ecma_5/Array/unshift-01.js
index 9614adb75252..84c9d88a5d7d 100644
--- a/js/src/tests/ecma_5/Array/unshift-01.js
+++ b/js/src/tests/ecma_5/Array/unshift-01.js
@@ -13,10 +13,14 @@ print(BUGNUMBER + ": " + summary);
  * BEGIN TEST *
  **************/
 
+// ES6 ToLength clamps length values to 2^53 - 1.
+// We currently clamp to 2^32 - 1 instead. See bug 924058.
+var MAX_LENGTH = 0xffffffff;
+
 var a = {};
-a.length = 4294967296;
-assertEq([].unshift.call(a), 0);
-assertEq(a.length, 0);
+a.length = MAX_LENGTH + 1;
+assertEq([].unshift.call(a), MAX_LENGTH);
+assertEq(a.length, MAX_LENGTH);
 
 function testGetSet(len, expected) {
     var newlen;
@@ -30,8 +34,8 @@ testGetSet(0, 0);
 testGetSet(10, 10);
 testGetSet("1", 1);
 testGetSet(null, 0);
-testGetSet(4294967297, 1);
-testGetSet(-5, 4294967291);
+testGetSet(MAX_LENGTH + 2, MAX_LENGTH);
+testGetSet(-5, 0);
 
 /******************************************************************************/
 
diff --git a/js/src/tests/ecma_7/SIMD/clamp.js b/js/src/tests/ecma_7/SIMD/clamp.js
deleted file mode 100644
index e1b5217a6cff..000000000000
--- a/js/src/tests/ecma_7/SIMD/clamp.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var Float32x4 = SIMD.Float32x4;
-var Float64x2 = SIMD.Float64x2;
-
-function test() {
-  // FIXME -- Bug 1068028: Amend to check for correctness of NaN/-0 border
-  // cases once the semantics are defined.
-
-  var a = Float32x4(-20, 10, 30, 0.5);
-  var lower = Float32x4(2, 1, 50, 0);
-  var upper = Float32x4(2.5, 5, 55, 1);
-  var c = SIMD.Float32x4.clamp(a, lower, upper);
-  assertEqX4(c, [2, 5, 50, .5])
-
-  var d = Float32x4(-13.37, 10.46, 31.79, 0.54);
-  var lower1 = Float32x4(2.1, 1.1, 50.13, 0.0);
-  var upper1 = Float32x4(2.56, 5.55, 55.93, 1.1);
-  var f = SIMD.Float32x4.clamp(d, lower1, upper1);
-  assertEqX4(f, [2.1, 5.55, 50.13, 0.54].map(Math.fround));
-
-  var g = Float32x4(4, -Infinity, 10, -10);
-  var lower2 = Float32x4(5, -Infinity, -Infinity, -Infinity);
-  var upper2 = Float32x4(Infinity, 5, Infinity, Infinity);
-  var i = SIMD.Float32x4.clamp(g, lower2, upper2);
-  assertEqX4(i, [5, -Infinity, 10, -10].map(Math.fround));
-
-  var j = Float64x2(-20, 10);
-  var k = Float64x2(2.125, 3);
-  var lower3 = Float64x2(2, 1);
-  var upper3 = Float64x2(2.5, 5);
-  var l = Float64x2.clamp(j, lower3, upper3);
-  assertEqX2(l, [2, 5]);
-  var m = Float64x2.clamp(k, lower3, upper3);
-  assertEqX2(m, [2.125, 3]);
-
-  var n = Float64x2(-5, 5);
-  var lower4 = Float64x2(-Infinity, 0);
-  var upper4 = Float64x2(+Infinity, +Infinity);
-  var p = Float64x2.clamp(n, lower4, upper4);
-  assertEqX2(p, [-5, 5]);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index e1d59ed73b60..ae338c37894c 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -19,7 +19,7 @@ class ScriptFrameIter;
 
 namespace jit {
 class JitFrameLayout;
-}
+} // namespace jit
 
 /*
  * ArgumentsData stores the initial indexed arguments provided to the
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 7e8a48bbb41d..69c19f02ed65 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -125,13 +125,6 @@ GetOrCreateFunctionScript(JSContext* cx, HandleFunction fun)
     return fun->nonLazyScript();
 }
 
-bool
-js::ReportObjectRequired(JSContext* cx)
-{
-    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, "value");
-    return false;
-}
-
 static bool
 ValueToIdentifier(JSContext* cx, HandleValue v, MutableHandleId id)
 {
@@ -2243,7 +2236,6 @@ Debugger::updateObservesAsmJSOnDebuggees(IsObserving observing)
     }
 }
 
-
 
 /*** Allocations Tracking *************************************************************************/
 
@@ -2645,11 +2637,9 @@ const Class Debugger::jsclass = {
 /* static */ Debugger*
 Debugger::fromThisValue(JSContext* cx, const CallArgs& args, const char* fnname)
 {
-    if (!args.thisv().isObject()) {
-        ReportObjectRequired(cx);
+    JSObject* thisobj = NonNullObject(cx, args.thisv());
+    if (!thisobj)
         return nullptr;
-    }
-    JSObject* thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &Debugger::jsclass) {
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger", fnname, thisobj->getClass()->name);
@@ -3206,10 +3196,9 @@ Debugger::construct(JSContext* cx, unsigned argc, Value* vp)
 
     /* Check that the arguments, if any, are cross-compartment wrappers. */
     for (unsigned i = 0; i < args.length(); i++) {
-        const Value& arg = args[i];
-        if (!arg.isObject())
-            return ReportObjectRequired(cx);
-        JSObject* argobj = &arg.toObject();
+        JSObject* argobj = NonNullObject(cx, args[i]);
+        if (!argobj)
+            return false;
         if (!argobj->is<CrossCompartmentWrapperObject>()) {
             JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_CCW_REQUIRED,
                                  "Debugger");
@@ -4565,11 +4554,9 @@ Debugger::wrapScript(JSContext* cx, HandleScript script)
 static JSObject*
 DebuggerScript_check(JSContext* cx, const Value& v, const char* clsname, const char* fnname)
 {
-    if (!v.isObject()) {
-        ReportObjectRequired(cx);
+    JSObject* thisobj = NonNullObject(cx, v);
+    if (!thisobj)
         return nullptr;
-    }
-    JSObject* thisobj = &v.toObject();
     if (thisobj->getClass() != &DebuggerScript_class) {
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              clsname, fnname, thisobj->getClass()->name);
@@ -5592,12 +5579,9 @@ DebuggerSource_construct(JSContext* cx, unsigned argc, Value* vp)
 static NativeObject*
 DebuggerSource_checkThis(JSContext* cx, const CallArgs& args, const char* fnname)
 {
-    if (!args.thisv().isObject()) {
-        ReportObjectRequired(cx);
+    JSObject* thisobj = NonNullObject(cx, args.thisv());
+    if (!thisobj)
         return nullptr;
-    }
-
-    JSObject* thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerSource_class) {
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Source", fnname, thisobj->getClass()->name);
@@ -5890,11 +5874,9 @@ const Class DebuggerFrame_class = {
 static NativeObject*
 CheckThisFrame(JSContext* cx, const CallArgs& args, const char* fnname, bool checkLive)
 {
-    if (!args.thisv().isObject()) {
-        ReportObjectRequired(cx);
+    JSObject* thisobj = NonNullObject(cx, args.thisv());
+    if (!thisobj)
         return nullptr;
-    }
-    JSObject* thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerFrame_class) {
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Frame", fnname, thisobj->getClass()->name);
@@ -6113,11 +6095,9 @@ DebuggerArguments_getArg(JSContext* cx, unsigned argc, Value* vp)
     int32_t i = args.callee().as<JSFunction>().getExtendedSlot(0).toInt32();
 
     /* Check that the this value is an Arguments object. */
-    if (!args.thisv().isObject()) {
-        ReportObjectRequired(cx);
+    RootedObject argsobj(cx, NonNullObject(cx, args.thisv()));
+    if (!argsobj)
         return false;
-    }
-    RootedObject argsobj(cx, &args.thisv().toObject());
     if (argsobj->getClass() != &DebuggerArguments_class) {
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Arguments", "getArgument", argsobj->getClass()->name);
@@ -6660,11 +6640,9 @@ const Class DebuggerObject_class = {
 static NativeObject*
 DebuggerObject_checkThis(JSContext* cx, const CallArgs& args, const char* fnname)
 {
-    if (!args.thisv().isObject()) {
-        ReportObjectRequired(cx);
+    JSObject* thisobj = NonNullObject(cx, args.thisv());
+    if (!thisobj)
         return nullptr;
-    }
-    JSObject* thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerObject_class) {
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Object", fnname, thisobj->getClass()->name);
@@ -7608,11 +7586,9 @@ static NativeObject*
 DebuggerEnv_checkThis(JSContext* cx, const CallArgs& args, const char* fnname,
                       bool requireDebuggee = true)
 {
-    if (!args.thisv().isObject()) {
-        ReportObjectRequired(cx);
+    JSObject* thisobj = NonNullObject(cx, args.thisv());
+    if (!thisobj)
         return nullptr;
-    }
-    JSObject* thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerEnv_class) {
         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Environment", fnname, thisobj->getClass()->name);
diff --git a/js/src/vm/HelperThreads.h b/js/src/vm/HelperThreads.h
index 2568f7bc2474..de3d2c5578c3 100644
--- a/js/src/vm/HelperThreads.h
+++ b/js/src/vm/HelperThreads.h
@@ -29,7 +29,7 @@ struct AsmJSParallelTask;
 struct ParseTask;
 namespace jit {
   class IonBuilder;
-}
+} // namespace jit
 
 // Per-process state for off thread work items.
 class GlobalHelperThreadState
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 62bc65d29eac..e467935df62b 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -612,7 +612,7 @@ struct AutoStopwatch final
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-}
+} // namespace js
 
 // MSVC with PGO inlines a lot of functions in RunScript, resulting in large
 // stack frames and stack overflow issues, see bug 1167883. Turn off PGO to
diff --git a/js/src/vm/ObjectGroup.h b/js/src/vm/ObjectGroup.h
index 80c5d28e4e03..cc5d3c1978e4 100644
--- a/js/src/vm/ObjectGroup.h
+++ b/js/src/vm/ObjectGroup.h
@@ -127,7 +127,7 @@ AsTaggedProto(HandleObject obj)
 
 namespace gc {
 void MergeCompartments(JSCompartment* source, JSCompartment* target);
-}
+} // namespace gc
 
 /*
  * The NewObjectKind allows an allocation site to specify the type properties
diff --git a/js/src/vm/Probes.h b/js/src/vm/Probes.h
index 95307f3f2189..edcc9d33e1ac 100644
--- a/js/src/vm/Probes.h
+++ b/js/src/vm/Probes.h
@@ -91,7 +91,8 @@ bool FinalizeObject(JSObject* obj);
 void DTraceEnterJSFun(JSContext* cx, JSFunction* fun, JSScript* script);
 void DTraceExitJSFun(JSContext* cx, JSFunction* fun, JSScript* script);
 
-} /* namespace Probes */
+} // namespace probes
+
 
 #ifdef INCLUDE_MOZILLA_DTRACE
 static const char* ObjectClassname(JSObject* obj) {
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index 387bb980ecf2..15e7c7b93019 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -61,7 +61,7 @@ using JS::DoubleNaNValue;
 
 namespace js {
     bool gCanUseExtraThreads = true;
-};
+} // namespace js
 
 void
 js::DisableExtraThreads()
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 64ddbff4d761..0e72361fd48e 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -100,7 +100,7 @@ typedef vixl::Simulator Simulator;
 #elif defined(JS_SIMULATOR)
 class Simulator;
 #endif
-}
+} // namespace jit
 
 /*
  * GetSrcNote cache to avoid O(n^2) growth in finding a source note for a
@@ -409,7 +409,7 @@ class FreeOp : public JSFreeOp
 
 namespace JS {
 struct RuntimeSizes;
-}
+} // namespace JS
 
 /* Various built-in or commonly-used names pinned on first context. */
 struct JSAtomState
diff --git a/js/src/vm/SavedStacks.cpp b/js/src/vm/SavedStacks.cpp
index 71423041f2b4..4e10670293b7 100644
--- a/js/src/vm/SavedStacks.cpp
+++ b/js/src/vm/SavedStacks.cpp
@@ -487,7 +487,7 @@ public:
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-} // anonymous namespace
+} // namespace
 
 static inline js::SavedFrame*
 UnwrapSavedFrame(JSContext* cx, HandleObject obj, bool& skippedAsync)
diff --git a/js/src/vm/Shape.h b/js/src/vm/Shape.h
index 92ec0bba660e..6ceadc0b8381 100644
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -1394,7 +1394,7 @@ namespace JS {
 namespace ubi {
 template<> struct Concrete<js::Shape> : TracerConcreteWithCompartment<js::Shape> { };
 template<> struct Concrete<js::BaseShape> : TracerConcreteWithCompartment<js::BaseShape> { };
-}
-}
+} // namespace ubi
+} // namespace JS
 
 #endif /* vm_Shape_h */
diff --git a/js/src/vm/SharedTypedArrayObject.h b/js/src/vm/SharedTypedArrayObject.h
index a9ba1a2a288d..0932469be759 100644
--- a/js/src/vm/SharedTypedArrayObject.h
+++ b/js/src/vm/SharedTypedArrayObject.h
@@ -143,7 +143,7 @@ SharedTypedArrayObject::byteLengthValue(SharedTypedArrayObject* tarr)
     return Int32Value(tarr->getFixedSlot(LENGTH_SLOT).toInt32() * size);
 }
 
-}  // namespace js
+} // namespace js
 
 template <>
 inline bool
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index f89d02079fa8..6b8b93a75e6d 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -25,8 +25,8 @@ struct JSCompartment;
 namespace JS {
 namespace dbg {
 class AutoEntryMonitor;
-}
-}
+} // namespace dbg
+} // namespace JS
 
 namespace js {
 
@@ -82,7 +82,7 @@ enum MaybeCheckLexical { CheckLexical = true, DontCheckLexical = false };
 namespace jit {
     class BaselineFrame;
     class RematerializedFrame;
-}
+} // namespace jit
 
 /*
  * Pointer to either a ScriptFrameIter::Data, an InterpreterFrame, or a Baseline
@@ -1095,7 +1095,7 @@ class AsmJSActivation;
 
 namespace jit {
     class JitActivation;
-};
+} // namespace jit
 
 class Activation
 {
diff --git a/js/src/vm/TraceLogging.h b/js/src/vm/TraceLogging.h
index 27674d0f0f9a..1ac21a16a835 100644
--- a/js/src/vm/TraceLogging.h
+++ b/js/src/vm/TraceLogging.h
@@ -23,14 +23,14 @@ struct JSRuntime;
 
 namespace JS {
     class ReadOnlyCompileOptions;
-}
+} // namespace JS
 
 namespace js {
 class PerThreadData;
 
 namespace jit {
     class CompileRuntime;
-}
+} // namespace jit
 
 /*
  * Tracelogging overview.
@@ -521,6 +521,6 @@ class AutoTraceLog
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-}  /* namedata js */
+} // namespace js
 
 #endif /* TraceLogging_h */
diff --git a/js/src/vm/TraceLoggingGraph.h b/js/src/vm/TraceLoggingGraph.h
index 2de8b1e36837..fd83cc5505f2 100644
--- a/js/src/vm/TraceLoggingGraph.h
+++ b/js/src/vm/TraceLoggingGraph.h
@@ -64,7 +64,7 @@
 
 namespace js {
 void DestroyTraceLoggerGraphState();
-}
+} // namespace js
 
 class TraceLoggerGraphState
 {
diff --git a/js/src/vm/TypeInference.cpp b/js/src/vm/TypeInference.cpp
index eb51f1c55ef5..af5007c81f83 100644
--- a/js/src/vm/TypeInference.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -3607,7 +3607,7 @@ struct DestroyTypeNewScript
     }
 };
 
-} // anonymous namespace
+} // namespace
 
 bool
 TypeNewScript::maybeAnalyze(JSContext* cx, ObjectGroup* group, bool* regenerate, bool force)
diff --git a/js/src/vm/TypeInference.h b/js/src/vm/TypeInference.h
index feaae7154b26..e9e5c2b80ea5 100644
--- a/js/src/vm/TypeInference.h
+++ b/js/src/vm/TypeInference.h
@@ -30,7 +30,7 @@ namespace jit {
     struct IonScript;
     class JitAllocPolicy;
     class TempAllocator;
-}
+} // namespace jit
 
 class TaggedProto;
 struct TypeZone;
@@ -1303,7 +1303,7 @@ PrintTypes(JSContext* cx, JSCompartment* comp, bool force);
 namespace JS {
 namespace ubi {
 template<> struct Concrete<js::ObjectGroup> : TracerConcrete<js::ObjectGroup> { };
-}
-}
+} // namespace ubi
+} // namespace JS
 
 #endif /* vm_TypeInference_h */
diff --git a/js/src/vm/UbiNode.cpp b/js/src/vm/UbiNode.cpp
index c8023fbc4b98..eae050f8a54a 100644
--- a/js/src/vm/UbiNode.cpp
+++ b/js/src/vm/UbiNode.cpp
@@ -277,8 +277,8 @@ template class TracerConcrete<js::jit::JitCode>;
 template class TracerConcreteWithCompartment<js::Shape>;
 template class TracerConcreteWithCompartment<js::BaseShape>;
 template class TracerConcrete<js::ObjectGroup>;
-}
-}
+} // namespace ubi
+} // namespace JS
 
 namespace JS {
 namespace ubi {
diff --git a/js/xpconnect/loader/mozJSLoaderUtils.h b/js/xpconnect/loader/mozJSLoaderUtils.h
index b3a3b6fec1b4..9adf82bf6fbf 100644
--- a/js/xpconnect/loader/mozJSLoaderUtils.h
+++ b/js/xpconnect/loader/mozJSLoaderUtils.h
@@ -12,8 +12,8 @@
 namespace mozilla {
 namespace scache {
 class StartupCache;
-}
-}
+} // namespace scache
+} // namespace mozilla
 
 nsresult
 ReadCachedScript(mozilla::scache::StartupCache* cache, nsACString& uri,
diff --git a/js/xpconnect/src/XPCJSMemoryReporter.h b/js/xpconnect/src/XPCJSMemoryReporter.h
index b44e96fa1ddc..1f1c23f27aba 100644
--- a/js/xpconnect/src/XPCJSMemoryReporter.h
+++ b/js/xpconnect/src/XPCJSMemoryReporter.h
@@ -28,6 +28,6 @@ public:
                                    bool anonymize);
 };
 
-}
+} // namespace xpc
 
 #endif
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 1d443d055c76..e2b1e2fb8384 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -526,7 +526,7 @@ CurrentWindowOrNull(JSContext* cx)
     return glob ? WindowOrNull(glob) : nullptr;
 }
 
-}
+} // namespace xpc
 
 static void
 CompartmentDestroyedCallback(JSFreeOp* fop, JSCompartment* compartment)
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 61166dfa9a74..199534b8c59e 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -941,7 +941,7 @@ public:
     NS_IMETHOD Run() { return NS_OK; }
 };
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 nsXPConnect::OnProcessNextEvent(nsIThreadInternal* aThread, bool aMayWait,
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 8acfbd501d9a..7598999b0c84 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -2865,9 +2865,9 @@ namespace mozilla {
 namespace dom {
 namespace danger {
 class AutoCxPusher;
-}
-}
-}
+} // namespace danger
+} // namespace dom
+} // namespace mozilla
 
 class XPCJSContextStack
 {
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index cce72cc102be..89585b90470a 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -147,7 +147,7 @@ namespace JS {
 
 struct RuntimeStats;
 
-}
+} // namespace JS
 
 #define XPCONNECT_GLOBAL_FLAGS_WITH_EXTRA_SLOTS(n)                            \
     JSCLASS_DOM_GLOBAL | JSCLASS_HAS_PRIVATE |                                \
diff --git a/js/xpconnect/wrappers/AccessCheck.cpp b/js/xpconnect/wrappers/AccessCheck.cpp
index c1c2e90d2f4c..29b960da43d3 100644
--- a/js/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/xpconnect/wrappers/AccessCheck.cpp
@@ -445,4 +445,4 @@ ExposedPropertiesOnly::deny(js::Wrapper::Action act, HandleId id)
     return false;
 }
 
-}
+} // namespace xpc
diff --git a/js/xpconnect/wrappers/AccessCheck.h b/js/xpconnect/wrappers/AccessCheck.h
index b731cd0228b5..488cceac0e23 100644
--- a/js/xpconnect/wrappers/AccessCheck.h
+++ b/js/xpconnect/wrappers/AccessCheck.h
@@ -101,6 +101,6 @@ struct ExposedPropertiesOnly : public Policy {
     }
 };
 
-}
+} // namespace xpc
 
 #endif /* __AccessCheck_h__ */
diff --git a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
index 919938107c29..fd542586c1a2 100644
--- a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
+++ b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
@@ -38,4 +38,4 @@ ChromeObjectWrapper::set(JSContext* cx, HandleObject wrapper, HandleId id, Handl
     return ChromeObjectWrapperBase::set(cx, wrapper, id, v, receiver, result);
 }
 
-}
+} // namespace xpc
diff --git a/js/xpconnect/wrappers/FilteringWrapper.cpp b/js/xpconnect/wrappers/FilteringWrapper.cpp
index b18e896ca1df..cd171de8ea73 100644
--- a/js/xpconnect/wrappers/FilteringWrapper.cpp
+++ b/js/xpconnect/wrappers/FilteringWrapper.cpp
@@ -261,4 +261,4 @@ template class XOW;
 template class NNXOW;
 template class NNXOWC;
 template class ChromeObjectWrapperBase;
-}
+} // namespace xpc
diff --git a/js/xpconnect/wrappers/FilteringWrapper.h b/js/xpconnect/wrappers/FilteringWrapper.h
index 20bdfc5831a4..40fb9048ba16 100644
--- a/js/xpconnect/wrappers/FilteringWrapper.h
+++ b/js/xpconnect/wrappers/FilteringWrapper.h
@@ -18,7 +18,7 @@ namespace JS {
 template <typename T>
 class AutoVectorRooter;
 typedef AutoVectorRooter<jsid> AutoIdVector;
-}
+} // namespace JS
 
 namespace xpc {
 
@@ -87,6 +87,6 @@ class CrossOriginXrayWrapper : public SecurityXrayDOM {
                                        JS::MutableHandle<JSPropertyDescriptor> desc) const override;
 };
 
-}
+} // namespace xpc
 
 #endif /* __FilteringWrapper_h__ */
diff --git a/js/xpconnect/wrappers/WaiveXrayWrapper.cpp b/js/xpconnect/wrappers/WaiveXrayWrapper.cpp
index 877982da97fd..2ba313f26d0c 100644
--- a/js/xpconnect/wrappers/WaiveXrayWrapper.cpp
+++ b/js/xpconnect/wrappers/WaiveXrayWrapper.cpp
@@ -97,4 +97,4 @@ WaiveXrayWrapper::getPrototype(JSContext* cx, HandleObject wrapper, MutableHandl
            (!protop || WrapperFactory::WaiveXrayAndWrap(cx, protop));
 }
 
-}
+} // namespace xpc
diff --git a/js/xpconnect/wrappers/WaiveXrayWrapper.h b/js/xpconnect/wrappers/WaiveXrayWrapper.h
index a1a1f86395c7..ef903d7823b9 100644
--- a/js/xpconnect/wrappers/WaiveXrayWrapper.h
+++ b/js/xpconnect/wrappers/WaiveXrayWrapper.h
@@ -40,6 +40,6 @@ class WaiveXrayWrapper : public js::CrossCompartmentWrapper {
     static const WaiveXrayWrapper singleton;
 };
 
-}
+} // namespace xpc
 
 #endif
diff --git a/js/xpconnect/wrappers/WrapperFactory.cpp b/js/xpconnect/wrappers/WrapperFactory.cpp
index 7d1e38efc0ac..8e6da86bd339 100644
--- a/js/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/xpconnect/wrappers/WrapperFactory.cpp
@@ -630,4 +630,4 @@ NativeGlobal(JSObject* obj)
     return global;
 }
 
-}
+} // namespace xpc
diff --git a/js/xpconnect/wrappers/WrapperFactory.h b/js/xpconnect/wrappers/WrapperFactory.h
index 566ae0caa070..3609472edced 100644
--- a/js/xpconnect/wrappers/WrapperFactory.h
+++ b/js/xpconnect/wrappers/WrapperFactory.h
@@ -55,6 +55,6 @@ class WrapperFactory {
 
 extern const js::Wrapper XrayWaiver;
 
-}
+} // namespace xpc
 
 #endif /* _xpc_WRAPPERFACTORY_H */
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 58ee6f67c3c5..06098d9b6e00 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1090,7 +1090,7 @@ bool CloneExpandoChain(JSContext* cx, JSObject* dstArg, JSObject* srcArg)
     RootedObject src(cx, srcArg);
     return GetXrayTraits(src)->cloneExpandoChain(cx, dst, src);
 }
-}
+} // namespace XrayUtils
 
 static JSObject*
 GetHolder(JSObject* obj)
@@ -1126,7 +1126,7 @@ IsXPCWNHolderClass(const JSClass* clasp)
   return clasp == &XPCWrappedNativeXrayTraits::HolderClass;
 }
 
-}
+} // namespace XrayUtils
 
 static nsGlobalWindow*
 AsWindow(JSContext* cx, JSObject* wrapper)
@@ -2320,4 +2320,4 @@ template<>
 const SCSecurityXrayXPCWN SCSecurityXrayXPCWN::singleton(0);
 template class SCSecurityXrayXPCWN;
 
-}
+} // namespace xpc
diff --git a/js/xpconnect/wrappers/XrayWrapper.h b/js/xpconnect/wrappers/XrayWrapper.h
index c6e6bd79ba29..d233372929ce 100644
--- a/js/xpconnect/wrappers/XrayWrapper.h
+++ b/js/xpconnect/wrappers/XrayWrapper.h
@@ -48,7 +48,7 @@ GetNativePropertiesObject(JSContext* cx, JSObject* wrapper);
 bool
 HasNativeProperty(JSContext* cx, JS::HandleObject wrapper, JS::HandleId id,
                   bool* hasProp);
-}
+} // namespace XrayUtils
 
 enum XrayType {
     XrayForDOMObject,
@@ -563,6 +563,6 @@ extern const SandboxCallableProxyHandler sandboxCallableProxyHandler;
 
 class AutoSetWrapperNotShadowing;
 
-}
+} // namespace xpc
 
 #endif
diff --git a/layout/base/AccessibleCaretManager.h b/layout/base/AccessibleCaretManager.h
index a03c6c489258..d6d04933b06a 100644
--- a/layout/base/AccessibleCaretManager.h
+++ b/layout/base/AccessibleCaretManager.h
@@ -27,7 +27,7 @@ namespace mozilla {
 
 namespace dom {
 class Selection;
-}
+} // namespace dom
 
 class AccessibleCaret;
 
diff --git a/layout/base/ActiveLayerTracker.cpp b/layout/base/ActiveLayerTracker.cpp
index 75ec284a505a..eaefc102a901 100644
--- a/layout/base/ActiveLayerTracker.cpp
+++ b/layout/base/ActiveLayerTracker.cpp
@@ -334,4 +334,4 @@ ActiveLayerTracker::Shutdown()
   gLayerActivityTracker = nullptr;
 }
 
-}
+} // namespace mozilla
diff --git a/layout/base/ActiveLayerTracker.h b/layout/base/ActiveLayerTracker.h
index d81677214890..7ac336faa91e 100644
--- a/layout/base/ActiveLayerTracker.h
+++ b/layout/base/ActiveLayerTracker.h
@@ -101,6 +101,6 @@ public:
   static bool IsContentActive(nsIFrame* aFrame);
 };
 
-}
+} // namespace mozilla
 
 #endif /* ACTIVELAYERTRACKER_H_ */
diff --git a/layout/base/CaretAssociationHint.h b/layout/base/CaretAssociationHint.h
index 52bb5ba5b024..9067de6268d8 100644
--- a/layout/base/CaretAssociationHint.h
+++ b/layout/base/CaretAssociationHint.h
@@ -17,6 +17,6 @@ enum CaretAssociationHint {
   CARET_ASSOCIATE_AFTER
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/layout/base/DisplayItemClip.cpp b/layout/base/DisplayItemClip.cpp
index 6ef03d05d699..d3a5e1aa83db 100644
--- a/layout/base/DisplayItemClip.cpp
+++ b/layout/base/DisplayItemClip.cpp
@@ -475,4 +475,4 @@ DisplayItemClip::ToString() const
   return str;
 }
 
-}
+} // namespace mozilla
diff --git a/layout/base/DisplayItemClip.h b/layout/base/DisplayItemClip.h
index 1536242da162..9afca38b8466 100644
--- a/layout/base/DisplayItemClip.h
+++ b/layout/base/DisplayItemClip.h
@@ -19,8 +19,8 @@ namespace mozilla {
 namespace gfx {
 class DrawTarget;
 class Path;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 namespace mozilla {
 
@@ -186,6 +186,6 @@ private:
   bool mHaveClipRect;
 };
 
-}
+} // namespace mozilla
 
 #endif /* DISPLAYITEMCLIP_H_ */
diff --git a/layout/base/DisplayListClipState.cpp b/layout/base/DisplayListClipState.cpp
index 85a84a329fdf..6314b67a9d3e 100644
--- a/layout/base/DisplayListClipState.cpp
+++ b/layout/base/DisplayListClipState.cpp
@@ -114,4 +114,4 @@ DisplayListClipState::AutoSaveRestore::AutoSaveRestore(nsDisplayListBuilder* aBu
   , mRestored(false)
 {}
 
-}
+} // namespace mozilla
diff --git a/layout/base/DisplayListClipState.h b/layout/base/DisplayListClipState.h
index cd29d2dde721..967298ca5ce9 100644
--- a/layout/base/DisplayListClipState.h
+++ b/layout/base/DisplayListClipState.h
@@ -259,6 +259,6 @@ protected:
   DebugOnly<bool> mExtraClipUsed;
 };
 
-}
+} // namespace mozilla
 
 #endif /* DISPLAYLISTCLIPSTATE_H_ */
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index c9bdfbf48511..01ab32dc98ea 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -1380,7 +1380,8 @@ struct MaskLayerUserData : public LayerUserData
            mAppUnitsPerDevPixel == aOther.mAppUnitsPerDevPixel;
   }
 
-  nsRefPtr<const MaskLayerImageCache::MaskLayerImageKey> mImageKey;
+  // Keeps a MaskLayerImageKey alive by managing its mLayerCount member-var
+  MaskLayerImageCache::MaskLayerImageKeyRef mImageKey;
   // properties of the mask layer; the mask layer may be re-used if these
   // remain unchanged.
   nsTArray<DisplayItemClip::RoundedRect> mRoundedClipRects;
@@ -5914,7 +5915,7 @@ ContainerState::CreateMaskLayer(Layer *aLayer,
   userData->mOffset = newData.mOffset;
   userData->mAppUnitsPerDevPixel = newData.mAppUnitsPerDevPixel;
   userData->mRoundedClipRects.SwapElements(newData.mRoundedClipRects);
-  userData->mImageKey = lookupKey;
+  userData->mImageKey.Reset(lookupKey);
 
   return maskLayer.forget();
 }
diff --git a/layout/base/FrameLayerBuilder.h b/layout/base/FrameLayerBuilder.h
index cc0cd0effb60..c8a27a60871e 100644
--- a/layout/base/FrameLayerBuilder.h
+++ b/layout/base/FrameLayerBuilder.h
@@ -28,11 +28,11 @@ class ContainerLayer;
 class LayerManager;
 class BasicLayerManager;
 class PaintedLayer;
-}
+} // namespace layers
 
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 
 class FrameLayerBuilder;
 class LayerManagerData;
@@ -743,6 +743,6 @@ protected:
   uint32_t                            mMaxContainerLayerGeneration;
 };
 
-}
+} // namespace mozilla
 
 #endif /* FRAMELAYERBUILDER_H_ */
diff --git a/layout/base/FramePropertyTable.h b/layout/base/FramePropertyTable.h
index 739115b35c31..decb982b3f52 100644
--- a/layout/base/FramePropertyTable.h
+++ b/layout/base/FramePropertyTable.h
@@ -245,6 +245,6 @@ private:
   nsIFrame* mFrame;
 };
 
-}
+} // namespace mozilla
 
 #endif /* FRAMEPROPERTYTABLE_H_ */
diff --git a/layout/base/GeometryUtils.cpp b/layout/base/GeometryUtils.cpp
index 3a303916d0b3..eacd02247c2c 100644
--- a/layout/base/GeometryUtils.cpp
+++ b/layout/base/GeometryUtils.cpp
@@ -384,4 +384,4 @@ ConvertPointFromNode(nsINode* aTo, const dom::DOMPointInit& aPoint,
   return result.forget();
 }
 
-}
+} // namespace mozilla
diff --git a/layout/base/GeometryUtils.h b/layout/base/GeometryUtils.h
index c9e8c4661ff5..5cefbafd17df 100644
--- a/layout/base/GeometryUtils.h
+++ b/layout/base/GeometryUtils.h
@@ -28,7 +28,7 @@ class DOMPoint;
 struct DOMPointInit;
 class OwningTextOrElementOrDocument;
 class TextOrElementOrDocument;
-}
+} // namespace dom
 
 typedef dom::TextOrElementOrDocument GeometryNode;
 typedef dom::OwningTextOrElementOrDocument OwningGeometryNode;
@@ -60,6 +60,6 @@ ConvertPointFromNode(nsINode* aTo, const dom::DOMPointInit& aPoint,
                      const dom::ConvertCoordinateOptions& aOptions,
                      ErrorResult& aRv);
 
-}
+} // namespace mozilla
 
 #endif /* MOZILLA_GEOMETRYUTILS_H_ */
diff --git a/layout/base/LayerState.h b/layout/base/LayerState.h
index 494fe0ae0d6e..643e1e9741a3 100644
--- a/layout/base/LayerState.h
+++ b/layout/base/LayerState.h
@@ -21,6 +21,6 @@ enum LayerState {
   LAYER_SVG_EFFECTS
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/layout/base/MaskLayerImageCache.cpp b/layout/base/MaskLayerImageCache.cpp
index 32bf9d4ddee7..ba4c321c0a21 100644
--- a/layout/base/MaskLayerImageCache.cpp
+++ b/layout/base/MaskLayerImageCache.cpp
@@ -26,7 +26,7 @@ MaskLayerImageCache::SweepFunc(MaskLayerImageEntry* aEntry,
 {
   const MaskLayerImageCache::MaskLayerImageKey* key = aEntry->mKey;
 
-  if (key->mLayerCount == 0) {
+  if (key->HasZeroLayerCount()) {
     return PL_DHASH_REMOVE;
   }
 
@@ -57,24 +57,16 @@ MaskLayerImageCache::PutImage(const MaskLayerImageKey* aKey, ImageContainer* aCo
   entry->mContainer = aContainer;
 }
 
-// This case is particularly 'clever' because it uses AddRef/Release to track the use
-// not to release the object.
-template<>
-struct HasDangerousPublicDestructor<MaskLayerImageCache::MaskLayerImageKey>
-{
-  static const bool value = true;
-};
-
 MaskLayerImageCache::MaskLayerImageKey::MaskLayerImageKey()
-  : mLayerCount(0)
-  , mRoundedClipRects()
+  : mRoundedClipRects()
+  , mLayerCount(0)
 {
   MOZ_COUNT_CTOR(MaskLayerImageKey);
 }
 
 MaskLayerImageCache::MaskLayerImageKey::MaskLayerImageKey(const MaskLayerImageKey& aKey)
-  : mLayerCount(aKey.mLayerCount)
-  , mRoundedClipRects(aKey.mRoundedClipRects)
+  : mRoundedClipRects(aKey.mRoundedClipRects)
+  , mLayerCount(aKey.mLayerCount)
 {
   MOZ_COUNT_CTOR(MaskLayerImageKey);
 }
@@ -84,4 +76,4 @@ MaskLayerImageCache::MaskLayerImageKey::~MaskLayerImageKey()
   MOZ_COUNT_DTOR(MaskLayerImageKey);
 }
 
-}
+} // namespace mozilla
diff --git a/layout/base/MaskLayerImageCache.h b/layout/base/MaskLayerImageCache.h
index 8b9b9b24cc0e..f5e2f0ead0e4 100644
--- a/layout/base/MaskLayerImageCache.h
+++ b/layout/base/MaskLayerImageCache.h
@@ -14,7 +14,7 @@ namespace mozilla {
 
 namespace layers {
 class ImageContainer;
-}
+} // namespace layers
 
 /**
  * Keeps a record of image containers for mask layers, containers are mapped
@@ -119,6 +119,8 @@ public:
     PixelRoundedRect() = delete;
   };
 
+  struct MaskLayerImageKeyRef;
+
   /**
    * A key to identify cached image containers.
    * The const-ness of this class is with respect to its use as a key into a
@@ -131,16 +133,15 @@ public:
    */
   struct MaskLayerImageKey
   {
+    friend struct MaskLayerImageKeyRef;
+
     MaskLayerImageKey();
     MaskLayerImageKey(const MaskLayerImageKey& aKey);
 
     ~MaskLayerImageKey();
 
-    void AddRef() const { ++mLayerCount; }
-    void Release() const
-    {
-      NS_ASSERTION(mLayerCount > 0, "Inconsistent layer count");
-      --mLayerCount;
+    bool HasZeroLayerCount() const {
+      return mLayerCount == 0;
     }
 
     PLDHashNumber Hash() const
@@ -159,11 +160,54 @@ public:
       return mRoundedClipRects == aOther.mRoundedClipRects;
     }
 
-    mutable uint32_t mLayerCount;
     nsTArray<PixelRoundedRect> mRoundedClipRects;
+  private:
+    void IncLayerCount() const { ++mLayerCount; }
+    void DecLayerCount() const
+    {
+      NS_ASSERTION(mLayerCount > 0, "Inconsistent layer count");
+      --mLayerCount;
+    }
+    mutable uint32_t mLayerCount;
+  };
+
+  /**
+   * This struct maintains a reference to a MaskLayerImageKey, via a variant on
+   * refcounting. When a key is passed in via Reset(), we increment the
+   * passed-in key's mLayerCount, and we decrement its mLayerCount when we're
+   * destructed (or when the key is replaced via a second Reset() call).
+   *
+   * However, unlike standard refcounting smart-pointers, this object does
+   * *not* delete the tracked MaskLayerImageKey -- instead, deletion happens
+   * in MaskLayerImageCache::Sweep(), for any keys whose mLayerCount is 0.
+   */
+  struct MaskLayerImageKeyRef
+  {
+    ~MaskLayerImageKeyRef()
+    {
+      if (mRawPtr) {
+        mRawPtr->DecLayerCount();
+      }
+    }
+
+    MaskLayerImageKeyRef() : mRawPtr(nullptr) {}
+    MaskLayerImageKeyRef(const MaskLayerImageKeyRef&) = delete;
+    void operator=(const MaskLayerImageKeyRef&) = delete;
+
+    void Reset(const MaskLayerImageKey* aPtr)
+    {
+      MOZ_ASSERT(aPtr, "Cannot initialize a MaskLayerImageKeyRef with a null pointer");
+      aPtr->IncLayerCount();
+      if (mRawPtr) {
+        mRawPtr->DecLayerCount();
+      }
+      mRawPtr = aPtr;
+    }
+
+  private:
+    const MaskLayerImageKey* mRawPtr;
   };
 
-  
   // Find an image container for aKey, returns nullptr if there is no suitable
   // cached image. If there is an image, then aKey is set to point at the stored
   // key for the image.
@@ -236,7 +280,7 @@ protected:
 };
 
 
-}
+} // namespace mozilla
 
 
 #endif
diff --git a/layout/base/PositionedEventTargeting.cpp b/layout/base/PositionedEventTargeting.cpp
index d937d3840812..82848cc64133 100644
--- a/layout/base/PositionedEventTargeting.cpp
+++ b/layout/base/PositionedEventTargeting.cpp
@@ -591,4 +591,4 @@ FindFrameTargetedByInputEvent(WidgetGUIEvent* aEvent,
   return target;
 }
 
-}
+} // namespace mozilla
diff --git a/layout/base/PositionedEventTargeting.h b/layout/base/PositionedEventTargeting.h
index d6535fd0b3a0..e6a2fddb98a6 100644
--- a/layout/base/PositionedEventTargeting.h
+++ b/layout/base/PositionedEventTargeting.h
@@ -27,6 +27,6 @@ FindFrameTargetedByInputEvent(WidgetGUIEvent* aEvent,
                               const nsPoint& aPointRelativeToRootFrame,
                               uint32_t aFlags = 0);
 
-}
+} // namespace mozilla
 
 #endif /* mozilla_PositionedEventTargeting_h */
diff --git a/layout/base/ScrollbarStyles.cpp b/layout/base/ScrollbarStyles.cpp
index fa6b4f9c0503..cc9f0c57de65 100644
--- a/layout/base/ScrollbarStyles.cpp
+++ b/layout/base/ScrollbarStyles.cpp
@@ -29,4 +29,4 @@ namespace mozilla {
       mScrollSnapDestinationX(aDisplay->mScrollSnapDestination.mXPosition),
       mScrollSnapDestinationY(aDisplay->mScrollSnapDestination.mYPosition) {}
 
-}
+} // namespace mozilla
diff --git a/layout/base/ScrollbarStyles.h b/layout/base/ScrollbarStyles.h
index 9436099e2ab8..e6f0c6dde5cb 100644
--- a/layout/base/ScrollbarStyles.h
+++ b/layout/base/ScrollbarStyles.h
@@ -77,6 +77,6 @@ struct ScrollbarStyles
   }
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/layout/base/SelectionCarets.h b/layout/base/SelectionCarets.h
index e8a7c6efc18d..04b7285e35e6 100644
--- a/layout/base/SelectionCarets.h
+++ b/layout/base/SelectionCarets.h
@@ -28,7 +28,7 @@ namespace mozilla {
 
 namespace dom {
 class Selection;
-}
+} // namespace dom
 
 /**
  * The SelectionCarets draw a pair of carets when the selection is not
@@ -273,6 +273,7 @@ private:
   // Unique ID of current Mobile ActionBar view.
   uint32_t mActionBarViewID;
 };
+
 } // namespace mozilla
 
 #endif //SelectionCarets_h__
diff --git a/layout/base/UnitTransforms.h b/layout/base/UnitTransforms.h
index 18980d9b7af2..058b584e95fe 100644
--- a/layout/base/UnitTransforms.h
+++ b/layout/base/UnitTransforms.h
@@ -184,6 +184,6 @@ static Maybe<gfx::PointTyped<TargetUnits>> UntransformVector(const gfx::Matrix4x
   return Some(ViewAs<TargetUnits>(point.As2DPoint()));
 }
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/layout/base/Units.h b/layout/base/Units.h
index 6f3c28ba9f05..93410d2579ca 100644
--- a/layout/base/Units.h
+++ b/layout/base/Units.h
@@ -591,6 +591,6 @@ gfx::ScaleFactor<src, dst> MinScaleRatio(const gfx::SizeTyped<dst>& aDestSize, c
                                              aDestSize.height / aSrcSize.height));
 }
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/layout/base/WordMovementType.h b/layout/base/WordMovementType.h
index c1d64a7a651d..8d0c8e5d1454 100644
--- a/layout/base/WordMovementType.h
+++ b/layout/base/WordMovementType.h
@@ -9,6 +9,6 @@ namespace mozilla {
 
 enum EWordMovementType { eStartWord, eEndWord, eDefaultBehavior };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/layout/base/gtest/TestAccessibleCaretEventHub.cpp b/layout/base/gtest/TestAccessibleCaretEventHub.cpp
index 4e18fb857763..636da5a7e539 100644
--- a/layout/base/gtest/TestAccessibleCaretEventHub.cpp
+++ b/layout/base/gtest/TestAccessibleCaretEventHub.cpp
@@ -758,4 +758,4 @@ TEST_F(AccessibleCaretEventHubTester, TestWheelEventScroll)
   EXPECT_EQ(mHub->GetState(), MockAccessibleCaretEventHub::NoActionState());
 }
 
-}; // namespace mozilla
+} // namespace mozilla
diff --git a/layout/base/nsBidiPresUtils.h b/layout/base/nsBidiPresUtils.h
index 510c6c9107e1..2c8b4677b972 100644
--- a/layout/base/nsBidiPresUtils.h
+++ b/layout/base/nsBidiPresUtils.h
@@ -30,7 +30,7 @@ template<class T> class nsTHashtable;
 namespace mozilla {
   class WritingMode;
   class LogicalMargin;
-}
+} // namespace mozilla
 
 /**
  * A structure representing some continuation state for each frame on the line,
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 121ea0ab2aa7..fd45e9908fc2 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -45,8 +45,8 @@ namespace dom {
 
 class FlattenedChildIterator;
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsCSSFrameConstructor : public nsFrameManager
 {
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index d6dfc38ae81d..7d2fa81c20a6 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -26,11 +26,11 @@ namespace mozilla {
 
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 
 namespace layers {
 class ImageContainer;
-}
+} // namespace layers
 
 // A CSSSizeOrRatio represents a (possibly partially specified) size for use
 // in computing image sizes. Either or both of the width and height might be
@@ -98,7 +98,7 @@ struct CSSSizeOrRatio
   bool mHasHeight;
 };
 
-}
+} // namespace mozilla
 
 /**
  * This is a small wrapper class to encapsulate image drawing that can draw an
diff --git a/layout/base/nsCSSRenderingBorders.h b/layout/base/nsCSSRenderingBorders.h
index cbe2d06bd867..03b2118d9ee4 100644
--- a/layout/base/nsCSSRenderingBorders.h
+++ b/layout/base/nsCSSRenderingBorders.h
@@ -21,8 +21,8 @@ struct nsBorderColors;
 namespace mozilla {
 namespace gfx {
 class GradientStops;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 // define this to enable a bunch of debug dump info
 #undef DEBUG_NEW_BORDERS
@@ -277,6 +277,6 @@ static inline void PrintAsStringNewline(const char *s = nullptr) {}
 static inline void PrintAsFormatString(const char *fmt, ...) {}
 #endif
 
-}
+} // namespace mozilla
 
 #endif /* NS_CSS_RENDERING_BORDERS_H */
diff --git a/layout/base/nsCaret.h b/layout/base/nsCaret.h
index 990c20b5b426..23ac2af40106 100644
--- a/layout/base/nsCaret.h
+++ b/layout/base/nsCaret.h
@@ -29,11 +29,11 @@ class nsITimer;
 namespace mozilla {
 namespace dom {
 class Selection;
-}
+} // namespace dom
 namespace gfx {
 class DrawTarget;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 //-----------------------------------------------------------------------------
 class nsCaret final : public nsISelectionListener
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 602b1ebce80d..376e18aadf0f 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1300,6 +1300,18 @@ nsDisplayListBuilder::GetDirtyRectForScrolledContents(const nsIFrame* aScrollabl
   return result;
 }
 
+bool
+nsDisplayListBuilder::IsBuildingLayerEventRegions()
+{
+  if (mMode == PAINTING) {
+    // Note: this is the only place that gets to query LayoutEventRegionsEnabled
+    // 'directly' - other code should call this function.
+    return gfxPrefs::LayoutEventRegionsEnabledDoNotUseDirectly() ||
+           mAsyncPanZoomEnabled;
+  }
+  return false;
+}
+
 void nsDisplayListSet::MoveTo(const nsDisplayListSet& aDestination) const
 {
   aDestination.BorderBackground()->AppendToTop(BorderBackground());
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index d54e81c815d7..ca78d7bafbf9 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -49,11 +49,11 @@ namespace layers {
 class Layer;
 class ImageLayer;
 class ImageContainer;
-} //namespace
+} // namespace layers
 namespace gfx {
 class VRHMDInfo;
-} //namespace
-} //namespace
+} // namespace gfx
+} // namespace mozilla
 
 // A set of blend modes, that never includes OP_OVER (since it's
 // considered the default, rather than a specific blend mode).
@@ -345,16 +345,7 @@ public:
   {
     mLayerEventRegions = aItem;
   }
-  bool IsBuildingLayerEventRegions()
-  {
-    if (mMode == PAINTING) {
-      // Note: this is the only place that gets to query LayoutEventRegionsEnabled
-      // 'directly' - other code should call this function.
-      return gfxPrefs::LayoutEventRegionsEnabledDoNotUseDirectly() ||
-             mAsyncPanZoomEnabled;
-    }
-    return false;
-  }
+  bool IsBuildingLayerEventRegions();
   bool IsInsidePointerEventsNoneDoc()
   {
     return CurrentPresShellState()->mInsidePointerEventsNoneDoc;
diff --git a/layout/base/nsFrameTraversal.cpp b/layout/base/nsFrameTraversal.cpp
index eb97901d943a..51a30fdadd53 100644
--- a/layout/base/nsFrameTraversal.cpp
+++ b/layout/base/nsFrameTraversal.cpp
@@ -27,7 +27,8 @@ public:
   virtual void Prev() override;
 
   nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart,
-                  nsIteratorType aType, bool aLockScroll, bool aFollowOOFs);
+                  nsIteratorType aType, bool aLockScroll, bool aFollowOOFs,
+                  bool aSkipPopupChecks);
 
 protected:
   virtual ~nsFrameIterator() {}
@@ -87,6 +88,7 @@ protected:
   nsPresContext* const mPresContext;
   const bool mLockScroll;
   const bool mFollowOOFs;
+  const bool mSkipPopupChecks;
   const nsIteratorType mType;
 
 private:
@@ -103,8 +105,9 @@ class nsVisualIterator: public nsFrameIterator
 {
 public:
   nsVisualIterator(nsPresContext* aPresContext, nsIFrame *aStart,
-                   nsIteratorType aType, bool aLockScroll, bool aFollowOOFs) :
-  nsFrameIterator(aPresContext, aStart, aType, aLockScroll, aFollowOOFs) {}
+                   nsIteratorType aType, bool aLockScroll,
+                   bool aFollowOOFs, bool aSkipPopupChecks) :
+  nsFrameIterator(aPresContext, aStart, aType, aLockScroll, aFollowOOFs, aSkipPopupChecks) {}
 
 protected:
   nsIFrame* GetFirstChildInner(nsIFrame* aFrame) override;
@@ -136,7 +139,8 @@ NS_NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
                      nsIteratorType aType,
                      bool aVisual,
                      bool aLockInScrollView,
-                     bool aFollowOOFs)
+                     bool aFollowOOFs,
+                     bool aSkipPopupChecks)
 {
   if (!aEnumerator || !aStart)
     return NS_ERROR_NULL_POINTER;
@@ -148,10 +152,10 @@ NS_NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
   nsCOMPtr<nsIFrameEnumerator> trav;
   if (aVisual) {
     trav = new nsVisualIterator(aPresContext, aStart, aType,
-                                aLockInScrollView, aFollowOOFs);
+                                aLockInScrollView, aFollowOOFs, aSkipPopupChecks);
   } else {
     trav = new nsFrameIterator(aPresContext, aStart, aType,
-                               aLockInScrollView, aFollowOOFs);
+                               aLockInScrollView, aFollowOOFs, aSkipPopupChecks);
   }
   trav.forget(aEnumerator);
   return NS_OK;
@@ -175,11 +179,12 @@ NS_IMETHODIMP
                                      int32_t aType,
                                      bool aVisual,
                                      bool aLockInScrollView,
-                                     bool aFollowOOFs)
+                                     bool aFollowOOFs,
+                                     bool aSkipPopupChecks)
 {
   return NS_NewFrameTraversal(aEnumerator, aPresContext, aStart,
                               static_cast<nsIteratorType>(aType),
-                              aVisual, aLockInScrollView, aFollowOOFs);  
+                              aVisual, aLockInScrollView, aFollowOOFs, aSkipPopupChecks);  
 }
 
 // nsFrameIterator implementation
@@ -188,10 +193,11 @@ NS_IMPL_ISUPPORTS(nsFrameIterator, nsIFrameEnumerator)
 
 nsFrameIterator::nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart,
                                  nsIteratorType aType, bool aLockInScrollView,
-                                 bool aFollowOOFs)
+                                 bool aFollowOOFs, bool aSkipPopupChecks)
 : mPresContext(aPresContext),
   mLockScroll(aLockInScrollView),
   mFollowOOFs(aFollowOOFs),
+  mSkipPopupChecks(aSkipPopupChecks),
   mType(aType),
   mStart(aStart),
   mCurrent(aStart),
@@ -242,7 +248,7 @@ nsFrameIterator::Last()
   nsIFrame* parent = getCurrent();
   // If the current frame is a popup, don't move farther up the tree.
   // Otherwise, get the nearest root frame or popup.
-  if (parent->GetType() != nsGkAtoms::menuPopupFrame) {
+  if (mSkipPopupChecks || parent->GetType() != nsGkAtoms::menuPopupFrame) {
     while (!IsRootFrame(parent) && (result = GetParentFrameNotPopup(parent)))
       parent = result;
   }
@@ -499,6 +505,11 @@ nsFrameIterator::GetPlaceholderFrame(nsIFrame* aFrame)
 bool
 nsFrameIterator::IsPopupFrame(nsIFrame* aFrame)
 {
+  // If skipping popup checks, pretend this isn't one.
+  if (mSkipPopupChecks) {
+    return false;
+  }
+
   return (aFrame &&
           aFrame->StyleDisplay()->mDisplay == NS_STYLE_DISPLAY_POPUP);
 }
diff --git a/layout/base/nsFrameTraversal.h b/layout/base/nsFrameTraversal.h
index a54a5ebfc252..d0d94e60f47c 100644
--- a/layout/base/nsFrameTraversal.h
+++ b/layout/base/nsFrameTraversal.h
@@ -16,7 +16,8 @@ nsresult NS_NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
                               nsIteratorType aType,
                               bool aVisual,
                               bool aLockInScrollView,
-                              bool aFollowOOFs);
+                              bool aFollowOOFs,
+                              bool aSkipPopupChecks);
 
 nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult);
 
@@ -33,7 +34,8 @@ public:
                                int32_t aType,
                                bool aVisual,
                                bool aLockInScrollView,
-                               bool aFollowOOFs) override;
+                               bool aFollowOOFs,
+                               bool aSkipPopupChecks) override;
 
 protected:
   virtual ~nsFrameTraversal();
diff --git a/layout/base/nsIFrameTraversal.h b/layout/base/nsIFrameTraversal.h
index 84ae12e03dfb..29e007138b26 100644
--- a/layout/base/nsIFrameTraversal.h
+++ b/layout/base/nsIFrameTraversal.h
@@ -34,9 +34,9 @@ enum nsIteratorType {
   ePostOrder
 };
 
-// {9d469828-9bf2-4151-a385-05f30219221b}
+// {d33fe76c-207c-4359-a315-8eb1eecf80e5}
 #define NS_IFRAMETRAVERSAL_IID \
-{ 0x9d469828, 0x9bf2, 0x4151, { 0xa3, 0x85, 0x05, 0xf3, 0x02, 0x19, 0x22, 0x1b } }
+{ 0xd33fe76c, 0x207c, 0x4359, { 0xa3, 0x15, 0x8e, 0xb1, 0xee, 0xcf, 0x80, 0xe5 } }
 
 class nsIFrameTraversal : public nsISupports
 {
@@ -57,6 +57,8 @@ public:
    *        If true, when reaching a placeholder frame while going down will get
    *        the real frame. Going back up will go on past the placeholder,
    *        so the placeholders are logically part of the frame tree.
+   * @param aSkipPopupChecks [in] if false, then don't iterate into or out of a
+   *        popup frame. If true, skip any popup related checks.
    */
   NS_IMETHOD NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
                                nsPresContext* aPresContext,
@@ -64,7 +66,8 @@ public:
                                int32_t aType,
                                bool aVisual,
                                bool aLockInScrollView,
-                               bool aFollowOOFs) = 0;
+                               bool aFollowOOFs,
+                               bool aSkipPopupChecks) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIFrameTraversal, NS_IFRAMETRAVERSAL_IID)
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 2ea9cfc64041..bf933176b91d 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -8067,8 +8067,8 @@ MaybeSetupTransactionIdAllocator(layers::LayerManager* aManager, nsView* aView)
   }
 }
 
-}
-}
+} // namespace layout
+} // namespace mozilla
 
 /* static */ bool
 nsLayoutUtils::IsOutlineStyleAutoEnabled()
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index 638a287d1226..45d04a13a908 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -80,8 +80,8 @@ struct RectCornerRadii;
 } // namespace gfx
 namespace layers {
 class Layer;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 namespace mozilla {
 
@@ -2825,8 +2825,8 @@ void StrokeLineWithSnapping(const nsPoint& aP1, const nsPoint& aP2,
 
     void MaybeSetupTransactionIdAllocator(layers::LayerManager* aManager, nsView* aView);
 
-  }
-}
+  } // namespace layout
+} // namespace mozilla
 
 class nsSetAttrRunnable : public nsRunnable
 {
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 3e3a1362cd1b..1237cd9736fc 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -123,7 +123,7 @@ private:
   nsCString mCharSet;
 };
 
-} // anonymous namespace
+} // namespace
 
 nscolor
 nsPresContext::MakeColorPref(const nsString& aColor)
@@ -1992,7 +1992,7 @@ nsPresContext::MediaFeatureValuesChanged(nsRestyleHint aRestyleHint,
     // Note that we intentionally send the notifications to media query
     // list in the order they were created and, for each list, to the
     // listeners in the order added.
-    MediaQueryList::NotifyList notifyList;
+    nsTArray<MediaQueryList::HandleChangeData> notifyList;
     for (PRCList *l = PR_LIST_HEAD(mDocument->MediaQueryLists());
          l != mDocument->MediaQueryLists(); l = PR_NEXT_LINK(l)) {
       MediaQueryList *mql = static_cast<MediaQueryList*>(l);
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 908e23e253dd..e05ff443521b 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -70,8 +70,8 @@ class CounterStyleManager;
 namespace layers {
 class ContainerLayer;
 class LayerManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 // supported values for cached bool types
 enum nsPresContext_CachedBoolPrefType {
diff --git a/layout/base/nsRefreshDriver.h b/layout/base/nsRefreshDriver.h
index c1a7e554d3ad..040c39b2d396 100644
--- a/layout/base/nsRefreshDriver.h
+++ b/layout/base/nsRefreshDriver.h
@@ -36,8 +36,8 @@ namespace mozilla {
 class RefreshDriverTimer;
 namespace layout {
 class VsyncChild;
-}
-}
+} // namespace layout
+} // namespace mozilla
 
 /**
  * An abstract base class to be implemented by callers wanting to be
diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h
index 2fef6f0b582e..6cc9503398a3 100644
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -40,8 +40,8 @@ class nsIScrollableFrame;
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 class nsComboboxControlFrame final : public nsBlockFrame,
                                      public nsIFormControlFrame,
diff --git a/layout/forms/nsNumberControlFrame.h b/layout/forms/nsNumberControlFrame.h
index c07b2ee9ddfb..458e0abe4b63 100644
--- a/layout/forms/nsNumberControlFrame.h
+++ b/layout/forms/nsNumberControlFrame.h
@@ -20,8 +20,8 @@ class WidgetEvent;
 class WidgetGUIEvent;
 namespace dom {
 class HTMLInputElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * This frame type is used for <input type=number>.
diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h
index 5f85b149c1ac..8b67c7ce28da 100644
--- a/layout/forms/nsTextControlFrame.h
+++ b/layout/forms/nsTextControlFrame.h
@@ -21,8 +21,8 @@ class nsIEditor;
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsTextControlFrame final : public nsContainerFrame,
                                  public nsIAnonymousContentCreator,
diff --git a/layout/generic/AsyncScrollBase.h b/layout/generic/AsyncScrollBase.h
index 3a930ad7355a..9a1725ba8882 100644
--- a/layout/generic/AsyncScrollBase.h
+++ b/layout/generic/AsyncScrollBase.h
@@ -87,6 +87,6 @@ protected:
   nsSMILKeySpline mTimingFunctionY;
 };
 
-}
+} // namespace mozilla
 
 #endif // mozilla_layout_AsyncScrollBase_h_
diff --git a/layout/generic/JustificationUtils.h b/layout/generic/JustificationUtils.h
index 7c0c9a0c6ddf..ddfbe86c17d4 100644
--- a/layout/generic/JustificationUtils.h
+++ b/layout/generic/JustificationUtils.h
@@ -139,6 +139,6 @@ public:
   }
 };
 
-}
+} // namespace mozilla
 
 #endif /* !defined(mozilla_JustificationUtils_h_) */
diff --git a/layout/generic/RubyUtils.h b/layout/generic/RubyUtils.h
index 0ad57368d55f..8d9feea064b3 100644
--- a/layout/generic/RubyUtils.h
+++ b/layout/generic/RubyUtils.h
@@ -151,6 +151,6 @@ private:
   bool mAtIntraLevelWhitespace;
 };
 
-}
+} // namespace mozilla
 
 #endif /* !defined(mozilla_RubyUtils_h_) */
diff --git a/layout/generic/ScrollVelocityQueue.cpp b/layout/generic/ScrollVelocityQueue.cpp
index a9d6d77d2ddb..820e6cb5cac3 100644
--- a/layout/generic/ScrollVelocityQueue.cpp
+++ b/layout/generic/ScrollVelocityQueue.cpp
@@ -6,6 +6,7 @@
 
 #include "ScrollVelocityQueue.h"
 
+#include "gfxPrefs.h"
 #include "nsPresContext.h"
 #include "nsRefreshDriver.h"
 
diff --git a/layout/generic/Selection.h b/layout/generic/Selection.h
index bb87533d46bf..62663c01fa75 100644
--- a/layout/generic/Selection.h
+++ b/layout/generic/Selection.h
@@ -28,7 +28,7 @@ struct SelectionDetails;
 namespace mozilla {
 class ErrorResult;
 struct AutoPrepareFocusRange;
-}
+} // namespace mozilla
 
 struct RangeData
 {
diff --git a/layout/generic/TextOverflow.cpp b/layout/generic/TextOverflow.cpp
index 2613e857bed1..6171c4b388f4 100644
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@@ -814,5 +814,5 @@ TextOverflow::Marker::SetupString(nsIFrame* aFrame)
   mInitialized = true;
 }
 
-}  // namespace css
-}  // namespace mozilla
+} // namespace css
+} // namespace mozilla
diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h
index d3fcf6c2b164..2911361f0f94 100644
--- a/layout/generic/nsContainerFrame.h
+++ b/layout/generic/nsContainerFrame.h
@@ -26,7 +26,7 @@
 class nsOverflowContinuationTracker;
 namespace mozilla {
 class FramePropertyTable;
-}
+} // namespace mozilla
 
 // Some macros for container classes to do sanity checking on
 // width/height/x/y values computed during reflow.
diff --git a/layout/generic/nsFlexContainerFrame.h b/layout/generic/nsFlexContainerFrame.h
index ce20f5387a33..df1d11418c85 100644
--- a/layout/generic/nsFlexContainerFrame.h
+++ b/layout/generic/nsFlexContainerFrame.h
@@ -15,7 +15,7 @@
 namespace mozilla {
 template <class T> class LinkedList;
 class LogicalPoint;
-}
+} // namespace mozilla
 
 nsContainerFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
                                            nsStyleContext* aContext);
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 8c7e74f11200..8838e47a5f9d 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -109,8 +109,8 @@ using namespace mozilla::layout;
 namespace mozilla {
 namespace gfx {
 class VRHMDInfo;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 // Struct containing cached metrics for box-wrapped frames.
 struct nsBoxLayoutMetrics
@@ -6220,7 +6220,8 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
                                     ePostOrder,
                                     false, // aVisual
                                     aPos->mScrollViewStop,
-                                    false     // aFollowOOFs
+                                    false, // aFollowOOFs
+                                    false  // aSkipPopupChecks
                                     );
       if (NS_FAILED(result))
         return result;
@@ -6320,7 +6321,8 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
                                       eLeaf,
                                       false, // aVisual
                                       aPos->mScrollViewStop,
-                                      false     // aFollowOOFs
+                                      false, // aFollowOOFs
+                                      false  // aSkipPopupChecks
                                       );
       }
       while ( !found ){
@@ -7108,7 +7110,8 @@ nsIFrame::GetFrameFromDirection(nsDirection aDirection, bool aVisual,
                                   eLeaf,
                                   aVisual && presContext->BidiEnabled(),
                                   aScrollViewStop,
-                                  true     // aFollowOOFs
+                                  true,  // aFollowOOFs
+                                  false  // aSkipPopupChecks
                                   );
     if (NS_FAILED(result))
       return result;
diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp
index 57d34f7301fb..ab41fb56f40e 100644
--- a/layout/generic/nsFrameList.cpp
+++ b/layout/generic/nsFrameList.cpp
@@ -17,9 +17,9 @@ namespace mozilla {
 namespace layout {
 namespace detail {
 const AlignedFrameListBytes gEmptyFrameListBytes = { 0 };
-}
-}
-}
+} // namespace detail
+} // namespace layout
+} // namespace mozilla
 
 void*
 nsFrameList::operator new(size_t sz, nsIPresShell* aPresShell) CPP_THROW_NEW
@@ -542,5 +542,5 @@ AutoFrameListPtr::~AutoFrameListPtr()
   }
 }
 
-}
-}
+} // namespace layout
+} // namespace mozilla
diff --git a/layout/generic/nsFrameList.h b/layout/generic/nsFrameList.h
index 7286cbd28c18..7084b677da65 100644
--- a/layout/generic/nsFrameList.h
+++ b/layout/generic/nsFrameList.h
@@ -45,8 +45,8 @@ namespace layout {
       // is normally done when manipulating child lists.
       kNoReflowPrincipalList        = 0x4000
   };
-}
-}
+} // namespace layout
+} // namespace mozilla
 
 // Uncomment this to enable expensive frame-list integrity checking
 // #define DEBUG_FRAME_LIST
@@ -559,9 +559,10 @@ union AlignedFrameListBytes {
   char bytes[sizeof(nsFrameList)];
 };
 extern const AlignedFrameListBytes gEmptyFrameListBytes;
-}
-}
-}
+} // namespace detail
+
+} // namespace layout
+} // namespace mozilla
 
 /* static */ inline const nsFrameList&
 nsFrameList::EmptyList()
diff --git a/layout/generic/nsFrameSelection.h b/layout/generic/nsFrameSelection.h
index 2b48a9ce7b0e..f7a80981adf2 100644
--- a/layout/generic/nsFrameSelection.h
+++ b/layout/generic/nsFrameSelection.h
@@ -167,8 +167,8 @@ struct nsPrevNextBidiLevels
 namespace mozilla {
 namespace dom {
 class Selection;
-}
-}
+} // namespace dom
+} // namespace mozilla
 class nsIScrollableFrame;
 
 /**
diff --git a/layout/generic/nsFrameState.h b/layout/generic/nsFrameState.h
index 99615f6382ec..73bdd60d2afc 100644
--- a/layout/generic/nsFrameState.h
+++ b/layout/generic/nsFrameState.h
@@ -100,6 +100,6 @@ namespace mozilla {
 nsCString GetFrameState(nsIFrame* aFrame);
 void PrintFrameState(nsIFrame* aFrame);
 #endif
-}
+} // namespace mozilla
 
 #endif /* nsFrameState_h_ */ 
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index fe71115c098d..47fb0a475bb0 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -34,11 +34,11 @@ struct ScrollReflowState;
 namespace mozilla {
 namespace layers {
 class Layer;
-}
+} // namespace layers
 namespace layout {
 class ScrollbarActivity;
-}
-}
+} // namespace layout
+} // namespace mozilla
 
 namespace mozilla {
 
@@ -559,7 +559,7 @@ protected:
   static int32_t sVertScrollFraction;
 };
 
-}
+} // namespace mozilla
 
 /**
  * The scroll frame creates and manages the scrolling view
diff --git a/layout/generic/nsHTMLCanvasFrame.h b/layout/generic/nsHTMLCanvasFrame.h
index 29ce7546f5f3..e3bbf731c372 100644
--- a/layout/generic/nsHTMLCanvasFrame.h
+++ b/layout/generic/nsHTMLCanvasFrame.h
@@ -16,8 +16,8 @@ namespace mozilla {
 namespace layers {
 class Layer;
 class LayerManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 class nsPresContext;
 class nsDisplayItem;
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 4e7a5fa2fade..fd1bcccea7a2 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -93,12 +93,12 @@ class EventStates;
 
 namespace layers {
 class Layer;
-}
+} // namespace layers
 
 namespace gfx {
 class Matrix;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 /**
  * Indication of how the frame can be split. This is used when doing runaround
@@ -364,7 +364,8 @@ struct IntrinsicSize {
     return !(*this == rhs);
   }
 };
-}
+
+} // namespace mozilla
 
 /// Generic destructor for frame properties. Calls delete.
 template<typename T>
diff --git a/layout/generic/nsIScrollableFrame.h b/layout/generic/nsIScrollableFrame.h
index 85385f3dd05f..035f8632c09f 100644
--- a/layout/generic/nsIScrollableFrame.h
+++ b/layout/generic/nsIScrollableFrame.h
@@ -35,7 +35,7 @@ struct ContainerLayerParameters;
 class DisplayItemClip;
 namespace layers {
 class Layer;
-}
+} // namespace layers
 
 struct FrameMetricsAndClip
 {
diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h
index 61cef21912e1..a3ce60f940f1 100644
--- a/layout/generic/nsImageFrame.h
+++ b/layout/generic/nsImageFrame.h
@@ -38,8 +38,8 @@ namespace layers {
   class ImageContainer;
   class ImageLayer;
   class LayerManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 class nsImageListener : public imgINotificationObserver
 {
diff --git a/layout/generic/nsPluginFrame.h b/layout/generic/nsPluginFrame.h
index ac99fa1ca544..611839ca7243 100644
--- a/layout/generic/nsPluginFrame.h
+++ b/layout/generic/nsPluginFrame.h
@@ -37,8 +37,8 @@ namespace layers {
 class ImageContainer;
 class Layer;
 class LayerManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 typedef nsFrame nsPluginFrameSuper;
 
diff --git a/layout/generic/nsRubyBaseContainerFrame.h b/layout/generic/nsRubyBaseContainerFrame.h
index 3b7b1af2ceaa..05ce113ea05f 100644
--- a/layout/generic/nsRubyBaseContainerFrame.h
+++ b/layout/generic/nsRubyBaseContainerFrame.h
@@ -20,7 +20,7 @@ nsContainerFrame* NS_NewRubyBaseContainerFrame(nsIPresShell* aPresShell,
 
 namespace mozilla {
 struct RubyColumn;
-}
+} // namespace mozilla
 
 class nsRubyBaseContainerFrame final : public nsContainerFrame
 {
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index c3730ae79cf1..b767e5b308a4 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -425,7 +425,8 @@ struct MOZ_STACK_CLASS AutoPrepareFocusRange
   Maybe<Selection::AutoApplyUserSelectStyle> mUserSelect;
   MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
-}
+
+} // namespace mozilla
 
 ////////////BEGIN nsFrameSelection methods
 
@@ -1327,7 +1328,8 @@ nsFrameSelection::GetFrameFromLevel(nsIFrame    *aFrameIn,
                                    eLeaf,
                                    false, // aVisual
                                    false, // aLockInScrollView
-                                   false     // aFollowOOFs
+                                   false, // aFollowOOFs
+                                   false  // aSkipPopupChecks
                                    );
   if (NS_FAILED(result))
     return result;
diff --git a/layout/generic/nsSimplePageSequenceFrame.h b/layout/generic/nsSimplePageSequenceFrame.h
index 8e68b4939698..46afc7bffd1f 100644
--- a/layout/generic/nsSimplePageSequenceFrame.h
+++ b/layout/generic/nsSimplePageSequenceFrame.h
@@ -18,8 +18,8 @@ namespace dom {
 
 class HTMLCanvasElement;
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //-----------------------------------------------
 // This class maintains all the data that 
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 92839bd77963..78ef2c2daa53 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -10,6 +10,8 @@
 
 #include "nsSubDocumentFrame.h"
 
+#include "gfxPrefs.h"
+
 #include "mozilla/layout/RenderFrameParent.h"
 
 #include "nsCOMPtr.h"
diff --git a/layout/generic/nsVideoFrame.h b/layout/generic/nsVideoFrame.h
index bd8d5f6b7cfd..9c5a9973c3ff 100644
--- a/layout/generic/nsVideoFrame.h
+++ b/layout/generic/nsVideoFrame.h
@@ -19,8 +19,8 @@ namespace mozilla {
 namespace layers {
 class Layer;
 class LayerManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 class nsAString;
 class nsPresContext;
diff --git a/layout/inspector/inLayoutUtils.h b/layout/inspector/inLayoutUtils.h
index e427b2500319..e86e7d71c793 100644
--- a/layout/inspector/inLayoutUtils.h
+++ b/layout/inspector/inLayoutUtils.h
@@ -13,7 +13,7 @@ class nsIDOMNode;
 
 namespace mozilla {
 class EventStateManager;
-}
+} // namespace mozilla
 
 class inLayoutUtils
 {
diff --git a/layout/ipc/RenderFrameChild.cpp b/layout/ipc/RenderFrameChild.cpp
index 2c1d62b1455e..72225abc0908 100644
--- a/layout/ipc/RenderFrameChild.cpp
+++ b/layout/ipc/RenderFrameChild.cpp
@@ -31,5 +31,5 @@ RenderFrameChild::Destroy()
   // WARNING: |this| is dead, hands off
 }
 
-}  // namespace layout
-}  // namespace mozilla
+} // namespace layout
+} // namespace mozilla
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index 0c24a80048b0..bdd60c40aa68 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -616,8 +616,8 @@ RenderFrameParent::TakeFocusForClick()
                         nsIFocusManager::FLAG_NOSCROLL);
 }
 
-}  // namespace layout
-}  // namespace mozilla
+} // namespace layout
+} // namespace mozilla
 
 nsDisplayRemote::nsDisplayRemote(nsDisplayListBuilder* aBuilder,
                                  nsSubDocumentFrame* aFrame,
diff --git a/layout/ipc/RenderFrameParent.h b/layout/ipc/RenderFrameParent.h
index 38ec401432ce..6b32138c7792 100644
--- a/layout/ipc/RenderFrameParent.h
+++ b/layout/ipc/RenderFrameParent.h
@@ -28,7 +28,7 @@ class APZCTreeManager;
 class TargetConfig;
 struct TextureFactoryIdentifier;
 struct ScrollableLayerGuid;
-}
+} // namespace layers
 
 namespace layout {
 
diff --git a/layout/ipc/VsyncChild.h b/layout/ipc/VsyncChild.h
index de41db730126..aec9967340b0 100644
--- a/layout/ipc/VsyncChild.h
+++ b/layout/ipc/VsyncChild.h
@@ -16,7 +16,7 @@ class VsyncObserver;
 
 namespace ipc {
 class BackgroundChildImpl;
-}
+} // namespace ipc
 
 namespace layout {
 
@@ -54,6 +54,6 @@ private:
 };
 
 } // namespace layout
-} // namespatce mozilla
+} // namespace mozilla
 
 #endif  // mozilla_layout_ipc_VsyncChild_h
diff --git a/layout/ipc/VsyncParent.h b/layout/ipc/VsyncParent.h
index b0a3691cdca1..c6110e821281 100644
--- a/layout/ipc/VsyncParent.h
+++ b/layout/ipc/VsyncParent.h
@@ -17,7 +17,7 @@ namespace mozilla {
 
 namespace ipc {
 class BackgroundParentImpl;
-}
+} // namespace ipc
 
 namespace layout {
 
@@ -49,7 +49,7 @@ private:
   nsRefPtr<RefreshTimerVsyncDispatcher> mVsyncDispatcher;
 };
 
-} //layout
-} //mozilla
+} // namespace layout
+} // namespace mozilla
 
 #endif  //mozilla_layout_ipc_VsyncParent_h
diff --git a/layout/printing/nsPrintPreviewListener.h b/layout/printing/nsPrintPreviewListener.h
index 4d7a7c95ead6..dddb1bed5aeb 100644
--- a/layout/printing/nsPrintPreviewListener.h
+++ b/layout/printing/nsPrintPreviewListener.h
@@ -16,8 +16,8 @@
 namespace mozilla {
 namespace dom {
 class EventTarget;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 //
 // class nsPrintPreviewListener
diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 40a1c196491d..be6ee13fd65c 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -144,7 +144,7 @@ skip-if(B2G||Mulet) == 726420-1.html 726420-1-ref.html # Initial mulet triage: p
 == 817406-3.html 817406-1-ref.html
 == 817406-4.html 817406-4-ref.html
 == 847242-1.html 847242-1-ref.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 869833-1.xul 869833-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
+skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == 869833-1.xul 869833-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
 == 922530-1.html 922530-1-ref.html
 == 922550-1.html 922550-1-ref.html
 == 1067268-1.html 1067268-1-ref.html
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 2fc1c07b0308..d52eeda06a9a 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1481,7 +1481,7 @@ needs-focus != 542116-1.html 542116-1-ref.html
 needs-focus != 542116-2.html 542116-2-ref.html
 needs-focus != 542116-3.html 542116-3-ref.html
 == 542317-1.html 542317-1-ref.html
-fuzzy-if(Android,17,2) skip-if((B2G&&browserIsRemote)||Mulet) == 542605-hidden-unscrollable.xul 542605-hidden-unscrollable-ref.xul # bug 974780 # Initial mulet triage: parity with B2G/B2G Desktop
+fuzzy-if(Android,17,2) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,230) skip-if((B2G&&browserIsRemote)||Mulet) == 542605-hidden-unscrollable.xul 542605-hidden-unscrollable-ref.xul # bug 974780 # Initial mulet triage: parity with B2G/B2G Desktop
 == 542620-1.html 542620-1-ref.html
 == 545049-1.html 545049-1-ref.html
 == 546033-1.html 546033-1-ref.html
diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list
index c28c0945e5f9..4ae7376bf540 100644
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -1,5 +1,5 @@
 skip-if((B2G&&browserIsRemote)||Mulet) HTTP == deferred-anchor.xhtml#d deferred-anchor-ref.xhtml#d # Initial mulet triage: parity with B2G/B2G Desktop
-== deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d
+fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,23) == deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d # bug 1182632
 HTTP == fixed-1.html fixed-1.html?ref
 HTTP == fixed-table-1.html fixed-table-1.html?ref
 HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list
index 505e1cf563f2..2d471c0deff5 100644
--- a/layout/reftests/xul/reftest.list
+++ b/layout/reftests/xul/reftest.list
@@ -5,7 +5,7 @@ random-if(Android||B2G) fails-if(winWidget) skip-if((B2G&&browserIsRemote)||Mule
 skip-if((B2G&&browserIsRemote)||Mulet) == textbox-overflow-1.xul textbox-overflow-1-ref.xul # for bug 749658 # Initial mulet triage: parity with B2G/B2G Desktop
 # accesskeys are not normally displayed on Mac, so skip this test
 skip-if(cocoaWidget) skip-if((B2G&&browserIsRemote)||Mulet) == accesskey.xul accesskey-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(cocoaWidget) skip-if((B2G&&browserIsRemote)||Mulet) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
+fails-if(cocoaWidget) skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if((B2G&&browserIsRemote)||Mulet) != tree-row-outline-1.xul tree-row-outline-1-notref.xul # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if((B2G&&browserIsRemote)||Mulet) == text-small-caps-1.xul text-small-caps-1-ref.xul # Initial mulet triage: parity with B2G/B2G Desktop
 
diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp
index 0f2ddb73a68a..278958f61272 100644
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@@ -529,7 +529,7 @@ AnimValuesStyleRule::List(FILE* out, int32_t aIndent) const
 }
 #endif
 
-} /* end sub-namespace css */
+} // namespace css
 
 bool
 AnimationCollection::CanAnimatePropertyOnCompositor(
@@ -972,4 +972,4 @@ AnimationCollection::HasCurrentAnimationsForProperties(
   return false;
 }
 
-}
+} // namespace mozilla
diff --git a/layout/style/AnimationCommon.h b/layout/style/AnimationCommon.h
index d74be6e0c4e1..700ba4b04cb2 100644
--- a/layout/style/AnimationCommon.h
+++ b/layout/style/AnimationCommon.h
@@ -236,7 +236,7 @@ private:
   InfallibleTArray<PropertyValuePair> mPropertyValuePairs;
 };
 
-} /* end css sub-namespace */
+} // namespace css
 
 typedef InfallibleTArray<nsRefPtr<dom::Animation>> AnimationPtrArray;
 
diff --git a/layout/style/CSS.cpp b/layout/style/CSS.cpp
index 7f7f144d5149..a0ec3a2f04d5 100644
--- a/layout/style/CSS.cpp
+++ b/layout/style/CSS.cpp
@@ -95,5 +95,5 @@ CSS::Escape(const GlobalObject& aGlobal,
   }
 }
 
-} // dom
-} // mozilla
+} // namespace dom
+} // namespace mozilla
diff --git a/layout/style/CSSCalc.h b/layout/style/CSSCalc.h
index 9b71c05bb488..141ca9c0ab8f 100644
--- a/layout/style/CSSCalc.h
+++ b/layout/style/CSSCalc.h
@@ -354,8 +354,8 @@ SerializeCalcInternal(const typename CalcOps::input_type& aValue, CalcOps &aOps)
   }
 }
 
-}
+} // namespace css
 
-}
+} // namespace mozilla
 
 #endif /* !defined(CSSCalc_h_) */
diff --git a/layout/style/CSSStyleSheet.h b/layout/style/CSSStyleSheet.h
index 243cce05c7fc..45a2f4710abf 100644
--- a/layout/style/CSSStyleSheet.h
+++ b/layout/style/CSSStyleSheet.h
@@ -44,10 +44,10 @@ namespace css {
 class Rule;
 class GroupRule;
 class ImportRule;
-}
+} // namespace css
 namespace dom {
 class CSSRuleList;
-}
+} // namespace dom
 
 // -------------------------------
 // CSS Style Sheet Inner Data Container
diff --git a/layout/style/CSSValue.h b/layout/style/CSSValue.h
index 452a2b7b4af3..ecba05e847d1 100644
--- a/layout/style/CSSValue.h
+++ b/layout/style/CSSValue.h
@@ -15,7 +15,7 @@
 class nsROCSSPrimitiveValue;
 namespace mozilla {
 class ErrorResult;
-}
+} // namespace mozilla
 
 namespace mozilla {
 namespace dom {
@@ -41,7 +41,7 @@ public:
   nsROCSSPrimitiveValue *AsPrimitiveValue();
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/layout/style/CSSVariableDeclarations.h b/layout/style/CSSVariableDeclarations.h
index 8e081ad70297..d4dd7a6f6a66 100644
--- a/layout/style/CSSVariableDeclarations.h
+++ b/layout/style/CSSVariableDeclarations.h
@@ -12,7 +12,7 @@
 
 namespace mozilla {
 class CSSVariableResolver;
-}
+} // namespace mozilla
 struct nsRuleData;
 
 namespace mozilla {
diff --git a/layout/style/CSSVariableResolver.cpp b/layout/style/CSSVariableResolver.cpp
index 421355b842d2..a79e2b29a65c 100644
--- a/layout/style/CSSVariableResolver.cpp
+++ b/layout/style/CSSVariableResolver.cpp
@@ -262,4 +262,4 @@ CSSVariableResolver::Put(const nsAString& aVariableName,
   }
 }
 
-}
+} // namespace mozilla
diff --git a/layout/style/CSSVariableResolver.h b/layout/style/CSSVariableResolver.h
index 01de94f6fc71..ed21db47de23 100644
--- a/layout/style/CSSVariableResolver.h
+++ b/layout/style/CSSVariableResolver.h
@@ -143,6 +143,6 @@ private:
 #endif
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index 6522b99dd28e..3cf0be6b891e 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -1534,5 +1534,5 @@ Declaration::GetVariableValueIsImportant(const nsAString& aName) const
   return mImportantVariables && mImportantVariables->Has(aName);
 }
 
-} // namespace mozilla::css
+} // namespace css
 } // namespace mozilla
diff --git a/layout/style/ErrorReporter.cpp b/layout/style/ErrorReporter.cpp
index 81d0b0740c26..1d3a879df10a 100644
--- a/layout/style/ErrorReporter.cpp
+++ b/layout/style/ErrorReporter.cpp
@@ -58,7 +58,8 @@ private:
   nsString mSpec;
   bool mPending;
 };
-}
+
+} // namespace
 
 static bool sReportErrors;
 static nsIConsoleService *sConsoleService;
diff --git a/layout/style/FontFace.h b/layout/style/FontFace.h
index 7d4c667fafff..0ecb5559bc20 100644
--- a/layout/style/FontFace.h
+++ b/layout/style/FontFace.h
@@ -23,8 +23,8 @@ struct FontFaceDescriptors;
 class FontFaceSet;
 class Promise;
 class StringOrArrayBufferOrArrayBufferView;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 namespace mozilla {
 namespace dom {
diff --git a/layout/style/FontFaceSet.h b/layout/style/FontFaceSet.h
index af03a3a942d2..a3a67e7c3825 100644
--- a/layout/style/FontFaceSet.h
+++ b/layout/style/FontFaceSet.h
@@ -23,12 +23,12 @@ class nsPIDOMWindow;
 namespace mozilla {
 namespace css {
 class FontFamilyListRefCnt;
-}
+} // namespace css
 namespace dom {
 class FontFace;
 class Promise;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 namespace mozilla {
 namespace dom {
diff --git a/layout/style/Loader.h b/layout/style/Loader.h
index 39a17f271061..5cd4f8d6d8d2 100644
--- a/layout/style/Loader.h
+++ b/layout/style/Loader.h
@@ -33,8 +33,8 @@ namespace mozilla {
 class CSSStyleSheet;
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 namespace mozilla {
 
diff --git a/layout/style/MediaQueryList.cpp b/layout/style/MediaQueryList.cpp
index 0020ac5cc3df..069e049c462d 100644
--- a/layout/style/MediaQueryList.cpp
+++ b/layout/style/MediaQueryList.cpp
@@ -103,10 +103,11 @@ MediaQueryList::AddListener(MediaQueryListListener& aListener)
     }
   }
 
-  mCallbacks.AppendElement(&aListener, fallible);
-  if (!HasListeners()) {
-    // Append failed; undo the AddRef above.
-    NS_RELEASE_THIS();
+  if (!mCallbacks.AppendElement(&aListener, fallible)) {
+    if (!HasListeners()) {
+      // Append failed; undo the AddRef above.
+      NS_RELEASE_THIS();
+    }
   }
 }
 
@@ -170,7 +171,8 @@ MediaQueryList::RecomputeMatches()
 }
 
 void
-MediaQueryList::MediumFeaturesChanged(NotifyList &aListenersToNotify)
+MediaQueryList::MediumFeaturesChanged(
+    nsTArray<HandleChangeData>& aListenersToNotify)
 {
   mMatchesValid = false;
 
diff --git a/layout/style/MediaQueryList.h b/layout/style/MediaQueryList.h
index 144696be3389..e0587a0a5b08 100644
--- a/layout/style/MediaQueryList.h
+++ b/layout/style/MediaQueryList.h
@@ -48,11 +48,8 @@ public:
     nsRefPtr<mozilla::dom::MediaQueryListListener> callback;
   };
 
-  typedef FallibleTArray< nsRefPtr<mozilla::dom::MediaQueryListListener> > CallbackList;
-  typedef FallibleTArray<HandleChangeData> NotifyList;
-
   // Appends listeners that need notification to aListenersToNotify
-  void MediumFeaturesChanged(NotifyList &aListenersToNotify);
+  void MediumFeaturesChanged(nsTArray<HandleChangeData>& aListenersToNotify);
 
   bool HasListeners() const { return !mCallbacks.IsEmpty(); }
 
@@ -88,7 +85,7 @@ private:
   nsRefPtr<nsMediaList> mMediaList;
   bool mMatches;
   bool mMatchesValid;
-  CallbackList mCallbacks;
+  nsTArray<nsRefPtr<mozilla::dom::MediaQueryListListener>> mCallbacks;
 };
 
 } // namespace dom
diff --git a/layout/style/RuleProcessorCache.h b/layout/style/RuleProcessorCache.h
index 2ec9058b1b9f..42a0d7fa9457 100644
--- a/layout/style/RuleProcessorCache.h
+++ b/layout/style/RuleProcessorCache.h
@@ -24,8 +24,8 @@ namespace mozilla {
 class CSSStyleSheet;
 namespace css {
 class DocumentRule;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 namespace mozilla {
 
diff --git a/layout/style/SVGAttrAnimationRuleProcessor.h b/layout/style/SVGAttrAnimationRuleProcessor.h
index 149d892c9c0f..7a3fb6514486 100644
--- a/layout/style/SVGAttrAnimationRuleProcessor.h
+++ b/layout/style/SVGAttrAnimationRuleProcessor.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace dom {
 class Element;
-}
+} // namespace dom
 
 class SVGAttrAnimationRuleProcessor final : public nsIStyleRuleProcessor
 {
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 09f77a7799ca..434b389c4037 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -996,8 +996,8 @@ ImportantRule::List(FILE* out, int32_t aIndent) const
 namespace mozilla {
 namespace css {
 class DOMCSSStyleRule;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 class DOMCSSDeclarationImpl : public nsDOMCSSDeclaration
 {
diff --git a/layout/style/nsCSSDataBlock.h b/layout/style/nsCSSDataBlock.h
index bea69897677c..fcc562f968a6 100644
--- a/layout/style/nsCSSDataBlock.h
+++ b/layout/style/nsCSSDataBlock.h
@@ -23,8 +23,8 @@ class nsCSSExpandedDataBlock;
 namespace mozilla {
 namespace css {
 class Declaration;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 /**
  * An |nsCSSCompressedDataBlock| holds a usually-immutable chunk of
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 3d27bea26f38..c34931862fd6 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -15476,7 +15476,7 @@ CSSParserImpl::IsValueValidForProperty(const nsCSSProperty aPropID,
   return parsedOK;
 }
 
-} // anonymous namespace
+} // namespace
 
 // Recycling of parser implementation objects
 
diff --git a/layout/style/nsCSSParser.h b/layout/style/nsCSSParser.h
index cc113033d199..8be66ed8f5c8 100644
--- a/layout/style/nsCSSParser.h
+++ b/layout/style/nsCSSParser.h
@@ -34,8 +34,8 @@ class Rule;
 class Declaration;
 class Loader;
 class StyleRule;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 // Interface to the css parser.
 
diff --git a/layout/style/nsCSSScanner.h b/layout/style/nsCSSScanner.h
index 2243009294cd..8c09acf1fe86 100644
--- a/layout/style/nsCSSScanner.h
+++ b/layout/style/nsCSSScanner.h
@@ -13,8 +13,8 @@
 namespace mozilla {
 namespace css {
 class ErrorReporter;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 // Token types; in close but not perfect correspondence to the token
 // categorization in section 4.1.1 of CSS2.1.  (The deviations are all
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
index 4ddeadef23e5..a0e5ac00315f 100644
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -828,7 +828,7 @@ private:
   nsCSSValue::Serialization mValueSerialization;
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 nsCSSValue::AppendPolygonToString(nsCSSProperty aProperty, nsAString& aResult,
diff --git a/layout/style/nsCSSValue.h b/layout/style/nsCSSValue.h
index 49ed46c5f331..01b620e8cb08 100644
--- a/layout/style/nsCSSValue.h
+++ b/layout/style/nsCSSValue.h
@@ -236,8 +236,8 @@ private:
     }
 };
 
-}
-}
+} // namespace css
+} // namespace mozilla
 
 enum nsCSSUnit {
   eCSSUnit_Null         = 0,      // (n/a) null unit, value is not specified
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 4a84e57ae8a1..53429256876e 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -24,8 +24,8 @@
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 struct nsComputedStyleMap;
 class nsIFrame;
diff --git a/layout/style/nsDOMCSSAttrDeclaration.h b/layout/style/nsDOMCSSAttrDeclaration.h
index 681751843b9b..7efbbea090d7 100644
--- a/layout/style/nsDOMCSSAttrDeclaration.h
+++ b/layout/style/nsDOMCSSAttrDeclaration.h
@@ -16,8 +16,8 @@
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsDOMCSSAttributeDeclaration final : public nsDOMCSSDeclaration
 {
diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h
index 079842a9ddcd..b61f6af641c6 100644
--- a/layout/style/nsDOMCSSDeclaration.h
+++ b/layout/style/nsDOMCSSDeclaration.h
@@ -24,8 +24,8 @@ namespace css {
 class Declaration;
 class Loader;
 class Rule;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 class nsDOMCSSDeclaration : public nsICSSDeclaration
 {
diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index 85b625dca71b..d70fdc00e7a9 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -37,7 +37,7 @@ ClearAttrCache(const nsAString& aKey, MiscContainer*& aValue, void*)
   return PL_DHASH_REMOVE;
 }
 
-} // anonymous namespace
+} // namespace
 
 nsHTMLCSSStyleSheet::nsHTMLCSSStyleSheet()
 {
diff --git a/layout/style/nsHTMLCSSStyleSheet.h b/layout/style/nsHTMLCSSStyleSheet.h
index ab0715cc9d4e..f1ecf2fe4287 100644
--- a/layout/style/nsHTMLCSSStyleSheet.h
+++ b/layout/style/nsHTMLCSSStyleSheet.h
@@ -22,8 +22,8 @@ struct MiscContainer;
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsHTMLCSSStyleSheet final : public nsIStyleRuleProcessor
 {
diff --git a/layout/style/nsLayoutStylesheetCache.h b/layout/style/nsLayoutStylesheetCache.h
index 15c55939db52..0802c3c77978 100644
--- a/layout/style/nsLayoutStylesheetCache.h
+++ b/layout/style/nsLayoutStylesheetCache.h
@@ -21,8 +21,8 @@ namespace mozilla {
 class CSSStyleSheet;
 namespace css {
 class Loader;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 class nsLayoutStylesheetCache final
  : public nsIObserver
diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
index 2b7394e87f60..dfe8aa519e61 100644
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -17,8 +17,8 @@
 namespace mozilla {
 namespace css {
 typedef mozilla::Side Side;
-}
-}
+} // namespace css
+} // namespace mozilla
 
 #define NS_FOR_CSS_SIDES(var_) for (mozilla::css::Side var_ = NS_SIDE_TOP; var_ <= NS_SIDE_LEFT; var_++)
 static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
diff --git a/layout/style/nsStyleCoord.h b/layout/style/nsStyleCoord.h
index 5b646798a1a3..ea8975885fe5 100644
--- a/layout/style/nsStyleCoord.h
+++ b/layout/style/nsStyleCoord.h
@@ -12,6 +12,7 @@
 #include "nsStyleConsts.h"
 
 namespace mozilla {
+
 class WritingMode;
 
 // Logical axis, edge and side constants for use in various places.
@@ -29,7 +30,8 @@ enum LogicalSide {
   eLogicalSideIStart = (eLogicalAxisInline << 1) | eLogicalEdgeStart,  // 0x2
   eLogicalSideIEnd   = (eLogicalAxisInline << 1) | eLogicalEdgeEnd     // 0x3
 };
-};
+
+} // namespace mozilla
 
 enum nsStyleUnit : uint8_t {
   eStyleUnit_Null         = 0,      // (no value) value is not specified
diff --git a/layout/style/nsStyleTransformMatrix.h b/layout/style/nsStyleTransformMatrix.h
index 8b27cb061f9e..013e4f1912fe 100644
--- a/layout/style/nsStyleTransformMatrix.h
+++ b/layout/style/nsStyleTransformMatrix.h
@@ -19,7 +19,7 @@ class nsPresContext;
 struct nsRect;
 namespace mozilla {
 class RuleNodeCacheConditions;
-}
+} // namespace mozilla
 
 /**
  * A helper to generate gfxMatrixes from css transform functions.
diff --git a/layout/style/nsTransitionManager.h b/layout/style/nsTransitionManager.h
index 603fc047a38e..5381d24beda8 100644
--- a/layout/style/nsTransitionManager.h
+++ b/layout/style/nsTransitionManager.h
@@ -22,7 +22,7 @@ class nsCSSPropertySet;
 
 namespace mozilla {
 struct StyleTransition;
-}
+} // namespace mozilla
 
 /*****************************************************************************
  * Per-Element data                                                          *
diff --git a/layout/svg/SVGTextFrame.h b/layout/svg/SVGTextFrame.h
index c35ea3e4f9b0..3b36b6158a24 100644
--- a/layout/svg/SVGTextFrame.h
+++ b/layout/svg/SVGTextFrame.h
@@ -35,7 +35,7 @@ class TextRenderedRunIterator;
 namespace dom {
 class SVGIRect;
 class SVGPathElement;
-}
+} // namespace dom
 
 /**
  * Information about the positioning for a single character in an SVG <text>
diff --git a/layout/svg/nsFilterInstance.h b/layout/svg/nsFilterInstance.h
index d895349b15c1..5c3780e4e63f 100644
--- a/layout/svg/nsFilterInstance.h
+++ b/layout/svg/nsFilterInstance.h
@@ -28,8 +28,8 @@ class nsSVGFilterPaintCallback;
 namespace mozilla {
 namespace dom {
 class UserSpaceMetrics;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * This class performs all filter processing.
diff --git a/layout/svg/nsISVGChildFrame.h b/layout/svg/nsISVGChildFrame.h
index 6908e3af9644..9451f94a386c 100644
--- a/layout/svg/nsISVGChildFrame.h
+++ b/layout/svg/nsISVGChildFrame.h
@@ -25,8 +25,8 @@ class SVGUserUnitList;
 
 namespace gfx {
 class Matrix;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 /**
  * This class is not particularly well named. It is inherited by some, but
diff --git a/layout/svg/nsSVGFilterFrame.h b/layout/svg/nsSVGFilterFrame.h
index 772c0f2a0dd5..b0e334d46636 100644
--- a/layout/svg/nsSVGFilterFrame.h
+++ b/layout/svg/nsSVGFilterFrame.h
@@ -24,8 +24,8 @@ struct nsRect;
 namespace mozilla {
 namespace dom {
 class SVGFilterElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 typedef nsSVGContainerFrame nsSVGFilterFrameBase;
 
diff --git a/layout/svg/nsSVGFilterInstance.h b/layout/svg/nsSVGFilterInstance.h
index 3bbdbc0a68b1..ab37e784057c 100644
--- a/layout/svg/nsSVGFilterInstance.h
+++ b/layout/svg/nsSVGFilterInstance.h
@@ -19,8 +19,8 @@ struct nsStyleFilter;
 namespace mozilla {
 namespace dom {
 class SVGFilterElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
  * This class helps nsFilterInstance build its filter graph by processing a
diff --git a/layout/svg/nsSVGIntegrationUtils.h b/layout/svg/nsSVGIntegrationUtils.h
index 43a746f499e3..2554e6e69d42 100644
--- a/layout/svg/nsSVGIntegrationUtils.h
+++ b/layout/svg/nsSVGIntegrationUtils.h
@@ -23,11 +23,11 @@ struct nsRect;
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
+} // namespace gfx
 namespace layers {
 class LayerManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 struct nsPoint;
 struct nsSize;
diff --git a/layout/svg/nsSVGMarkerFrame.h b/layout/svg/nsSVGMarkerFrame.h
index beb35ca46e10..0e31c37140eb 100644
--- a/layout/svg/nsSVGMarkerFrame.h
+++ b/layout/svg/nsSVGMarkerFrame.h
@@ -21,8 +21,8 @@ class nsSVGPathGeometryFrame;
 namespace mozilla {
 namespace dom {
 class SVGSVGElement;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 struct nsSVGMark;
 
diff --git a/layout/svg/nsSVGPaintServerFrame.h b/layout/svg/nsSVGPaintServerFrame.h
index 7a63c85b6cf1..bf0006b3bcce 100644
--- a/layout/svg/nsSVGPaintServerFrame.h
+++ b/layout/svg/nsSVGPaintServerFrame.h
@@ -17,8 +17,8 @@
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 class gfxContext;
 class gfxPattern;
diff --git a/layout/svg/nsSVGPathGeometryFrame.h b/layout/svg/nsSVGPathGeometryFrame.h
index c478153b69a9..ac895db9c3ab 100644
--- a/layout/svg/nsSVGPathGeometryFrame.h
+++ b/layout/svg/nsSVGPathGeometryFrame.h
@@ -18,8 +18,8 @@
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 class gfxContext;
 class nsDisplaySVGPathGeometry;
diff --git a/layout/svg/nsSVGUtils.h b/layout/svg/nsSVGUtils.h
index 9ffbd5768cf9..177b3efd54c7 100644
--- a/layout/svg/nsSVGUtils.h
+++ b/layout/svg/nsSVGUtils.h
@@ -56,7 +56,7 @@ class UserSpaceMetrics;
 namespace gfx {
 class DrawTarget;
 class GeneralPattern;
-}
+} // namespace gfx
 } // namespace mozilla
 
 // maximum dimension of an offscreen surface - choose so that
diff --git a/layout/tables/TableArea.h b/layout/tables/TableArea.h
index 05e9420f64c2..a94eea6e6c6b 100644
--- a/layout/tables/TableArea.h
+++ b/layout/tables/TableArea.h
@@ -36,6 +36,6 @@ private:
   nsIntRect mRect;
 };
 
-}
+} // namespace mozilla
 
 #endif // mozilla_TableArea_h_
diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h
index ee5d1ac30272..8087f9e322df 100644
--- a/layout/tables/nsTableFrame.h
+++ b/layout/tables/nsTableFrame.h
@@ -28,7 +28,7 @@ class nsStyleContext;
 namespace mozilla {
 class WritingMode;
 class LogicalMargin;
-}
+} // namespace mozilla
 
 struct nsTableReflowState;
 struct BCPropertyData;
diff --git a/layout/xul/BoxObject.h b/layout/xul/BoxObject.h
index 39511e47a2da..ac3df420b6cf 100644
--- a/layout/xul/BoxObject.h
+++ b/layout/xul/BoxObject.h
@@ -85,7 +85,7 @@ protected:
   nsIContent* mContent; // [WEAK]
 };
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 #endif
diff --git a/layout/xul/ListBoxObject.cpp b/layout/xul/ListBoxObject.cpp
index d13c975d2153..435065f5b261 100644
--- a/layout/xul/ListBoxObject.cpp
+++ b/layout/xul/ListBoxObject.cpp
@@ -225,8 +225,8 @@ ListBoxObject::ClearCachedValues()
   mListBoxBody = nullptr;
 }
 
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 // Creation Routine ///////////////////////////////////////////////////////////////////////
 
diff --git a/layout/xul/nsBoxFrame.h b/layout/xul/nsBoxFrame.h
index dc47415173fc..5e67092c3f64 100644
--- a/layout/xul/nsBoxFrame.h
+++ b/layout/xul/nsBoxFrame.h
@@ -24,8 +24,8 @@ class nsBoxLayoutState;
 namespace mozilla {
 namespace gfx {
 class DrawTarget;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 nsIFrame* NS_NewBoxFrame(nsIPresShell* aPresShell,
                          nsStyleContext* aContext,
diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp
index 14e8790ff51f..63d8fed4cb93 100644
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -188,17 +188,26 @@ nsXULPopupManager::Rollup(uint32_t aCount, bool aFlush,
   nsMenuChainItem* item = GetTopVisibleMenu();
   if (item) {
     if (aLastRolledUp) {
-      // we need to get the popup that will be closed last, so that
-      // widget can keep track of it so it doesn't reopen if a mouse
-      // down event is going to processed.
-      // Keep going up the menu chain to get the first level menu. This will
-      // be the one that closes up last. It's possible that this menu doesn't
-      // end up closing because the popuphiding event was cancelled, but in
-      // that case we don't need to deal with the menu reopening as it will
-      // already still be open.
+      // We need to get the popup that will be closed last, so that widget can
+      // keep track of it so it doesn't reopen if a mousedown event is going to
+      // processed. Keep going up the menu chain to get the first level menu of
+      // the same type. If a different type is encountered it means we have,
+      // for example, a menulist or context menu inside a panel, and we want to
+      // treat these as distinct. It's possible that this menu doesn't end up
+      // closing because the popuphiding event was cancelled, but in that case
+      // we don't need to deal with the menu reopening as it will already still
+      // be open.
       nsMenuChainItem* first = item;
-      while (first->GetParent())
-        first = first->GetParent();
+      while (first->GetParent()) {
+        nsMenuChainItem* parent = first->GetParent();
+        if (first->Frame()->PopupType() != parent->Frame()->PopupType() ||
+            first->IsContextMenu() != parent->IsContextMenu()) {
+          break;
+        }
+        first = parent;
+      }
+
+
       *aLastRolledUp = first->Content();
     }
 
diff --git a/layout/xul/tree/nsTreeBodyFrame.h b/layout/xul/tree/nsTreeBodyFrame.h
index ef00186129dd..c38e23fd3f4d 100644
--- a/layout/xul/tree/nsTreeBodyFrame.h
+++ b/layout/xul/tree/nsTreeBodyFrame.h
@@ -32,8 +32,8 @@ class nsTreeImageListener;
 namespace mozilla {
 namespace layout {
 class ScrollbarActivity;
-}
-}
+} // namespace layout
+} // namespace mozilla
 
 // An entry in the tree's image cache
 struct nsTreeImageCacheEntry
diff --git a/media/gmp-clearkey/0.1/Endian.h b/media/gmp-clearkey/0.1/Endian.h
index 91b7174d498a..921dd49d6f52 100644
--- a/media/gmp-clearkey/0.1/Endian.h
+++ b/media/gmp-clearkey/0.1/Endian.h
@@ -63,6 +63,6 @@ public:
   }
 };
 
-}
+} // namespace mozilla
 
 #endif // __Endian_h__
diff --git a/media/mtransport/simpletokenbucket.h b/media/mtransport/simpletokenbucket.h
index 8e7a7800c394..ee94825cbf99 100644
--- a/media/mtransport/simpletokenbucket.h
+++ b/media/mtransport/simpletokenbucket.h
@@ -48,6 +48,7 @@ class SimpleTokenBucket {
 
     DISALLOW_COPY_ASSIGN(SimpleTokenBucket);
 };
+
 } // namespace mozilla
 
 #endif // simpletokenbucket_h__
diff --git a/media/mtransport/test_nr_socket.cpp b/media/mtransport/test_nr_socket.cpp
index 1d6c8ca195dd..8b60560e2f0d 100644
--- a/media/mtransport/test_nr_socket.cpp
+++ b/media/mtransport/test_nr_socket.cpp
@@ -759,5 +759,6 @@ int TestNrSocket::PortMapping::cancel(int how) {
 
   return external_socket_->cancel(how);
 }
+
 } // namespace mozilla
 
diff --git a/media/webrtc/signaling/src/common/YuvStamper.cpp b/media/webrtc/signaling/src/common/YuvStamper.cpp
index b021097cc749..0116de8daa5a 100644
--- a/media/webrtc/signaling/src/common/YuvStamper.cpp
+++ b/media/webrtc/signaling/src/common/YuvStamper.cpp
@@ -465,4 +465,4 @@ static unsigned char *DIGITS[] = {
       *ptr = sLumaMax;
    }
 
-}  // Namespace mozilla.
+} // namespace mozilla.
diff --git a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
index 8849dfb34a15..9cd7dc968339 100644
--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -3169,4 +3169,5 @@ JsepSessionImpl::AllLocalTracksAreAssigned() const
 
   return true;
 }
+
 } // namespace mozilla
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
index 08e0b8731410..cf6f8abe6d7e 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
@@ -430,4 +430,4 @@ bool PeerConnectionCtx::gmpHasH264() {
   return true;
 }
 
-}  // namespace mozilla
+} // namespace mozilla
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.h
index 11f55699c596..09750a6dec82 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.h
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.h
@@ -107,6 +107,6 @@ public:
   static mozilla::StaticRefPtr<mozilla::PeerConnectionCtxShutdown> gPeerConnectionCtxShutdown;
 };
 
-}  // namespace mozilla
+} // namespace mozilla
 
 #endif
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
index 73a5ed7c9124..0c0e1f1a183e 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
@@ -1339,4 +1339,4 @@ LocalSourceStreamInfo::ForgetPipelineByTrackId_m(const std::string& trackId)
   return nullptr;
 }
 
-}  // namespace mozilla
+} // namespace mozilla
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
index 748b651070c1..bc345cca47e3 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
@@ -524,5 +524,6 @@ class PeerConnectionMedia : public sigslot::has_slots<> {
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PeerConnectionMedia)
 };
 
-}  // namespace mozilla
+} // namespace mozilla
+
 #endif
diff --git a/memory/build/replace_malloc_bridge.h b/memory/build/replace_malloc_bridge.h
index e3774b8bc60f..301b165ebbaf 100644
--- a/memory/build/replace_malloc_bridge.h
+++ b/memory/build/replace_malloc_bridge.h
@@ -104,7 +104,7 @@ MOZ_END_EXTERN_C
 namespace mozilla {
 namespace dmd {
 struct DMDFuncs;
-}
+} // namespace dmd
 
 /* Callbacks to register debug file handles for Poison IO interpose.
  * See Mozilla(|Un)RegisterDebugHandle in xpcom/build/PoisonIOInterposer.h */
diff --git a/memory/fallible/fallible.cpp b/memory/fallible/fallible.cpp
index f083fe674d55..5a449bc80e32 100644
--- a/memory/fallible/fallible.cpp
+++ b/memory/fallible/fallible.cpp
@@ -8,4 +8,4 @@ namespace mozilla {
 
 const fallible_t fallible = {};
 
-}
+} // namespace mozilla
diff --git a/memory/fallible/fallible.h b/memory/fallible/fallible.h
index 0ae5d56dcf2e..c028360b140f 100644
--- a/memory/fallible/fallible.h
+++ b/memory/fallible/fallible.h
@@ -62,6 +62,7 @@ struct fallible_t { };
 extern const fallible_t fallible;
 
 } // namespace mozilla
+
 #endif
 
 #endif // mozilla_fallible_h
diff --git a/memory/mozalloc/msvc_raise_wrappers.cpp b/memory/mozalloc/msvc_raise_wrappers.cpp
index 09186714d2ab..768efdc12f23 100644
--- a/memory/mozalloc/msvc_raise_wrappers.cpp
+++ b/memory/mozalloc/msvc_raise_wrappers.cpp
@@ -57,4 +57,4 @@ moz_Xruntime_error(const char* what)
     abort_from_exception("runtime_error", what);
 }
 
-}  // namespace std
+} // namespace std
diff --git a/memory/mozalloc/msvc_throw_wrapper.cpp b/memory/mozalloc/msvc_throw_wrapper.cpp
index 52ca221f1b96..e93fd8a50ce6 100644
--- a/memory/mozalloc/msvc_throw_wrapper.cpp
+++ b/memory/mozalloc/msvc_throw_wrapper.cpp
@@ -23,4 +23,4 @@ mozilla_Throw(const exception& e)
     mozalloc_abort(e.what());
 }
 
-}  // namespace std
+} // namespace std
diff --git a/memory/replace/dmd/DMD.cpp b/memory/replace/dmd/DMD.cpp
index c16f8ffd7d3e..14ed6908a210 100644
--- a/memory/replace/dmd/DMD.cpp
+++ b/memory/replace/dmd/DMD.cpp
@@ -1191,8 +1191,8 @@ FreeCallback(void* aPtr, Thread* aT, DeadBlock* aDeadBlock)
 
 static void Init(const malloc_table_t* aMallocTable);
 
-}   // namespace dmd
-}   // namespace mozilla
+} // namespace dmd
+} // namespace mozilla
 
 void
 replace_init(const malloc_table_t* aMallocTable)
@@ -2041,5 +2041,5 @@ DMDFuncs::ResetEverything(const char* aOptions)
   gSmallBlockActualSizeCounter = 0;
 }
 
-}   // namespace dmd
-}   // namespace mozilla
+} // namespace dmd
+} // namespace mozilla
diff --git a/memory/volatile/VolatileBuffer.h b/memory/volatile/VolatileBuffer.h
index e82f755a824b..9fe692f47055 100644
--- a/memory/volatile/VolatileBuffer.h
+++ b/memory/volatile/VolatileBuffer.h
@@ -163,6 +163,6 @@ private:
   VolatileBufferPtr(VolatileBufferPtr const& vbufptr) = delete;
 };
 
-}; /* namespace mozilla */
+} // namespace mozilla
 
 #endif /* mozalloc_VolatileBuffer_h */
diff --git a/mfbt/AlreadyAddRefed.h b/mfbt/AlreadyAddRefed.h
index 417cfc945ecb..099a3d51febe 100644
--- a/mfbt/AlreadyAddRefed.h
+++ b/mfbt/AlreadyAddRefed.h
@@ -29,7 +29,7 @@ struct unused_t;
  * because of the sheer number of usages of already_AddRefed.
  */
 template<class T>
-struct already_AddRefed
+struct MOZ_MUST_USE already_AddRefed
 {
   /*
    * We want to allow returning nullptr from functions returning
diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h
index 80fd773e63e6..463b9ba21859 100644
--- a/mfbt/Attributes.h
+++ b/mfbt/Attributes.h
@@ -451,6 +451,9 @@
  *   function.  This is intended to be used with operator->() of our smart
  *   pointer classes to ensure that the refcount of an object wrapped in a
  *   smart pointer is not manipulated directly.
+ * MOZ_MUST_USE: Applies to type declarations.  Makes it a compile time error to not
+ *   use the return value of a function which has this type.  This is intended to be
+ *   used with types which it is an error to not use.
  */
 #ifdef MOZ_CLANG_PLUGIN
 #  define MOZ_MUST_OVERRIDE __attribute__((annotate("moz_must_override")))
@@ -470,6 +473,7 @@
 #  define MOZ_NON_OWNING_REF __attribute__((annotate("moz_weak_ref")))
 #  define MOZ_UNSAFE_REF(reason) __attribute__((annotate("moz_weak_ref")))
 #  define MOZ_NO_ADDREF_RELEASE_ON_RETURN __attribute__((annotate("moz_no_addref_release_on_return")))
+#  define MOZ_MUST_USE __attribute__((annotate("moz_must_use")))
 /*
  * It turns out that clang doesn't like void func() __attribute__ {} without a
  * warning, so use pragmas to disable the warning. This code won't work on GCC
@@ -493,6 +497,7 @@
 #  define MOZ_NON_OWNING_REF /* nothing */
 #  define MOZ_UNSAFE_REF(reason) /* nothing */
 #  define MOZ_NO_ADDREF_RELEASE_ON_RETURN /* nothing */
+#  define MOZ_MUST_USE /* nothing */
 #endif /* MOZ_CLANG_PLUGIN */
 
 #endif /* __cplusplus */
diff --git a/mfbt/ChaosMode.h b/mfbt/ChaosMode.h
index ca943a1e76f5..b3a81a2bd959 100644
--- a/mfbt/ChaosMode.h
+++ b/mfbt/ChaosMode.h
@@ -17,7 +17,7 @@ namespace mozilla {
 
 namespace detail {
 extern MFBT_DATA Atomic<uint32_t> gChaosModeCounter;
-}
+} // namespace detail
 
 /**
  * When "chaos mode" is activated, code that makes implicitly nondeterministic
diff --git a/mfbt/DebugOnly.h b/mfbt/DebugOnly.h
index 0243c3f399f6..67d963cf1de5 100644
--- a/mfbt/DebugOnly.h
+++ b/mfbt/DebugOnly.h
@@ -82,6 +82,6 @@ public:
   ~DebugOnly() {}
 };
 
-}
+} // namespace mozilla
 
 #endif /* mozilla_DebugOnly_h */
diff --git a/mfbt/IndexSequence.h b/mfbt/IndexSequence.h
index 83abdc0a4ace..b6e00d99fb25 100644
--- a/mfbt/IndexSequence.h
+++ b/mfbt/IndexSequence.h
@@ -109,7 +109,7 @@ struct MakeIndexSequenceImpl<N, IndexTuple<Indices...>>
   typedef IndexSequence<Indices...> Type;
 };
 
-}  // namespace detail
+} // namespace detail
 
 /**
  * A utility for building an IndexSequence of consecutive indices.
diff --git a/mfbt/JSONWriter.h b/mfbt/JSONWriter.h
index b181db426839..da6e0c49b7ff 100644
--- a/mfbt/JSONWriter.h
+++ b/mfbt/JSONWriter.h
@@ -117,7 +117,7 @@ public:
 // on Linux that caused link errors, whereas this formulation didn't.
 namespace detail {
 extern MFBT_DATA const char gTwoCharEscapes[256];
-}
+} // namespace detail
 
 class JSONWriter
 {
diff --git a/mfbt/NullPtr.h b/mfbt/NullPtr.h
index 849b1a2ef848..d2248f4bccc7 100644
--- a/mfbt/NullPtr.h
+++ b/mfbt/NullPtr.h
@@ -26,6 +26,6 @@ struct IsNullPointer : FalseType {};
 template<>
 struct IsNullPointer<decltype(nullptr)> : TrueType {};
 
-}
+} // namespace mozilla
 
 #endif /* mozilla_NullPtr_h */
diff --git a/mfbt/Tuple.h b/mfbt/Tuple.h
index 98872796a962..dc830c06703c 100644
--- a/mfbt/Tuple.h
+++ b/mfbt/Tuple.h
@@ -161,7 +161,7 @@ private:
   HeadT mHead;  // The element stored at this index in the tuple.
 };
 
-}  // namespace detail
+} // namespace detail
 
 /**
  * Tuple is a class that stores zero or more objects, whose types are specified
@@ -242,7 +242,7 @@ auto TupleGetHelper(const TupleImpl<Index, Elements...>& aTuple)
   return TupleImpl<Index, Elements...>::Head(aTuple);
 }
 
-}  // namespace detail
+} // namespace detail
 
 /**
  * Index-based access to an element of a tuple.
diff --git a/mfbt/TypeTraits.h b/mfbt/TypeTraits.h
index 47c7945a6a2d..5f301c2318ff 100644
--- a/mfbt/TypeTraits.h
+++ b/mfbt/TypeTraits.h
@@ -1041,7 +1041,7 @@ struct RemovePointerHelper<T, Pointee*>
   typedef Pointee Type;
 };
 
-} // namespac detail
+} // namespace detail
 
 /**
  * Produces the pointed-to type if a pointer is provided, else returns the input
diff --git a/mfbt/TypedEnumBits.h b/mfbt/TypedEnumBits.h
index 8f11b8d6fef6..642630c50f4f 100644
--- a/mfbt/TypedEnumBits.h
+++ b/mfbt/TypedEnumBits.h
@@ -118,7 +118,7 @@ template<typename E>
 struct UnsignedIntegerTypeForEnum
   : UnsignedStdintTypeForSize<sizeof(E)>
 {};
-}
+} // namespace detail
 
 } // namespace mozilla
 
diff --git a/mfbt/decimal/Decimal.h b/mfbt/decimal/Decimal.h
index 8c57d44ddc9d..b36a9f257c34 100644
--- a/mfbt/decimal/Decimal.h
+++ b/mfbt/decimal/Decimal.h
@@ -58,7 +58,7 @@ namespace WebCore {
 
 namespace DecimalPrivate {
 class SpecialValueHandler;
-}
+} // namespace DecimalPrivate
 
 // This class represents decimal base floating point number.
 //
@@ -200,7 +200,7 @@ private:
 
 namespace mozilla {
   typedef WebCore::Decimal Decimal;
-}
+} // namespace mozilla
 
 #undef WTF_MAKE_FAST_ALLOCATED
 
diff --git a/mfbt/decimal/moz-decimal-utils.h b/mfbt/decimal/moz-decimal-utils.h
index a13152d5e729..d05447c1b477 100644
--- a/mfbt/decimal/moz-decimal-utils.h
+++ b/mfbt/decimal/moz-decimal-utils.h
@@ -106,7 +106,7 @@ private:
   std::string mStr;
 };
 
-} // namespace moz-decimal-utils
+} // namespace moz_decimal_utils
 
 #endif
 
diff --git a/mfbt/unused.cpp b/mfbt/unused.cpp
index ea97ef80c7d0..cee781c4cb95 100644
--- a/mfbt/unused.cpp
+++ b/mfbt/unused.cpp
@@ -10,4 +10,4 @@ namespace mozilla {
 
 const unused_t unused = unused_t();
 
-}  // namespace mozilla
+} // namespace mozilla
diff --git a/mfbt/unused.h b/mfbt/unused.h
index 443b7024b447..cec1f6da0d56 100644
--- a/mfbt/unused.h
+++ b/mfbt/unused.h
@@ -27,6 +27,6 @@ operator<<(const unused_t& /*unused*/, const T& /*unused*/)
 {
 }
 
-}
+} // namespace mozilla
 
 #endif // mozilla_unused_h
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index a0fc7f7e016a..967a1bae4280 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -395,7 +395,7 @@ class AddPreferencesMemoryReporterRunnable : public nsRunnable
     return RegisterStrongMemoryReporter(new PreferenceServiceReporter());
   }
 };
-} // anonymous namespace
+} // namespace
 
 // static
 Preferences*
diff --git a/modules/libpref/Preferences.h b/modules/libpref/Preferences.h
index 6c5c6190716c..e686da3f1bab 100644
--- a/modules/libpref/Preferences.h
+++ b/modules/libpref/Preferences.h
@@ -32,7 +32,7 @@ namespace mozilla {
 
 namespace dom {
 class PrefSetting;
-}
+} // namespace dom
 
 class Preferences final : public nsIPrefService,
                           public nsIObserver,
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 11f5e1b4cd2a..cb6a47360d27 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4342,6 +4342,9 @@ pref("alerts.disableSlidingEffect", false);
 pref("full-screen-api.enabled", false);
 pref("full-screen-api.allow-trusted-requests-only", true);
 pref("full-screen-api.pointer-lock.enabled", true);
+// transition duration of fade-to-black and fade-from-black, unit: ms
+pref("full-screen-api.transition-duration.enter", "400 400");
+pref("full-screen-api.transition-duration.leave", "400 400");
 
 // DOM idle observers API
 pref("dom.idle-observers-api.enabled", true);
diff --git a/modules/libpref/nsPrefBranch.h b/modules/libpref/nsPrefBranch.h
index ea5ec9a9af16..e1123c80c4c8 100644
--- a/modules/libpref/nsPrefBranch.h
+++ b/modules/libpref/nsPrefBranch.h
@@ -26,7 +26,7 @@
 
 namespace mozilla {
 class PreferenceServiceReporter;
-} // namespace mozilla;
+} // namespace mozilla
 
 class nsPrefBranch;
 
diff --git a/modules/libpref/prefapi_private_data.h b/modules/libpref/prefapi_private_data.h
index 0fdfcf9403cb..4ccf8c1bc6f1 100644
--- a/modules/libpref/prefapi_private_data.h
+++ b/modules/libpref/prefapi_private_data.h
@@ -16,8 +16,8 @@ extern bool gDirty;
 namespace mozilla {
 namespace dom {
 class PrefSetting;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 void
 pref_savePrefs(PLDHashTable* aTable, char** aPrefArray);
diff --git a/mozglue/build/SSE.cpp b/mozglue/build/SSE.cpp
index f125d527d7e4..1e79caab43a8 100644
--- a/mozglue/build/SSE.cpp
+++ b/mozglue/build/SSE.cpp
@@ -106,7 +106,7 @@ has_cpuid_bit(unsigned int level, CPUIDRegister reg, unsigned int bit)
 
 #endif // end CPUID declarations
 
-}
+} // namespace
 
 namespace mozilla {
 
diff --git a/mozglue/build/SSE.h b/mozglue/build/SSE.h
index 1d10cc5babb1..6d57acbdb01d 100644
--- a/mozglue/build/SSE.h
+++ b/mozglue/build/SSE.h
@@ -200,7 +200,7 @@ namespace mozilla {
     extern bool MFBT_DATA sse4_2_enabled;
 #endif
 #endif
-  }
+  } // namespace sse_private
 
 #if defined(MOZILLA_PRESUME_MMX)
 #define MOZILLA_MAY_SUPPORT_MMX 1
@@ -286,6 +286,6 @@ namespace mozilla {
   inline bool supports_sse4_2() { return false; }
 #endif
 
-}
+} // namespace mozilla
 
 #endif /* !defined(mozilla_SSE_h_) */
diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
index 30d757e75c10..0218dfa914f9 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -700,7 +700,7 @@ continue_loading:
 
 WindowsDllInterceptor NtDllIntercept;
 
-} // anonymous namespace
+} // namespace
 
 NS_EXPORT void
 DllBlocklist_Initialize()
diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h
index 6fe410d0f4d8..d09d7cc07d6e 100644
--- a/mozglue/build/arm.h
+++ b/mozglue/build/arm.h
@@ -116,7 +116,7 @@ namespace mozilla {
     extern bool MFBT_DATA neon_enabled;
 #endif
 #endif
-  }
+  } // namespace arm_private
 
 #if defined(MOZILLA_PRESUME_EDSP)
 #  define MOZILLA_MAY_SUPPORT_EDSP 1
@@ -158,6 +158,6 @@ namespace mozilla {
   inline bool supports_neon() { return false; }
 #endif
 
-}
+} // namespace mozilla
 
 #endif /* !defined(mozilla_arm_h_) */
diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
index a6d5494dd29d..7a561e3af671 100644
--- a/mozglue/misc/StackWalk.cpp
+++ b/mozglue/misc/StackWalk.cpp
@@ -930,7 +930,7 @@ FramePointerStackWalk(MozWalkStackCallback aCallback, uint32_t aSkipFrames,
   return numFrames != 0;
 }
 
-}
+} // namespace mozilla
 
 #define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__))
 #if X86_OR_PPC && (MOZ_STACKWALK_SUPPORTS_MACOSX || MOZ_STACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
diff --git a/mozglue/misc/StackWalk.h b/mozglue/misc/StackWalk.h
index 4546f62d8c94..4a7ba9128443 100644
--- a/mozglue/misc/StackWalk.h
+++ b/mozglue/misc/StackWalk.h
@@ -153,7 +153,7 @@ FramePointerStackWalk(MozWalkStackCallback aCallback, uint32_t aSkipFrames,
                       uint32_t aMaxFrames, void* aClosure, void** aBp,
                       void* aStackEnd);
 
-}
+} // namespace mozilla
 
 /**
  * Initialize the critical sections for this platform so that we can
diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h
index 8f043d441161..58958351ea87 100644
--- a/mozglue/misc/TimeStamp.h
+++ b/mozglue/misc/TimeStamp.h
@@ -16,7 +16,7 @@
 
 namespace IPC {
 template<typename T> struct ParamTraits;
-}
+} // namespace IPC
 
 #ifdef XP_WIN
 // defines TimeStampValue as a complex value keeping both
@@ -571,6 +571,6 @@ private:
   TimeStampValue mValue;
 };
 
-}
+} // namespace mozilla
 
 #endif /* mozilla_TimeStamp_h */
diff --git a/netwerk/base/AutoClose.h b/netwerk/base/AutoClose.h
index f8521144a9d5..79a6bda296fa 100644
--- a/netwerk/base/AutoClose.h
+++ b/netwerk/base/AutoClose.h
@@ -70,6 +70,7 @@ private:
   nsCOMPtr<T> mPtr;
 };
 
-} } // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_AutoClose_h
diff --git a/netwerk/base/BackgroundFileSaver.h b/netwerk/base/BackgroundFileSaver.h
index 9a0569e4005d..a2b2c4c3994e 100644
--- a/netwerk/base/BackgroundFileSaver.h
+++ b/netwerk/base/BackgroundFileSaver.h
@@ -413,6 +413,7 @@ private:
   // Don't accidentally copy construct.
   DigestOutputStream(const DigestOutputStream& d);
 };
+
 } // namespace net
 } // namespace mozilla
 
diff --git a/netwerk/base/Dashboard.cpp b/netwerk/base/Dashboard.cpp
index ac11ee0fa779..f0f59e9ff725 100644
--- a/netwerk/base/Dashboard.cpp
+++ b/netwerk/base/Dashboard.cpp
@@ -918,4 +918,5 @@ GetErrorString(nsresult rv, nsAString& errorString)
     CopyUTF8toUTF16(errorCString, errorString);
 }
 
-} } // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/Dashboard.h b/netwerk/base/Dashboard.h
index 2bf3abe32981..4e893c15d489 100644
--- a/netwerk/base/Dashboard.h
+++ b/netwerk/base/Dashboard.h
@@ -99,5 +99,7 @@ private:
     nsCOMPtr<nsIDNSService> mDnsService;
 };
 
-} } // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
+
 #endif // nsDashboard_h__
diff --git a/netwerk/base/DashboardTypes.h b/netwerk/base/DashboardTypes.h
index 1a1e2fd5f02b..3f1f30d16bc3 100644
--- a/netwerk/base/DashboardTypes.h
+++ b/netwerk/base/DashboardTypes.h
@@ -57,6 +57,7 @@ struct HttpRetParams
     bool      ssl;
 };
 
-} }
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_DashboardTypes_h_
diff --git a/netwerk/base/EventTokenBucket.cpp b/netwerk/base/EventTokenBucket.cpp
index ae8b4588d6a9..3f28e6d10f6f 100644
--- a/netwerk/base/EventTokenBucket.cpp
+++ b/netwerk/base/EventTokenBucket.cpp
@@ -434,5 +434,5 @@ EventTokenBucket::FineGrainResetTimerNotify()
 
 #endif
 
-} // mozilla::net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/EventTokenBucket.h b/netwerk/base/EventTokenBucket.h
index 9c0ad458a7f5..eba755251422 100644
--- a/netwerk/base/EventTokenBucket.h
+++ b/netwerk/base/EventTokenBucket.h
@@ -141,7 +141,7 @@ private:
 #endif
 };
 
-} // ::mozilla::net
-} // ::mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/base/LoadContextInfo.cpp b/netwerk/base/LoadContextInfo.cpp
index d44e4dcdd89f..82a493b1d2f2 100644
--- a/netwerk/base/LoadContextInfo.cpp
+++ b/netwerk/base/LoadContextInfo.cpp
@@ -110,5 +110,5 @@ GetLoadContextInfo(bool const aIsPrivate,
                              aIsAnonymous);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/LoadContextInfo.h b/netwerk/base/LoadContextInfo.h
index d8009f8dffd6..0432743b80fc 100644
--- a/netwerk/base/LoadContextInfo.h
+++ b/netwerk/base/LoadContextInfo.h
@@ -47,7 +47,7 @@ GetLoadContextInfo(bool const aIsPrivate = false,
                    bool const aIsInBrowserElement = false,
                    bool const aIsAnonymous = false);
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/base/LoadInfo.h b/netwerk/base/LoadInfo.h
index cac7f6f0e6ed..d0747a89b14e 100644
--- a/netwerk/base/LoadInfo.h
+++ b/netwerk/base/LoadInfo.h
@@ -19,14 +19,14 @@ namespace mozilla {
 
 namespace net {
 class LoadInfoArgs;
-}
+} // namespace net
 
 namespace ipc {
 // we have to forward declare that function so we can use it as a friend.
 nsresult
 LoadInfoArgsToLoadInfo(const mozilla::net::LoadInfoArgs& aLoadInfoArgs,
                        nsILoadInfo** outLoadInfo);
-}
+} // namespace ipc
 
 /**
  * Class that provides an nsILoadInfo implementation.
diff --git a/netwerk/base/NetworkActivityMonitor.h b/netwerk/base/NetworkActivityMonitor.h
index eabcf7629696..28c9a911e363 100644
--- a/netwerk/base/NetworkActivityMonitor.h
+++ b/netwerk/base/NetworkActivityMonitor.h
@@ -40,6 +40,7 @@ private:
   PRIntervalTime                  mLastNotificationTime[2];
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif /* NetworkActivityMonitor_h___ */
diff --git a/netwerk/base/OfflineObserver.cpp b/netwerk/base/OfflineObserver.cpp
index 14a65863e22f..1cdc838ea758 100644
--- a/netwerk/base/OfflineObserver.cpp
+++ b/netwerk/base/OfflineObserver.cpp
@@ -114,5 +114,5 @@ DisconnectableParent::OfflineNotification(nsISupports *aSubject)
   return NS_OK;
 }
 
-} // net namespace
-} // mozilla namespace
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/OfflineObserver.h b/netwerk/base/OfflineObserver.h
index bcddd6f65c0f..02e52e1ffddf 100644
--- a/netwerk/base/OfflineObserver.h
+++ b/netwerk/base/OfflineObserver.h
@@ -67,7 +67,7 @@ private:
   DisconnectableParent * mParent;
 };
 
-} // net namespace
-} // mozilla namespace
+} // namespace net
+} // namespace mozilla
 
 #endif // nsOfflineObserver_h__
diff --git a/netwerk/base/Predictor.cpp b/netwerk/base/Predictor.cpp
index 8853ff483a11..aa54b2555eb4 100644
--- a/netwerk/base/Predictor.cpp
+++ b/netwerk/base/Predictor.cpp
@@ -505,7 +505,7 @@ class NuwaMarkPredictorThreadRunner : public nsRunnable
     return NS_OK;
   }
 };
-} // anon namespace
+} // namespace
 #endif
 
 // Predictor::nsICacheEntryMetaDataVisitor
@@ -680,7 +680,8 @@ private:
   nsCOMPtr<nsIThread> mIOThread;
   nsCOMPtr<nsIFile> mDBFile;
 };
-} // anon namespace
+
+} // namespace
 
 void
 Predictor::MaybeCleanupOldDBFiles()
@@ -2034,5 +2035,5 @@ Predictor::OnPredictDNS(nsIURI *aURI) {
   return NS_OK;
 }
 
-} // ::mozilla::net
-} // ::mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/Predictor.h b/netwerk/base/Predictor.h
index 83935dc42aa0..832ed7b536d4 100644
--- a/netwerk/base/Predictor.h
+++ b/netwerk/base/Predictor.h
@@ -364,7 +364,7 @@ private:
   static Predictor *sSelf;
 };
 
-} // ::mozilla::net
-} // ::mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_Predictor_h
diff --git a/netwerk/base/PrivateBrowsingChannel.h b/netwerk/base/PrivateBrowsingChannel.h
index a07d7f05fced..165bea03c462 100644
--- a/netwerk/base/PrivateBrowsingChannel.h
+++ b/netwerk/base/PrivateBrowsingChannel.h
@@ -99,8 +99,8 @@ protected:
   bool mPrivateBrowsing;
 };
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
 #endif
 
diff --git a/netwerk/base/ProxyAutoConfig.cpp b/netwerk/base/ProxyAutoConfig.cpp
index a7dddb9191dc..b65124ad370c 100644
--- a/netwerk/base/ProxyAutoConfig.cpp
+++ b/netwerk/base/ProxyAutoConfig.cpp
@@ -1021,5 +1021,5 @@ ProxyAutoConfig::IsInBrowser(const JS::CallArgs &aArgs)
   return true;
 }
 
+} // namespace net
 } // namespace mozilla
-} // namespace mozilla::net
diff --git a/netwerk/base/ProxyAutoConfig.h b/netwerk/base/ProxyAutoConfig.h
index ead3ba6164da..7f45075284a4 100644
--- a/netwerk/base/ProxyAutoConfig.h
+++ b/netwerk/base/ProxyAutoConfig.h
@@ -13,7 +13,7 @@
 class nsITimer;
 namespace JS {
 class CallArgs;
-}
+} // namespace JS
 
 namespace mozilla { namespace net {
 
@@ -111,6 +111,7 @@ private:
   nsCOMPtr<nsITimer> mTimer;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif  // ProxyAutoConfig_h__
diff --git a/netwerk/base/RedirectChannelRegistrar.cpp b/netwerk/base/RedirectChannelRegistrar.cpp
index 49904c661567..c33b6ddf4639 100644
--- a/netwerk/base/RedirectChannelRegistrar.cpp
+++ b/netwerk/base/RedirectChannelRegistrar.cpp
@@ -72,5 +72,5 @@ RedirectChannelRegistrar::DeregisterChannels(uint32_t id)
   return NS_OK;
 }
 
-}
-}
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/RedirectChannelRegistrar.h b/netwerk/base/RedirectChannelRegistrar.h
index 148d3e8b86e9..333389d67124 100644
--- a/netwerk/base/RedirectChannelRegistrar.h
+++ b/netwerk/base/RedirectChannelRegistrar.h
@@ -36,7 +36,7 @@ protected:
   uint32_t mId;
 };
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/base/ReferrerPolicy.h b/netwerk/base/ReferrerPolicy.h
index f43d569abde7..382cc3bb6cca 100644
--- a/netwerk/base/ReferrerPolicy.h
+++ b/netwerk/base/ReferrerPolicy.h
@@ -74,6 +74,7 @@ IsValidReferrerPolicy(const nsAString& content)
       || content.LowerCaseEqualsLiteral("unsafe-url");
 }
 
-} } //namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/base/StreamingProtocolService.h b/netwerk/base/StreamingProtocolService.h
index 69b9f9d3150c..96d51fe5c431 100644
--- a/netwerk/base/StreamingProtocolService.h
+++ b/netwerk/base/StreamingProtocolService.h
@@ -29,7 +29,8 @@ public:
   StreamingProtocolControllerService() {};
   static already_AddRefed<StreamingProtocolControllerService> GetInstance();
 };
-} // namespace dom
+
+} // namespace net
 } // namespace mozilla
 
 #endif //mozilla_net_StreamingProtocolControllerService_h
diff --git a/netwerk/base/TLSServerSocket.cpp b/netwerk/base/TLSServerSocket.cpp
index d02fa974f959..962b0ceab11c 100644
--- a/netwerk/base/TLSServerSocket.cpp
+++ b/netwerk/base/TLSServerSocket.cpp
@@ -282,7 +282,7 @@ TLSServerSecurityObserverProxy::OnHandshakeDoneRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(TLSServerConnectionInfo,
                   nsITLSServerConnectionInfo,
diff --git a/netwerk/base/Tickler.cpp b/netwerk/base/Tickler.cpp
index 265ea4f67614..4b8e05dd104b 100644
--- a/netwerk/base/Tickler.cpp
+++ b/netwerk/base/Tickler.cpp
@@ -291,7 +291,7 @@ NS_IMETHODIMP TicklerTimer::Notify(nsITimer *timer)
 namespace mozilla {
 namespace net {
 NS_IMPL_ISUPPORTS0(Tickler)
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // defined MOZ_USE_WIFI_TICKLER
diff --git a/netwerk/base/Tickler.h b/netwerk/base/Tickler.h
index f199cd4d2e9d..573fe6e76225 100644
--- a/netwerk/base/Tickler.h
+++ b/netwerk/base/Tickler.h
@@ -125,7 +125,7 @@ public:
 
 #endif // defined MOZ_USE_WIFI_TICKLER
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // mozilla_net_Tickler_h
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
index 37f3f5ca9609..1843add54364 100644
--- a/netwerk/base/nsIOService.cpp
+++ b/netwerk/base/nsIOService.cpp
@@ -1385,9 +1385,6 @@ nsIOService::Observe(nsISupports *subject,
             // If we fail here, we will fail always on.
             mNetworkLinkServiceInitialized = true;
 
-            // The browser starts off as offline. We go into online mode after this.
-            SetOffline(false);
-
             // And now reflect the preference setting
             nsCOMPtr<nsIPrefBranch> prefBranch;
             GetPrefBranch(getter_AddRefs(prefBranch));
@@ -1868,7 +1865,7 @@ private:
     int32_t mState;
 };
 
-}
+} // namespace
 
 NS_IMETHODIMP
 nsIOService::SetAppOffline(uint32_t aAppId, int32_t aState)
diff --git a/netwerk/base/nsMediaFragmentURIParser.cpp b/netwerk/base/nsMediaFragmentURIParser.cpp
index 904b17ab6138..3b20f5328156 100644
--- a/netwerk/base/nsMediaFragmentURIParser.cpp
+++ b/netwerk/base/nsMediaFragmentURIParser.cpp
@@ -406,4 +406,5 @@ void nsMediaFragmentURIParser::Parse(nsACString& aRef)
   }
 }
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/nsMediaFragmentURIParser.h b/netwerk/base/nsMediaFragmentURIParser.h
index cb324f82089d..01c9872eb638 100644
--- a/netwerk/base/nsMediaFragmentURIParser.h
+++ b/netwerk/base/nsMediaFragmentURIParser.h
@@ -107,6 +107,7 @@ private:
   Maybe<int>       mSampleSize;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/base/nsNetUtil.cpp b/netwerk/base/nsNetUtil.cpp
index a7f6fca3704c..7a81be46a795 100644
--- a/netwerk/base/nsNetUtil.cpp
+++ b/netwerk/base/nsNetUtil.cpp
@@ -2198,5 +2198,5 @@ InScriptableRange(uint64_t val)
     return val <= kJS_MAX_SAFE_UINTEGER;
 }
 
+} // namespace net
 } // namespace mozilla
-} // namespace mozilla::net
diff --git a/netwerk/base/nsNetUtil.h b/netwerk/base/nsNetUtil.h
index a7af82628515..ba40c655fd36 100644
--- a/netwerk/base/nsNetUtil.h
+++ b/netwerk/base/nsNetUtil.h
@@ -984,8 +984,8 @@ bool InScriptableRange(int64_t val);
 // Make sure a 64bit value can be captured by JS MAX_SAFE_INTEGER
 bool InScriptableRange(uint64_t val);
 
+} // namespace net
 } // namespace mozilla
-} // namespace mozilla::net
 
 // Include some function bodies for callers with external linkage
 #ifndef MOZILLA_INTERNAL_API
diff --git a/netwerk/base/nsPACMan.cpp b/netwerk/base/nsPACMan.cpp
index 6f34350e8853..fe8edaaeb6ec 100644
--- a/netwerk/base/nsPACMan.cpp
+++ b/netwerk/base/nsPACMan.cpp
@@ -780,5 +780,5 @@ GetProxyLog()
     return sLog;
 }
 
-}
-}
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/base/nsPACMan.h b/netwerk/base/nsPACMan.h
index d7ee72e0cd20..28249e81360b 100644
--- a/netwerk/base/nsPACMan.h
+++ b/netwerk/base/nsPACMan.h
@@ -242,7 +242,7 @@ private:
 namespace mozilla {
 namespace net {
 PRLogModuleInfo* GetProxyLog();
-}
-}
+} // namespace net
+} // namespace mozilla
 
 #endif  // nsPACMan_h__
diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp
index abe6f2c389d0..e09166f807ab 100644
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -43,7 +43,7 @@ namespace mozilla {
   extern const char kProxyType_SOCKS4[];
   extern const char kProxyType_SOCKS5[];
   extern const char kProxyType_DIRECT[];
-}
+} // namespace mozilla
 
 using namespace mozilla;
 
@@ -788,7 +788,7 @@ const char kProxyType_SOCKS[]   = "socks";
 const char kProxyType_SOCKS4[]  = "socks4";
 const char kProxyType_SOCKS5[]  = "socks5";
 const char kProxyType_DIRECT[]  = "direct";
-}
+} // namespace mozilla
 
 const char *
 nsProtocolProxyService::ExtractProxyInfo(const char *start,
diff --git a/netwerk/base/nsProxyInfo.cpp b/netwerk/base/nsProxyInfo.cpp
index 1d96f320ff98..dc801aff318a 100644
--- a/netwerk/base/nsProxyInfo.cpp
+++ b/netwerk/base/nsProxyInfo.cpp
@@ -80,7 +80,7 @@ namespace mozilla {
   extern const char kProxyType_SOCKS4[];
   extern const char kProxyType_SOCKS5[];
   extern const char kProxyType_DIRECT[];
-}
+} // namespace mozilla
 
 bool
 nsProxyInfo::IsDirect()
diff --git a/netwerk/base/nsServerSocket.cpp b/netwerk/base/nsServerSocket.cpp
index 66eabc65d40a..82b341b9d204 100644
--- a/netwerk/base/nsServerSocket.cpp
+++ b/netwerk/base/nsServerSocket.cpp
@@ -511,7 +511,7 @@ ServerSocketListenerProxy::OnStopListeningRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 nsServerSocket::AsyncListen(nsIServerSocketListener *aListener)
diff --git a/netwerk/base/nsServerSocket.h b/netwerk/base/nsServerSocket.h
index 4bedeb28e6dc..8ca39a5a0b83 100644
--- a/netwerk/base/nsServerSocket.h
+++ b/netwerk/base/nsServerSocket.h
@@ -16,7 +16,8 @@
 class nsIEventTarget;
 namespace mozilla { namespace net {
 union NetAddr;
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 class nsServerSocket : public nsASocketHandler
                      , public nsIServerSocket
diff --git a/netwerk/base/nsSocketTransportService2.h b/netwerk/base/nsSocketTransportService2.h
index 3e34e71330de..bab101c46f45 100644
--- a/netwerk/base/nsSocketTransportService2.h
+++ b/netwerk/base/nsSocketTransportService2.h
@@ -59,8 +59,8 @@ static const int32_t kDefaultTCPKeepCount =
 #else
                                               4;  // Specifiable in Linux.
 #endif
-}
-}
+} // namespace net
+} // namespace mozilla
 
 //-----------------------------------------------------------------------------
 
diff --git a/netwerk/base/nsUDPSocket.cpp b/netwerk/base/nsUDPSocket.cpp
index 44d4ed516504..899043fe7052 100644
--- a/netwerk/base/nsUDPSocket.cpp
+++ b/netwerk/base/nsUDPSocket.cpp
@@ -1278,7 +1278,7 @@ SendRequestRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 nsUDPSocket::AsyncListen(nsIUDPSocketListener *aListener)
diff --git a/netwerk/build/nsNetModule.cpp b/netwerk/build/nsNetModule.cpp
index 7140ab7a3245..875b899d3763 100644
--- a/netwerk/build/nsNetModule.cpp
+++ b/netwerk/build/nsNetModule.cpp
@@ -138,8 +138,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(CacheStorageService)
 namespace mozilla {
 namespace net {
   NS_GENERIC_FACTORY_CONSTRUCTOR(CaptivePortalService)
-}
-}
+} // namespace net
+} // namespace mozilla
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -255,8 +255,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpChannelAuthProvider)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpActivityDistributor)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpBasicAuth)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpDigestAuth)
-}
-}
+} // namespace net
+} // namespace mozilla
 #endif // !NECKO_PROTOCOL_http
 
 #include "mozilla/net/Dashboard.h"
@@ -265,8 +265,8 @@ namespace mozilla {
 namespace net {
   NS_GENERIC_FACTORY_CONSTRUCTOR(Dashboard)
   NS_GENERIC_FACTORY_CONSTRUCTOR(PackagedAppService)
-}
-}
+} // namespace net
+} // namespace mozilla
 #include "AppProtocolHandler.h"
 
 #ifdef NECKO_PROTOCOL_res
@@ -338,7 +338,7 @@ type##Constructor(nsISupports *aOuter, REFNSIID aIID, \
 WEB_SOCKET_HANDLER_CONSTRUCTOR(WebSocketChannel, false)
 WEB_SOCKET_HANDLER_CONSTRUCTOR(WebSocketSSLChannel, true)
 #undef WEB_SOCKET_HANDLER_CONSTRUCTOR
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 #endif
 
diff --git a/netwerk/cache/nsApplicationCacheService.cpp b/netwerk/cache/nsApplicationCacheService.cpp
index f4c4056a15a8..65ad9c4da39e 100644
--- a/netwerk/cache/nsApplicationCacheService.cpp
+++ b/netwerk/cache/nsApplicationCacheService.cpp
@@ -238,7 +238,7 @@ private:
 
 NS_IMPL_ISUPPORTS(AppCacheClearDataObserver, nsIObserver)
 
-} // anonymous namespace
+} // namespace
 
 // Instantiates and registers AppCacheClearDataObserver for notifications
 void
diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp
index c2bcbba749ee..94d3a4a312aa 100644
--- a/netwerk/cache/nsCacheService.cpp
+++ b/netwerk/cache/nsCacheService.cpp
@@ -1355,7 +1355,7 @@ EvictionNotifierRunnable::Run()
     return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 nsCacheService::EvictEntriesForClient(const char *          clientID,
diff --git a/netwerk/cache/nsDiskCacheBlockFile.cpp b/netwerk/cache/nsDiskCacheBlockFile.cpp
index 6a1f4182f24a..1ec99cf2d1d2 100644
--- a/netwerk/cache/nsDiskCacheBlockFile.cpp
+++ b/netwerk/cache/nsDiskCacheBlockFile.cpp
@@ -13,6 +13,33 @@
 
 using namespace mozilla;
 
+/* to cope with short read.
+ * xxx not sure  if we want to repeat PR_Read() if no octet is ever read
+ * and is errno == EINTR
+ */
+static
+PRInt32
+busy_beaver_PR_Read(PRFileDesc *fd, void * start, PRInt32 len)
+{
+    int n;
+    PRInt32 remaining = len;
+
+    while (remaining > 0) {
+        n = PR_Read(fd, start, remaining);
+        if (n < 0) {
+            if( (len - remaining) == 0 ) // no octet is ever read
+                return -1;
+            break;
+        } else {
+            remaining -= n;
+            char *cp = (char *) start;
+            cp += n;
+            start = cp;
+        }
+    }
+    return len - remaining;
+}
+
 /******************************************************************************
  * nsDiskCacheBlockFile - 
  *****************************************************************************/
@@ -74,7 +101,7 @@ nsDiskCacheBlockFile::Open(nsIFile * blockFile,
         
     } else {
         // read the bit map
-        const int32_t bytesRead = PR_Read(mFD, mBitMap, bitMapBytes);
+        const int32_t bytesRead = busy_beaver_PR_Read(mFD, mBitMap, bitMapBytes);
         if ((bytesRead < 0) || ((uint32_t)bytesRead < bitMapBytes)) {
             *corruptInfo = nsDiskCache::kBlockFileBitMapReadError;
             rv = NS_ERROR_UNEXPECTED;
@@ -253,11 +280,15 @@ nsDiskCacheBlockFile::ReadBlocks( void *    buffer,
     if ((bytesToRead <= 0) || ((uint32_t)bytesToRead > mBlockSize * numBlocks)) {
         bytesToRead = mBlockSize * numBlocks;
     }
-    *bytesRead = PR_Read(mFD, buffer, bytesToRead);
-    
+    /* This has to tolerate short read, i.e., we need to repeat! */
+    *bytesRead = busy_beaver_PR_Read(mFD, buffer, bytesToRead);
+
     CACHE_LOG_DEBUG(("CACHE: nsDiskCacheBlockFile::Read [this=%p] "
                      "returned %d / %d bytes", this, *bytesRead, bytesToRead));
 
+    if(*bytesRead == -1)
+        return NS_ERROR_UNEXPECTED;
+
     return NS_OK;
 }
 
diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.cpp b/netwerk/cache/nsDiskCacheDeviceSQL.cpp
index bbce0a9d3ca7..d866e22ef3a0 100644
--- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp
+++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp
@@ -1328,7 +1328,7 @@ GetJARIdentifier(nsIURI *aURI,
     return AppendJARIdentifier(_result, appId, isInBrowserElement);
 }
 
-} // anon namespace
+} // namespace
 
 // static
 nsresult
diff --git a/netwerk/cache2/AppCacheStorage.cpp b/netwerk/cache2/AppCacheStorage.cpp
index 6f54347cb6d4..c3af478f327e 100644
--- a/netwerk/cache2/AppCacheStorage.cpp
+++ b/netwerk/cache2/AppCacheStorage.cpp
@@ -180,5 +180,5 @@ NS_IMETHODIMP AppCacheStorage::AsyncVisitStorage(nsICacheStorageVisitor* aVisito
   return NS_OK;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/AppCacheStorage.h b/netwerk/cache2/AppCacheStorage.h
index 43594c298c12..eef70dea0808 100644
--- a/netwerk/cache2/AppCacheStorage.h
+++ b/netwerk/cache2/AppCacheStorage.h
@@ -31,7 +31,7 @@ private:
   nsCOMPtr<nsIApplicationCache> mAppCache;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheEntry.cpp b/netwerk/cache2/CacheEntry.cpp
index 61792af39581..a8c88295c443 100644
--- a/netwerk/cache2/CacheEntry.cpp
+++ b/netwerk/cache2/CacheEntry.cpp
@@ -1695,5 +1695,5 @@ size_t CacheEntry::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const
   return mallocSizeOf(this) + SizeOfExcludingThis(mallocSizeOf);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheEntry.h b/netwerk/cache2/CacheEntry.h
index 03e1f35288fa..c43c054d5c73 100644
--- a/netwerk/cache2/CacheEntry.h
+++ b/netwerk/cache2/CacheEntry.h
@@ -384,7 +384,7 @@ private:
   nsRefPtr<CacheEntry> mEntry;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFile.cpp b/netwerk/cache2/CacheFile.cpp
index 6f2e58d34cd9..cd802e8a538d 100644
--- a/netwerk/cache2/CacheFile.cpp
+++ b/netwerk/cache2/CacheFile.cpp
@@ -1983,7 +1983,7 @@ CacheFile::InitIndexEntry()
 
 // Memory reporting
 
-namespace { // anon
+namespace {
 
 size_t
 CollectChunkSize(uint32_t const & aIdx,
@@ -1993,7 +1993,7 @@ CollectChunkSize(uint32_t const & aIdx,
   return aChunk->SizeOfIncludingThis(mallocSizeOf);
 }
 
-} // anon
+} // namespace
 
 size_t
 CacheFile::SizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const
@@ -2034,5 +2034,5 @@ CacheFile::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const
   return mallocSizeOf(this) + SizeOfExcludingThis(mallocSizeOf);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFile.h b/netwerk/cache2/CacheFile.h
index 2edbb31863a7..21e8281dd577 100644
--- a/netwerk/cache2/CacheFile.h
+++ b/netwerk/cache2/CacheFile.h
@@ -250,7 +250,7 @@ private:
   bool mLocked;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFileChunk.cpp b/netwerk/cache2/CacheFileChunk.cpp
index 8d13330366b6..a7eb0b3871ca 100644
--- a/netwerk/cache2/CacheFileChunk.cpp
+++ b/netwerk/cache2/CacheFileChunk.cpp
@@ -780,5 +780,5 @@ mozilla::Atomic<uint32_t>& CacheFileChunk::ChunksMemoryUsage()
   return mIsPriority ? prioChunksMemoryUsage : chunksMemoryUsage;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFileChunk.h b/netwerk/cache2/CacheFileChunk.h
index 2f7d39f37896..efa6bd70f75c 100644
--- a/netwerk/cache2/CacheFileChunk.h
+++ b/netwerk/cache2/CacheFileChunk.h
@@ -158,7 +158,7 @@ private:
 };
 
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFileContextEvictor.cpp b/netwerk/cache2/CacheFileContextEvictor.cpp
index d8ab93f643c1..561c7fa76ae6 100644
--- a/netwerk/cache2/CacheFileContextEvictor.cpp
+++ b/netwerk/cache2/CacheFileContextEvictor.cpp
@@ -591,5 +591,5 @@ CacheFileContextEvictor::EvictEntries()
   return NS_OK;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFileContextEvictor.h b/netwerk/cache2/CacheFileContextEvictor.h
index 1ab2167f4802..bf8111547ff2 100644
--- a/netwerk/cache2/CacheFileContextEvictor.h
+++ b/netwerk/cache2/CacheFileContextEvictor.h
@@ -88,7 +88,7 @@ private:
   nsCOMPtr<nsIFile> mEntriesDir;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFileIOManager.cpp b/netwerk/cache2/CacheFileIOManager.cpp
index 632f6608cf54..7cfa07eaf8e7 100644
--- a/netwerk/cache2/CacheFileIOManager.cpp
+++ b/netwerk/cache2/CacheFileIOManager.cpp
@@ -2719,7 +2719,7 @@ EvictionNotifierRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 CacheFileIOManager::EvictAllInternal()
@@ -3883,7 +3883,7 @@ CacheFileIOManager::UpdateSmartCacheSize(int64_t aFreeSpace)
 
 // Memory reporting
 
-namespace { // anon
+namespace {
 
 // A helper class that dispatches and waits for an event that gets result of
 // CacheFileIOManager->mHandles.SizeOfExcludingThis() on the I/O thread
@@ -3944,7 +3944,7 @@ private:
   size_t mSize;
 };
 
-} // anon
+} // namespace
 
 size_t
 CacheFileIOManager::SizeOfExcludingThisInternal(mozilla::MallocSizeOf mallocSizeOf) const
@@ -4004,5 +4004,5 @@ CacheFileIOManager::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf)
   return mallocSizeOf(gInstance) + SizeOfExcludingThis(mallocSizeOf);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFileIOManager.h b/netwerk/cache2/CacheFileIOManager.h
index 39e368158bf8..aaae0a790b6f 100644
--- a/netwerk/cache2/CacheFileIOManager.h
+++ b/netwerk/cache2/CacheFileIOManager.h
@@ -407,7 +407,7 @@ private:
   TimeStamp                            mLastSmartSizeTime;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFileInputStream.cpp b/netwerk/cache2/CacheFileInputStream.cpp
index 974007cbff40..108a681da6ea 100644
--- a/netwerk/cache2/CacheFileInputStream.cpp
+++ b/netwerk/cache2/CacheFileInputStream.cpp
@@ -631,5 +631,5 @@ CacheFileInputStream::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) co
   return mallocSizeOf(this);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFileInputStream.h b/netwerk/cache2/CacheFileInputStream.h
index 22f60b7736e7..d3781dad05ab 100644
--- a/netwerk/cache2/CacheFileInputStream.h
+++ b/netwerk/cache2/CacheFileInputStream.h
@@ -67,7 +67,7 @@ private:
 };
 
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFileMetadata.cpp b/netwerk/cache2/CacheFileMetadata.cpp
index d0585eefa12d..5355ce17ff72 100644
--- a/netwerk/cache2/CacheFileMetadata.cpp
+++ b/netwerk/cache2/CacheFileMetadata.cpp
@@ -997,5 +997,5 @@ CacheFileMetadata::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const
   return mallocSizeOf(this) + SizeOfExcludingThis(mallocSizeOf);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFileMetadata.h b/netwerk/cache2/CacheFileMetadata.h
index 100832a12150..b02eead05767 100644
--- a/netwerk/cache2/CacheFileMetadata.h
+++ b/netwerk/cache2/CacheFileMetadata.h
@@ -197,7 +197,7 @@ private:
 };
 
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFileOutputStream.cpp b/netwerk/cache2/CacheFileOutputStream.cpp
index b78d541a8861..9566e32a316d 100644
--- a/netwerk/cache2/CacheFileOutputStream.cpp
+++ b/netwerk/cache2/CacheFileOutputStream.cpp
@@ -450,5 +450,5 @@ CacheFileOutputStream::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) c
   return mallocSizeOf(this);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFileOutputStream.h b/netwerk/cache2/CacheFileOutputStream.h
index 778891832b54..f8cdcf3bbaf7 100644
--- a/netwerk/cache2/CacheFileOutputStream.h
+++ b/netwerk/cache2/CacheFileOutputStream.h
@@ -63,7 +63,7 @@ private:
 };
 
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheFileUtils.cpp b/netwerk/cache2/CacheFileUtils.cpp
index 170df7f0d87c..0082b5cf2127 100644
--- a/netwerk/cache2/CacheFileUtils.cpp
+++ b/netwerk/cache2/CacheFileUtils.cpp
@@ -15,7 +15,7 @@ namespace mozilla {
 namespace net {
 namespace CacheFileUtils {
 
-namespace { // anon
+namespace {
 
 /**
  * A simple recursive descent parser for the mapping key.
@@ -196,7 +196,7 @@ public:
   }
 };
 
-} // anon
+} // namespace
 
 already_AddRefed<nsILoadContextInfo>
 ParseKey(const nsCSubstring &aKey,
@@ -534,6 +534,6 @@ DetailedCacheHitTelemetry::AddRecord(ERecType aType, TimeStamp aLoadStart)
   }
 }
 
-} // CacheFileUtils
-} // net
-} // mozilla
+} // namespace CacheFileUtils
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheFileUtils.h b/netwerk/cache2/CacheFileUtils.h
index 2fa2a08746f6..bc876d85235b 100644
--- a/netwerk/cache2/CacheFileUtils.h
+++ b/netwerk/cache2/CacheFileUtils.h
@@ -146,8 +146,8 @@ private:
   static HitRate sHRStats[kNumOfRanges];
 };
 
-} // CacheFileUtils
-} // net
-} // mozilla
+} // namespace CacheFileUtils
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheHashUtils.cpp b/netwerk/cache2/CacheHashUtils.cpp
index 2171d27ae0dc..8e4eda56b598 100644
--- a/netwerk/cache2/CacheHashUtils.cpp
+++ b/netwerk/cache2/CacheHashUtils.cpp
@@ -187,6 +187,6 @@ CacheHash::GetHash16()
   return (hash & 0xFFFF);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
diff --git a/netwerk/cache2/CacheHashUtils.h b/netwerk/cache2/CacheHashUtils.h
index 4e25e25511b4..d97e76ff9371 100644
--- a/netwerk/cache2/CacheHashUtils.h
+++ b/netwerk/cache2/CacheHashUtils.h
@@ -55,7 +55,7 @@ private:
 };
 
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheIOThread.cpp b/netwerk/cache2/CacheIOThread.cpp
index 8b00ca1f82d4..be238954a60b 100644
--- a/netwerk/cache2/CacheIOThread.cpp
+++ b/netwerk/cache2/CacheIOThread.cpp
@@ -349,5 +349,5 @@ size_t CacheIOThread::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) co
   return mallocSizeOf(this) + SizeOfExcludingThis(mallocSizeOf);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheIOThread.h b/netwerk/cache2/CacheIOThread.h
index 031254bb6574..077d4d98db0b 100644
--- a/netwerk/cache2/CacheIOThread.h
+++ b/netwerk/cache2/CacheIOThread.h
@@ -99,7 +99,7 @@ private:
   DebugOnly<bool> mInsideLoop;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheIndex.cpp b/netwerk/cache2/CacheIndex.cpp
index 3d98963b2ba1..dc7700d293cd 100644
--- a/netwerk/cache2/CacheIndex.cpp
+++ b/netwerk/cache2/CacheIndex.cpp
@@ -21,6 +21,7 @@
 #include "mozilla/AutoRestore.h"
 #include <algorithm>
 #include "mozilla/Telemetry.h"
+#include "mozilla/unused.h"
 
 
 #define kMinUnwrittenChanges   300
@@ -1609,7 +1610,7 @@ CacheIndex::WriteIndexToDisk()
   mSkipEntries = 0;
 }
 
-namespace { // anon
+namespace {
 
 struct WriteRecordsHelper
 {
@@ -1622,7 +1623,7 @@ struct WriteRecordsHelper
 #endif
 };
 
-} // anon
+} // namespace
 
 void
 CacheIndex::WriteRecords()
@@ -3045,7 +3046,7 @@ CacheIndex::FinishUpdate(bool aSucceeded)
       NS_WARNING(("CacheIndex::FinishUpdate() - Leaking mDirEnumerator!"));
       // This can happen only in case dispatching event to IO thread failed in
       // CacheIndex::PreShutdown().
-      mDirEnumerator.forget(); // Leak it since dir enumerator is not threadsafe
+      unused << mDirEnumerator.forget(); // Leak it since dir enumerator is not threadsafe
     } else {
       mDirEnumerator->Close();
       mDirEnumerator = nullptr;
@@ -3195,7 +3196,7 @@ CacheIndex::ReleaseBuffer()
   mRWBufPos = 0;
 }
 
-namespace { // anon
+namespace {
 
 class FrecencyComparator
 {
@@ -3215,7 +3216,7 @@ public:
   }
 };
 
-} // anon
+} // namespace
 
 void
 CacheIndex::InsertRecordToFrecencyArray(CacheIndexRecord *aRecord)
@@ -3633,7 +3634,7 @@ CacheIndex::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf)
   return mallocSizeOf(gInstance) + SizeOfExcludingThis(mallocSizeOf);
 }
 
-namespace { // anon
+namespace {
 
 class HashComparator
 {
@@ -3679,7 +3680,7 @@ ReportHashSizeMatch(const SHA1Sum::Hash *aHash1, const SHA1Sum::Hash *aHash2)
   MOZ_ASSERT(false, "Found a collision in the index!");
 }
 
-} // anon
+} // namespace
 
 void
 CacheIndex::ReportHashStats()
@@ -3701,5 +3702,5 @@ CacheIndex::ReportHashStats()
   CacheObserver::SetHashStatsReported();
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheIndex.h b/netwerk/cache2/CacheIndex.h
index 2a703ef285c1..65eebe6271b9 100644
--- a/netwerk/cache2/CacheIndex.h
+++ b/netwerk/cache2/CacheIndex.h
@@ -1151,7 +1151,7 @@ private:
   bool mLocked;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheIndexContextIterator.cpp b/netwerk/cache2/CacheIndexContextIterator.cpp
index 825b495da035..5f3cb7bd7c34 100644
--- a/netwerk/cache2/CacheIndexContextIterator.cpp
+++ b/netwerk/cache2/CacheIndexContextIterator.cpp
@@ -41,5 +41,5 @@ CacheIndexContextIterator::AddRecords(
   }
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheIndexContextIterator.h b/netwerk/cache2/CacheIndexContextIterator.h
index 49797522d24f..32eb9c4789a3 100644
--- a/netwerk/cache2/CacheIndexContextIterator.h
+++ b/netwerk/cache2/CacheIndexContextIterator.h
@@ -26,7 +26,7 @@ private:
   nsCOMPtr<nsILoadContextInfo> mInfo;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheIndexIterator.cpp b/netwerk/cache2/CacheIndexIterator.cpp
index ad43ec53a36c..57e8601fa39b 100644
--- a/netwerk/cache2/CacheIndexIterator.cpp
+++ b/netwerk/cache2/CacheIndexIterator.cpp
@@ -122,5 +122,5 @@ CacheIndexIterator::ReplaceRecord(CacheIndexRecord *aOldRecord,
   return false;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheIndexIterator.h b/netwerk/cache2/CacheIndexIterator.h
index 1ca005c1ffe5..10c16098b291 100644
--- a/netwerk/cache2/CacheIndexIterator.h
+++ b/netwerk/cache2/CacheIndexIterator.h
@@ -54,7 +54,7 @@ protected:
   bool                         mAddNew;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheLog.cpp b/netwerk/cache2/CacheLog.cpp
index 8ad96df76c48..b9205c20d78d 100644
--- a/netwerk/cache2/CacheLog.cpp
+++ b/netwerk/cache2/CacheLog.cpp
@@ -24,5 +24,5 @@ PRLogModuleInfo* GetCache2Log()
   return sLog;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheLog.h b/netwerk/cache2/CacheLog.h
index 751f2471dfb6..a726d852cd97 100644
--- a/netwerk/cache2/CacheLog.h
+++ b/netwerk/cache2/CacheLog.h
@@ -14,7 +14,7 @@ extern PRLogModuleInfo* GetCache2Log();
 #define LOG(x)  MOZ_LOG(GetCache2Log(), mozilla::LogLevel::Debug, x)
 #define LOG_ENABLED() MOZ_LOG_TEST(GetCache2Log(), mozilla::LogLevel::Debug)
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheObserver.cpp b/netwerk/cache2/CacheObserver.cpp
index 65d8e70c8f9f..be276e55b9b4 100644
--- a/netwerk/cache2/CacheObserver.cpp
+++ b/netwerk/cache2/CacheObserver.cpp
@@ -391,7 +391,7 @@ void CacheObserver::ParentDirOverride(nsIFile** aDir)
   sSelf->mCacheParentDirectoryOverride->Clone(aDir);
 }
 
-namespace { // anon
+namespace {
 
 class CacheStorageEvictHelper
 {
@@ -466,7 +466,7 @@ CacheStorageEvictHelper::ClearStorage(bool const aPrivate,
   return NS_OK;
 }
 
-} // anon
+} // namespace
 
 // static
 bool const CacheObserver::EntryIsTooBig(int64_t aSize, bool aUsingDisk)
@@ -566,5 +566,5 @@ CacheObserver::Observe(nsISupports* aSubject,
   return NS_OK;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheObserver.h b/netwerk/cache2/CacheObserver.h
index 017008c47de4..deeed2f9aba3 100644
--- a/netwerk/cache2/CacheObserver.h
+++ b/netwerk/cache2/CacheObserver.h
@@ -106,7 +106,7 @@ private:
   nsCOMPtr<nsIFile> mCacheParentDirectoryOverride;
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheStorage.cpp b/netwerk/cache2/CacheStorage.cpp
index c420193bb2bf..e862adb7296b 100644
--- a/netwerk/cache2/CacheStorage.cpp
+++ b/netwerk/cache2/CacheStorage.cpp
@@ -216,5 +216,5 @@ nsresult CacheStorage::ChooseApplicationCache(nsIURI* aURI,
   return NS_OK;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheStorage.h b/netwerk/cache2/CacheStorage.h
index f9072d739556..be0f805e19a8 100644
--- a/netwerk/cache2/CacheStorage.h
+++ b/netwerk/cache2/CacheStorage.h
@@ -69,7 +69,7 @@ public:
   bool LookupAppCache() const { return mLookupAppCache; }
 };
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cache2/CacheStorageService.cpp b/netwerk/cache2/CacheStorageService.cpp
index 649ffe2c1906..7aa1cc3a4c5c 100644
--- a/netwerk/cache2/CacheStorageService.cpp
+++ b/netwerk/cache2/CacheStorageService.cpp
@@ -42,7 +42,7 @@ void AppendMemoryStorageID(nsAutoCString &key)
   key.Append('M');
 }
 
-}
+} // namespace
 
 // Not defining as static or class member of CacheStorageService since
 // it would otherwise need to include CacheEntry.h and that then would
@@ -168,7 +168,7 @@ void CacheStorageService::ShutdownBackground()
 
 // Internal management methods
 
-namespace { // anon
+namespace {
 
 // WalkCacheRunnable
 // Base class for particular storage entries visiting
@@ -523,7 +523,7 @@ PLDHashOperator CollectContexts(const nsACString& aKey,
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 void CacheStorageService::DropPrivateBrowsingEntries()
 {
@@ -539,7 +539,7 @@ void CacheStorageService::DropPrivateBrowsingEntries()
     DoomStorageEntries(keys[i], nullptr, true, nullptr);
 }
 
-namespace { // anon
+namespace {
 
 class CleaupCacheDirectoriesRunnable : public nsRunnable
 {
@@ -626,7 +626,7 @@ NS_IMETHODIMP CleaupCacheDirectoriesRunnable::Run()
   return NS_OK;
 }
 
-} // anon
+} // namespace
 
 // static
 void CacheStorageService::CleaupCacheDirectories(uint32_t aVersion, uint32_t aActive)
@@ -837,7 +837,7 @@ NS_IMETHODIMP CacheStorageService::GetIoTarget(nsIEventTarget** aEventTarget)
 
 // Methods used by CacheEntry for management of in-memory structures.
 
-namespace { // anon
+namespace {
 
 class FrecencyComparator
 {
@@ -861,7 +861,7 @@ public:
   }
 };
 
-} // anon
+} // namespace
 
 void
 CacheStorageService::RegisterEntry(CacheEntry* aEntry)
@@ -1082,7 +1082,7 @@ void CacheStorageService::ForceEntryValidFor(nsACString &aCacheEntryKey,
   mForcedValidEntries.Put(aCacheEntryKey, validUntil);
 }
 
-namespace { // anon
+namespace {
 
 PLDHashOperator PruneForcedValidEntries(
   const nsACString& aKey, TimeStamp& aTimeStamp, void* aClosure)
@@ -1095,7 +1095,7 @@ PLDHashOperator PruneForcedValidEntries(
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 // Cleans out the old entries in mForcedValidEntries
 void CacheStorageService::ForcedValidEntriesPrune(TimeStamp &now)
@@ -1487,7 +1487,7 @@ CacheStorageService::CheckStorageEntry(CacheStorage const* aStorage,
   return NS_OK;
 }
 
-namespace { // anon
+namespace {
 
 class CacheEntryDoomByKeyCallback : public CacheFileIOListener
                                   , public nsIRunnable
@@ -1543,7 +1543,7 @@ NS_IMETHODIMP CacheEntryDoomByKeyCallback::Run()
 
 NS_IMPL_ISUPPORTS(CacheEntryDoomByKeyCallback, CacheFileIOListener, nsIRunnable);
 
-} // anon
+} // namespace
 
 nsresult
 CacheStorageService::DoomStorageEntry(CacheStorage const* aStorage,
@@ -1856,7 +1856,7 @@ CacheStorageService::GetCacheEntryInfo(CacheEntry* aEntry,
 
 // Telementry collection
 
-namespace { // anon
+namespace {
 
 bool TelemetryEntryKey(CacheEntry const* entry, nsAutoCString& key)
 {
@@ -1892,7 +1892,7 @@ PLDHashOperator PrunePurgeTimeStamps(
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 void
 CacheStorageService::TelemetryPrune(TimeStamp &now)
@@ -1988,7 +1988,7 @@ CacheStorageService::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) con
   return mallocSizeOf(this) + SizeOfExcludingThis(mallocSizeOf);
 }
 
-namespace { // anon
+namespace {
 
 class ReportStorageMemoryData
 {
@@ -2045,7 +2045,7 @@ PLDHashOperator ReportStorageMemory(const nsACString& aKey,
   return PL_DHASH_NEXT;
 }
 
-} // anon
+} // namespace
 
 NS_IMETHODIMP
 CacheStorageService::CollectReports(nsIMemoryReporterCallback* aHandleReport,
@@ -2098,5 +2098,5 @@ CacheStorageService::CollectReports(nsIMemoryReporterCallback* aHandleReport,
   return NS_OK;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/CacheStorageService.h b/netwerk/cache2/CacheStorageService.h
index 52e84ba2fb57..e79283805d99 100644
--- a/netwerk/cache2/CacheStorageService.h
+++ b/netwerk/cache2/CacheStorageService.h
@@ -378,8 +378,8 @@ void ProxyReleaseMainThread(nsCOMPtr<T> &object)
   ProxyRelease(object, mainThread);
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
 
 #define NS_CACHE_STORAGE_SERVICE_CID \
   { 0xea70b098, 0x5014, 0x4e21, \
diff --git a/netwerk/cache2/OldWrappers.cpp b/netwerk/cache2/OldWrappers.cpp
index 1022ed1f920e..4e3feb15f6fb 100644
--- a/netwerk/cache2/OldWrappers.cpp
+++ b/netwerk/cache2/OldWrappers.cpp
@@ -31,7 +31,7 @@ static uint32_t const CHECK_MULTITHREADED = nsICacheStorage::CHECK_MULTITHREADED
 namespace mozilla {
 namespace net {
 
-namespace { // anon
+namespace {
 
 // Fires the doom callback back on the main thread
 // after the cache I/O thread is looped.
@@ -125,7 +125,7 @@ NS_IMETHODIMP DoomCallbackWrapper::OnCacheEntryDoomed(nsresult status)
   return NS_OK;
 }
 
-} // anon
+} // namespace
 
 // _OldVisitCallbackWrapper
 // Receives visit callbacks from the old API and forwards it to the new API
@@ -490,7 +490,7 @@ NS_IMETHODIMP _OldCacheEntryWrapper::HasWriteAccess(bool aWriteAllowed_unused, b
   return NS_OK;
 }
 
-namespace { // anon
+namespace {
 
 class MetaDataVisitorWrapper : public nsICacheMetaDataVisitor
 {
@@ -513,7 +513,7 @@ MetaDataVisitorWrapper::VisitMetaDataElement(char const * key,
   return mCB->OnMetaDataElement(key, value);
 }
 
-} // anon
+} // namespace
 
 NS_IMETHODIMP _OldCacheEntryWrapper::VisitMetaData(nsICacheEntryMetaDataVisitor* cb)
 {
@@ -521,7 +521,7 @@ NS_IMETHODIMP _OldCacheEntryWrapper::VisitMetaData(nsICacheEntryMetaDataVisitor*
   return mOldDesc->VisitMetaData(w);
 }
 
-namespace { // anon
+namespace {
 
 nsresult
 GetCacheSessionNameForStoragePolicy(
@@ -655,7 +655,7 @@ GetCacheSession(nsCSubstring const &aScheme,
   return NS_OK;
 }
 
-} // anon
+} // namespace
 
 
 NS_IMPL_ISUPPORTS_INHERITED(_OldCacheLoad, nsRunnable, nsICacheListener)
@@ -1171,5 +1171,5 @@ nsresult _OldStorage::ChooseApplicationCache(nsCSubstring const &cacheKey,
   return NS_OK;
 }
 
-} // net
-} // mozilla
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/cache2/OldWrappers.h b/netwerk/cache2/OldWrappers.h
index c56eda31dbbb..b1979a880858 100644
--- a/netwerk/cache2/OldWrappers.h
+++ b/netwerk/cache2/OldWrappers.h
@@ -263,6 +263,7 @@ private:
   int64_t mSize;
 };
 
-}}
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/cookie/CookieServiceChild.cpp b/netwerk/cookie/CookieServiceChild.cpp
index 4f67f0316d15..615f9c629732 100644
--- a/netwerk/cookie/CookieServiceChild.cpp
+++ b/netwerk/cookie/CookieServiceChild.cpp
@@ -223,6 +223,6 @@ CookieServiceChild::SetCookieStringFromHttp(nsIURI     *aHostURI,
                                  aServerTime, true);
 }
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
diff --git a/netwerk/cookie/CookieServiceChild.h b/netwerk/cookie/CookieServiceChild.h
index 9b556615eee6..bc6efedf41a5 100644
--- a/netwerk/cookie/CookieServiceChild.h
+++ b/netwerk/cookie/CookieServiceChild.h
@@ -60,8 +60,8 @@ protected:
   bool mThirdPartySession;
 };
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_CookieServiceChild_h__
 
diff --git a/netwerk/cookie/CookieServiceParent.cpp b/netwerk/cookie/CookieServiceParent.cpp
index e7fcce2e15f4..5fa863b7fffa 100644
--- a/netwerk/cookie/CookieServiceParent.cpp
+++ b/netwerk/cookie/CookieServiceParent.cpp
@@ -146,6 +146,6 @@ CookieServiceParent::CloneProtocol(Channel* aChannel,
   return actor.forget();
 }
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
diff --git a/netwerk/cookie/CookieServiceParent.h b/netwerk/cookie/CookieServiceParent.h
index e449a30dc327..4204d6b802c7 100644
--- a/netwerk/cookie/CookieServiceParent.h
+++ b/netwerk/cookie/CookieServiceParent.h
@@ -51,8 +51,8 @@ protected:
   nsRefPtr<nsCookieService> mCookieService;
 };
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_CookieServiceParent_h
 
diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index 02e9cab15c92..124beb16d7e7 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -598,7 +598,7 @@ public:
 
 NS_IMPL_ISUPPORTS(AppClearDataObserver, nsIObserver)
 
-} // anonymous namespace
+} // namespace
 
 size_t
 nsCookieKey::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
@@ -4012,7 +4012,7 @@ struct GetCookiesForAppStruct {
   {}
 };
 
-} // anonymous namespace
+} // namespace
 
 /* static */ PLDHashOperator
 nsCookieService::GetCookiesForApp(nsCookieEntry* entry, void* arg)
diff --git a/netwerk/cookie/nsCookieService.h b/netwerk/cookie/nsCookieService.h
index bb7a5422289b..1d375ad94a99 100644
--- a/netwerk/cookie/nsCookieService.h
+++ b/netwerk/cookie/nsCookieService.h
@@ -47,8 +47,8 @@ struct nsListIter;
 namespace mozilla {
 namespace net {
 class CookieServiceParent;
-}
-}
+} // namespace net
+} // namespace mozilla
 
 // hash key class
 class nsCookieKey : public PLDHashEntryHdr
diff --git a/netwerk/dns/ChildDNSService.h b/netwerk/dns/ChildDNSService.h
index 9a0b4ceadf86..bb0f5366e21b 100644
--- a/netwerk/dns/ChildDNSService.h
+++ b/netwerk/dns/ChildDNSService.h
@@ -55,4 +55,5 @@ private:
 
 } // namespace net
 } // namespace mozilla
+
 #endif // mozilla_net_ChildDNSService_h
diff --git a/netwerk/dns/DNS.cpp b/netwerk/dns/DNS.cpp
index f0dc59375de6..90536065ef4b 100644
--- a/netwerk/dns/DNS.cpp
+++ b/netwerk/dns/DNS.cpp
@@ -332,5 +332,5 @@ AddrInfo::SizeOfIncludingThis(MallocSizeOf mallocSizeOf) const
   return n;
 }
 
-} // namespace dns
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/dns/DNSListenerProxy.h b/netwerk/dns/DNSListenerProxy.h
index e406731219e2..76761a773255 100644
--- a/netwerk/dns/DNSListenerProxy.h
+++ b/netwerk/dns/DNSListenerProxy.h
@@ -68,4 +68,5 @@ private:
 
 } // namespace net
 } // namespace mozilla
+
 #endif // DNSListenerProxy_h__
diff --git a/netwerk/dns/DNSRequestChild.cpp b/netwerk/dns/DNSRequestChild.cpp
index 85115f6c6e45..16f83614fdaa 100644
--- a/netwerk/dns/DNSRequestChild.cpp
+++ b/netwerk/dns/DNSRequestChild.cpp
@@ -309,4 +309,5 @@ DNSRequestChild::Cancel(nsresult reason)
 }
 
 //------------------------------------------------------------------------------
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/dns/DNSRequestChild.h b/netwerk/dns/DNSRequestChild.h
index e36cd6af3092..26d4ff98d76a 100644
--- a/netwerk/dns/DNSRequestChild.h
+++ b/netwerk/dns/DNSRequestChild.h
@@ -57,4 +57,5 @@ protected:
 
 } // namespace net
 } // namespace mozilla
+
 #endif // mozilla_net_DNSRequestChild_h
diff --git a/netwerk/dns/DNSRequestParent.cpp b/netwerk/dns/DNSRequestParent.cpp
index 656fabc4af4b..fc47c089f8b8 100644
--- a/netwerk/dns/DNSRequestParent.cpp
+++ b/netwerk/dns/DNSRequestParent.cpp
@@ -127,4 +127,5 @@ DNSRequestParent::OnLookupComplete(nsICancelable *request,
 
 
 
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/dns/DNSRequestParent.h b/netwerk/dns/DNSRequestParent.h
index ef22899692f0..d217dbd4fe17 100644
--- a/netwerk/dns/DNSRequestParent.h
+++ b/netwerk/dns/DNSRequestParent.h
@@ -46,4 +46,5 @@ private:
 
 } // namespace net
 } // namespace mozilla
+
 #endif // mozilla_net_DNSRequestParent_h
diff --git a/netwerk/ipc/ChannelEventQueue.cpp b/netwerk/ipc/ChannelEventQueue.cpp
index 8f236da2eec2..bf4d7529acd1 100644
--- a/netwerk/ipc/ChannelEventQueue.cpp
+++ b/netwerk/ipc/ChannelEventQueue.cpp
@@ -76,5 +76,5 @@ ChannelEventQueue::RetargetDeliveryTo(nsIEventTarget* aTargetThread)
   return NS_OK;
 }
 
-}
-}
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/ipc/ChannelEventQueue.h b/netwerk/ipc/ChannelEventQueue.h
index ec94c70a4e39..be8d99139db4 100644
--- a/netwerk/ipc/ChannelEventQueue.h
+++ b/netwerk/ipc/ChannelEventQueue.h
@@ -172,7 +172,7 @@ class MOZ_STACK_CLASS AutoEventEnqueuer
   nsRefPtr<ChannelEventQueue> mEventQueue;
 };
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/ipc/NeckoChild.cpp b/netwerk/ipc/NeckoChild.cpp
index ba499b0225ab..3a595d62e7e2 100644
--- a/netwerk/ipc/NeckoChild.cpp
+++ b/netwerk/ipc/NeckoChild.cpp
@@ -386,5 +386,6 @@ NeckoChild::RecvAppOfflineStatus(const uint32_t& aId, const bool& aOffline)
   return true;
 }
 
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
 
diff --git a/netwerk/ipc/NeckoCommon.cpp b/netwerk/ipc/NeckoCommon.cpp
index 3391f0da888f..0b4b4dd883bd 100644
--- a/netwerk/ipc/NeckoCommon.cpp
+++ b/netwerk/ipc/NeckoCommon.cpp
@@ -13,7 +13,7 @@ namespace net {
 namespace NeckoCommonInternal {
   bool gSecurityDisabled = true;
   bool gRegisteredBool = false;
-}
+} // namespace NeckoCommonInternal
 
 } // namespace net
 } // namespace mozilla
diff --git a/netwerk/ipc/NeckoCommon.h b/netwerk/ipc/NeckoCommon.h
index 8875f0f30541..15bf5da5b1ac 100644
--- a/netwerk/ipc/NeckoCommon.h
+++ b/netwerk/ipc/NeckoCommon.h
@@ -15,7 +15,8 @@
 
 namespace mozilla { namespace dom {
 class TabChild;
-}}
+} // namespace dom
+} // namespace mozilla
 
 #if defined(DEBUG)
 # define NECKO_ERRORS_ARE_FATAL_DEFAULT true
@@ -103,7 +104,7 @@ IsNeckoChild()
 namespace NeckoCommonInternal {
   extern bool gSecurityDisabled;
   extern bool gRegisteredBool;
-}
+} // namespace NeckoCommonInternal
 
 // This should always return true unless xpcshell tests are being used
 inline bool
diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h
index 4e93f7f55519..3886a81a8bd7 100644
--- a/netwerk/ipc/NeckoMessageUtils.h
+++ b/netwerk/ipc/NeckoMessageUtils.h
@@ -180,6 +180,6 @@ struct ParamTraits<mozilla::net::ResourceTimingStruct>
   }
 };
 
-}
+} // namespace IPC
 
 #endif // mozilla_net_NeckoMessageUtils_h
diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
index 469b120d8079..4966109e208c 100644
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -782,7 +782,7 @@ CallbackMap()
   static std::map<uint64_t, nsCOMPtr<nsIAuthPromptCallback> > sCallbackMap;
   return sCallbackMap;
 }
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(NeckoParent::NestedFrameAuthPrompt, nsIAuthPrompt2)
 
@@ -970,4 +970,5 @@ NeckoParent::OfflineNotification(nsISupports *aSubject)
   return NS_OK;
 }
 
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/ipc/RemoteOpenFileChild.h b/netwerk/ipc/RemoteOpenFileChild.h
index 97ae885015ea..d2fc0c87e789 100644
--- a/netwerk/ipc/RemoteOpenFileChild.h
+++ b/netwerk/ipc/RemoteOpenFileChild.h
@@ -20,7 +20,7 @@ namespace mozilla {
 
 namespace ipc {
 class FileDescriptor;
-}
+} // namespace ipc
 
 namespace net {
 
diff --git a/netwerk/protocol/data/DataChannelChild.cpp b/netwerk/protocol/data/DataChannelChild.cpp
index 8f6f846f9582..3eea542900ab 100644
--- a/netwerk/protocol/data/DataChannelChild.cpp
+++ b/netwerk/protocol/data/DataChannelChild.cpp
@@ -66,5 +66,5 @@ DataChannelChild::ActorDestroy(ActorDestroyReason why)
     Release();
 }
 
-} // namespace mozilla
 } // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/data/DataChannelChild.h b/netwerk/protocol/data/DataChannelChild.h
index 928c60aace78..8fa42177a031 100644
--- a/netwerk/protocol/data/DataChannelChild.h
+++ b/netwerk/protocol/data/DataChannelChild.h
@@ -37,7 +37,7 @@ private:
     bool mIPCOpen;
 };
 
-} // namespace mozilla
 } // namespace net
+} // namespace mozilla
 
 #endif /* NS_DATACHANNELCHILD_H */
diff --git a/netwerk/protocol/data/DataChannelParent.cpp b/netwerk/protocol/data/DataChannelParent.cpp
index 62871f61c8fb..68b14b40bdb8 100644
--- a/netwerk/protocol/data/DataChannelParent.cpp
+++ b/netwerk/protocol/data/DataChannelParent.cpp
@@ -84,5 +84,5 @@ DataChannelParent::OnDataAvailable(nsIRequest *aRequest,
     MOZ_CRASH("Should never be called");
 }
 
-} // namespace mozilla
 } // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/data/DataChannelParent.h b/netwerk/protocol/data/DataChannelParent.h
index 692727184914..e75fa737ed47 100644
--- a/netwerk/protocol/data/DataChannelParent.h
+++ b/netwerk/protocol/data/DataChannelParent.h
@@ -35,7 +35,7 @@ private:
     virtual void ActorDestroy(ActorDestroyReason why) override;
 };
 
-} // namespace mozilla
 } // namespace net
+} // namespace mozilla
 
 #endif /* NS_DATACHANNELPARENT_H */
diff --git a/netwerk/protocol/ftp/nsFTPChannel.cpp b/netwerk/protocol/ftp/nsFTPChannel.cpp
index 75e58dbf2805..ac3262d48706 100644
--- a/netwerk/protocol/ftp/nsFTPChannel.cpp
+++ b/netwerk/protocol/ftp/nsFTPChannel.cpp
@@ -183,7 +183,7 @@ FTPEventSinkProxy::OnFTPControlLogRunnable::Run()
     return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 nsFtpChannel::GetFTPEventSink(nsCOMPtr<nsIFTPEventSink> &aResult)
diff --git a/netwerk/protocol/http/ASpdySession.cpp b/netwerk/protocol/http/ASpdySession.cpp
index 3138ef51bc23..6c8fed403313 100644
--- a/netwerk/protocol/http/ASpdySession.cpp
+++ b/netwerk/protocol/http/ASpdySession.cpp
@@ -173,6 +173,7 @@ SpdyPushCache::RemovePushedStreamHttp2(nsCString key)
     mHashHttp2.Remove(key);
   return rv;
 }
-} // namespace mozilla::net
+
+} // namespace net
 } // namespace mozilla
 
diff --git a/netwerk/protocol/http/ASpdySession.h b/netwerk/protocol/http/ASpdySession.h
index 7d3705bfbcaf..c2e55555b713 100644
--- a/netwerk/protocol/http/ASpdySession.h
+++ b/netwerk/protocol/http/ASpdySession.h
@@ -117,6 +117,7 @@ public:
   ALPNCallback ALPNCallbacks[kCount];
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_ASpdySession_h
diff --git a/netwerk/protocol/http/AlternateServices.cpp b/netwerk/protocol/http/AlternateServices.cpp
index 9f7009c4148d..bbb0612a8a3e 100644
--- a/netwerk/protocol/http/AlternateServices.cpp
+++ b/netwerk/protocol/http/AlternateServices.cpp
@@ -584,5 +584,5 @@ AltSvcOverride::GetAllow1918(bool *allow)
 
 NS_IMPL_ISUPPORTS(AltSvcOverride, nsIInterfaceRequestor, nsISpeculativeConnectionOverrider)
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/AlternateServices.h b/netwerk/protocol/http/AlternateServices.h
index d66ad7c2327c..a3a9d49fa68f 100644
--- a/netwerk/protocol/http/AlternateServices.h
+++ b/netwerk/protocol/http/AlternateServices.h
@@ -133,6 +133,7 @@ private:
   nsRefPtrHashtable<nsCStringHashKey, AltSvcMapping> mHash;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // include guard
diff --git a/netwerk/protocol/http/ConnectionDiagnostics.cpp b/netwerk/protocol/http/ConnectionDiagnostics.cpp
index 00e552bd4477..28873c760808 100644
--- a/netwerk/protocol/http/ConnectionDiagnostics.cpp
+++ b/netwerk/protocol/http/ConnectionDiagnostics.cpp
@@ -251,5 +251,5 @@ nsHttpTransaction::PrintDiagnostics(nsCString &log)
   log.AppendPrintf("     classification = 0x%x\n", mClassification);
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/Http2Compression.cpp b/netwerk/protocol/http/Http2Compression.cpp
index e89e56989f2b..9bc69abd611e 100644
--- a/netwerk/protocol/http/Http2Compression.cpp
+++ b/netwerk/protocol/http/Http2Compression.cpp
@@ -1224,5 +1224,5 @@ Http2Compressor::SetMaxBufferSizeInternal(uint32_t maxBufferSize)
   return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/Http2Compression.h b/netwerk/protocol/http/Http2Compression.h
index 50d4d65f4ff4..60f0923040be 100644
--- a/netwerk/protocol/http/Http2Compression.h
+++ b/netwerk/protocol/http/Http2Compression.h
@@ -174,7 +174,7 @@ private:
   uint32_t mLowestBufferSizeWaiting;
 };
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // mozilla_net_Http2Compression_Internal_h
diff --git a/netwerk/protocol/http/Http2Push.cpp b/netwerk/protocol/http/Http2Push.cpp
index 1446ca964d5c..14d4f8a62fe6 100644
--- a/netwerk/protocol/http/Http2Push.cpp
+++ b/netwerk/protocol/http/Http2Push.cpp
@@ -445,5 +445,5 @@ Http2PushTransactionBuffer::GetBufferedData(char *buf,
   return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/Http2Push.h b/netwerk/protocol/http/Http2Push.h
index ece3483b4b6f..aab37ff17d88 100644
--- a/netwerk/protocol/http/Http2Push.h
+++ b/netwerk/protocol/http/Http2Push.h
@@ -119,7 +119,7 @@ private:
   uint32_t mBufferedHTTP1Consumed;
 };
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // mozilla_net_Http2Push_Internal_h
diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
index 97bc7c3c1e65..9a44c31c8c61 100644
--- a/netwerk/protocol/http/Http2Session.cpp
+++ b/netwerk/protocol/http/Http2Session.cpp
@@ -3720,5 +3720,5 @@ Http2Session::SendPing()
   ResumeRecv();
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/Http2Session.h b/netwerk/protocol/http/Http2Session.h
index 672554e9783e..e4752658ea8d 100644
--- a/netwerk/protocol/http/Http2Session.h
+++ b/netwerk/protocol/http/Http2Session.h
@@ -491,7 +491,7 @@ private:
   nsDataHashtable<nsCStringHashKey, uint32_t> mTunnelHash;
 };
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // mozilla_net_Http2Session_h
diff --git a/netwerk/protocol/http/Http2Stream.cpp b/netwerk/protocol/http/Http2Stream.cpp
index c48ce45af7ce..d0f631f98c5d 100644
--- a/netwerk/protocol/http/Http2Stream.cpp
+++ b/netwerk/protocol/http/Http2Stream.cpp
@@ -1361,6 +1361,6 @@ Http2Stream::MapStreamToHttpConnection()
                                      mTransaction->ConnectionInfo());
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
diff --git a/netwerk/protocol/http/Http2Stream.h b/netwerk/protocol/http/Http2Stream.h
index 4f53d8aa91fc..c22b6993c386 100644
--- a/netwerk/protocol/http/Http2Stream.h
+++ b/netwerk/protocol/http/Http2Stream.h
@@ -324,7 +324,7 @@ private:
   bool mPlainTextTunnel;
 };
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // mozilla_net_Http2Stream_h
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 127c497468bc..59cbb742daa7 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -1637,7 +1637,7 @@ private:
   NS_ConvertASCIItoUTF16 mCookie;
 };
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 HttpBaseChannel::SetCookie(const char *aCookieHeader)
@@ -2762,6 +2762,6 @@ HttpBaseChannel::GetPerformance()
 
 //------------------------------------------------------------------------------
 
-}  // namespace net
-}  // namespace mozilla
+} // namespace net
+} // namespace mozilla
 
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index c432759efee7..633c8564031e 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -57,7 +57,7 @@ static_assert(FileDescriptorSet::MAX_DESCRIPTORS_PER_MESSAGE == 250,
               "MAX_DESCRIPTORS_PER_MESSAGE mismatch!");
 #endif
 
-}
+} // namespace
 
 // A stream listener interposed between the nsInputStreamPump used for intercepted channels
 // and this channel's original listener. This is only used to ensure the original listener
@@ -2209,4 +2209,5 @@ HttpChannelChild::ForceIntercepted()
   return NS_OK;
 }
 
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index 17281bd17cc8..a7276d2bfd4e 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1321,4 +1321,5 @@ HttpChannelParent::ReportSecurityMessage(const nsAString& aMessageTag,
   return NS_OK;
 }
 
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h
index 68828843a485..fb9274d82f51 100644
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -30,7 +30,7 @@ namespace mozilla {
 namespace dom{
 class TabParent;
 class PBrowserOrId;
-}
+} // namespace dom
 
 namespace net {
 
diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp
index 729bcdaf7e25..b0a2573660ab 100644
--- a/netwerk/protocol/http/HttpChannelParentListener.cpp
+++ b/netwerk/protocol/http/HttpChannelParentListener.cpp
@@ -267,4 +267,5 @@ HttpChannelParentListener::DivertTo(nsIStreamListener* aListener)
   return ResumeForDiversion();
 }
 
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/http/HttpInfo.h b/netwerk/protocol/http/HttpInfo.h
index b7036debd07a..e13ffff16c80 100644
--- a/netwerk/protocol/http/HttpInfo.h
+++ b/netwerk/protocol/http/HttpInfo.h
@@ -19,6 +19,7 @@ public:
     static void GetHttpConnectionData(nsTArray<HttpRetParams> *);
 };
 
-} } // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpInfo__
diff --git a/netwerk/protocol/http/NullHttpTransaction.cpp b/netwerk/protocol/http/NullHttpTransaction.cpp
index 4a706992d577..32d1124a52c1 100644
--- a/netwerk/protocol/http/NullHttpTransaction.cpp
+++ b/netwerk/protocol/http/NullHttpTransaction.cpp
@@ -327,6 +327,6 @@ NullHttpTransaction::PipelinePosition()
   return 1;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
diff --git a/netwerk/protocol/http/NullHttpTransaction.h b/netwerk/protocol/http/NullHttpTransaction.h
index cc338ce7cf69..e4b91a2930ef 100644
--- a/netwerk/protocol/http/NullHttpTransaction.h
+++ b/netwerk/protocol/http/NullHttpTransaction.h
@@ -78,6 +78,7 @@ protected:
 
 NS_DEFINE_STATIC_IID_ACCESSOR(NullHttpTransaction, NS_NULLHTTPTRANSACTION_IID)
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_NullHttpTransaction_h
diff --git a/netwerk/protocol/http/PSpdyPush.h b/netwerk/protocol/http/PSpdyPush.h
index dd835eca113d..b0c9e2b7f67d 100644
--- a/netwerk/protocol/http/PSpdyPush.h
+++ b/netwerk/protocol/http/PSpdyPush.h
@@ -62,7 +62,7 @@ private:
   nsDataHashtable<nsCStringHashKey, Http2PushedStream *> mHashHttp2;
 };
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // mozilla_net_SpdyPush_Public_h
diff --git a/netwerk/protocol/http/SpdyPush31.cpp b/netwerk/protocol/http/SpdyPush31.cpp
index 26b592415ef3..3f2e655c334e 100644
--- a/netwerk/protocol/http/SpdyPush31.cpp
+++ b/netwerk/protocol/http/SpdyPush31.cpp
@@ -374,5 +374,5 @@ SpdyPush31TransactionBuffer::GetBufferedData(char *buf,
   return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/SpdyPush31.h b/netwerk/protocol/http/SpdyPush31.h
index 4cda1ca6b6db..e8ac9b4ce7a0 100644
--- a/netwerk/protocol/http/SpdyPush31.h
+++ b/netwerk/protocol/http/SpdyPush31.h
@@ -96,7 +96,7 @@ private:
   uint32_t mBufferedHTTP1Consumed;
 };
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // mozilla_net_SpdyPush3_Internal_h
diff --git a/netwerk/protocol/http/SpdySession31.cpp b/netwerk/protocol/http/SpdySession31.cpp
index f5084996689a..37d66c608c7a 100644
--- a/netwerk/protocol/http/SpdySession31.cpp
+++ b/netwerk/protocol/http/SpdySession31.cpp
@@ -3094,5 +3094,5 @@ SpdySession31::SendPing()
   gHttpHandler->ConnMgr()->ActivateTimeoutTick();
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/SpdySession31.h b/netwerk/protocol/http/SpdySession31.h
index 7d6b68494f28..011a4e532812 100644
--- a/netwerk/protocol/http/SpdySession31.h
+++ b/netwerk/protocol/http/SpdySession31.h
@@ -425,6 +425,7 @@ private:
   nsDataHashtable<nsCStringHashKey, uint32_t> mTunnelHash;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_SpdySession31_h
diff --git a/netwerk/protocol/http/SpdyStream31.cpp b/netwerk/protocol/http/SpdyStream31.cpp
index a8443c670b6b..7111450903f2 100644
--- a/netwerk/protocol/http/SpdyStream31.cpp
+++ b/netwerk/protocol/http/SpdyStream31.cpp
@@ -1647,5 +1647,5 @@ SpdyStream31::MapStreamToHttpConnection()
                                      mTransaction->ConnectionInfo());
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/SpdyStream31.h b/netwerk/protocol/http/SpdyStream31.h
index 7541b85f303d..535fec2f5849 100644
--- a/netwerk/protocol/http/SpdyStream31.h
+++ b/netwerk/protocol/http/SpdyStream31.h
@@ -277,6 +277,7 @@ private:
   bool mPlainTextTunnel;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_SpdyStream31_h
diff --git a/netwerk/protocol/http/TimingStruct.h b/netwerk/protocol/http/TimingStruct.h
index 024b9072b544..5d8969b08b2d 100644
--- a/netwerk/protocol/http/TimingStruct.h
+++ b/netwerk/protocol/http/TimingStruct.h
@@ -26,6 +26,7 @@ struct ResourceTimingStruct : TimingStruct {
   TimeStamp redirectEnd;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/protocol/http/TunnelUtils.cpp b/netwerk/protocol/http/TunnelUtils.cpp
index fbdc4c92b228..f3424744bee0 100644
--- a/netwerk/protocol/http/TunnelUtils.cpp
+++ b/netwerk/protocol/http/TunnelUtils.cpp
@@ -1643,5 +1643,5 @@ NS_IMPL_ISUPPORTS(OutputStreamShim, nsIOutputStream, nsIAsyncOutputStream)
 NS_IMPL_ISUPPORTS(SocketInWrapper, nsIAsyncInputStream)
 NS_IMPL_ISUPPORTS(SocketOutWrapper, nsIAsyncOutputStream)
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/TunnelUtils.h b/netwerk/protocol/http/TunnelUtils.h
index 553697aadac0..b1b741383858 100644
--- a/netwerk/protocol/http/TunnelUtils.h
+++ b/netwerk/protocol/http/TunnelUtils.h
@@ -239,6 +239,7 @@ private:
   nsRefPtr<nsHttpTransaction>    mDrivingTransaction;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_TLSFilterTransaction_h
diff --git a/netwerk/protocol/http/nsAHttpConnection.h b/netwerk/protocol/http/nsAHttpConnection.h
index d858342c25cd..e82f7ff4654f 100644
--- a/netwerk/protocol/http/nsAHttpConnection.h
+++ b/netwerk/protocol/http/nsAHttpConnection.h
@@ -246,6 +246,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsAHttpConnection, NS_AHTTPCONNECTION_IID)
             (fwdObject)->SetSecurityCallbacks(aCallbacks);  \
     }
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsAHttpConnection_h__
diff --git a/netwerk/protocol/http/nsAHttpTransaction.h b/netwerk/protocol/http/nsAHttpTransaction.h
index 5c71831d428e..a4317f275048 100644
--- a/netwerk/protocol/http/nsAHttpTransaction.h
+++ b/netwerk/protocol/http/nsAHttpTransaction.h
@@ -265,6 +265,7 @@ public:
 #define NS_DECL_NSAHTTPSEGMENTWRITER \
     nsresult OnWriteSegment(char *, uint32_t, uint32_t *) override;
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsAHttpTransaction_h__
diff --git a/netwerk/protocol/http/nsHttp.cpp b/netwerk/protocol/http/nsHttp.cpp
index 4f4a903c3076..05c4ca353d35 100644
--- a/netwerk/protocol/http/nsHttp.cpp
+++ b/netwerk/protocol/http/nsHttp.cpp
@@ -456,5 +456,5 @@ ParsedHeaderValueListList::ParsedHeaderValueListList(const nsCString &fullHeader
     }
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttp.h b/netwerk/protocol/http/nsHttp.h
index 81dff4ba6ce1..e1fd0e08da4d 100644
--- a/netwerk/protocol/http/nsHttp.h
+++ b/netwerk/protocol/http/nsHttp.h
@@ -251,7 +251,7 @@ private:
 };
 
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #endif // nsHttp_h__
diff --git a/netwerk/protocol/http/nsHttpActivityDistributor.cpp b/netwerk/protocol/http/nsHttpActivityDistributor.cpp
index b71140f0b019..ab135097755b 100644
--- a/netwerk/protocol/http/nsHttpActivityDistributor.cpp
+++ b/netwerk/protocol/http/nsHttpActivityDistributor.cpp
@@ -130,5 +130,6 @@ nsHttpActivityDistributor::RemoveObserver(nsIHttpActivityObserver *aObserver)
 
     return NS_OK;
 }
-} // namespace mozilla::net
+
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpActivityDistributor.h b/netwerk/protocol/http/nsHttpActivityDistributor.h
index 08fa696859ef..4da59de7ae72 100644
--- a/netwerk/protocol/http/nsHttpActivityDistributor.h
+++ b/netwerk/protocol/http/nsHttpActivityDistributor.h
@@ -29,6 +29,7 @@ protected:
     Mutex mLock;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpActivityDistributor_h__
diff --git a/netwerk/protocol/http/nsHttpAuthCache.cpp b/netwerk/protocol/http/nsHttpAuthCache.cpp
index 9c2a8ef1805d..79f05e858d16 100644
--- a/netwerk/protocol/http/nsHttpAuthCache.cpp
+++ b/netwerk/protocol/http/nsHttpAuthCache.cpp
@@ -609,5 +609,5 @@ nsHttpAuthNode::ClearAuthEntry(const char *realm)
     }
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpAuthCache.h b/netwerk/protocol/http/nsHttpAuthCache.h
index 0e79b51f36d5..d6f9475aaaea 100644
--- a/netwerk/protocol/http/nsHttpAuthCache.h
+++ b/netwerk/protocol/http/nsHttpAuthCache.h
@@ -255,6 +255,7 @@ private:
     nsRefPtr<AppDataClearObserver> mObserver;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpAuthCache_h__
diff --git a/netwerk/protocol/http/nsHttpAuthManager.cpp b/netwerk/protocol/http/nsHttpAuthManager.cpp
index 70634a59af43..b6f73f1698ef 100644
--- a/netwerk/protocol/http/nsHttpAuthManager.cpp
+++ b/netwerk/protocol/http/nsHttpAuthManager.cpp
@@ -149,5 +149,5 @@ nsHttpAuthManager::ClearAll()
   return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpAuthManager.h b/netwerk/protocol/http/nsHttpAuthManager.h
index 459c7f2bfdd0..261417c1dc87 100644
--- a/netwerk/protocol/http/nsHttpAuthManager.h
+++ b/netwerk/protocol/http/nsHttpAuthManager.h
@@ -29,6 +29,7 @@ protected:
   nsHttpAuthCache *mPrivateAuthCache;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpAuthManager_h__
diff --git a/netwerk/protocol/http/nsHttpBasicAuth.cpp b/netwerk/protocol/http/nsHttpBasicAuth.cpp
index 4938d8b3fdbc..b680c8643530 100644
--- a/netwerk/protocol/http/nsHttpBasicAuth.cpp
+++ b/netwerk/protocol/http/nsHttpBasicAuth.cpp
@@ -97,5 +97,5 @@ nsHttpBasicAuth::GetAuthFlags(uint32_t *flags)
     return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpBasicAuth.h b/netwerk/protocol/http/nsHttpBasicAuth.h
index 6a0b90dcb643..b824b1d5ac7b 100644
--- a/netwerk/protocol/http/nsHttpBasicAuth.h
+++ b/netwerk/protocol/http/nsHttpBasicAuth.h
@@ -26,6 +26,7 @@ private:
 	virtual ~nsHttpBasicAuth();
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // !nsHttpBasicAuth_h__
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 4811065118ac..d8444a1f3cc1 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -6811,4 +6811,5 @@ nsHttpChannel::OnPush(const nsACString &url, Http2PushedStream *pushedStream)
     return rv;
 }
 
-} } // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 3c8a6423de9d..99e2f21ff597 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -511,6 +511,7 @@ private: // cache telemetry
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsHttpChannel, NS_HTTPCHANNEL_IID)
-} } // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpChannel_h__
diff --git a/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp b/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
index 348886b1cffe..f597c5b579b1 100644
--- a/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
+++ b/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
@@ -1427,5 +1427,5 @@ nsHttpChannelAuthProvider::GetCurrentPath(nsACString &path)
 NS_IMPL_ISUPPORTS(nsHttpChannelAuthProvider, nsICancelable,
                   nsIHttpChannelAuthProvider, nsIAuthPromptCallback)
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpChannelAuthProvider.h b/netwerk/protocol/http/nsHttpChannelAuthProvider.h
index 649c5de7cd73..05b18162dd61 100644
--- a/netwerk/protocol/http/nsHttpChannelAuthProvider.h
+++ b/netwerk/protocol/http/nsHttpChannelAuthProvider.h
@@ -162,6 +162,7 @@ private:
     static uint32_t                   sAuthAllowPref;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpChannelAuthProvider_h__
diff --git a/netwerk/protocol/http/nsHttpChunkedDecoder.cpp b/netwerk/protocol/http/nsHttpChunkedDecoder.cpp
index cafcc4868554..f6c1eb00b975 100644
--- a/netwerk/protocol/http/nsHttpChunkedDecoder.cpp
+++ b/netwerk/protocol/http/nsHttpChunkedDecoder.cpp
@@ -159,5 +159,5 @@ nsHttpChunkedDecoder::ParseChunkRemaining(char *buf,
     return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpChunkedDecoder.h b/netwerk/protocol/http/nsHttpChunkedDecoder.h
index 4bb77c18b53b..64c8fbf6484a 100644
--- a/netwerk/protocol/http/nsHttpChunkedDecoder.h
+++ b/netwerk/protocol/http/nsHttpChunkedDecoder.h
@@ -50,6 +50,7 @@ private:
     bool               mWaitEOF;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp
index 1dae66a610d5..65064795b670 100644
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -2128,5 +2128,5 @@ nsHttpConnection::CheckForTraffic(bool check)
     }
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpConnection.h b/netwerk/protocol/http/nsHttpConnection.h
index 6963061d5e73..5ad6dc0dab4a 100644
--- a/netwerk/protocol/http/nsHttpConnection.h
+++ b/netwerk/protocol/http/nsHttpConnection.h
@@ -349,6 +349,7 @@ private:
     nsCOMPtr<nsITimer>              mTCPKeepaliveTransitionTimer;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpConnection_h__
diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.cpp b/netwerk/protocol/http/nsHttpConnectionInfo.cpp
index 5a0fef6d7c9c..c431fe75d141 100644
--- a/netwerk/protocol/http/nsHttpConnectionInfo.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionInfo.cpp
@@ -279,5 +279,5 @@ nsHttpConnectionInfo::HostIsLocalIPLiteral() const
     return IsIPAddrLocal(&netAddr);
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.h b/netwerk/protocol/http/nsHttpConnectionInfo.h
index baea08efff83..01bbc25489cb 100644
--- a/netwerk/protocol/http/nsHttpConnectionInfo.h
+++ b/netwerk/protocol/http/nsHttpConnectionInfo.h
@@ -166,6 +166,7 @@ private:
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(nsHttpConnectionInfo)
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpConnectionInfo_h__
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index c5644477b880..d9ad8b5301f7 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -4103,5 +4103,5 @@ nsHttpConnectionMgr::MoveToWildCardConnEntry(nsHttpConnectionInfo *specificCI,
     }
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h
index af566ecb6554..1be39a86c0b2 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.h
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.h
@@ -728,6 +728,7 @@ private:
     nsCString mLogData;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // !nsHttpConnectionMgr_h__
diff --git a/netwerk/protocol/http/nsHttpDigestAuth.cpp b/netwerk/protocol/http/nsHttpDigestAuth.cpp
index 0e63936ddac4..1764e58cefc8 100644
--- a/netwerk/protocol/http/nsHttpDigestAuth.cpp
+++ b/netwerk/protocol/http/nsHttpDigestAuth.cpp
@@ -695,7 +695,7 @@ nsHttpDigestAuth::AppendQuotedString(const nsACString & value,
   return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 // vim: ts=2 sw=2
diff --git a/netwerk/protocol/http/nsHttpDigestAuth.h b/netwerk/protocol/http/nsHttpDigestAuth.h
index 47bdefeed252..fa1516676850 100644
--- a/netwerk/protocol/http/nsHttpDigestAuth.h
+++ b/netwerk/protocol/http/nsHttpDigestAuth.h
@@ -89,6 +89,7 @@ class nsHttpDigestAuth final : public nsIHttpAuthenticator
     char                           mHashBuf[DIGEST_LENGTH];
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpDigestAuth_h__
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 43247a06740b..cfa18695f047 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -2269,5 +2269,5 @@ nsHttpsHandler::AllowPort(int32_t aPort, const char *aScheme, bool *_retval)
     return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index 9211b8d22135..55695eb1d245 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -604,6 +604,7 @@ public:
     nsresult Init();
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpHandler_h__
diff --git a/netwerk/protocol/http/nsHttpHeaderArray.cpp b/netwerk/protocol/http/nsHttpHeaderArray.cpp
index f51fc14b903d..380f8b33e9f4 100644
--- a/netwerk/protocol/http/nsHttpHeaderArray.cpp
+++ b/netwerk/protocol/http/nsHttpHeaderArray.cpp
@@ -235,5 +235,5 @@ nsHttpHeaderArray::Clear()
     mHeaders.Clear();
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpHeaderArray.h b/netwerk/protocol/http/nsHttpHeaderArray.h
index 1012cc461663..ec1354b9909f 100644
--- a/netwerk/protocol/http/nsHttpHeaderArray.h
+++ b/netwerk/protocol/http/nsHttpHeaderArray.h
@@ -17,7 +17,7 @@ class nsIHttpHeaderVisitor;
 // without also including PHttpChannelParams.h
 namespace IPC {
     template <typename> struct ParamTraits;
-}
+} // namespace IPC
 
 namespace mozilla { namespace net {
 
@@ -198,6 +198,7 @@ nsHttpHeaderArray::IsSuspectDuplicateHeader(nsHttpAtom header)
     return retval;
 }
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif
diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
index 4b5a703dfe44..677b5fd7b91c 100644
--- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp
+++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
@@ -483,5 +483,5 @@ nsHttpNTLMAuth::GetAuthFlags(uint32_t *flags)
     return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.h b/netwerk/protocol/http/nsHttpNTLMAuth.h
index 75541ed58907..9bc1ef6f2ed3 100644
--- a/netwerk/protocol/http/nsHttpNTLMAuth.h
+++ b/netwerk/protocol/http/nsHttpNTLMAuth.h
@@ -25,6 +25,7 @@ private:
     bool  mUseNative;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // !nsHttpNTLMAuth_h__
diff --git a/netwerk/protocol/http/nsHttpPipeline.cpp b/netwerk/protocol/http/nsHttpPipeline.cpp
index b76d87511b47..b8371c406239 100644
--- a/netwerk/protocol/http/nsHttpPipeline.cpp
+++ b/netwerk/protocol/http/nsHttpPipeline.cpp
@@ -912,5 +912,5 @@ nsHttpPipeline::FillSendBuf()
     return NS_OK;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpPipeline.h b/netwerk/protocol/http/nsHttpPipeline.h
index 9ab37178a23f..053e62d64b32 100644
--- a/netwerk/protocol/http/nsHttpPipeline.h
+++ b/netwerk/protocol/http/nsHttpPipeline.h
@@ -99,6 +99,7 @@ private:
     bool     mSuppressSendEvents;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpPipeline_h__
diff --git a/netwerk/protocol/http/nsHttpRequestHead.cpp b/netwerk/protocol/http/nsHttpRequestHead.cpp
index 66835bffe90f..aa58ce02112d 100644
--- a/netwerk/protocol/http/nsHttpRequestHead.cpp
+++ b/netwerk/protocol/http/nsHttpRequestHead.cpp
@@ -107,5 +107,5 @@ nsHttpRequestHead::Flatten(nsACString &buf, bool pruneProxyHeaders)
     mHeaders.Flatten(buf, pruneProxyHeaders);
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpRequestHead.h b/netwerk/protocol/http/nsHttpRequestHead.h
index a7ac6b31baa9..64a66794f4d5 100644
--- a/netwerk/protocol/http/nsHttpRequestHead.h
+++ b/netwerk/protocol/http/nsHttpRequestHead.h
@@ -113,6 +113,7 @@ private:
     bool              mHTTPS;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpRequestHead_h__
diff --git a/netwerk/protocol/http/nsHttpResponseHead.cpp b/netwerk/protocol/http/nsHttpResponseHead.cpp
index e4c732f3b868..a0e8df68d8b2 100644
--- a/netwerk/protocol/http/nsHttpResponseHead.cpp
+++ b/netwerk/protocol/http/nsHttpResponseHead.cpp
@@ -835,5 +835,5 @@ nsHttpResponseHead::ParsePragma(const char *val)
         mPragmaNoCache = true;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpResponseHead.h b/netwerk/protocol/http/nsHttpResponseHead.h
index 14e9656bc018..a77bbcf8f446 100644
--- a/netwerk/protocol/http/nsHttpResponseHead.h
+++ b/netwerk/protocol/http/nsHttpResponseHead.h
@@ -14,7 +14,7 @@
 // without also including PHttpChannelParams.h
 namespace IPC {
     template <typename> struct ParamTraits;
-}
+} // namespace IPC
 
 namespace mozilla { namespace net {
 
@@ -158,6 +158,8 @@ private:
 
     friend struct IPC::ParamTraits<nsHttpResponseHead>;
 };
-}} // namespace mozilla::net
+
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpResponseHead_h__
diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
index 4addffe1df71..cfa293ed1ed6 100644
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@@ -2251,5 +2251,5 @@ nsHttpTransaction::GetNetworkAddresses(NetAddr &self, NetAddr &peer)
     peer = mPeerAddr;
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/nsHttpTransaction.h b/netwerk/protocol/http/nsHttpTransaction.h
index 45a06400b861..c7c12a4d55fc 100644
--- a/netwerk/protocol/http/nsHttpTransaction.h
+++ b/netwerk/protocol/http/nsHttpTransaction.h
@@ -450,6 +450,7 @@ private:
     NetAddr                         mPeerAddr;
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // nsHttpTransaction_h__
diff --git a/netwerk/protocol/rtsp/controller/RtspController.h b/netwerk/protocol/rtsp/controller/RtspController.h
index 666fb822648f..1c1c7f50c3ff 100644
--- a/netwerk/protocol/rtsp/controller/RtspController.h
+++ b/netwerk/protocol/rtsp/controller/RtspController.h
@@ -52,5 +52,7 @@ private:
 };
 
 }
+
 } // namespace mozilla::net
+
 #endif
diff --git a/netwerk/protocol/rtsp/controller/RtspControllerChild.h b/netwerk/protocol/rtsp/controller/RtspControllerChild.h
index 555ff8f022d0..7205207ed537 100644
--- a/netwerk/protocol/rtsp/controller/RtspControllerChild.h
+++ b/netwerk/protocol/rtsp/controller/RtspControllerChild.h
@@ -92,6 +92,7 @@ class RtspControllerChild : public nsIStreamingProtocolController
   // receiving Stop command or OnDisconnected event.
   void StopPlayAndPauseTimer();
 };
+
 } // namespace net
 } // namespace mozilla
 
diff --git a/netwerk/protocol/rtsp/controller/RtspControllerParent.h b/netwerk/protocol/rtsp/controller/RtspControllerParent.h
index 04c5c5dd0b2a..e8099732a9a1 100644
--- a/netwerk/protocol/rtsp/controller/RtspControllerParent.h
+++ b/netwerk/protocol/rtsp/controller/RtspControllerParent.h
@@ -53,4 +53,5 @@ class RtspControllerParent : public PRtspControllerParent
 
 } // namespace net
 } // namespace mozilla
+
 #endif // RtspControllerParent_h
diff --git a/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp b/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
index 5eaa5b3d6d84..c1373be18ad8 100644
--- a/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
+++ b/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
@@ -807,4 +807,5 @@ bool RTSPSource::isLiveStream() {
     getDuration(&duration);
     return duration == 0;
 }
+
 }  // namespace android
diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
index 84982f75a2ac..f22a35c1efa9 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -2189,7 +2189,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 WebSocketChannel::CleanupConnection()
@@ -3745,7 +3745,7 @@ WebSocketChannel::SaveNetworkStats(bool enforce)
 #endif
 }
 
-} // namespace mozilla::net
+} // namespace net
 } // namespace mozilla
 
 #undef CLOSE_GOING_AWAY
diff --git a/netwerk/protocol/websocket/WebSocketChannel.h b/netwerk/protocol/websocket/WebSocketChannel.h
index 87c61836f595..5dbccb1b52a4 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.h
+++ b/netwerk/protocol/websocket/WebSocketChannel.h
@@ -314,6 +314,7 @@ protected:
     virtual ~WebSocketSSLChannel() {}
 };
 
-}} // namespace mozilla::net
+} // namespace net
+} // namespace mozilla
 
 #endif // mozilla_net_WebSocketChannel_h
diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
index acde58b38a34..14563f7bce0e 100644
--- a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
+++ b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
@@ -768,4 +768,5 @@ WyciwygChannelChild::GetCharsetAndSource(int32_t *aSource, nsACString & _retval)
 }
 
 //------------------------------------------------------------------------------
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
index 429da9f22bd6..1e5fb6f527e3 100644
--- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
+++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
@@ -350,4 +350,5 @@ WyciwygChannelParent::GetInterface(const nsIID& uuid, void** result)
 }
 
 
-}} // mozilla::net
+} // namespace net
+} // namespace mozilla
diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelParent.h b/netwerk/protocol/wyciwyg/WyciwygChannelParent.h
index ea972e5a648b..aa038260af9c 100644
--- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.h
+++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.h
@@ -16,7 +16,7 @@
 namespace mozilla {
 namespace dom {
   class PBrowserParent;
-}
+} // namespace dom
 
 namespace net {
 
diff --git a/netwerk/standalone/nsNetModuleStandalone.h b/netwerk/standalone/nsNetModuleStandalone.h
index 6e59cef4eaea..a9fe9227703d 100644
--- a/netwerk/standalone/nsNetModuleStandalone.h
+++ b/netwerk/standalone/nsNetModuleStandalone.h
@@ -8,6 +8,6 @@ namespace mozilla {
 nsresult InitNetModuleStandalone();
 nsresult ShutdownNetModuleStandalone();
 
-}
+} // namespace mozilla
 
 #endif //  ns_net_module_standalone_h_
diff --git a/netwerk/test/TestProtocols.cpp b/netwerk/test/TestProtocols.cpp
index fb44850f8e3c..fa8ff15099e9 100644
--- a/netwerk/test/TestProtocols.cpp
+++ b/netwerk/test/TestProtocols.cpp
@@ -816,7 +816,7 @@ nsresult LoadURLFromConsole()
     return NS_OK;
 }
 
-} // namespace
+} // namespace TestProtocols
 
 using namespace TestProtocols;
 
diff --git a/netwerk/wifi/win_xp_wifiScanner.cpp b/netwerk/wifi/win_xp_wifiScanner.cpp
index 1f7fcae7ca43..4dcd3403415f 100644
--- a/netwerk/wifi/win_xp_wifiScanner.cpp
+++ b/netwerk/wifi/win_xp_wifiScanner.cpp
@@ -91,7 +91,7 @@ bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data, nsWifiAccessPoint* ac
 int GetDataFromBssIdList(const NDIS_802_11_BSSID_LIST& bss_id_list,
                          int list_size,
                          nsCOMArray<nsWifiAccessPoint>& outData);
-}  // namespace
+} // namespace
 
 class WindowsNdisApi
 {
@@ -375,7 +375,7 @@ bool ResizeBuffer(size_t requested_size, std::vector<char>& buffer) {
   return true;
 }
 
-}  // namespace
+} // namespace
 
 
 nsresult
diff --git a/other-licenses/snappy/src/snappy-sinksource.cc b/other-licenses/snappy/src/snappy-sinksource.cc
index 1017895f962d..b6454cbfb236 100644
--- a/other-licenses/snappy/src/snappy-sinksource.cc
+++ b/other-licenses/snappy/src/snappy-sinksource.cc
@@ -69,4 +69,4 @@ char* UncheckedByteArraySink::GetAppendBuffer(size_t len, char* scratch) {
 }
 
 
-}
+} // namespace snappy
diff --git a/other-licenses/snappy/src/snappy-sinksource.h b/other-licenses/snappy/src/snappy-sinksource.h
index 430baeabb0ed..b3c35fd96196 100644
--- a/other-licenses/snappy/src/snappy-sinksource.h
+++ b/other-licenses/snappy/src/snappy-sinksource.h
@@ -131,6 +131,6 @@ class UncheckedByteArraySink : public Sink {
 };
 
 
-}
+} // namespace snappy
 
 #endif  // UTIL_SNAPPY_SNAPPY_SINKSOURCE_H_
diff --git a/security/manager/ssl/DataStorage.h b/security/manager/ssl/DataStorage.h
index 11dea8c88244..2dd658a451ed 100644
--- a/security/manager/ssl/DataStorage.h
+++ b/security/manager/ssl/DataStorage.h
@@ -180,6 +180,6 @@ private:
   const nsString mFilename;
 };
 
-}; // namespace mozilla
+} // namespace mozilla
 
 #endif // mozilla_DataStorage_h
diff --git a/security/manager/ssl/NSSErrorsService.cpp b/security/manager/ssl/NSSErrorsService.cpp
index bc90c75dcb7c..9fd5118c3bc2 100644
--- a/security/manager/ssl/NSSErrorsService.cpp
+++ b/security/manager/ssl/NSSErrorsService.cpp
@@ -201,5 +201,5 @@ NSSErrorsService::GetErrorMessage(nsresult aXPCOMErrorCode, nsAString &aErrorMes
   return rv;
 }
 
-} // psm
-} // mozilla
+} // namespace psm
+} // namespace mozilla
diff --git a/security/manager/ssl/NSSErrorsService.h b/security/manager/ssl/NSSErrorsService.h
index 0a72c85a9e93..844ceda35e7f 100644
--- a/security/manager/ssl/NSSErrorsService.h
+++ b/security/manager/ssl/NSSErrorsService.h
@@ -40,8 +40,8 @@ bool IsNSSErrorCode(PRErrorCode code);
 nsresult GetXPCOMFromNSSError(PRErrorCode code);
 bool ErrorIsOverridable(PRErrorCode code);
 
-} // psm
-} // mozilla
+} // namespace psm
+} // namespace mozilla
 
 #define NS_NSSERRORSSERVICE_CID \
   { 0x9ef18451, 0xa157, 0x4d17, { 0x81, 0x32, 0x47, 0xaf, 0xef, 0x21, 0x36, 0x89 } }
diff --git a/security/manager/ssl/PSMContentListener.h b/security/manager/ssl/PSMContentListener.h
index 13bff90b7c49..d948383a4535 100644
--- a/security/manager/ssl/PSMContentListener.h
+++ b/security/manager/ssl/PSMContentListener.h
@@ -21,8 +21,8 @@ namespace net {
 
 class PChannelDiverterParent;
 
-}
-}
+} // namespace net
+} // namespace mozilla
 
 namespace mozilla { namespace psm {
 
diff --git a/security/manager/ssl/SharedSSLState.cpp b/security/manager/ssl/SharedSSLState.cpp
index 8c70d7b8a547..b783331a90a8 100644
--- a/security/manager/ssl/SharedSSLState.cpp
+++ b/security/manager/ssl/SharedSSLState.cpp
@@ -57,7 +57,7 @@ public:
   bool mShouldClearSessionCache;
 };
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
@@ -102,7 +102,7 @@ private:
 
 SharedSSLState* gPublicState;
 SharedSSLState* gPrivateState;
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(PrivateBrowsingObserver, nsIObserver)
 
diff --git a/security/manager/ssl/nsCertVerificationThread.cpp b/security/manager/ssl/nsCertVerificationThread.cpp
index 1698b9be1d93..6f26d6b0b8b5 100644
--- a/security/manager/ssl/nsCertVerificationThread.cpp
+++ b/security/manager/ssl/nsCertVerificationThread.cpp
@@ -34,7 +34,7 @@ private:
   nsCOMPtr<nsIX509Cert> mCert;
   nsCOMPtr<nsICertVerificationResult> mResult;
 };
-} // anonymous namespace
+} // namespace
 
 void nsCertVerificationJob::Run()
 {
diff --git a/security/manager/ssl/nsDataSignatureVerifier.cpp b/security/manager/ssl/nsDataSignatureVerifier.cpp
index c0e45a2b83ef..04692c7389e4 100644
--- a/security/manager/ssl/nsDataSignatureVerifier.cpp
+++ b/security/manager/ssl/nsDataSignatureVerifier.cpp
@@ -255,7 +255,7 @@ VerifyCertificate(CERTCertificate* cert, void* voidContext, void* pinArg)
                                                &context->builtChain));
 }
 
-} // unnamed namespcae
+} // namespace
 
 NS_IMETHODIMP
 nsDataSignatureVerifier::VerifySignature(const char* aRSABuf,
diff --git a/security/manager/ssl/nsNSSCallbacks.cpp b/security/manager/ssl/nsNSSCallbacks.cpp
index dadee90f8558..e00d7284a7fa 100644
--- a/security/manager/ssl/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/nsNSSCallbacks.cpp
@@ -43,7 +43,7 @@ const uint32_t POSSIBLE_VERSION_DOWNGRADE = 4;
 const uint32_t POSSIBLE_CIPHER_SUITE_DOWNGRADE = 2;
 const uint32_t KEA_NOT_SUPPORTED = 1;
 
-}
+} // namespace
 
 class nsHTTPDownloadEvent : public nsRunnable {
 public:
diff --git a/security/manager/ssl/nsNSSCertificate.h b/security/manager/ssl/nsNSSCertificate.h
index 77e3ab45bdcc..ba8f29e30285 100644
--- a/security/manager/ssl/nsNSSCertificate.h
+++ b/security/manager/ssl/nsNSSCertificate.h
@@ -81,7 +81,7 @@ SECStatus ConstructCERTCertListFromReversedDERArray(
             const mozilla::pkix::DERArray& certArray,
             /*out*/ mozilla::ScopedCERTCertList& certList);
 
-} // namespcae mozilla
+} // namespace mozilla
 
 class nsNSSCertList: public nsIX509CertList,
                      public nsISerializable,
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
index 2f5f7b6ec330..3442d7742acf 100644
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -853,7 +853,7 @@ CipherSuiteChangeObserver::Observe(nsISupports* aSubject,
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 // Caller must hold a lock on nsNSSComponent::mutex when calling this function
 void nsNSSComponent::setValidationOptions(bool isInitialSetting,
diff --git a/security/manager/ssl/nsNSSIOLayer.cpp b/security/manager/ssl/nsNSSIOLayer.cpp
index 2ad7a9ef4193..b788aaa84c2d 100644
--- a/security/manager/ssl/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/nsNSSIOLayer.cpp
@@ -647,7 +647,7 @@ getSocketInfoIfRunning(PRFileDesc* fd, Operation op,
   return socketInfo;
 }
 
-} // unnnamed namespace
+} // namespace
 
 static PRStatus
 nsSSLIOLayerConnect(PRFileDesc* fd, const PRNetAddr* addr,
@@ -1267,7 +1267,7 @@ checkHandshake(int32_t bytesTransfered, bool wasReading,
   return bytesTransfered;
 }
 
-}
+} // namespace
 
 static int16_t
 nsSSLIOLayerPoll(PRFileDesc* fd, int16_t in_flags, int16_t* out_flags)
diff --git a/security/manager/ssl/nsNSSIOLayer.h b/security/manager/ssl/nsNSSIOLayer.h
index 80f691cd15ac..092485fedf75 100644
--- a/security/manager/ssl/nsNSSIOLayer.h
+++ b/security/manager/ssl/nsNSSIOLayer.h
@@ -19,8 +19,8 @@
 namespace mozilla {
 namespace psm {
 class SharedSSLState;
-}
-}
+} // namespace psm
+} // namespace mozilla
 
 class nsIObserver;
 
diff --git a/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp b/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
index 903287a8eaa0..06a8611fc7ab 100644
--- a/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
+++ b/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
@@ -175,7 +175,7 @@ namespace {
 // Alias for nullptr to aid readability in the code below.
 static const char* byKey = nullptr;
 
-} // unnamed namespcae
+} // namespace
 
 class pkixocsp_VerifyEncodedResponse_successful
   : public pkixocsp_VerifyEncodedResponse
diff --git a/startupcache/StartupCache.h b/startupcache/StartupCache.h
index d4388343ea57..f4546efae823 100644
--- a/startupcache/StartupCache.h
+++ b/startupcache/StartupCache.h
@@ -230,4 +230,5 @@ class StartupCacheWrapper final
 
 } // namespace scache
 } // namespace mozilla
+
 #endif //StartupCache_h_
diff --git a/startupcache/StartupCacheUtils.cpp b/startupcache/StartupCacheUtils.cpp
index 6ce4ce122b2c..aac8d8a36b9c 100644
--- a/startupcache/StartupCacheUtils.cpp
+++ b/startupcache/StartupCacheUtils.cpp
@@ -247,5 +247,5 @@ PathifyURI(nsIURI *in, nsACString &out)
     return NS_OK;
 }
 
-}
-}
+} // namespace scache
+} // namespace mozilla
diff --git a/startupcache/StartupCacheUtils.h b/startupcache/StartupCacheUtils.h
index e4023d86abcd..1226d1668c2f 100644
--- a/startupcache/StartupCacheUtils.h
+++ b/startupcache/StartupCacheUtils.h
@@ -36,6 +36,7 @@ NewBufferFromStorageStream(nsIStorageStream *storageStream,
 
 NS_EXPORT nsresult
 PathifyURI(nsIURI *in, nsACString &out);
-}
-}
+} // namespace scache
+} // namespace mozilla
+
 #endif //nsStartupCacheUtils_h_
diff --git a/startupcache/test/TestStartupCache.cpp b/startupcache/test/TestStartupCache.cpp
index 4ae876906dfb..a1cdef821586 100644
--- a/startupcache/test/TestStartupCache.cpp
+++ b/startupcache/test/TestStartupCache.cpp
@@ -42,8 +42,8 @@ NewObjectOutputWrappedStorageStream(nsIObjectOutputStream **wrapperStream,
 NS_IMPORT nsresult
 NewBufferFromStorageStream(nsIStorageStream *storageStream, 
                            char** buffer, uint32_t* len);
-}
-}
+} // namespace scache
+} // namespace mozilla
 
 using namespace mozilla::scache;
 
diff --git a/storage/FileSystemModule.cpp b/storage/FileSystemModule.cpp
index a12178be2864..ed2f8cdef2a7 100644
--- a/storage/FileSystemModule.cpp
+++ b/storage/FileSystemModule.cpp
@@ -267,7 +267,7 @@ int RowId(sqlite3_vtab_cursor* aCursor, sqlite3_int64* aRowid)
   return SQLITE_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace storage {
diff --git a/storage/IStorageBindingParamsInternal.h b/storage/IStorageBindingParamsInternal.h
index c7165e33b668..e02778680623 100644
--- a/storage/IStorageBindingParamsInternal.h
+++ b/storage/IStorageBindingParamsInternal.h
@@ -45,7 +45,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IStorageBindingParamsInternal,
 #define NS_DECL_ISTORAGEBINDINGPARAMSINTERNAL \
   already_AddRefed<mozIStorageError> bind(sqlite3_stmt *aStatement) override;
 
-} // storage
-} // mozilla
+} // namespace storage
+} // namespace mozilla
 
 #endif // mozilla_storage_IStorageBindingParamsInternal_h_
diff --git a/storage/SQLCollations.cpp b/storage/SQLCollations.cpp
index ff2bf4a14b68..392bcd804505 100644
--- a/storage/SQLCollations.cpp
+++ b/storage/SQLCollations.cpp
@@ -101,7 +101,7 @@ struct Collations {
   int(*xCompare)(void*, int, const void*, int, const void*);
 };
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Exposed Functions
diff --git a/storage/StorageBaseStatementInternal.h b/storage/StorageBaseStatementInternal.h
index 500530085950..64d3d72eaa84 100644
--- a/storage/StorageBaseStatementInternal.h
+++ b/storage/StorageBaseStatementInternal.h
@@ -347,7 +347,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(StorageBaseStatementInternal,
 
   
 
-} // storage
-} // mozilla
+} // namespace storage
+} // namespace mozilla
 
 #endif // mozilla_storage_StorageBaseStatementInternal_h_
diff --git a/storage/TelemetryVFS.cpp b/storage/TelemetryVFS.cpp
index 5c0f750edd10..fc4ad5043c51 100644
--- a/storage/TelemetryVFS.cpp
+++ b/storage/TelemetryVFS.cpp
@@ -823,7 +823,7 @@ xNextSystemCall(sqlite3_vfs *vfs, const char *zName)
   return orig_vfs->xNextSystemCall(orig_vfs, zName);
 }
 
-}
+} // namespace
 
 namespace mozilla {
 namespace storage {
@@ -888,5 +888,5 @@ sqlite3_vfs* ConstructTelemetryVFS()
   return tvfs;
 }
 
-}
-}
+} // namespace storage
+} // namespace mozilla
diff --git a/storage/VacuumManager.cpp b/storage/VacuumManager.cpp
index dfd3428c12df..13fb284de0da 100644
--- a/storage/VacuumManager.cpp
+++ b/storage/VacuumManager.cpp
@@ -298,7 +298,7 @@ Vacuumer::notifyCompletion(bool aSucceeded)
   return NS_OK;
 }
 
-} // Anonymous namespace.
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// VacuumManager
diff --git a/storage/mozStorageAsyncStatement.h b/storage/mozStorageAsyncStatement.h
index 565d6127030b..0873c4de8ec1 100644
--- a/storage/mozStorageAsyncStatement.h
+++ b/storage/mozStorageAsyncStatement.h
@@ -101,7 +101,7 @@ private:
   friend class AsyncStatementJSHelper;
 };
 
-} // storage
-} // mozilla
+} // namespace storage
+} // namespace mozilla
 
 #endif // mozilla_storage_mozStorageAsyncStatement_h_
diff --git a/storage/mozStorageAsyncStatementExecution.cpp b/storage/mozStorageAsyncStatementExecution.cpp
index 277b566fb800..c42d02035e6a 100644
--- a/storage/mozStorageAsyncStatementExecution.cpp
+++ b/storage/mozStorageAsyncStatementExecution.cpp
@@ -155,7 +155,7 @@ private:
   ExecutionState mReason;
 };
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// AsyncExecuteStatements
diff --git a/storage/mozStorageBindingParams.cpp b/storage/mozStorageBindingParams.cpp
index 169fd1b1fcf9..c036b78a645d 100644
--- a/storage/mozStorageBindingParams.cpp
+++ b/storage/mozStorageBindingParams.cpp
@@ -98,7 +98,7 @@ sqlite3_T_blob(BindingColumnData aData,
 
 #include "variantToSQLiteT_impl.h"
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// BindingParams
diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp
index c116e087d5d7..d57c2ddf2679 100644
--- a/storage/mozStorageConnection.cpp
+++ b/storage/mozStorageConnection.cpp
@@ -375,7 +375,7 @@ WaitForUnlockNotify(sqlite3* aDatabase)
   return srv;
 }
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Local Classes
@@ -517,7 +517,7 @@ private:
   nsCOMPtr<mozIStorageCompletionCallback> mCallback;
 };
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Connection
diff --git a/storage/mozStorageError.h b/storage/mozStorageError.h
index 35dd5fbe2614..07963cf133b8 100644
--- a/storage/mozStorageError.h
+++ b/storage/mozStorageError.h
@@ -29,7 +29,7 @@ private:
   nsCString mMessage;
 };
 
-} // namespace stoarge
+} // namespace storage
 } // namespace mozilla
 
 #endif // mozStorageError_h
diff --git a/storage/mozStoragePrivateHelpers.cpp b/storage/mozStoragePrivateHelpers.cpp
index 9ae13f42e30a..cb5bbd9afd4e 100644
--- a/storage/mozStoragePrivateHelpers.cpp
+++ b/storage/mozStoragePrivateHelpers.cpp
@@ -255,7 +255,7 @@ public:
 private:
   nsCOMPtr<mozIStorageCompletionCallback> mCallback;
 };
-} // anonymous namespace
+} // namespace
 already_AddRefed<nsIRunnable>
 newCompletionEvent(mozIStorageCompletionCallback *aCallback)
 {
diff --git a/storage/mozStorageSQLFunctions.cpp b/storage/mozStorageSQLFunctions.cpp
index 4a3d6f8521da..ebe4b4fdf45f 100644
--- a/storage/mozStorageSQLFunctions.cpp
+++ b/storage/mozStorageSQLFunctions.cpp
@@ -279,7 +279,7 @@ struct Functions {
   void (*xFunc)(::sqlite3_context*, int, sqlite3_value**);
 };
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Exposed Functions
diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp
index cafbeb422bd1..d9232443efe2 100644
--- a/storage/mozStorageService.cpp
+++ b/storage/mozStorageService.cpp
@@ -510,7 +510,7 @@ const sqlite3_mem_methods memMethods = {
   nullptr
 };
 
-} // anonymous namespace
+} // namespace
 
 #endif  // MOZ_STORAGE_MEMORY
 
@@ -754,7 +754,7 @@ private:
   nsRefPtr<mozIStorageCompletionCallback> mCallback;
 };
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 Service::OpenAsyncDatabase(nsIVariant *aDatabaseStore,
diff --git a/storage/mozStorageStatement.h b/storage/mozStorageStatement.h
index 84fd5da2de7e..c6056a12c952 100644
--- a/storage/mozStorageStatement.h
+++ b/storage/mozStorageStatement.h
@@ -112,7 +112,7 @@ private:
   friend class StatementJSHelper;
 };
 
-} // storage
-} // mozilla
+} // namespace storage
+} // namespace mozilla
 
 #endif // mozStorageStatement_h
diff --git a/storage/mozStorageStatementRow.cpp b/storage/mozStorageStatementRow.cpp
index 2436b6e32ae2..af61804b3357 100644
--- a/storage/mozStorageStatementRow.cpp
+++ b/storage/mozStorageStatementRow.cpp
@@ -152,4 +152,4 @@ StatementRow::Resolve(nsIXPConnectWrappedNative *aWrapper,
 }
 
 } // namespace storage
-} // namescape mozilla
+} // namespace mozilla
diff --git a/testing/gtest/mozilla/GTestRunner.cpp b/testing/gtest/mozilla/GTestRunner.cpp
index d53863e643e0..e690e7584c30 100644
--- a/testing/gtest/mozilla/GTestRunner.cpp
+++ b/testing/gtest/mozilla/GTestRunner.cpp
@@ -121,4 +121,4 @@ public:
   }
 } InitRunGTest;
 
-}
+} // namespace mozilla
diff --git a/testing/gtest/mozilla/GTestRunner.h b/testing/gtest/mozilla/GTestRunner.h
index 14bf9881202f..6c0af0cdb440 100644
--- a/testing/gtest/mozilla/GTestRunner.h
+++ b/testing/gtest/mozilla/GTestRunner.h
@@ -7,4 +7,4 @@ namespace mozilla {
 
 extern int (*RunGTest)();
 
-}
+} // namespace mozilla
diff --git a/testing/gtest/mozilla/SanityTest.cpp b/testing/gtest/mozilla/SanityTest.cpp
index b5c2971eed00..614c9d30d7cc 100644
--- a/testing/gtest/mozilla/SanityTest.cpp
+++ b/testing/gtest/mozilla/SanityTest.cpp
@@ -19,7 +19,7 @@ public:
   TestMock() {}
   MOCK_METHOD0(MockedCall, void());
 };
-}
+} // namespace
 TEST(MozillaGMockSanity, Runs) {
   TestMock mockedClass;
   EXPECT_CALL(mockedClass, MockedCall())
diff --git a/testing/marionette/driver/marionette_driver/marionette.py b/testing/marionette/driver/marionette_driver/marionette.py
index 02003316bce9..81bbcf790d1c 100644
--- a/testing/marionette/driver/marionette_driver/marionette.py
+++ b/testing/marionette/driver/marionette_driver/marionette.py
@@ -663,6 +663,7 @@ class Marionette(object):
     def is_port_available(port, host=''):
         port = int(port)
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         try:
             s.bind((host, port))
             return True
diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
index a0a1e3813e10..66ce9fa6fbeb 100644
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -219,27 +219,9 @@ if (typeof(computedStyle) == 'undefined') {
 **/
 SimpleTest.testPluginIsOOP = function () {
     var testPluginIsOOP = false;
-    if (navigator.platform.indexOf("Mac") == 0) {
-        if (SpecialPowers.XPCOMABI.match(/x86-/)) {
-            try {
-                testPluginIsOOP = SpecialPowers.getBoolPref("dom.ipc.plugins.enabled.i386.test.plugin");
-            } catch (e) {
-                testPluginIsOOP = SpecialPowers.getBoolPref("dom.ipc.plugins.enabled.i386");
-            }
-        }
-        else if (SpecialPowers.XPCOMABI.match(/x86_64-/)) {
-            try {
-                testPluginIsOOP = SpecialPowers.getBoolPref("dom.ipc.plugins.enabled.x86_64.test.plugin");
-            } catch (e) {
-                testPluginIsOOP = SpecialPowers.getBoolPref("dom.ipc.plugins.enabled.x86_64");
-            }
-        }
-    }
-    else {
-        testPluginIsOOP = SpecialPowers.getBoolPref("dom.ipc.plugins.enabled");
-    }
-
-    return testPluginIsOOP;
+    var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
+                          .getService(SpecialPowers.Ci.nsIPluginHost);
+    return ph.isPluginOOP("application/x-test");
 };
 
 SimpleTest._tests = [];
diff --git a/testing/runtimes/writeruntimes.py b/testing/runtimes/writeruntimes.py
index 31448e71d9b7..520534d61474 100644
--- a/testing/runtimes/writeruntimes.py
+++ b/testing/runtimes/writeruntimes.py
@@ -34,7 +34,7 @@ def query_activedata(suite, platforms=None):
     data = response.json()["data"]
     return data
 
-def write_runtimes(data, suite):
+def write_runtimes(data, suite, indir=here, outdir=here):
     testdata = defaultdict(lambda: defaultdict(list))
     for result in data:
         # Each result is a list with four members: platform,
@@ -46,6 +46,19 @@ def write_runtimes(data, suite):
     for platform in testdata:
         for buildtype in testdata[platform]:
             print 'processing %s-%s results' % (platform, buildtype)
+            dirname = "%s-%s" % (platform, buildtype)
+            out_path = os.path.join(outdir, dirname)
+            in_path = os.path.join(indir, dirname)
+            outfilename = os.path.join(out_path, "%s.runtimes.json" % suite)
+            infilename = os.path.join(in_path, "%s.runtimes.json" % suite)
+            if not os.path.exists(out_path):
+                os.makedirs(out_path)
+
+            # read in existing data, if any
+            indata = None
+            if os.path.exists(infilename):
+                with open(infilename, 'r') as f:
+                    indata = json.loads(f.read()).get('runtimes')
 
             # identify a threshold of durations, below which we ignore
             runtimes = []
@@ -58,24 +71,36 @@ def write_runtimes(data, suite):
 
             # split the durations into two groups; excluded and specified
             ommitted = []
-            specified = {}
+            specified = indata if indata else {}
+            current_tests = []
             for test, duration in testdata[platform][buildtype]:
+                current_tests.append(test)
                 duration = int(duration * 1000) if duration else 0
                 if duration > 0 and duration < threshold:
                     ommitted.append(duration)
-                elif duration >= threshold:
-                    specified[test] = duration
+                    if test in specified:
+                        del specified[test]
+                elif duration >= threshold and test != "automation.py":
+                    original = specified.get(test, 0)
+                    if not original or abs(original - duration) > (original/20):
+                        # only write new data if it's > 20% different than original
+                        specified[test] = duration
+
+            # delete any test references no longer needed
+            to_delete = []
+            for test in specified:
+                if test not in current_tests:
+                    to_delete.append(test)
+            for test in to_delete:
+                del specified[test]
+
             avg = int(sum(ommitted)/len(ommitted))
 
             results = {'excluded_test_average': avg,
                        'runtimes': specified}
 
-            dirname = "%s-%s" % (platform, buildtype)
-            if not os.path.exists(dirname):
-                os.mkdir(dirname)
-            outfilename = os.path.join(dirname, "%s.runtimes.json" % suite)
             with open(outfilename, 'w') as f:
-                f.write(json.dumps(results))
+                f.write(json.dumps(results, indent=2, sort_keys=True))
 
 
 def cli(args=sys.argv[1:]):
@@ -83,6 +108,9 @@ def cli(args=sys.argv[1:]):
     parser.add_argument('-o', '--output-directory', dest='outdir',
         default=here, help="Directory to save runtime data.")
 
+    parser.add_argument('-i', '--input-directory', dest='indir',
+        default=here, help="Directory from which to read current runtime data.")
+
     parser.add_argument('-p', '--platforms', default=None,
         help="Comma separated list of platforms from which to generate data.")
 
@@ -100,7 +128,7 @@ def cli(args=sys.argv[1:]):
         args.platforms = args.platforms.split(',')
 
     data = query_activedata(args.suite, args.platforms)
-    write_runtimes(data, args.suite)
+    write_runtimes(data, args.suite, indir=args.indir, outdir=args.outdir)
 
 if __name__ == "__main__":
     sys.exit(cli())
diff --git a/toolkit/components/ctypes/ctypes.cpp b/toolkit/components/ctypes/ctypes.cpp
index cf7d3de5f64d..05c70e906af4 100644
--- a/toolkit/components/ctypes/ctypes.cpp
+++ b/toolkit/components/ctypes/ctypes.cpp
@@ -128,8 +128,8 @@ Module::Call(nsIXPConnectWrappedNative* wrapper,
   return NS_OK;
 }
 
-}
-}
+} // namespace ctypes
+} // namespace mozilla
 
 NS_DEFINE_NAMED_CID(JSCTYPES_CID);
 
diff --git a/toolkit/components/ctypes/ctypes.h b/toolkit/components/ctypes/ctypes.h
index 19e8b2a398fa..b72f22c1c076 100644
--- a/toolkit/components/ctypes/ctypes.h
+++ b/toolkit/components/ctypes/ctypes.h
@@ -24,7 +24,7 @@ private:
   ~Module();
 };
 
-}
-}
+} // namespace ctypes
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/components/downloads/SQLFunctions.cpp b/toolkit/components/downloads/SQLFunctions.cpp
index 7540d39b7a47..57fa8ca1ba06 100644
--- a/toolkit/components/downloads/SQLFunctions.cpp
+++ b/toolkit/components/downloads/SQLFunctions.cpp
@@ -142,5 +142,5 @@ GenerateGUIDFunction::OnFunctionCall(mozIStorageValueArray *aArguments,
   return NS_OK;
 }
 
-} // namespace mozilla
 } // namespace downloads
+} // namespace mozilla
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
index be1164f4daab..de7b262583cc 100644
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -1723,7 +1723,7 @@ private:
   nsCOMPtr<nsIDownload> mResult;
   nsCOMPtr<nsIDownloadManagerResult> mCallback;
 };
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 nsDownloadManager::GetDownloadByGUID(const nsACString& aGUID,
diff --git a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp b/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
index e7e17880b4fc..f638dc8456ae 100644
--- a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
+++ b/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
@@ -1228,7 +1228,7 @@ NativeFileWatcherIOTask::MakeResourcePath(
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 // The NativeFileWatcherService component
 
diff --git a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp b/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
index a0e80bfe0421..0c5c35178389 100644
--- a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
+++ b/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
@@ -174,7 +174,7 @@ static const JSFunctionSpec sWitnessClassFunctions[] = {
   JS_FS_END
 };
 
-}
+} // namespace
 
 NS_IMPL_ISUPPORTS(FinalizationWitnessService, nsIFinalizationWitnessService, nsIObserver)
 
diff --git a/toolkit/components/osfile/NativeOSFileInternals.cpp b/toolkit/components/osfile/NativeOSFileInternals.cpp
index fcdfce5329cf..5f9282a1bd0e 100644
--- a/toolkit/components/osfile/NativeOSFileInternals.cpp
+++ b/toolkit/components/osfile/NativeOSFileInternals.cpp
@@ -856,7 +856,7 @@ protected:
   nsRefPtr<StringResult> mResult;
 };
 
-} // osfile
+} // namespace
 
 // The OS.File service
 
diff --git a/toolkit/components/perf/PerfMeasurement.cpp b/toolkit/components/perf/PerfMeasurement.cpp
index 5f4a97991e34..b0d9c86e5762 100644
--- a/toolkit/components/perf/PerfMeasurement.cpp
+++ b/toolkit/components/perf/PerfMeasurement.cpp
@@ -95,8 +95,8 @@ Module::Call(nsIXPConnectWrappedNative* wrapper,
   return NS_OK;
 }
 
-}
-}
+} // namespace jsperf
+} // namespace mozilla
 
 NS_DEFINE_NAMED_CID(JSPERF_CID);
 
diff --git a/toolkit/components/perf/PerfMeasurement.h b/toolkit/components/perf/PerfMeasurement.h
index 51dae35876df..b158d16852c9 100644
--- a/toolkit/components/perf/PerfMeasurement.h
+++ b/toolkit/components/perf/PerfMeasurement.h
@@ -24,7 +24,7 @@ private:
   ~Module();
 };
 
-}
-}
+} // namespace jsperf
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/components/places/AsyncFaviconHelpers.cpp b/toolkit/components/places/AsyncFaviconHelpers.cpp
index 1fc2185fceb2..105b1a05bbca 100644
--- a/toolkit/components/places/AsyncFaviconHelpers.cpp
+++ b/toolkit/components/places/AsyncFaviconHelpers.cpp
@@ -340,7 +340,7 @@ OptimizeIconSize(IconData& aIcon,
   return NS_OK;
 }
 
-} // Anonymous namespace.
+} // namespace
 
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/toolkit/components/places/Database.cpp b/toolkit/components/places/Database.cpp
index 179e2952b7f7..16d8384719a2 100644
--- a/toolkit/components/places/Database.cpp
+++ b/toolkit/components/places/Database.cpp
@@ -291,7 +291,7 @@ CreateRoot(nsCOMPtr<mozIStorageConnection>& aDBConn,
 }
 
 
-} // Anonymous namespace
+} // namespace
 
 /**
  * An AsyncShutdown blocker in charge of shutting down places
diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp
index ea6702c72d07..c69acf373e33 100644
--- a/toolkit/components/places/History.cpp
+++ b/toolkit/components/places/History.cpp
@@ -1954,7 +1954,7 @@ StoreAndNotifyEmbedVisit(VisitData& aPlace,
   (void)NS_DispatchToMainThread(event);
 }
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// History
diff --git a/toolkit/components/places/SQLFunctions.h b/toolkit/components/places/SQLFunctions.h
index d42f5f3c8677..f7619bf635f0 100644
--- a/toolkit/components/places/SQLFunctions.h
+++ b/toolkit/components/places/SQLFunctions.h
@@ -325,6 +325,6 @@ public:
 
 
 } // namespace places
-} // namespace storage
+} // namespace mozilla
 
 #endif // mozilla_places_SQLFunctions_h_
diff --git a/toolkit/components/places/nsAnnoProtocolHandler.cpp b/toolkit/components/places/nsAnnoProtocolHandler.cpp
index 173b9b1ad18f..c0b3823a7636 100644
--- a/toolkit/components/places/nsAnnoProtocolHandler.cpp
+++ b/toolkit/components/places/nsAnnoProtocolHandler.cpp
@@ -201,7 +201,7 @@ NS_IMPL_ISUPPORTS_INHERITED(
   nsIRequestObserver
 )
 
-} // anonymous namespace
+} // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// nsAnnoProtocolHandler
diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp
index e3104143136d..2e58a654ba03 100644
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -110,7 +110,7 @@ private:
   DataType mData;
 };
 
-} // Anonymous namespace.
+} // namespace
 
 
 nsNavBookmarks::nsNavBookmarks()
diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp
index ddce0cafad10..feb31b0e18ad 100644
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -227,7 +227,7 @@ protected:
   nsNavHistory& mNavHistory;
 };
 
-} // anonymouse namespace
+} // namespace
 
 
 // Queries rows indexes to bind or get values, if adding a new one, be sure to
@@ -579,7 +579,7 @@ private:
   PRTime mLastVisitDate;
 };
 
-} // anonymous namespace
+} // namespace
 
 void
 nsNavHistory::DispatchFrecencyChangedNotification(const nsACString& aSpec,
@@ -1007,7 +1007,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 nsNavHistory::invalidateFrecencies(const nsCString& aPlaceIdsQueryString)
@@ -3180,7 +3180,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 nsNavHistory::DecayFrecency()
@@ -4443,7 +4443,7 @@ void ParseSearchTermsFromQueries(const nsCOMArray<nsNavHistoryQuery>& aQueries,
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 
 nsresult
@@ -4509,7 +4509,7 @@ public:
   }
 };
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 nsNavHistory::FixInvalidFrecencies()
diff --git a/toolkit/components/places/nsNavHistoryQuery.cpp b/toolkit/components/places/nsNavHistoryQuery.cpp
index 3e9865b4c1fd..53e459e4b12d 100644
--- a/toolkit/components/places/nsNavHistoryQuery.cpp
+++ b/toolkit/components/places/nsNavHistoryQuery.cpp
@@ -246,7 +246,7 @@ namespace PlacesFolderConversion {
 
     return NS_OK;
   }
-}
+} // namespace PlacesFolderConversion
 
 // nsNavHistory::QueryStringToQueries
 //
diff --git a/toolkit/components/places/tests/cpp/test_IHistory.cpp b/toolkit/components/places/tests/cpp/test_IHistory.cpp
index 64cc163603f8..a5ce4eb2679a 100644
--- a/toolkit/components/places/tests/cpp/test_IHistory.cpp
+++ b/toolkit/components/places/tests/cpp/test_IHistory.cpp
@@ -141,7 +141,7 @@ test_wait_checkpoint()
 namespace test_unvisited_does_not_notify {
   nsCOMPtr<nsIURI> testURI;
   nsRefPtr<Link> testLink;
-}
+} // namespace test_unvisited_does_not_notify
 void
 test_unvisited_does_not_notify_part1()
 {
@@ -373,7 +373,7 @@ namespace test_observer_topic_dispatched_helpers {
     statusObserver,
     nsIObserver
   )
-}
+} // namespace test_observer_topic_dispatched_helpers
 void
 test_observer_topic_dispatched()
 {
diff --git a/toolkit/components/reflect/reflect.cpp b/toolkit/components/reflect/reflect.cpp
index f2dd8bcbc7fc..91ed8cbde902 100644
--- a/toolkit/components/reflect/reflect.cpp
+++ b/toolkit/components/reflect/reflect.cpp
@@ -52,8 +52,8 @@ Module::Call(nsIXPConnectWrappedNative* wrapper,
   return NS_OK;
 }
 
-}
-}
+} // namespace reflect
+} // namespace mozilla
 
 NS_DEFINE_NAMED_CID(JSREFLECT_CID);
 
diff --git a/toolkit/components/reflect/reflect.h b/toolkit/components/reflect/reflect.h
index 870ffb8c1a91..6f5237104cd9 100644
--- a/toolkit/components/reflect/reflect.h
+++ b/toolkit/components/reflect/reflect.h
@@ -24,7 +24,7 @@ private:
   ~Module();
 };
 
-}
-}
+} // namespace reflect
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/components/startup/StartupTimeline.h b/toolkit/components/startup/StartupTimeline.h
index ff871e493793..8a966f1731d2 100644
--- a/toolkit/components/startup/StartupTimeline.h
+++ b/toolkit/components/startup/StartupTimeline.h
@@ -93,7 +93,7 @@ private:
   static NS_EXTERNAL_VIS_(const char *) sStartupTimelineDesc[MAX_EVENT_ID];
 };
 
-}
+} // namespace mozilla
 
 #endif /* mozilla_StartupTimeline */
 
diff --git a/toolkit/components/telemetry/ProcessedStack.h b/toolkit/components/telemetry/ProcessedStack.h
index ae8a5fe34c14..2bda5500727b 100644
--- a/toolkit/components/telemetry/ProcessedStack.h
+++ b/toolkit/components/telemetry/ProcessedStack.h
@@ -59,4 +59,5 @@ GetStackAndModules(const std::vector<uintptr_t> &aPCs);
 
 } // namespace Telemetry
 } // namespace mozilla
+
 #endif // ProcessedStack_h__
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 31134d37d8e5..3fc2f68fb8c0 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -3637,7 +3637,7 @@ TelemetryImpl::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
   return n;
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 void
diff --git a/toolkit/components/telemetry/Telemetry.h b/toolkit/components/telemetry/Telemetry.h
index 9282b954d837..f4e08ff83496 100644
--- a/toolkit/components/telemetry/Telemetry.h
+++ b/toolkit/components/telemetry/Telemetry.h
@@ -14,12 +14,12 @@
 
 namespace base {
   class Histogram;
-}
+} // namespace base
 
 namespace mozilla {
 namespace HangMonitor {
   class HangAnnotations;
-}
+} // namespace HangMonitor
 namespace Telemetry {
 
 #include "TelemetryHistogramEnums.h"
@@ -269,4 +269,5 @@ void WriteFailedProfileLock(nsIFile* aProfileDir);
 
 } // namespace Telemetry
 } // namespace mozilla
+
 #endif // Telemetry_h__
diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm
index 6825d327fad2..a23fed97f476 100644
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -1127,8 +1127,18 @@ EnvironmentCache.prototype = {
       // again as part of bug 1154500.
       //DWriteVersion: getGfxField("DWriteVersion", null),
       adapters: [],
+      monitors: [],
     };
 
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GTK)
+    let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
+    try {
+      gfxData.monitors = gfxInfo.getMonitors();
+    } catch (e) {
+      this._log.error("nsIGfxInfo.getMonitors() caught error", e);
+    }
+#endif
+
     // GfxInfo does not yet expose a way to iterate through all the adapters.
     gfxData.adapters.push(getGfxAdapter(""));
     gfxData.adapters[0].GPUActive = true;
diff --git a/toolkit/components/telemetry/ThreadHangStats.h b/toolkit/components/telemetry/ThreadHangStats.h
index 859e52eafc52..eaf43edc8d5c 100644
--- a/toolkit/components/telemetry/ThreadHangStats.h
+++ b/toolkit/components/telemetry/ThreadHangStats.h
@@ -194,4 +194,5 @@ public:
 
 } // namespace Telemetry
 } // namespace mozilla
+
 #endif // mozilla_BackgroundHangTelemetry_h
diff --git a/toolkit/components/telemetry/docs/environment.rst b/toolkit/components/telemetry/docs/environment.rst
index 8ce36cae5775..e4c891fb70c5 100644
--- a/toolkit/components/telemetry/docs/environment.rst
+++ b/toolkit/components/telemetry/docs/environment.rst
@@ -133,6 +133,18 @@ Structure::
               },
               ...
             ],
+            // Note: currently only added on Desktop. On Linux, only a single
+            // monitor is returned representing the entire virtual screen.
+            monitors: [
+              {
+                screenWidth: <number>,  // screen width in pixels
+                screenHeight: <number>, // screen height in pixels
+                refreshRate: <number>,  // refresh rate in hertz (present on Windows only)
+                pseudoDisplay: <bool>,  // networked screen (present on Windows only)
+                scale: <number>,        // backing scale factor (present on Mac only)
+              },
+              ...
+            ],
           },
       },
       addons: {
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
index 7c024591fdc2..5e0de56e903c 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@@ -416,6 +416,20 @@ function checkSystemSection(data) {
   Assert.equal(typeof gfxData.adapters[0].GPUActive, "boolean");
   Assert.ok(gfxData.adapters[0].GPUActive, "The first GFX adapter must be active.");
 
+  Assert.ok(Array.isArray(gfxData.monitors));
+  if (gIsWindows || gIsMac) {
+    Assert.ok(gfxData.monitors.length >= 1, "There is at least one monitor.");
+    Assert.equal(typeof gfxData.monitors[0].screenWidth, "number");
+    Assert.equal(typeof gfxData.monitors[0].screenHeight, "number");
+    if (gIsWindows) {
+      Assert.equal(typeof gfxData.monitors[0].refreshRate, "number");
+      Assert.equal(typeof gfxData.monitors[0].pseudoDisplay, "boolean");
+    }
+    if (gIsMac) {
+      Assert.equal(typeof gfxData.monitors[0].scale, "number");
+    }
+  }
+
   try {
     // If we've not got nsIGfxInfoDebug, then this will throw and stop us doing
     // this test.
diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp
index 31e8acc01895..c330263ad955 100644
--- a/toolkit/components/terminator/nsTerminator.cpp
+++ b/toolkit/components/terminator/nsTerminator.cpp
@@ -316,7 +316,7 @@ static ShutdownStep sShutdownSteps[] = {
   ShutdownStep("xpcom-shutdown"),
 };
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(nsTerminator, nsIObserver)
 
diff --git a/toolkit/components/terminator/nsTerminator.h b/toolkit/components/terminator/nsTerminator.h
index 9dc845eff8fc..4c23740a56db 100644
--- a/toolkit/components/terminator/nsTerminator.h
+++ b/toolkit/components/terminator/nsTerminator.h
@@ -35,7 +35,7 @@ private:
   int32_t mCurrentStep;
 };
 
-}
+} // namespace mozilla
 
 #define NS_TOOLKIT_TERMINATOR_CID { 0x2e59cc70, 0xf83a, 0x412f, \
   { 0x89, 0xd4, 0x45, 0x38, 0x85, 0x83, 0x72, 0x17 } }
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
index dd581c4e47f4..e9774d36b35e 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
+++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
@@ -1251,7 +1251,8 @@ nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell,
                             eLeaf,
                             false, // aVisual
                             false, // aLockInScrollView
-                            false     // aFollowOOFs
+                            false, // aFollowOOFs
+                            false  // aSkipPopupChecks
                             );
 
   if (!frameTraversal)
diff --git a/toolkit/components/url-classifier/ChunkSet.cpp b/toolkit/components/url-classifier/ChunkSet.cpp
index 8e0e20dcb44d..8906fe816fa2 100644
--- a/toolkit/components/url-classifier/ChunkSet.cpp
+++ b/toolkit/components/url-classifier/ChunkSet.cpp
@@ -94,5 +94,5 @@ ChunkSet::Clear()
   mChunks.Clear();
 }
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
diff --git a/toolkit/components/url-classifier/ChunkSet.h b/toolkit/components/url-classifier/ChunkSet.h
index ab5a7634290c..c7aae13d7ea0 100644
--- a/toolkit/components/url-classifier/ChunkSet.h
+++ b/toolkit/components/url-classifier/ChunkSet.h
@@ -43,7 +43,7 @@ private:
   FallibleTArray<uint32_t> mChunks;
 };
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/components/url-classifier/Classifier.h b/toolkit/components/url-classifier/Classifier.h
index f936bdfe859d..5ec5970b5091 100644
--- a/toolkit/components/url-classifier/Classifier.h
+++ b/toolkit/components/url-classifier/Classifier.h
@@ -104,7 +104,7 @@ private:
   nsDataHashtable<nsCStringHashKey, int64_t> mTableFreshness;
 };
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/components/url-classifier/Entries.h b/toolkit/components/url-classifier/Entries.h
index 158f18cea4ec..ea92c7350832 100644
--- a/toolkit/components/url-classifier/Entries.h
+++ b/toolkit/components/url-classifier/Entries.h
@@ -299,4 +299,5 @@ WriteTArray(nsIOutputStream* aStream, nsTArray_Impl<T, Alloc>& aArray)
 
 } // namespace safebrowsing
 } // namespace mozilla
+
 #endif // SBEntries_h__
diff --git a/toolkit/components/url-classifier/HashStore.cpp b/toolkit/components/url-classifier/HashStore.cpp
index 422472a5c0ad..935644da91b5 100644
--- a/toolkit/components/url-classifier/HashStore.cpp
+++ b/toolkit/components/url-classifier/HashStore.cpp
@@ -1054,5 +1054,5 @@ HashStore::AugmentAdds(const nsTArray<uint32_t>& aPrefixes)
   return NS_OK;
 }
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
diff --git a/toolkit/components/url-classifier/HashStore.h b/toolkit/components/url-classifier/HashStore.h
index 3d90a61f98cc..f8799c30e494 100644
--- a/toolkit/components/url-classifier/HashStore.h
+++ b/toolkit/components/url-classifier/HashStore.h
@@ -205,6 +205,7 @@ private:
   SubCompleteArray mSubCompletes;
 };
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
+
 #endif
diff --git a/toolkit/components/url-classifier/LookupCache.cpp b/toolkit/components/url-classifier/LookupCache.cpp
index 48aa8f53777f..1899fe5b916d 100644
--- a/toolkit/components/url-classifier/LookupCache.cpp
+++ b/toolkit/components/url-classifier/LookupCache.cpp
@@ -692,5 +692,5 @@ LookupCache::GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes)
 }
 
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
diff --git a/toolkit/components/url-classifier/LookupCache.h b/toolkit/components/url-classifier/LookupCache.h
index c8621ea07ded..de8b492c53b6 100644
--- a/toolkit/components/url-classifier/LookupCache.h
+++ b/toolkit/components/url-classifier/LookupCache.h
@@ -137,7 +137,7 @@ private:
   nsRefPtr<nsUrlClassifierPrefixSet> mPrefixSet;
 };
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/components/url-classifier/ProtocolParser.h b/toolkit/components/url-classifier/ProtocolParser.h
index c44e263ec3a9..edc602d2da4b 100644
--- a/toolkit/components/url-classifier/ProtocolParser.h
+++ b/toolkit/components/url-classifier/ProtocolParser.h
@@ -113,7 +113,7 @@ private:
   TableUpdate *mTableUpdate;
 };
 
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.h b/toolkit/components/url-classifier/nsUrlClassifierDBService.h
index ed91826fcbf9..2d63de1d4897 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.h
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.h
@@ -45,8 +45,8 @@ namespace safebrowsing {
 class Classifier;
 class ProtocolParser;
 class TableUpdate;
-}
-}
+} // namespace safebrowsing
+} // namespace mozilla
 
 // This is a proxy class that just creates a background thread and delagates
 // calls to the background thread.
diff --git a/toolkit/crashreporter/nsExceptionHandler.h b/toolkit/crashreporter/nsExceptionHandler.h
index a3aee029e38a..793fcc907537 100644
--- a/toolkit/crashreporter/nsExceptionHandler.h
+++ b/toolkit/crashreporter/nsExceptionHandler.h
@@ -264,6 +264,6 @@ void AddLibraryMapping(const char* library_name,
                        size_t      file_offset);
 
 #endif
-}
+} // namespace CrashReporter
 
 #endif /* nsExceptionHandler_h__ */
diff --git a/toolkit/devtools/server/CoreDump.pb.h b/toolkit/devtools/server/CoreDump.pb.h
index 8420a2415777..401e520cc13d 100644
--- a/toolkit/devtools/server/CoreDump.pb.h
+++ b/toolkit/devtools/server/CoreDump.pb.h
@@ -634,8 +634,8 @@ namespace google {
 namespace protobuf {
 
 
-}  // namespace google
-}  // namespace protobuf
+} // namespace protobuf
+} // namespace google
 #endif  // SWIG
 
 // @@protoc_insertion_point(global_scope)
diff --git a/toolkit/devtools/server/DeserializedNode.cpp b/toolkit/devtools/server/DeserializedNode.cpp
index ac617821e9fa..04430f1a5f79 100644
--- a/toolkit/devtools/server/DeserializedNode.cpp
+++ b/toolkit/devtools/server/DeserializedNode.cpp
@@ -180,5 +180,5 @@ Concrete<DeserializedNode>::edges(JSContext* cx, bool) const
   return UniquePtr<EdgeRange>(range.release());
 }
 
-} // namespace JS
 } // namespace ubi
+} // namespace JS
diff --git a/toolkit/devtools/server/DeserializedNode.h b/toolkit/devtools/server/DeserializedNode.h
index 9efedcce15ae..d2e53897edde 100644
--- a/toolkit/devtools/server/DeserializedNode.h
+++ b/toolkit/devtools/server/DeserializedNode.h
@@ -151,7 +151,7 @@ public:
   UniquePtr<EdgeRange> edges(JSContext* cx, bool) const override;
 };
 
-} // namespace JS
 } // namespace ubi
+} // namespace JS
 
 #endif // mozilla_devtools_DeserializedNode__
diff --git a/toolkit/devtools/server/nsJSInspector.cpp b/toolkit/devtools/server/nsJSInspector.cpp
index 59ae33d046d5..fa1fead2b90c 100644
--- a/toolkit/devtools/server/nsJSInspector.cpp
+++ b/toolkit/devtools/server/nsJSInspector.cpp
@@ -123,8 +123,8 @@ nsJSInspector::GetLastNestRequestor(JS::MutableHandle<JS::Value> out)
   return NS_OK;
 }
 
-}
-}
+} // namespace jsinspector
+} // namespace mozilla
 
 NS_DEFINE_NAMED_CID(JSINSPECTOR_CID);
 
diff --git a/toolkit/devtools/server/nsJSInspector.h b/toolkit/devtools/server/nsJSInspector.h
index 31f4173b567d..4e60b0428719 100644
--- a/toolkit/devtools/server/nsJSInspector.h
+++ b/toolkit/devtools/server/nsJSInspector.h
@@ -33,7 +33,7 @@ private:
   JS::Heap<JS::Value> mLastRequestor;
 };
 
-}
-}
+} // namespace jsinspector
+} // namespace mozilla
 
 #endif
diff --git a/toolkit/mozapps/extensions/AddonPathService.cpp b/toolkit/mozapps/extensions/AddonPathService.cpp
index 8299286bce84..71d4cb5a9668 100644
--- a/toolkit/mozapps/extensions/AddonPathService.cpp
+++ b/toolkit/mozapps/extensions/AddonPathService.cpp
@@ -221,4 +221,4 @@ MapURIToAddonID(nsIURI* aURI)
   return AddonPathService::FindAddonId(filePath);
 }
 
-}
+} // namespace mozilla
diff --git a/toolkit/xre/EventTracer.cpp b/toolkit/xre/EventTracer.cpp
index 9e4927d4d0cd..71a54240057d 100644
--- a/toolkit/xre/EventTracer.cpp
+++ b/toolkit/xre/EventTracer.cpp
@@ -264,4 +264,4 @@ void ShutdownEventTracing()
   CleanUpWidgetTracing();
 }
 
-}  // namespace mozilla
+} // namespace mozilla
diff --git a/toolkit/xre/EventTracer.h b/toolkit/xre/EventTracer.h
index 67fa6661dd76..886b624e0ae6 100644
--- a/toolkit/xre/EventTracer.h
+++ b/toolkit/xre/EventTracer.h
@@ -18,6 +18,6 @@ bool InitEventTracing(bool aLog);
 // Must be called from the same thread that called InitEventTracing.
 void ShutdownEventTracing();
 
-}  // namespace mozilla
+} // namespace mozilla
 
 #endif /* XRE_EVENTTRACER_H_ */
diff --git a/toolkit/xre/MacAutoreleasePool.h b/toolkit/xre/MacAutoreleasePool.h
index 580e37da4376..7668957f1915 100644
--- a/toolkit/xre/MacAutoreleasePool.h
+++ b/toolkit/xre/MacAutoreleasePool.h
@@ -26,6 +26,6 @@ private:
   void operator=(const MacAutoreleasePool&);
 };
 
-}
+} // namespace mozilla
 
 #endif // MacAutoreleasePool_h_
diff --git a/toolkit/xre/MacLaunchHelper.mm b/toolkit/xre/MacLaunchHelper.mm
index e11aa4e2af38..8d922c728bc9 100644
--- a/toolkit/xre/MacLaunchHelper.mm
+++ b/toolkit/xre/MacLaunchHelper.mm
@@ -33,7 +33,7 @@ cpu_type_t cpu_i386_types[2] = {
 cpu_type_t cpu_x64_86_types[2] = {
                                  CPU_TYPE_X86_64,
                                  CPU_TYPE_ANY };
-}
+} // namespace
 
 void LaunchChildMac(int aArgc, char** aArgv,
                     uint32_t aRestartType, pid_t *pid)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 45123127f5c7..e06611f94547 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -252,7 +252,7 @@ extern "C" MFBT_API bool IsSignalHandlingBroken();
 
 namespace mozilla {
 int (*RunGTest)() = 0;
-}
+} // namespace mozilla
 
 using namespace mozilla;
 using mozilla::unused;
@@ -1967,7 +1967,7 @@ private:
   nsresult mRv;
 };
 
-} // anonymous namespace
+} // namespace
 
 static ReturnAbortOnError
 ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir,
@@ -3579,7 +3579,7 @@ static void PR_CALLBACK AnnotateSystemManufacturer_ThreadStart(void*)
 
 namespace mozilla {
   ShutdownChecksMode gShutdownChecks = SCM_NOTHING;
-}
+} // namespace mozilla
 
 static void SetShutdownChecks() {
   // Set default first. On debug builds we crash. On nightly and local
diff --git a/toolkit/xre/nsAppRunner.h b/toolkit/xre/nsAppRunner.h
index 1295144c7008..ec724d80db70 100644
--- a/toolkit/xre/nsAppRunner.h
+++ b/toolkit/xre/nsAppRunner.h
@@ -112,8 +112,8 @@ WriteStatusApplied(LPCWSTR updateDirPath);
 namespace mozilla {
 namespace startup {
 extern GeckoProcessType sChildProcessType;
-}
-}
+} // namespace startup
+} // namespace mozilla
 
 /**
  * Set up platform specific error handling such as suppressing DLL load dialog
diff --git a/toolkit/xre/nsCommandLineServiceMac.h b/toolkit/xre/nsCommandLineServiceMac.h
index 4679acd34b9a..f21596856e9c 100644
--- a/toolkit/xre/nsCommandLineServiceMac.h
+++ b/toolkit/xre/nsCommandLineServiceMac.h
@@ -15,6 +15,6 @@ namespace CommandLineServiceMac {
   // SetupMacCommandLine. Returns false if no command line is
   // being set up or the addition fails for any other reason.
   bool AddURLToCurrentCommandLine(const char* aURL);
-}
+} // namespace CommandLineServiceMac
 
 #endif // nsCommandLineServiceMac_h_
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index d4a7c75e6c98..75cf03e77caf 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -220,8 +220,8 @@ XRE_ChildProcessTypeToString(GeckoProcessType aProcessType)
 namespace mozilla {
 namespace startup {
 GeckoProcessType sChildProcessType = GeckoProcessType_Default;
-}
-}
+} // namespace startup
+} // namespace mozilla
 
 void
 XRE_SetProcessType(const char* aProcessTypeString)
@@ -831,7 +831,8 @@ TestShellParent* GetOrCreateTestShellParent()
     }
     return tsp;
 }
-}
+
+} // namespace
 
 bool
 XRE_SendTestShellCommand(JSContext* aCx,
diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp
index 9d5d28ff0050..000129004d11 100644
--- a/toolkit/xre/nsSigHandlers.cpp
+++ b/toolkit/xre/nsSigHandlers.cpp
@@ -38,7 +38,9 @@
 #endif
 
 static char _progname[1024] = "huh?";
-static unsigned int _gdb_sleep_duration = 300;
+
+// Note: some tests manipulate this value.
+unsigned int _gdb_sleep_duration = 300;
 
 #if defined(LINUX) && defined(DEBUG) && \
       (defined(__i386) || defined(__x86_64) || defined(PPC))
diff --git a/tools/profiler/core/GeckoSampler.cpp b/tools/profiler/core/GeckoSampler.cpp
index 489e81667bcb..950bb91d5ee2 100644
--- a/tools/profiler/core/GeckoSampler.cpp
+++ b/tools/profiler/core/GeckoSampler.cpp
@@ -1251,7 +1251,7 @@ SyncProfile* NewSyncProfile()
   return profile;
 }
 
-} // anonymous namespace
+} // namespace
 
 SyncProfile* GeckoSampler::GetBacktrace()
 {
diff --git a/tools/profiler/public/GeckoProfilerImpl.h b/tools/profiler/public/GeckoProfilerImpl.h
index 179e81be9975..0d81b7d425e5 100644
--- a/tools/profiler/public/GeckoProfilerImpl.h
+++ b/tools/profiler/public/GeckoProfilerImpl.h
@@ -42,7 +42,7 @@ class GeckoSampler;
 
 namespace mozilla {
 class TimeStamp;
-}
+} // namespace mozilla
 
 extern mozilla::ThreadLocal<PseudoStack *> tlsPseudoStack;
 extern mozilla::ThreadLocal<GeckoSampler *> tlsTicker;
@@ -449,7 +449,7 @@ private:
   void* mHandle;
 };
 
-} //mozilla
+} // namespace mozilla
 
 inline PseudoStack* mozilla_get_pseudo_stack(void)
 {
diff --git a/tools/profiler/public/ProfilerMarkers.h b/tools/profiler/public/ProfilerMarkers.h
index 4003138cde3b..95f994e5a18b 100644
--- a/tools/profiler/public/ProfilerMarkers.h
+++ b/tools/profiler/public/ProfilerMarkers.h
@@ -12,8 +12,8 @@
 namespace mozilla {
 namespace layers {
 class Layer;
-} // layers
-} // mozilla
+} // namespace layers
+} // namespace mozilla
 
 class SpliceableJSONWriter;
 class UniqueStacks;
diff --git a/tools/profiler/tasktracer/GeckoTaskTracer.cpp b/tools/profiler/tasktracer/GeckoTaskTracer.cpp
index 02927a713818..8f70887116cc 100644
--- a/tools/profiler/tasktracer/GeckoTaskTracer.cpp
+++ b/tools/profiler/tasktracer/GeckoTaskTracer.cpp
@@ -190,6 +190,7 @@ ObsoleteCurrentTraceInfos()
     (*sTraceInfos)[i]->mObsolete = true;
   }
 }
+
 } // namespace anonymous
 
 nsCString*
diff --git a/uriloader/exthandler/ExternalHelperAppParent.h b/uriloader/exthandler/ExternalHelperAppParent.h
index 039e1be0783d..270b8af8ae26 100644
--- a/uriloader/exthandler/ExternalHelperAppParent.h
+++ b/uriloader/exthandler/ExternalHelperAppParent.h
@@ -13,7 +13,7 @@
 
 namespace IPC {
 class URI;
-}
+} // namespace IPC
 
 namespace mozilla {
 
diff --git a/uriloader/prefetch/OfflineCacheUpdateChild.cpp b/uriloader/prefetch/OfflineCacheUpdateChild.cpp
index 4cfc0945afe9..7285cf9d5a72 100644
--- a/uriloader/prefetch/OfflineCacheUpdateChild.cpp
+++ b/uriloader/prefetch/OfflineCacheUpdateChild.cpp
@@ -529,5 +529,5 @@ OfflineCacheUpdateChild::RecvFinish(const bool &succeeded,
     return true;
 }
 
-}
-}
+} // namespace docshell
+} // namespace mozilla
diff --git a/uriloader/prefetch/OfflineCacheUpdateChild.h b/uriloader/prefetch/OfflineCacheUpdateChild.h
index 3edf383e6132..f99b66e94877 100644
--- a/uriloader/prefetch/OfflineCacheUpdateChild.h
+++ b/uriloader/prefetch/OfflineCacheUpdateChild.h
@@ -88,7 +88,7 @@ private:
     uint64_t mByteProgress;
 };
 
-}
-}
+} // namespace docshell
+} // namespace mozilla
 
 #endif
diff --git a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp b/uriloader/prefetch/OfflineCacheUpdateGlue.cpp
index 6a20ccc77bae..8ffac3811dcf 100644
--- a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp
+++ b/uriloader/prefetch/OfflineCacheUpdateGlue.cpp
@@ -217,5 +217,5 @@ OfflineCacheUpdateGlue::ApplicationCacheAvailable(nsIApplicationCache *aApplicat
     return NS_OK;
 }
 
-}
-}
+} // namespace docshell
+} // namespace mozilla
diff --git a/uriloader/prefetch/OfflineCacheUpdateGlue.h b/uriloader/prefetch/OfflineCacheUpdateGlue.h
index b4a9b96ca93a..fdd51af4b0b1 100644
--- a/uriloader/prefetch/OfflineCacheUpdateGlue.h
+++ b/uriloader/prefetch/OfflineCacheUpdateGlue.h
@@ -74,7 +74,7 @@ private:
     nsCOMPtr<nsIURI> mDocumentURI;
 };
 
-}
-}
+} // namespace docshell
+} // namespace mozilla
 
 #endif
diff --git a/uriloader/prefetch/OfflineCacheUpdateParent.cpp b/uriloader/prefetch/OfflineCacheUpdateParent.cpp
index fb56987e9077..56ad75fbdc04 100644
--- a/uriloader/prefetch/OfflineCacheUpdateParent.cpp
+++ b/uriloader/prefetch/OfflineCacheUpdateParent.cpp
@@ -263,5 +263,5 @@ OfflineCacheUpdateParent::GetAppId(uint32_t *aAppId)
     return NS_OK;
 }
 
-} // docshell
-} // mozilla
+} // namespace docshell
+} // namespace mozilla
diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.cpp b/uriloader/prefetch/nsOfflineCacheUpdate.cpp
index bda26798c233..8dd5798a1c0e 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdate.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdate.cpp
@@ -78,7 +78,7 @@ private:
     char **mValues;
 };
 
-namespace { // anon
+namespace {
 
 nsresult
 DropReferenceFromURL(nsIURI * aURI)
@@ -107,7 +107,7 @@ LogToConsole(const char * message, nsOfflineCacheUpdateItem * item = nullptr)
     }
 }
 
-} // anon namespace
+} // namespace
 
 //-----------------------------------------------------------------------------
 // nsManifestCheck
diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
index 1e342ec39140..be0e4937d8ba 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
@@ -86,7 +86,7 @@ PRLogModuleInfo *gOfflineCacheUpdateLog;
 #undef LOG_ENABLED
 #define LOG_ENABLED() MOZ_LOG_TEST(gOfflineCacheUpdateLog, mozilla::LogLevel::Debug)
 
-namespace { // anon
+namespace {
 
 nsresult
 GetAppIDAndInBrowserFromWindow(nsIDOMWindow *aWindow,
@@ -116,7 +116,7 @@ GetAppIDAndInBrowserFromWindow(nsIDOMWindow *aWindow,
     return NS_OK;
 }
 
-} // anon
+} // namespace
 
 //-----------------------------------------------------------------------------
 // nsOfflineCachePendingUpdate
diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h
index 5406e561d0ff..26ba9ab60f25 100644
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -447,7 +447,7 @@
 namespace IPC {
 template<typename T>
 struct ParamTraits;
-}
+} // namespace IPC
 
 namespace mozilla {
 
diff --git a/widget/ContentHelper.cpp b/widget/ContentHelper.cpp
index 12e14a35780b..78a1da8b25f6 100644
--- a/widget/ContentHelper.cpp
+++ b/widget/ContentHelper.cpp
@@ -89,5 +89,5 @@ ContentHelper::GetAllowedTouchBehavior(nsIWidget* aWidget, const LayoutDeviceInt
   return behavior;
 }
 
-}
-}
+} // namespace widget
+} // namespace mozilla
diff --git a/widget/ContentHelper.h b/widget/ContentHelper.h
index 5c454e14bf3c..b4ad1a59e44c 100644
--- a/widget/ContentHelper.h
+++ b/widget/ContentHelper.h
@@ -33,7 +33,7 @@ public:
   static TouchBehaviorFlags GetAllowedTouchBehavior(nsIWidget* aWidget, const LayoutDeviceIntPoint& aPoint);
 };
 
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 #endif /*__mozilla_widget_ContentHelper_h__ */
diff --git a/widget/FontRange.h b/widget/FontRange.h
index e2de0f4a1422..15cb4a01dad5 100644
--- a/widget/FontRange.h
+++ b/widget/FontRange.h
@@ -22,6 +22,6 @@ struct FontRange
   gfxFloat mFontSize; // in device pixels
 };
 
-}
+} // namespace mozilla
 
 #endif // mozilla_FontRange_h_
diff --git a/widget/GfxDriverInfo.h b/widget/GfxDriverInfo.h
index 9ab649cce5d5..b3a29a36c8fb 100644
--- a/widget/GfxDriverInfo.h
+++ b/widget/GfxDriverInfo.h
@@ -275,7 +275,7 @@ ParseDriverVersion(const nsAString& aVersion, uint64_t *aNumericVersion)
 #endif
 }
 
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 #endif /*__mozilla_widget_GfxDriverInfo_h__ */
diff --git a/widget/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp
index 8625ba228a68..cf3e28b95709 100644
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -1163,6 +1163,20 @@ GfxInfoBase::RemoveCollector(GfxInfoCollectorBase* collector)
   }
 }
 
+NS_IMETHODIMP
+GfxInfoBase::GetMonitors(JSContext* aCx, JS::MutableHandleValue aResult)
+{
+  JS::Rooted<JSObject*> array(aCx, JS_NewArrayObject(aCx, 0));
+
+  nsresult rv = FindMonitors(aCx, array);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  aResult.setObject(*array);
+  return NS_OK;
+}
+
 GfxInfoCollectorBase::GfxInfoCollectorBase()
 {
   GfxInfoBase::AddCollector(this);
diff --git a/widget/GfxInfoBase.h b/widget/GfxInfoBase.h
index 6b539f234dce..4188912ba390 100644
--- a/widget/GfxInfoBase.h
+++ b/widget/GfxInfoBase.h
@@ -54,7 +54,8 @@ public:
   NS_IMETHOD GetFeatureSuggestedDriverVersion(int32_t aFeature, nsAString & _retval) override;
   NS_IMETHOD GetWebGLParameter(const nsAString & aParam, nsAString & _retval) override;
 
-    NS_IMETHOD GetFailures(uint32_t *failureCount, int32_t** indices, char ***failures) override;
+  NS_IMETHOD GetMonitors(JSContext* cx, JS::MutableHandleValue _retval) override;
+  NS_IMETHOD GetFailures(uint32_t *failureCount, int32_t** indices, char ***failures) override;
   NS_IMETHOD_(void) LogFailure(const nsACString &failure) override;
   NS_IMETHOD GetInfo(JSContext*, JS::MutableHandle<JS::Value>) override;
 
@@ -114,7 +115,7 @@ private:
 
 };
 
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 #endif /* __mozilla_widget_GfxInfoBase_h__ */
diff --git a/widget/GfxInfoCollector.h b/widget/GfxInfoCollector.h
index 32b2dce6c339..9436b2333570 100644
--- a/widget/GfxInfoCollector.h
+++ b/widget/GfxInfoCollector.h
@@ -88,7 +88,7 @@ class GfxInfoCollector : public GfxInfoCollectorBase
 
 };
 
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 #endif
diff --git a/widget/GfxInfoWebGL.h b/widget/GfxInfoWebGL.h
index 8be8bf94348a..f18be14f0de8 100644
--- a/widget/GfxInfoWebGL.h
+++ b/widget/GfxInfoWebGL.h
@@ -21,7 +21,7 @@ protected:
     GfxInfoWebGL() { }
 };
 
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 #endif
diff --git a/widget/InputData.h b/widget/InputData.h
index 2f994a37d977..48a90f329d22 100644
--- a/widget/InputData.h
+++ b/widget/InputData.h
@@ -21,11 +21,11 @@ namespace mozilla {
 
 namespace dom {
 class Touch;
-}
+} // namespace dom
 
 namespace gfx {
 class Matrix4x4;
-}
+} // namespace gfx
 
 enum InputType
 {
@@ -527,6 +527,6 @@ public:
   ParentLayerPoint mLocalOrigin;
 };
 
-}
+} // namespace mozilla
 
 #endif // InputData_h__
diff --git a/widget/PluginWidgetProxy.cpp b/widget/PluginWidgetProxy.cpp
index f5abd0d91415..d5c9b9b590d7 100644
--- a/widget/PluginWidgetProxy.cpp
+++ b/widget/PluginWidgetProxy.cpp
@@ -177,5 +177,5 @@ PluginWidgetProxy::SetFocus(bool aRaise)
   return NS_OK;
 }
 
-}  // namespace widget
-}  // namespace mozilla
+} // namespace widget
+} // namespace mozilla
diff --git a/widget/PluginWidgetProxy.h b/widget/PluginWidgetProxy.h
index cf2af5ddd5a0..857a4e73ce13 100644
--- a/widget/PluginWidgetProxy.h
+++ b/widget/PluginWidgetProxy.h
@@ -18,7 +18,7 @@
 namespace mozilla {
 namespace plugins {
 class PluginWidgetChild;
-}
+} // namespace plugins
 namespace widget {
 
 class PluginWidgetProxy final : public PuppetWidget
@@ -69,6 +69,7 @@ private:
   uintptr_t mCachedPluginPort;
 };
 
-}  // namespace widget
-}  // namespace mozilla
+} // namespace widget
+} // namespace mozilla
+
 #endif
diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp
index e07739dfb407..f6fa54c0e502 100644
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@@ -1251,5 +1251,5 @@ PuppetScreenManager::GetSystemDefaultScale(float *aDefaultScale)
   return NS_OK;
 }
 
-}  // namespace widget
-}  // namespace mozilla
+} // namespace widget
+} // namespace mozilla
diff --git a/widget/PuppetWidget.h b/widget/PuppetWidget.h
index e2ed64613ca1..de9bbb0f41f5 100644
--- a/widget/PuppetWidget.h
+++ b/widget/PuppetWidget.h
@@ -29,7 +29,7 @@ namespace mozilla {
 
 namespace dom {
 class TabChild;
-}
+} // namespace dom
 
 namespace widget {
 
@@ -404,7 +404,7 @@ protected:
     nsCOMPtr<nsIScreen> mOneScreen;
 };
 
-}  // namespace widget
-}  // namespace mozilla
+} // namespace widget
+} // namespace mozilla
 
 #endif  // mozilla_widget_PuppetWidget_h__
diff --git a/widget/ScreenProxy.h b/widget/ScreenProxy.h
index c237816aa4e3..1747f905ff61 100644
--- a/widget/ScreenProxy.h
+++ b/widget/ScreenProxy.h
@@ -66,5 +66,6 @@ private:
 
 } // namespace widget
 } // namespace mozilla
+
 #endif
 
diff --git a/widget/WidgetTraceEvent.h b/widget/WidgetTraceEvent.h
index f920e103d640..d6e8f2c97bf3 100644
--- a/widget/WidgetTraceEvent.h
+++ b/widget/WidgetTraceEvent.h
@@ -22,6 +22,6 @@ bool FireAndWaitForTracerEvent();
 // Signal that the event has been received by the event loop.
 void SignalTracerThread();
 
-}
+} // namespace mozilla
 
 #endif  // WIDGET_PUBLIC_WIDGETTRACEEVENT_H_
diff --git a/widget/cocoa/GfxInfo.h b/widget/cocoa/GfxInfo.h
index 01b72d81fe9a..7c2bf7b398f5 100644
--- a/widget/cocoa/GfxInfo.h
+++ b/widget/cocoa/GfxInfo.h
@@ -59,6 +59,8 @@ public:
 
   virtual uint32_t OperatingSystemVersion() override { return mOSXVersion; }
 
+  nsresult FindMonitors(JSContext* cx, JS::HandleObject array) override;
+
 protected:
 
   virtual ~GfxInfo() {}
diff --git a/widget/cocoa/GfxInfo.mm b/widget/cocoa/GfxInfo.mm
index ddb35ea12b32..d3e8aaa552c4 100644
--- a/widget/cocoa/GfxInfo.mm
+++ b/widget/cocoa/GfxInfo.mm
@@ -379,6 +379,33 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
   return GfxInfoBase::GetFeatureStatusImpl(aFeature, aStatus, aSuggestedDriverVersion, aDriverInfo, &os);
 }
 
+nsresult
+GfxInfo::FindMonitors(JSContext* aCx, JS::HandleObject aOutArray)
+{
+  // Getting the refresh rate is a little hard on OS X. We could use
+  // CVDisplayLinkGetNominalOutputVideoRefreshPeriod, but that's a little
+  // involved. Ideally we could query it from vsync. For now, we leave it out.
+  int32_t deviceCount = 0;
+  for (NSScreen* screen in [NSScreen screens]) {
+    NSRect rect = [screen frame];
+
+    JS::Rooted<JSObject*> obj(aCx, JS_NewPlainObject(aCx));
+
+    JS::Rooted<JS::Value> screenWidth(aCx, JS::Int32Value((int)rect.size.width));
+    JS_SetProperty(aCx, obj, "screenWidth", screenWidth);
+
+    JS::Rooted<JS::Value> screenHeight(aCx, JS::Int32Value((int)rect.size.height));
+    JS_SetProperty(aCx, obj, "screenHeight", screenHeight);
+
+    JS::Rooted<JS::Value> scale(aCx, JS::NumberValue(nsCocoaUtils::GetBackingScaleFactor(screen)));
+    JS_SetProperty(aCx, obj, "scale", scale);
+
+    JS::Rooted<JS::Value> element(aCx, JS::ObjectValue(*obj));
+    JS_SetElement(aCx, aOutArray, deviceCount++, element);
+  }
+  return NS_OK;
+}
+
 #ifdef DEBUG
 
 // Implement nsIGfxInfoDebug
diff --git a/widget/cocoa/VibrancyManager.h b/widget/cocoa/VibrancyManager.h
index 3ec2d109ff29..bc3b6b3bb5cf 100644
--- a/widget/cocoa/VibrancyManager.h
+++ b/widget/cocoa/VibrancyManager.h
@@ -116,6 +116,6 @@ protected:
   nsClassHashtable<nsUint32HashKey, VibrantRegion> mVibrantRegions;
 };
 
-}
+} // namespace mozilla
 
 #endif // VibrancyManager_h
diff --git a/widget/cocoa/WidgetTraceEvent.mm b/widget/cocoa/WidgetTraceEvent.mm
index ff51fc04e991..7023a17ba09a 100644
--- a/widget/cocoa/WidgetTraceEvent.mm
+++ b/widget/cocoa/WidgetTraceEvent.mm
@@ -19,7 +19,7 @@ Mutex* sMutex = NULL;
 CondVar* sCondVar = NULL;
 bool sTracerProcessed = false;
 
-}
+} // namespace
 
 namespace mozilla {
 
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index e240c1c380c9..6ca6ce1d1f11 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -39,15 +39,15 @@ class nsCocoaWindow;
 namespace {
 class GLPresenter;
 class RectTextureImage;
-}
+} // namespace
 
 namespace mozilla {
 class VibrancyManager;
 namespace layers {
 class GLManager;
 class APZCTreeManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 
 @interface NSEvent (Undocumented)
 
@@ -539,6 +539,7 @@ public:
   already_AddRefed<mozilla::gfx::DrawTarget> StartRemoteDrawing() override;
   void EndRemoteDrawing() override;
   void CleanupRemoteDrawing() override;
+  bool InitCompositor(mozilla::layers::Compositor* aCompositor) override;
 
   APZCTreeManager* APZCTM() { return mAPZC ; }
 
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index d67aa42dfe42..4566ae5f6918 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -2562,6 +2562,8 @@ nsChildView::EnsureVibrancyManager()
 already_AddRefed<gfx::DrawTarget>
 nsChildView::StartRemoteDrawing()
 {
+  // should have created the GLPresenter in InitCompositor.
+  MOZ_ASSERT(mGLPresenter);
   if (!mGLPresenter) {
     mGLPresenter = GLPresenter::CreateForWindow(this);
 
@@ -2606,6 +2608,19 @@ nsChildView::CleanupRemoteDrawing()
   mGLPresenter = nullptr;
 }
 
+bool
+nsChildView::InitCompositor(Compositor* aCompositor)
+{
+  if (aCompositor->GetBackendType() == LayersBackend::LAYERS_BASIC) {
+    if (!mGLPresenter) {
+      mGLPresenter = GLPresenter::CreateForWindow(this);
+    }
+
+    return !!mGLPresenter;
+  }
+  return true;
+}
+
 void
 nsChildView::DoRemoteComposition(const nsIntRect& aRenderRect)
 {
diff --git a/widget/cocoa/nsCocoaUtils.h b/widget/cocoa/nsCocoaUtils.h
index 50d6e8ec984c..7a50c57869b7 100644
--- a/widget/cocoa/nsCocoaUtils.h
+++ b/widget/cocoa/nsCocoaUtils.h
@@ -49,8 +49,8 @@ class nsIWidget;
 namespace mozilla {
 namespace gfx {
 class SourceSurface;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 // Used to retain a Cocoa object for the remainder of a method's execution.
 class nsAutoRetainCocoaObject {
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index 182d2c6dc6ab..cc7660fc9240 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -285,10 +285,12 @@ public:
                                         nsIWidget *aWidget, bool aActivate) override;
     NS_IMETHOD              SetSizeMode(int32_t aMode) override;
     NS_IMETHOD              HideWindowChrome(bool aShouldHide) override;
-    virtual void            PrepareForDOMFullscreenTransition() override;
     void EnteredFullScreen(bool aFullScreen, bool aNativeMode = true);
-    inline bool ShouldToggleNativeFullscreen(bool aFullScreen);
-    NS_IMETHOD              MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr) override;
+    NS_IMETHOD MakeFullScreen(
+      bool aFullScreen, nsIScreen* aTargetScreen = nullptr) override final;
+    NS_IMETHOD MakeFullScreenWithNativeTransition(
+      bool aFullScreen, nsIScreen* aTargetScreen = nullptr) override final;
+
     NS_IMETHOD              Resize(double aWidth, double aHeight, bool aRepaint) override;
     NS_IMETHOD              Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint) override;
     NS_IMETHOD              GetClientBounds(nsIntRect &aRect) override;
@@ -385,6 +387,10 @@ protected:
   nsresult             DoResize(double aX, double aY, double aWidth, double aHeight,
                                 bool aRepaint, bool aConstrainToCurrentScreen);
 
+  inline bool ShouldToggleNativeFullscreen(bool aFullScreen,
+                                           bool aUseSystemTransition);
+  nsresult DoMakeFullScreen(bool aFullScreen, bool aUseSystemTransition);
+
   virtual already_AddRefed<nsIWidget>
   AllocateChildPopupWidget() override
   {
@@ -414,10 +420,6 @@ protected:
   bool                 mInFullScreenMode;
   bool                 mInFullScreenTransition; // true from the request to enter/exit fullscreen
                                                 // (MakeFullScreen() call) to EnteredFullScreen()
-  // We are in transition to/from DOM Fullscreen.
-  // XXX The transition is not implemented yet. This is currently only
-  // used to distinguish between DOM fullscreen and fullscreen mode.
-  bool                 mInDOMFullscreenTransition;
   bool                 mModal;
 
   // Only true on 10.7+ if SetShowsFullScreenButton(true) is called.
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index eb9626fa3626..0a570f174a86 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -45,8 +45,8 @@
 namespace mozilla {
 namespace layers {
 class LayerManager;
-}
-}
+} // namespace layers
+} // namespace mozilla
 using namespace mozilla::layers;
 using namespace mozilla::widget;
 using namespace mozilla;
@@ -108,7 +108,6 @@ nsCocoaWindow::nsCocoaWindow()
 , mSheetNeedsShow(false)
 , mInFullScreenMode(false)
 , mInFullScreenTransition(false)
-, mInDOMFullscreenTransition(false)
 , mModal(false)
 , mSupportsNativeFullScreen(false)
 , mInNativeFullScreenMode(false)
@@ -1266,11 +1265,6 @@ NS_IMETHODIMP nsCocoaWindow::HideWindowChrome(bool aShouldHide)
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-void nsCocoaWindow::PrepareForDOMFullscreenTransition()
-{
-  mInDOMFullscreenTransition = true;
-}
-
 void nsCocoaWindow::EnteredFullScreen(bool aFullScreen, bool aNativeMode)
 {
   mInFullScreenTransition = false;
@@ -1284,7 +1278,9 @@ void nsCocoaWindow::EnteredFullScreen(bool aFullScreen, bool aNativeMode)
   }
 }
 
-inline bool nsCocoaWindow::ShouldToggleNativeFullscreen(bool aFullScreen)
+inline bool
+nsCocoaWindow::ShouldToggleNativeFullscreen(bool aFullScreen,
+                                            bool aUseSystemTransition)
 {
   if (!mSupportsNativeFullScreen) {
     // If we cannot use native fullscreen, don't touch it.
@@ -1294,17 +1290,30 @@ inline bool nsCocoaWindow::ShouldToggleNativeFullscreen(bool aFullScreen)
     // If we are using native fullscreen, go ahead to exit it.
     return true;
   }
-  if (mInDOMFullscreenTransition) {
-    // We shouldn't use native fullscreen for DOM fullscreen.
+  if (!aUseSystemTransition) {
+    // If we do not want the system fullscreen transition,
+    // don't use the native fullscreen.
     return false;
   }
-  // If we are using native fullscreen, we should have returned earlier,
-  // which means if we reach here for exiting fullscreen, we must be
-  // exiting from DOM fullscreen, not native fullscreen.
+  // If we are using native fullscreen, we should have returned earlier.
   return aFullScreen;
 }
 
-NS_METHOD nsCocoaWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
+NS_IMETHODIMP
+nsCocoaWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
+{
+  return DoMakeFullScreen(aFullScreen, false);
+}
+
+NS_IMETHODIMP
+nsCocoaWindow::MakeFullScreenWithNativeTransition(bool aFullScreen,
+                                                  nsIScreen* aTargetScreen)
+{
+  return DoMakeFullScreen(aFullScreen, true);
+}
+
+nsresult
+nsCocoaWindow::DoMakeFullScreen(bool aFullScreen, bool aUseSystemTransition)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
@@ -1322,7 +1331,7 @@ NS_METHOD nsCocoaWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScre
 
   mInFullScreenTransition = true;
 
-  if (ShouldToggleNativeFullscreen(aFullScreen)) {
+  if (ShouldToggleNativeFullscreen(aFullScreen, aUseSystemTransition)) {
     // If we're using native fullscreen mode and our native window is invisible,
     // our attempt to go into fullscreen mode will fail with an assertion in
     // system code, without [WindowDelegate windowDidFailToEnterFullScreen:]
@@ -1350,11 +1359,6 @@ NS_METHOD nsCocoaWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScre
     EnteredFullScreen(aFullScreen, /* aNativeMode */ false);
   }
 
-  if (mInDOMFullscreenTransition) {
-    // Clear the flag about DOM fullscreen.
-    mInDOMFullscreenTransition = false;
-  }
-
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
diff --git a/widget/cocoa/nsMenuUtilsX.h b/widget/cocoa/nsMenuUtilsX.h
index a71147b3898c..1571cdfb0a6b 100644
--- a/widget/cocoa/nsMenuUtilsX.h
+++ b/widget/cocoa/nsMenuUtilsX.h
@@ -26,6 +26,6 @@ namespace nsMenuUtilsX
   NSMenuItem*   GetStandardEditMenuItem(); // returned object is not retained
   bool          NodeIsHiddenOrCollapsed(nsIContent* inContent);
   int           CalculateNativeInsertionPoint(nsMenuObjectX* aParent, nsMenuObjectX* aChild);
-}
+} // namespace nsMenuUtilsX
 
 #endif // nsMenuUtilsX_h_
diff --git a/widget/cocoa/nsWidgetFactory.mm b/widget/cocoa/nsWidgetFactory.mm
index 0e8ef3251540..c5d36956118e 100644
--- a/widget/cocoa/nsWidgetFactory.mm
+++ b/widget/cocoa/nsWidgetFactory.mm
@@ -86,8 +86,8 @@ namespace mozilla {
 namespace widget {
 // This constructor should really be shared with all platforms.
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 NS_DEFINE_NAMED_CID(NS_WINDOW_CID);
 NS_DEFINE_NAMED_CID(NS_POPUP_CID);
diff --git a/widget/gonk/GeckoTouchDispatcher.h b/widget/gonk/GeckoTouchDispatcher.h
index 3731912a67f6..58570ebbd1a6 100644
--- a/widget/gonk/GeckoTouchDispatcher.h
+++ b/widget/gonk/GeckoTouchDispatcher.h
@@ -94,4 +94,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif // GECKO_TOUCH_INPUT_DISPATCHER_h
diff --git a/widget/gonk/GonkMemoryPressureMonitoring.cpp b/widget/gonk/GonkMemoryPressureMonitoring.cpp
index 52aa7db2e1c9..19eee6f94c1a 100644
--- a/widget/gonk/GonkMemoryPressureMonitoring.cpp
+++ b/widget/gonk/GonkMemoryPressureMonitoring.cpp
@@ -274,7 +274,7 @@ private:
 
 NS_IMPL_ISUPPORTS(MemoryPressureWatcher, nsIRunnable, nsIObserver);
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/widget/gonk/GonkPermission.h b/widget/gonk/GonkPermission.h
index 5e40b2a2779a..d34fcd8ac154 100644
--- a/widget/gonk/GonkPermission.h
+++ b/widget/gonk/GonkPermission.h
@@ -80,5 +80,7 @@ private:
   GonkPermissionService(): android::BnPermissionController() {}
   nsTArray<PermissionGrant> mGrantArray;
 };
+
 } // namespace mozilla
+
 #endif // GONKPERMISSION_H
diff --git a/widget/gonk/HwcComposer2D.cpp b/widget/gonk/HwcComposer2D.cpp
index d5951462a6c7..334adace3fee 100644
--- a/widget/gonk/HwcComposer2D.cpp
+++ b/widget/gonk/HwcComposer2D.cpp
@@ -229,7 +229,7 @@ private:
     GonkDisplay::DisplayType mType;
     bool mConnected;
 };
-} // anonymous namespace
+} // namespace
 
 void
 HwcComposer2D::Hotplug(int aDisplay, int aConnected)
diff --git a/widget/gonk/OrientationObserver.cpp b/widget/gonk/OrientationObserver.cpp
index dd70293fa68f..187ed337eb0a 100644
--- a/widget/gonk/OrientationObserver.cpp
+++ b/widget/gonk/OrientationObserver.cpp
@@ -153,7 +153,7 @@ ConvertToDomOrientation(uint32_t aRotation, ScreenOrientation *aResult)
 // should be on the main thread.
 static StaticAutoPtr<OrientationObserver> sOrientationSensorObserver;
 
-} // Anonymous namespace
+} // namespace
 
 OrientationObserver*
 OrientationObserver::GetInstance()
diff --git a/widget/gonk/ProcessOrientation.h b/widget/gonk/ProcessOrientation.h
index d565e7fde4c8..d6d4bc3b6cf5 100644
--- a/widget/gonk/ProcessOrientation.h
+++ b/widget/gonk/ProcessOrientation.h
@@ -107,4 +107,5 @@ private:
 };
 
 } // namespace mozilla
+
 #endif
diff --git a/widget/gonk/WidgetTraceEvent.cpp b/widget/gonk/WidgetTraceEvent.cpp
index 48e5b4739145..ac14cfa0afe5 100644
--- a/widget/gonk/WidgetTraceEvent.cpp
+++ b/widget/gonk/WidgetTraceEvent.cpp
@@ -92,5 +92,5 @@ namespace mozilla {
       return sTracerRunnable->Signal();
     }
   }
-}  // namespace mozilla
+} // namespace mozilla
 
diff --git a/widget/gonk/libdisplay/GonkDisplayICS.cpp b/widget/gonk/libdisplay/GonkDisplayICS.cpp
index 284176f50a09..25edd115ff58 100644
--- a/widget/gonk/libdisplay/GonkDisplayICS.cpp
+++ b/widget/gonk/libdisplay/GonkDisplayICS.cpp
@@ -67,7 +67,7 @@ frameBufferWatcher(void *)
     return nullptr;
 }
 
-} // anonymous namespace
+} // namespace
 
 
 namespace mozilla {
diff --git a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
index 1f775795f01e..1d7eb27021d0 100644
--- a/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
+++ b/widget/gonk/nativewindow/GonkBufferQueueLL/GonkBufferQueueConsumer.cpp
@@ -555,4 +555,5 @@ GonkBufferQueueConsumer::getSlotFromTextureClientLocked(GonkBufferSlot::TextureC
     ALOGE("getSlotFromBufferLocked: unknown TextureClient: %p", client);
     return BAD_VALUE;
 }
+
 } // namespace android
diff --git a/widget/gonk/nsScreenManagerGonk.cpp b/widget/gonk/nsScreenManagerGonk.cpp
index 7723d445450b..8165d312764f 100644
--- a/widget/gonk/nsScreenManagerGonk.cpp
+++ b/widget/gonk/nsScreenManagerGonk.cpp
@@ -15,6 +15,7 @@
 
 #include "android/log.h"
 #include "GLContext.h"
+#include "gfxPrefs.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "mozilla/Hal.h"
@@ -91,7 +92,7 @@ displayEnabledCallback(bool enabled)
     screenManager->DisplayEnabled(enabled);
 }
 
-} // anonymous namespace
+} // namespace
 
 static uint32_t
 SurfaceFormatToColorDepth(int32_t aSurfaceFormat)
diff --git a/widget/gtk/WidgetTraceEvent.cpp b/widget/gtk/WidgetTraceEvent.cpp
index 248d599797bb..f21cf37243ed 100644
--- a/widget/gtk/WidgetTraceEvent.cpp
+++ b/widget/gtk/WidgetTraceEvent.cpp
@@ -75,4 +75,4 @@ void SignalTracerThread()
   }
 }
 
-}  // namespace mozilla
+} // namespace mozilla
diff --git a/widget/gtk/nsSound.cpp b/widget/gtk/nsSound.cpp
index 360f1dc30461..f745cc1863aa 100644
--- a/widget/gtk/nsSound.cpp
+++ b/widget/gtk/nsSound.cpp
@@ -24,6 +24,7 @@
 #include "nsDirectoryServiceDefs.h"
 #include "mozilla/FileUtils.h"
 #include "mozilla/Services.h"
+#include "mozilla/unused.h"
 #include "nsIStringBundle.h"
 #include "nsIXULAppInfo.h"
 #include "nsContentUtils.h"
@@ -80,7 +81,7 @@ struct ScopedCanberraFile {
     }
 
     void forget() {
-        mFile.forget();
+        mozilla::unused << mFile.forget();
     }
     nsIFile* operator->() { return mFile; }
     operator nsIFile*() { return mFile; }
diff --git a/widget/nsBaseDragService.h b/widget/nsBaseDragService.h
index f1d89797ce59..6d306aff23f5 100644
--- a/widget/nsBaseDragService.h
+++ b/widget/nsBaseDragService.h
@@ -30,8 +30,8 @@ class nsIImageLoadingContent;
 namespace mozilla {
 namespace gfx {
 class SourceSurface;
-}
-}
+} // namespace gfx
+} // namespace mozilla
 
 /**
  * XP DragService wrapper base class
diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
index 19284db48209..f8944afc6299 100644
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -770,6 +770,16 @@ NS_IMETHODIMP nsBaseWidget::HideWindowChrome(bool aShouldHide)
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+/* virtual */ void
+nsBaseWidget::PerformFullscreenTransition(FullscreenTransitionStage aStage,
+                                          uint16_t aDuration,
+                                          nsISupports* aData,
+                                          nsIRunnable* aCallback)
+{
+  MOZ_ASSERT_UNREACHABLE(
+    "Should never call PerformFullscreenTransition on nsBaseWidget");
+}
+
 //-------------------------------------------------------------------------
 //
 // Put the window into full-screen mode
@@ -782,37 +792,19 @@ NS_IMETHODIMP nsBaseWidget::MakeFullScreen(bool aFullScreen, nsIScreen* aScreen)
   if (aFullScreen) {
     if (!mOriginalBounds)
       mOriginalBounds = new nsIntRect();
-    GetScreenBounds(*mOriginalBounds);
-    // convert dev pix to display pix for window manipulation
-    CSSToLayoutDeviceScale scale = GetDefaultScale();
-    mOriginalBounds->x = NSToIntRound(mOriginalBounds->x / scale.scale);
-    mOriginalBounds->y = NSToIntRound(mOriginalBounds->y / scale.scale);
-    mOriginalBounds->width = NSToIntRound(mOriginalBounds->width / scale.scale);
-    mOriginalBounds->height = NSToIntRound(mOriginalBounds->height / scale.scale);
+    *mOriginalBounds = GetScaledScreenBounds();
 
     // Move to top-left corner of screen and size to the screen dimensions
-    nsCOMPtr<nsIScreenManager> screenManager;
-    screenManager = do_GetService("@mozilla.org/gfx/screenmanager;1");
-    NS_ASSERTION(screenManager, "Unable to grab screenManager.");
-    if (screenManager) {
-      nsCOMPtr<nsIScreen> screen = aScreen;
-      if (!screen) {
-        // no screen was passed in, use the one that the window is on
-        screenManager->ScreenForRect(mOriginalBounds->x,
-                                     mOriginalBounds->y,
-                                     mOriginalBounds->width,
-                                     mOriginalBounds->height,
-                                     getter_AddRefs(screen));
-      }
-
-      if (screen) {
-        int32_t left, top, width, height;
-        if (NS_SUCCEEDED(screen->GetRectDisplayPix(&left, &top, &width, &height))) {
-          Resize(left, top, width, height, true);
-        }
+    nsCOMPtr<nsIScreen> screen = aScreen;
+    if (!screen) {
+      screen = GetWidgetScreen();
+    }
+    if (screen) {
+      int32_t left, top, width, height;
+      if (NS_SUCCEEDED(screen->GetRectDisplayPix(&left, &top, &width, &height))) {
+        Resize(left, top, width, height, true);
       }
     }
-
   } else if (mOriginalBounds) {
     Resize(mOriginalBounds->x, mOriginalBounds->y, mOriginalBounds->width,
            mOriginalBounds->height, true);
@@ -1119,10 +1111,7 @@ nsBaseWidget::GetPreferredCompositorBackends(nsTArray<LayersBackend>& aHints)
     aHints.AppendElement(LayersBackend::LAYERS_OPENGL);
   }
 
-  // At the moment, BasicCompositor is broken on mac.
-#ifndef XP_MACOSX
   aHints.AppendElement(LayersBackend::LAYERS_BASIC);
-#endif
 }
 
 nsIDocument*
@@ -1178,13 +1167,6 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
     return;
   }
 
-  nsTArray<LayersBackend> backendHints;
-  GetPreferredCompositorBackends(backendHints);
-  if (backendHints.IsEmpty()) {
-    mLayerManager = nullptr;
-    return;
-  }
-
   CreateCompositorVsyncDispatcher();
   mCompositorParent = NewCompositorParent(aWidth, aHeight);
   nsRefPtr<ClientLayerManager> lm = new ClientLayerManager(this);
@@ -1202,10 +1184,14 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
 
   TextureFactoryIdentifier textureFactoryIdentifier;
   PLayerTransactionChild* shadowManager = nullptr;
+  nsTArray<LayersBackend> backendHints;
+  GetPreferredCompositorBackends(backendHints);
 
   bool success = false;
-  shadowManager = mCompositorChild->SendPLayerTransactionConstructor(
-    backendHints, 0, &textureFactoryIdentifier, &success);
+  if (!backendHints.IsEmpty()) {
+    shadowManager = mCompositorChild->SendPLayerTransactionConstructor(
+      backendHints, 0, &textureFactoryIdentifier, &success);
+  }
 
   ShadowLayerForwarder* lf = lm->AsShadowForwarder();
 
@@ -1748,6 +1734,36 @@ nsBaseWidget::GetRootAccessible()
 
 #endif // ACCESSIBILITY
 
+nsIntRect
+nsBaseWidget::GetScaledScreenBounds()
+{
+  nsIntRect bounds;
+  GetScreenBounds(bounds);
+  CSSToLayoutDeviceScale scale = GetDefaultScale();
+  bounds.x = NSToIntRound(bounds.x / scale.scale);
+  bounds.y = NSToIntRound(bounds.y / scale.scale);
+  bounds.width = NSToIntRound(bounds.width / scale.scale);
+  bounds.height = NSToIntRound(bounds.height / scale.scale);
+  return bounds;
+}
+
+already_AddRefed<nsIScreen>
+nsBaseWidget::GetWidgetScreen()
+{
+  nsCOMPtr<nsIScreenManager> screenManager;
+  screenManager = do_GetService("@mozilla.org/gfx/screenmanager;1");
+  if (!screenManager) {
+    return nullptr;
+  }
+
+  nsIntRect bounds = GetScaledScreenBounds();
+  nsCOMPtr<nsIScreen> screen;
+  screenManager->ScreenForRect(bounds.x, bounds.y,
+                               bounds.width, bounds.height,
+                               getter_AddRefs(screen));
+  return screen.forget();
+}
+
 nsresult
 nsIWidget::SynthesizeNativeTouchTap(nsIntPoint aPointerScreenPoint, bool aLongTap,
                                     nsIObserver* aObserver)
diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h
index dfb4a184b703..78ce729b7bee 100644
--- a/widget/nsBaseWidget.h
+++ b/widget/nsBaseWidget.h
@@ -40,14 +40,14 @@ class GeckoContentController;
 class APZEventState;
 struct ScrollableLayerGuid;
 struct SetAllowedTouchBehaviorCallback;
-}
+} // namespace layers
 
 class CompositorVsyncDispatcher;
-}
+} // namespace mozilla
 
 namespace base {
 class Thread;
-}
+} // namespace base
 
 // Windows specific constant indicating the maximum number of touch points the
 // inject api will allow. This also sets the maximum numerical value for touch
@@ -143,8 +143,13 @@ public:
   virtual void            SetShowsFullScreenButton(bool aShow) override {}
   virtual void            SetWindowAnimationType(WindowAnimationType aType) override {}
   NS_IMETHOD              HideWindowChrome(bool aShouldHide) override;
-  virtual void            PrepareForDOMFullscreenTransition() override {}
+  virtual bool PrepareForFullscreenTransition(nsISupports** aData) override { return false; }
+  virtual void PerformFullscreenTransition(FullscreenTransitionStage aStage,
+                                           uint16_t aDuration,
+                                           nsISupports* aData,
+                                           nsIRunnable* aCallback) override;
   NS_IMETHOD              MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr) override;
+
   virtual LayerManager*   GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
                                           LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
                                           LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
@@ -279,6 +284,13 @@ public:
     return aClientSize;
   }
 
+  // return the widget's outside dimensions
+  // in global coordinates in display pixel.
+  nsIntRect GetScaledScreenBounds();
+
+  // return the screen the widget is in.
+  already_AddRefed<nsIScreen> GetWidgetScreen();
+
   // return true if this is a popup widget with a native titlebar
   bool IsPopupWithTitleBar() const
   {
diff --git a/widget/nsFilePickerProxy.cpp b/widget/nsFilePickerProxy.cpp
index 667271932ede..7da9742e4087 100644
--- a/widget/nsFilePickerProxy.cpp
+++ b/widget/nsFilePickerProxy.cpp
@@ -230,7 +230,7 @@ private:
 
 NS_IMPL_ISUPPORTS(SimpleEnumerator, nsISimpleEnumerator)
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 nsFilePickerProxy::GetDomfiles(nsISimpleEnumerator** aDomfiles)
diff --git a/widget/nsFilePickerProxy.h b/widget/nsFilePickerProxy.h
index aaba98577723..3829d1a91808 100644
--- a/widget/nsFilePickerProxy.h
+++ b/widget/nsFilePickerProxy.h
@@ -21,8 +21,8 @@ class nsPIDOMWindow;
 namespace mozilla {
 namespace dom {
 class File;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 /**
   This class creates a proxy file picker to be used in content processes.
diff --git a/widget/nsIGfxInfo.idl b/widget/nsIGfxInfo.idl
index fde9e6b27ff5..8b10556b2fa7 100644
--- a/widget/nsIGfxInfo.idl
+++ b/widget/nsIGfxInfo.idl
@@ -8,7 +8,7 @@
 
 /* NOTE: this interface is completely undesigned, not stable and likely to change */
 
-[scriptable, uuid(b0cd9d34-8dba-4b1d-8126-ca21826dbf35)]
+[scriptable, uuid(47eedfa0-f7cb-445b-b5cf-a2ca83600560)]
 interface nsIGfxInfo : nsISupports
 {
   /*
@@ -54,6 +54,17 @@ interface nsIGfxInfo : nsISupports
 
   readonly attribute boolean isGPU2Active;
 
+  /**
+   * Returns an array of objects describing each monitor. Guaranteed properties
+   * are "screenWidth" and "screenHeight". This is only implemented on Desktop.
+   *
+   * Windows additionally supplies "refreshRate" and "pseudoDisplay".
+   *
+   * OS X additionally supplies "scale".
+   */
+  [implicit_jscontext]
+  jsval getMonitors();
+
   void getFailures(
                out unsigned long failureCount,
                [optional, array, size_is(failureCount)] out long indices,
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index cb3aa50d7fba..62d7e7450652 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -37,32 +37,34 @@ class   ViewWrapper;
 class   nsIWidgetListener;
 class   nsIntRegion;
 class   nsIScreen;
+class   nsIRunnable;
 
 namespace mozilla {
 class CompositorVsyncDispatcher;
 class WritingMode;
 namespace dom {
 class TabChild;
-}
+} // namespace dom
 namespace plugins {
 class PluginWidgetChild;
-}
+} // namespace plugins
 namespace layers {
 class Composer2D;
+class Compositor;
 class CompositorChild;
 class LayerManager;
 class LayerManagerComposite;
 class PLayerTransactionChild;
 struct ScrollableLayerGuid;
-}
+} // namespace layers
 namespace gfx {
 class DrawTarget;
 class SourceSurface;
-}
+} // namespace gfx
 namespace widget {
 class TextEventDispatcher;
-}
-}
+} // namespace widget
+} // namespace mozilla
 
 /**
  * Callback function that processes events.
@@ -119,8 +121,8 @@ typedef void* nsNativeWidget;
 #define NS_NATIVE_PLUGIN_ID            105
 
 #define NS_IWIDGET_IID \
-{ 0x53376F57, 0xF081, 0x4949, \
-  { 0xB5, 0x5E, 0x87, 0xEF, 0x6A, 0xE9, 0xE3, 0x5A } };
+{ 0x22b4504e, 0xddba, 0x4211, \
+  { 0xa1, 0x49, 0x6e, 0x11, 0x73, 0xc4, 0x11, 0x45 } }
 
 /*
  * Window shadow styles
@@ -1696,18 +1698,33 @@ class nsIWidget : public nsISupports {
      */
     NS_IMETHOD HideWindowChrome(bool aShouldHide) = 0;
 
+    enum FullscreenTransitionStage
+    {
+      eBeforeFullscreenToggle,
+      eAfterFullscreenToggle
+    };
+
     /**
-     * Ask the widget to start the transition for entering or exiting
-     * DOM Fullscreen.
-     *
-     * XXX This method is currently not actually implemented by any
-     * widget. The only function of this method is to notify cocoa
-     * window that it should not use the native fullscreen mode. This
-     * method is reserved for bug 1160014 where a transition will be
-     * added for DOM fullscreen. Hence, this function is likely to
-     * be further changed then.
+     * Prepares for fullscreen transition and returns whether the widget
+     * supports fullscreen transition. If this method returns false,
+     * PerformFullscreenTransition() must never be called. Otherwise,
+     * caller should call that method twice with "before" and "after"
+     * stages respectively in order. In the latter case, this method may
+     * return some data via aData pointer. Caller must pass that data to
+     * PerformFullscreenTransition() if any, and caller is responsible
+     * for releasing that data.
      */
-    virtual void PrepareForDOMFullscreenTransition() = 0;
+    virtual bool PrepareForFullscreenTransition(nsISupports** aData) = 0;
+
+    /**
+     * Performs fullscreen transition. This method returns immediately,
+     * and will post aCallback to the main thread when the transition
+     * finishes.
+     */
+    virtual void PerformFullscreenTransition(FullscreenTransitionStage aStage,
+                                             uint16_t aDuration,
+                                             nsISupports* aData,
+                                             nsIRunnable* aCallback) = 0;
 
     /**
      * Put the toplevel window into or out of fullscreen mode.
@@ -1718,6 +1735,18 @@ class nsIWidget : public nsISupports {
      */
     NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr) = 0;
 
+    /**
+     * Same as MakeFullScreen, except that, on systems which natively
+     * support fullscreen transition, calling this method explicitly
+     * requests that behavior.
+     * It is currently only supported on OS X 10.7+.
+     */
+    NS_IMETHOD MakeFullScreenWithNativeTransition(
+      bool aFullScreen, nsIScreen* aTargetScreen = nullptr)
+    {
+      return MakeFullScreen(aFullScreen, aTargetScreen);
+    }
+
     /**
      * Invalidate a specified rect for a widget so that it will be repainted
      * later.
@@ -1828,6 +1857,16 @@ class nsIWidget : public nsISupports {
       EndRemoteDrawing();
     }
 
+    /**
+     * A hook for the widget to prepare a Compositor, during the latter's initialization.
+     *
+     * If this method returns true, it means that the widget will be able to
+     * present frames from the compoositor.
+     * Returning false will cause the compositor's initialization to fail, and
+     * a different compositor backend will be used (if any).
+     */
+    virtual bool InitCompositor(mozilla::layers::Compositor*) { return true; }
+
     /**
      * Clean up any resources used by Start/EndRemoteDrawing.
      *
diff --git a/widget/nsIdleService.cpp b/widget/nsIdleService.cpp
index ae9b77cbefc1..66053f960aed 100644
--- a/widget/nsIdleService.cpp
+++ b/widget/nsIdleService.cpp
@@ -380,7 +380,7 @@ nsIdleServiceDaily::DailyCallback(nsITimer* aTimer, void* aClosure)
 
 namespace { 
 nsIdleService* gIdleService;
-}
+} // namespace
 
 already_AddRefed<nsIdleService>
 nsIdleService::GetInstance()
diff --git a/widget/nsShmImage.cpp b/widget/nsShmImage.cpp
index 4c614aec1277..d3b004a5efc2 100644
--- a/widget/nsShmImage.cpp
+++ b/widget/nsShmImage.cpp
@@ -131,7 +131,9 @@ nsShmImage::Put(GdkWindow* aWindow, const nsIntRegion& aRegion)
     Drawable d = GDK_DRAWABLE_XID(gd);
 
     GC gc = XCreateGC(dpy, d, 0, nullptr);
-    nsIntRegionRectIterator iter(aRegion);
+    nsIntRegion bounded;
+    bounded.And(aRegion, nsIntRect(0, 0, mImage->width, mImage->height));
+    nsIntRegionRectIterator iter(bounded);
     for (const nsIntRect *r = iter.Next(); r; r = iter.Next()) {
         XShmPutImage(dpy, d, gc, mImage,
                      r->x, r->y,
@@ -159,7 +161,9 @@ nsShmImage::Put(GdkWindow* aWindow, const nsIntRegion& aRegion)
     int dx = 0, dy = 0;
 
     GC gc = XCreateGC(dpy, d, 0, nullptr);
-    nsIntRegionRectIterator iter(aRegion);
+    nsIntRegion bounded;
+    bounded.And(aRegion, nsIntRect(0, 0, mImage->width, mImage->height));
+    nsIntRegionRectIterator iter(bounded);
     for (const nsIntRect *r = iter.Next(); r; r = iter.Next()) {
         XShmPutImage(dpy, d, gc, mImage,
                      r->x, r->y,
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
index 30935b1ccdb6..eb1f4ec81dfa 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -17,6 +17,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/gfx/Logging.h"
 #include "nsPrintfCString.h"
+#include "jsapi.h"
 
 #if defined(MOZ_CRASHREPORTER)
 #include "nsExceptionHandler.h"
@@ -1211,6 +1212,49 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
   return GfxInfoBase::GetFeatureStatusImpl(aFeature, aStatus, aSuggestedDriverVersion, aDriverInfo, &os);
 }
 
+nsresult
+GfxInfo::FindMonitors(JSContext* aCx, JS::HandleObject aOutArray)
+{
+  int deviceCount = 0;
+  for (int deviceIndex = 0;; deviceIndex++) {
+    DISPLAY_DEVICEA device;
+    device.cb = sizeof(device);
+    if (!::EnumDisplayDevicesA(nullptr, deviceIndex, &device, 0)) {
+      break;
+    }
+
+    if (!(device.StateFlags & DISPLAY_DEVICE_ACTIVE)) {
+      continue;
+    }
+
+    DEVMODEA mode;
+    mode.dmSize = sizeof(mode);
+    mode.dmDriverExtra = 0;
+    if (!::EnumDisplaySettingsA(device.DeviceName, ENUM_CURRENT_SETTINGS, &mode)) {
+      continue;
+    }
+
+    JS::Rooted<JSObject*> obj(aCx, JS_NewPlainObject(aCx));
+
+    JS::Rooted<JS::Value> screenWidth(aCx, JS::Int32Value(mode.dmPelsWidth));
+    JS_SetProperty(aCx, obj, "screenWidth", screenWidth);
+
+    JS::Rooted<JS::Value> screenHeight(aCx, JS::Int32Value(mode.dmPelsHeight));
+    JS_SetProperty(aCx, obj, "screenHeight", screenHeight);
+
+    JS::Rooted<JS::Value> refreshRate(aCx, JS::Int32Value(mode.dmDisplayFrequency));
+    JS_SetProperty(aCx, obj, "refreshRate", refreshRate);
+
+    JS::Rooted<JS::Value> pseudoDisplay(aCx,
+      JS::BooleanValue(!!(device.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER)));
+    JS_SetProperty(aCx, obj, "pseudoDisplay", pseudoDisplay);
+
+    JS::Rooted<JS::Value> element(aCx, JS::ObjectValue(*obj));
+    JS_SetElement(aCx, aOutArray, deviceCount++, element);
+  }
+  return NS_OK;
+}
+
 #ifdef DEBUG
 
 // Implement nsIGfxInfoDebug
diff --git a/widget/windows/GfxInfo.h b/widget/windows/GfxInfo.h
index 380c6ffce6fb..5fd361900ba2 100644
--- a/widget/windows/GfxInfo.h
+++ b/widget/windows/GfxInfo.h
@@ -51,6 +51,8 @@ public:
 
   virtual uint32_t OperatingSystemVersion() override { return mWindowsVersion; }
 
+  nsresult FindMonitors(JSContext* cx, JS::HandleObject array) override;
+
   NS_DECL_ISUPPORTS_INHERITED
 #ifdef DEBUG
   NS_DECL_NSIGFXINFODEBUG
diff --git a/widget/windows/WidgetTraceEvent.cpp b/widget/windows/WidgetTraceEvent.cpp
index 1485e759db58..aaee0c1b9971 100644
--- a/widget/windows/WidgetTraceEvent.cpp
+++ b/widget/windows/WidgetTraceEvent.cpp
@@ -129,4 +129,4 @@ bool FireAndWaitForTracerEvent()
   return true;
 }
 
-}  // namespace mozilla
+} // namespace mozilla
diff --git a/widget/windows/WindowHook.cpp b/widget/windows/WindowHook.cpp
index 8e87a3a55efa..b2a3167d3128 100644
--- a/widget/windows/WindowHook.cpp
+++ b/widget/windows/WindowHook.cpp
@@ -123,6 +123,7 @@ WindowHook::CallbackData::Invoke(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
     return false;
   return cb(context, hWnd, msg, wParam, lParam, aResult);
 }
+
 } // namespace widget
 } // namespace mozilla
 
diff --git a/widget/windows/nsColorPicker.cpp b/widget/windows/nsColorPicker.cpp
index f6a4d679c50b..65bb945e7698 100644
--- a/widget/windows/nsColorPicker.cpp
+++ b/widget/windows/nsColorPicker.cpp
@@ -89,7 +89,7 @@ BGRIntToRGBString(DWORD color, nsAString& aResult)
   aResult.Append(ToHexString(g));
   aResult.Append(ToHexString(b));
 }
-} // anonymous namespace
+} // namespace
 
 static AsyncColorChooser* gColorChooser;
 
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index c6eec0f44aaf..29b3e003ecce 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -56,6 +56,7 @@
 
 #include "gfx2DGlue.h"
 #include "gfxPlatform.h"
+#include "gfxPrefs.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MiscEvents.h"
 #include "mozilla/MouseEvents.h"
@@ -325,6 +326,7 @@ nsWindow::nsWindow() : nsWindowBase()
   mIconSmall            = nullptr;
   mIconBig              = nullptr;
   mWnd                  = nullptr;
+  mTransitionWnd        = nullptr;
   mPaintDC              = nullptr;
   mCompositeDC          = nullptr;
   mPrevWndProc          = nullptr;
@@ -1521,6 +1523,15 @@ NS_METHOD nsWindow::Resize(double aX, double aY, double aWidth, double aHeight,
     ClearThemeRegion();
     VERIFY(::SetWindowPos(mWnd, nullptr, x, y,
                           width, GetHeight(height), flags));
+    if (mTransitionWnd) {
+      // If we have a fullscreen transition window, we need to make
+      // it topmost again, otherwise the taskbar may be raised by
+      // the system unexpectedly when we leave fullscreen state.
+      ::SetWindowPos(mTransitionWnd, HWND_TOPMOST, 0, 0, 0, 0,
+                     SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+      // Every transition window is only used once.
+      mTransitionWnd = nullptr;
+    }
     SetThemeRegion();
   }
 
@@ -2848,6 +2859,173 @@ NS_METHOD nsWindow::Invalidate(const nsIntRect & aRect)
   return NS_OK;
 }
 
+static LRESULT CALLBACK
+FullscreenTransitionWindowProc(HWND hWnd, UINT uMsg,
+                               WPARAM wParam, LPARAM lParam)
+{
+  switch (uMsg) {
+    case WM_FULLSCREEN_TRANSITION_BEFORE:
+    case WM_FULLSCREEN_TRANSITION_AFTER: {
+      // The message sender should have added ref for us.
+      nsCOMPtr<nsIRunnable> callback =
+        already_AddRefed<nsIRunnable>((nsIRunnable*)wParam);
+      DWORD duration = (DWORD)lParam;
+      DWORD flags = AW_BLEND;
+      if (uMsg == WM_FULLSCREEN_TRANSITION_AFTER) {
+        flags |= AW_HIDE;
+      }
+      ::AnimateWindow(hWnd, duration, flags);
+      NS_DispatchToMainThread(callback);
+      break;
+    }
+    case WM_DESTROY:
+      ::PostQuitMessage(0);
+      break;
+    default:
+      return ::DefWindowProcW(hWnd, uMsg, wParam, lParam);
+  }
+  return 0;
+}
+
+struct FullscreenTransitionInitData
+{
+  nsIntRect mBounds;
+  HANDLE mSemaphore;
+  HANDLE mThread;
+  HWND mWnd;
+
+  FullscreenTransitionInitData()
+    : mSemaphore(nullptr)
+    , mThread(nullptr)
+    , mWnd(nullptr) { }
+
+  ~FullscreenTransitionInitData()
+  {
+    if (mSemaphore) {
+      ::CloseHandle(mSemaphore);
+    }
+    if (mThread) {
+      ::CloseHandle(mThread);
+    }
+  }
+};
+
+static DWORD WINAPI
+FullscreenTransitionThreadProc(LPVOID lpParam)
+{
+  // Initialize window class
+  static bool sInitialized = false;
+  if (!sInitialized) {
+    WNDCLASSW wc = {};
+    wc.lpfnWndProc = ::FullscreenTransitionWindowProc;
+    wc.hInstance = nsToolkit::mDllInstance;
+    wc.hbrBackground = ::CreateSolidBrush(RGB(0, 0, 0));
+    wc.lpszClassName = kClassNameTransition;
+    ::RegisterClassW(&wc);
+    sInitialized = true;
+  }
+
+  auto data = static_cast<FullscreenTransitionInitData*>(lpParam);
+  HWND wnd = ::CreateWindowW(
+    kClassNameTransition, L"", 0, 0, 0, 0, 0,
+    nullptr, nullptr, nsToolkit::mDllInstance, nullptr);
+  if (!wnd) {
+    ::ReleaseSemaphore(data->mSemaphore, 1, nullptr);
+    return 0;
+  }
+
+  // Since AnimateWindow blocks the thread of the transition window,
+  // we need to hide the cursor for that window, otherwise the system
+  // would show the busy pointer to the user.
+  ::ShowCursor(false);
+  ::SetWindowLongW(wnd, GWL_STYLE, 0);
+  ::SetWindowLongW(wnd, GWL_EXSTYLE, WS_EX_LAYERED |
+                   WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE);
+  ::SetWindowPos(wnd, HWND_TOPMOST, data->mBounds.x, data->mBounds.y,
+                 data->mBounds.width, data->mBounds.height, 0);
+  data->mWnd = wnd;
+  ::ReleaseSemaphore(data->mSemaphore, 1, nullptr);
+  // The initialization data may no longer be valid
+  // after we release the semaphore.
+  data = nullptr;
+
+  MSG msg;
+  while (::GetMessageW(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
+  ::ShowCursor(true);
+  ::DestroyWindow(wnd);
+  return 0;
+}
+
+class FullscreenTransitionData final : public nsISupports
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  explicit FullscreenTransitionData(HWND aWnd)
+    : mWnd(aWnd)
+  {
+    MOZ_ASSERT(NS_IsMainThread(), "FullscreenTransitionData "
+               "should be constructed in the main thread");
+  }
+
+  const HWND mWnd;
+
+private:
+  ~FullscreenTransitionData()
+  {
+    MOZ_ASSERT(NS_IsMainThread(), "FullscreenTransitionData "
+               "should be deconstructed in the main thread");
+    ::PostMessageW(mWnd, WM_DESTROY, 0, 0);
+  }
+};
+
+NS_IMPL_ISUPPORTS0(FullscreenTransitionData)
+
+/* virtual */ bool
+nsWindow::PrepareForFullscreenTransition(nsISupports** aData)
+{
+  FullscreenTransitionInitData initData;
+  nsCOMPtr<nsIScreen> screen = GetWidgetScreen();
+  screen->GetRectDisplayPix(&initData.mBounds.x, &initData.mBounds.y,
+                            &initData.mBounds.width, &initData.mBounds.height);
+  // Create a semaphore for synchronizing the window handle which will
+  // be created by the transition thread and used by the main thread for
+  // posting the transition messages.
+  initData.mSemaphore = ::CreateSemaphore(nullptr, 0, 1, nullptr);
+  if (initData.mSemaphore) {
+    initData.mThread = ::CreateThread(
+      nullptr, 0, FullscreenTransitionThreadProc, &initData, 0, nullptr);
+    if (initData.mThread) {
+      ::WaitForSingleObject(initData.mSemaphore, INFINITE);
+    }
+  }
+  if (!initData.mWnd) {
+    return false;
+  }
+
+  mTransitionWnd = initData.mWnd;
+  auto data = new FullscreenTransitionData(initData.mWnd);
+  *aData = data;
+  NS_ADDREF(data);
+  return true;
+}
+
+/* virtual */ void
+nsWindow::PerformFullscreenTransition(FullscreenTransitionStage aStage,
+                                      uint16_t aDuration, nsISupports* aData,
+                                      nsIRunnable* aCallback)
+{
+  auto data = static_cast<FullscreenTransitionData*>(aData);
+  nsCOMPtr<nsIRunnable> callback = aCallback;
+  UINT msg = aStage == eBeforeFullscreenToggle ?
+    WM_FULLSCREEN_TRANSITION_BEFORE : WM_FULLSCREEN_TRANSITION_AFTER;
+  WPARAM wparam = (WPARAM)callback.forget().take();
+  ::PostMessage(data->mWnd, msg, wparam, (LPARAM)aDuration);
+}
+
 NS_IMETHODIMP
 nsWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
 {
@@ -2875,26 +3053,16 @@ nsWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
   // If we are going fullscreen, the window size continues to change
   // and the window will be reflow again then.
   UpdateNonClientMargins(mSizeMode, /* Reflow */ !aFullScreen);
-
-  bool visible = mIsVisible;
-  if (mOldSizeMode == nsSizeMode_Normal)
-    Show(false);
   
   // Will call hide chrome, reposition window. Note this will
   // also cache dimensions for restoration, so it should only
   // be called once per fullscreen request.
   nsresult rv = nsBaseWidget::MakeFullScreen(aFullScreen, aTargetScreen);
 
-  if (visible) {
-    Show(true);
-    Invalidate();
-
-    if (!aFullScreen && mOldSizeMode == nsSizeMode_Normal) {
-      // Ensure the window exiting fullscreen get activated. Window
-      // activation was bypassed by SetSizeMode, and hiding window for
-      // transition could also blur the current window.
-      DispatchFocusToTopLevelWindow(true);
-    }
+  if (mIsVisible && !aFullScreen && mOldSizeMode == nsSizeMode_Normal) {
+    // Ensure the window exiting fullscreen get activated. Window
+    // activation might be bypassed in SetSizeMode.
+    DispatchFocusToTopLevelWindow(true);
   }
 
   // Notify the taskbar that we have exited full screen mode.
diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
index 6766c16f8cd5..60050f272d37 100644
--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
@@ -126,6 +126,11 @@ public:
                                     uint32_t aHotspotX, uint32_t aHotspotY);
   NS_IMETHOD              SetCursor(nsCursor aCursor);
   virtual nsresult        ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
+  virtual bool PrepareForFullscreenTransition(nsISupports** aData) override;
+  virtual void PerformFullscreenTransition(FullscreenTransitionStage aStage,
+                                           uint16_t aDuration,
+                                           nsISupports* aData,
+                                           nsIRunnable* aCallback) override;
   NS_IMETHOD              MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr);
   NS_IMETHOD              HideWindowChrome(bool aShouldHide);
   NS_IMETHOD              Invalidate(bool aEraseBackground = false,
@@ -463,6 +468,7 @@ protected:
   nsIntSize             mLastSize;
   nsIntPoint            mLastPoint;
   HWND                  mWnd;
+  HWND                  mTransitionWnd;
   WNDPROC               mPrevWndProc;
   HBRUSH                mBrush;
   bool                  mIsTopWidgetWindow;
diff --git a/widget/windows/nsWindowDefs.h b/widget/windows/nsWindowDefs.h
index 5141b63f5909..c64588162f7c 100644
--- a/widget/windows/nsWindowDefs.h
+++ b/widget/windows/nsWindowDefs.h
@@ -91,16 +91,16 @@
 #endif
 
 #ifndef WM_DWMCOMPOSITIONCHANGED
-#define WM_DWMCOMPOSITIONCHANGED          0x031E
+#define WM_DWMCOMPOSITIONCHANGED          0x031E
 #endif
 #ifndef WM_DWMNCRENDERINGCHANGED
-#define WM_DWMNCRENDERINGCHANGED          0x031F
+#define WM_DWMNCRENDERINGCHANGED          0x031F
 #endif
 #ifndef WM_DWMCOLORIZATIONCOLORCHANGED
-#define WM_DWMCOLORIZATIONCOLORCHANGED    0x0320
+#define WM_DWMCOLORIZATIONCOLORCHANGED    0x0320
 #endif
 #ifndef WM_DWMWINDOWMAXIMIZEDCHANGE
-#define WM_DWMWINDOWMAXIMIZEDCHANGE       0x0321
+#define WM_DWMWINDOWMAXIMIZEDCHANGE       0x0321
 #endif
 
 // ConstrainPosition window positioning slop value
@@ -183,6 +183,10 @@
 #define TABLET_INK_TOUCH     0x00000080
 #define MOUSE_INPUT_SOURCE() WinUtils::GetMouseInputSource()
 
+// Messages for fullscreen transition window
+#define WM_FULLSCREEN_TRANSITION_BEFORE     (WM_USER + 0)
+#define WM_FULLSCREEN_TRANSITION_AFTER      (WM_USER + 1)
+
 /**************************************************************
  *
  * SECTION: enums
@@ -218,6 +222,7 @@ const wchar_t kClassNameGeneral[]    = L"MozillaWindowClass";
 const wchar_t kClassNameDialog[]     = L"MozillaDialogClass";
 const wchar_t kClassNameDropShadow[] = L"MozillaDropShadowWindowClass";
 const wchar_t kClassNameTemp[]       = L"MozillaTempWindowClass";
+const wchar_t kClassNameTransition[] = L"MozillaTransitionWindowClass";
 
 /**************************************************************
  *
diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp
index e98018548fa4..1cfb97625c7a 100644
--- a/xpcom/base/AvailableMemoryTracker.cpp
+++ b/xpcom/base/AvailableMemoryTracker.cpp
@@ -477,7 +477,7 @@ nsMemoryPressureWatcher::Observe(nsISupports* aSubject, const char* aTopic,
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace AvailableMemoryTracker {
diff --git a/xpcom/base/CycleCollectedJSRuntime.h b/xpcom/base/CycleCollectedJSRuntime.h
index ca2d021456fa..dfe8997619d3 100644
--- a/xpcom/base/CycleCollectedJSRuntime.h
+++ b/xpcom/base/CycleCollectedJSRuntime.h
@@ -24,7 +24,7 @@ class nsIRunnable;
 
 namespace js {
 struct Class;
-}
+} // namespace js
 
 namespace mozilla {
 
diff --git a/xpcom/base/ErrorNames.h b/xpcom/base/ErrorNames.h
index 7a215f24558c..9fdba7ace20e 100644
--- a/xpcom/base/ErrorNames.h
+++ b/xpcom/base/ErrorNames.h
@@ -20,6 +20,6 @@ namespace mozilla {
 // "NS_ERROR_GENERATE_FAILURE(<module>, <code>)".
 void GetErrorName(nsresult rv, nsACString& name);
 
-}
+} // namespace mozilla
 
 #endif // mozilla_ErrorNames_h
diff --git a/xpcom/base/nsAlgorithm.h b/xpcom/base/nsAlgorithm.h
index a9a6f6e4aa71..ceaa3ace33da 100644
--- a/xpcom/base/nsAlgorithm.h
+++ b/xpcom/base/nsAlgorithm.h
@@ -45,7 +45,7 @@ clamped(const T& aA, const T& aMin, const T& aMax)
   return XPCOM_MIN(XPCOM_MAX(aA, aMin), aMax);
 }
 
-}
+} // namespace mozilla
 
 template <class InputIterator, class T>
 inline uint32_t
diff --git a/xpcom/base/nsConsoleService.cpp b/xpcom/base/nsConsoleService.cpp
index 94c207239fe0..b9429ae1fd73 100644
--- a/xpcom/base/nsConsoleService.cpp
+++ b/xpcom/base/nsConsoleService.cpp
@@ -158,7 +158,7 @@ LogMessageRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 // nsIConsoleService methods
 NS_IMETHODIMP
diff --git a/xpcom/base/nsCycleCollector.h b/xpcom/base/nsCycleCollector.h
index e43de375a65c..fadd57bec1fe 100644
--- a/xpcom/base/nsCycleCollector.h
+++ b/xpcom/base/nsCycleCollector.h
@@ -19,7 +19,7 @@ template<class T> struct already_AddRefed;
 
 namespace mozilla {
 class CycleCollectedJSRuntime;
-}
+} // namespace mozilla
 
 bool nsCycleCollector_init();
 
diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
index 90561825fddb..2eddc3d87d43 100644
--- a/xpcom/base/nsMemoryInfoDumper.cpp
+++ b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -130,7 +130,7 @@ private:
 NS_IMPL_ISUPPORTS_INHERITED(GCAndCCLogDumpRunnable, nsRunnable,
                             nsIDumpGCAndCCLogsCallback)
 
-} // anonymous namespace
+} // namespace
 
 #if defined(MOZ_SUPPORTS_RT_SIGNALS) // {
 namespace {
@@ -188,7 +188,7 @@ void doGCCCDump(const uint8_t aRecvSig)
   NS_DispatchToMainThread(runnable);
 }
 
-} // anonymous namespace
+} // namespace
 #endif // MOZ_SUPPORTS_RT_SIGNALS }
 
 #if defined(MOZ_SUPPORTS_FIFO) // {
@@ -258,7 +258,7 @@ OnFifoEnabledChange(const char* /*unused*/, void* /*unused*/)
   }
 }
 
-} // anonymous namespace
+} // namespace
 #endif // MOZ_SUPPORTS_FIFO }
 
 NS_IMPL_ISUPPORTS(nsMemoryInfoDumper, nsIMemoryInfoDumper)
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 7ade60321f1f..eb19151be4ca 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -2200,7 +2200,7 @@ private:
   uint32_t mRemainingIters;
 };
 
-} // anonymous namespace
+} // namespace
 
 NS_IMETHODIMP
 nsMemoryReporterManager::MinimizeMemoryUsage(nsIRunnable* aCallback)
@@ -2365,7 +2365,7 @@ DEFINE_REGISTER_SIZE_OF_TAB(NonJS);
 
 #undef GET_MEMORY_REPORTER_MANAGER
 
-}
+} // namespace mozilla
 
 #if defined(MOZ_DMD)
 
diff --git a/xpcom/base/nsMemoryReporterManager.h b/xpcom/base/nsMemoryReporterManager.h
index e239b80a8bf4..152e83a69b13 100644
--- a/xpcom/base/nsMemoryReporterManager.h
+++ b/xpcom/base/nsMemoryReporterManager.h
@@ -18,8 +18,8 @@ namespace mozilla {
 namespace dom {
 class ContentParent;
 class MemoryReport;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class nsITimer;
 
diff --git a/xpcom/base/nsMessageLoop.cpp b/xpcom/base/nsMessageLoop.cpp
index e3f67aa8c18e..968bfee63d26 100644
--- a/xpcom/base/nsMessageLoop.cpp
+++ b/xpcom/base/nsMessageLoop.cpp
@@ -141,7 +141,7 @@ MessageLoopTimerCallback::Notify(nsITimer* aTimer)
 
 NS_IMPL_ISUPPORTS(MessageLoopTimerCallback, nsITimerCallback)
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_ISUPPORTS(nsMessageLoop, nsIMessageLoop)
 
diff --git a/xpcom/base/nsRefPtr.h b/xpcom/base/nsRefPtr.h
index 48f16f0c37b8..ae33bf0307a9 100644
--- a/xpcom/base/nsRefPtr.h
+++ b/xpcom/base/nsRefPtr.h
@@ -496,7 +496,7 @@ operator!=(U* aLhs, const nsRefPtr<T>& aRhs)
 
 namespace detail {
 class nsRefPtrZero;
-}
+} // namespace detail
 
 // Comparing an |nsRefPtr| to |0|
 
diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp
index 9854b7d78d42..db48e6a569a7 100644
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -172,7 +172,7 @@ nsresult GetInstallYear(uint32_t& aYear)
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 #endif // defined(XP_WIN)
 
 using namespace mozilla;
diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h
index 0c59cdd79f97..374763c79e25 100644
--- a/xpcom/build/BinaryPath.h
+++ b/xpcom/build/BinaryPath.h
@@ -183,6 +183,6 @@ public:
   }
 };
 
-}
+} // namespace mozilla
 
 #endif /* mozilla_BinaryPath_h */
diff --git a/xpcom/build/IOInterposer.cpp b/xpcom/build/IOInterposer.cpp
index 74f78e62c6f6..ea35e7821405 100644
--- a/xpcom/build/IOInterposer.cpp
+++ b/xpcom/build/IOInterposer.cpp
@@ -359,7 +359,7 @@ public:
 // List of observers registered
 static StaticAutoPtr<MasterList> sMasterList;
 static ThreadLocal<PerThreadData*> sThreadLocalData;
-} // anonymous namespace
+} // namespace
 
 IOInterposeObserver::Observation::Observation(Operation aOperation,
                                               const char* aReference,
diff --git a/xpcom/build/MainThreadIOLogger.cpp b/xpcom/build/MainThreadIOLogger.cpp
index 174861947a99..0ca942cb9f76 100644
--- a/xpcom/build/MainThreadIOLogger.cpp
+++ b/xpcom/build/MainThreadIOLogger.cpp
@@ -201,7 +201,7 @@ MainThreadIOLoggerImpl::Observe(Observation& aObservation)
   lock.Notify();
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/xpcom/build/NSPRInterposer.cpp b/xpcom/build/NSPRInterposer.cpp
index 29c1a53dcdca..a7c53a97a854 100644
--- a/xpcom/build/NSPRInterposer.cpp
+++ b/xpcom/build/NSPRInterposer.cpp
@@ -102,7 +102,7 @@ interposedFileInfo64(PRFileDesc* aFd, PRFileInfo64* aInfo)
   return sFileInfo64Fn(aFd, aInfo);
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/xpcom/build/PoisonIOInterposerBase.cpp b/xpcom/build/PoisonIOInterposerBase.cpp
index 08713b6ec101..7b7bf9522f1f 100644
--- a/xpcom/build/PoisonIOInterposerBase.cpp
+++ b/xpcom/build/PoisonIOInterposerBase.cpp
@@ -206,7 +206,7 @@ getDebugFileIDs()
 }
 
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/xpcom/build/PoisonIOInterposerMac.cpp b/xpcom/build/PoisonIOInterposerMac.cpp
index bf8e39ff7579..33346910941a 100644
--- a/xpcom/build/PoisonIOInterposerMac.cpp
+++ b/xpcom/build/PoisonIOInterposerMac.cpp
@@ -324,7 +324,7 @@ FuncData* Functions[] = {
 
 const int NumFunctions = ArrayLength(Functions);
 
-} // anonymous namespace
+} // namespace
 
 /******************************** IO Poisoning ********************************/
 
diff --git a/xpcom/build/PoisonIOInterposerWin.cpp b/xpcom/build/PoisonIOInterposerWin.cpp
index 83aa0168242f..752743b345d1 100644
--- a/xpcom/build/PoisonIOInterposerWin.cpp
+++ b/xpcom/build/PoisonIOInterposerWin.cpp
@@ -423,7 +423,7 @@ InterposedNtQueryFullAttributesFile(
                                             aFileInformation);
 }
 
-} // anonymous namespace
+} // namespace
 
 /******************************** IO Poisoning ********************************/
 
diff --git a/xpcom/build/ServiceList.h b/xpcom/build/ServiceList.h
index 1e99c1175140..050b72036e2f 100644
--- a/xpcom/build/ServiceList.h
+++ b/xpcom/build/ServiceList.h
@@ -47,6 +47,6 @@ MOZ_SERVICE(HistoryService, IHistory,
             "@mozilla.org/browser/history;1")
 
 #ifdef MOZ_USE_NAMESPACE
-}
+} // namespace mozilla
 #endif
 #endif // !defined(MOZILLA_XPCOMRT_API)
diff --git a/xpcom/build/nsXPCOM.h b/xpcom/build/nsXPCOM.h
index bb80817522b8..db4f320fe4d3 100644
--- a/xpcom/build/nsXPCOM.h
+++ b/xpcom/build/nsXPCOM.h
@@ -35,7 +35,7 @@ DECL_CLASS(nsIDebug2);
 #ifdef __cplusplus
 namespace mozilla {
 struct Module;
-}
+} // namespace mozilla
 #endif
 
 /**
diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h
index a4c0067bcd02..6be81fab2df2 100644
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -395,7 +395,7 @@ namespace mozilla {
 namespace gmp {
 class GMPLoader;
 } // namespace gmp
-} // namepsace mozilla
+} // namespace mozilla
 
 XRE_API(nsresult,
         XRE_InitChildProcess, (int aArgc,
diff --git a/xpcom/build/perfprobe.cpp b/xpcom/build/perfprobe.cpp
index 23d4d48ae24c..4cb3ddc52422 100644
--- a/xpcom/build/perfprobe.cpp
+++ b/xpcom/build/perfprobe.cpp
@@ -244,5 +244,5 @@ ProbeManager::StopSession()
   return NS_OK;
 }
 
-}  // namespace probes
-}  // namespace mozilla
+} // namespace probes
+} // namespace mozilla
diff --git a/xpcom/build/perfprobe.h b/xpcom/build/perfprobe.h
index 718b75127ef7..deac2f536f94 100644
--- a/xpcom/build/perfprobe.h
+++ b/xpcom/build/perfprobe.h
@@ -198,7 +198,7 @@ protected:
                                       PVOID aBuffer);  // Sets |mSessionHandle|
 };
 
-}  // namespace probes
-}  // namespace mozilla
+} // namespace probes
+} // namespace mozilla
 
 #endif //mozilla_perfprobe_h
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
index 55b8bb77e208..524d7127a414 100644
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -171,7 +171,7 @@ struct AutoPR_smprintf_free
   char* mBuf;
 };
 
-} // anonymous namespace
+} // namespace
 
 /**
  * If we are pre-loading XPTs, this method may do nothing because the
@@ -465,7 +465,7 @@ struct CachedDirective
   char* argv[4];
 };
 
-} // anonymous namespace
+} // namespace
 
 
 /**
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index 75e213dc10cd..df41bbce96c7 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -115,7 +115,7 @@ struct Module
   UnloadFuncPtr unloadProc;
 };
 
-} // namespace
+} // namespace mozilla
 
 #if defined(MOZILLA_INTERNAL_API)
 #  define NSMODULE_NAME(_name) _name##_NSModule
diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp
index 41889b16da6a..c17f82303bd7 100644
--- a/xpcom/components/nsCategoryManager.cpp
+++ b/xpcom/components/nsCategoryManager.cpp
@@ -513,7 +513,7 @@ CategoryNotificationRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 
 void
diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index d5e6aa0c4a1a..09501e55b6ff 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -250,7 +250,7 @@ private:
   bool mLocked;
 };
 
-} // anonymous namespace
+} // namespace
 
 #if !defined(MOZILLA_XPCOMRT_API)
 // this is safe to call during InitXPCOM
diff --git a/xpcom/components/nsNativeModuleLoader.h b/xpcom/components/nsNativeModuleLoader.h
index f0f6c6009486..b05a4a7a235c 100644
--- a/xpcom/components/nsNativeModuleLoader.h
+++ b/xpcom/components/nsNativeModuleLoader.h
@@ -13,7 +13,7 @@
 
 namespace mozilla {
 class FileLocation;
-}
+} // namespace mozilla
 
 class nsNativeModuleLoader final
 {
diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp
index 22ffa9b8172f..ff70a4277251 100644
--- a/xpcom/ds/nsObserverService.cpp
+++ b/xpcom/ds/nsObserverService.cpp
@@ -57,9 +57,9 @@ nsObserverService::CollectReports(nsIHandleReportCallback* aHandleReport,
     size_t mReferentCount;
   };
 
-  size_t numStrong = 0;
-  size_t numWeakAlive = 0;
-  size_t numWeakDead = 0;
+  size_t totalNumStrong = 0;
+  size_t totalNumWeakAlive = 0;
+  size_t totalNumWeakDead = 0;
   nsTArray<SuspectObserver> suspectObservers;
 
   for (auto iter = mObserverTopicTable.Iter(); !iter.Done(); iter.Next()) {
@@ -68,26 +68,34 @@ nsObserverService::CollectReports(nsIHandleReportCallback* aHandleReport,
       continue;
     }
 
+    size_t topicNumStrong = 0;
+    size_t topicNumWeakAlive = 0;
+    size_t topicNumWeakDead = 0;
+
     nsTArray<ObserverRef>& observers = observerList->mObservers;
     for (uint32_t i = 0; i < observers.Length(); i++) {
       if (observers[i].isWeakRef) {
         nsCOMPtr<nsIObserver> observerRef(
           do_QueryReferent(observers[i].asWeak()));
         if (observerRef) {
-          numWeakAlive++;
+          topicNumWeakAlive++;
         } else {
-          numWeakDead++;
+          topicNumWeakDead++;
         }
       } else {
-        numStrong++;
+        topicNumStrong++;
       }
     }
 
+    totalNumStrong += topicNumStrong;
+    totalNumWeakAlive += topicNumWeakAlive;
+    totalNumWeakDead += topicNumWeakDead;
+
     // Keep track of topics that have a suspiciously large number
     // of referents (symptom of leaks).
-    size_t total = numStrong + numWeakAlive + numWeakDead;
-    if (total > kSuspectReferentCount) {
-      SuspectObserver suspect(observerList->GetKey(), total);
+    size_t topicTotal = topicNumStrong + topicNumWeakAlive + topicNumWeakDead;
+    if (topicTotal > kSuspectReferentCount) {
+      SuspectObserver suspect(observerList->GetKey(), topicTotal);
       suspectObservers.AppendElement(suspect);
     }
   }
@@ -115,7 +123,7 @@ nsObserverService::CollectReports(nsIHandleReportCallback* aHandleReport,
   rv = aHandleReport->Callback(
          /* process */ EmptyCString(),
          NS_LITERAL_CSTRING("observer-service/referent/strong"),
-         KIND_OTHER, UNITS_COUNT, numStrong,
+         KIND_OTHER, UNITS_COUNT, totalNumStrong,
          NS_LITERAL_CSTRING("The number of strong references held by the "
                             "observer service."),
          aData);
@@ -127,7 +135,7 @@ nsObserverService::CollectReports(nsIHandleReportCallback* aHandleReport,
   rv = aHandleReport->Callback(
          /* process */ EmptyCString(),
          NS_LITERAL_CSTRING("observer-service/referent/weak/alive"),
-         KIND_OTHER, UNITS_COUNT, numWeakAlive,
+         KIND_OTHER, UNITS_COUNT, totalNumWeakAlive,
          NS_LITERAL_CSTRING("The number of weak references held by the "
                             "observer service that are still alive."),
          aData);
@@ -139,7 +147,7 @@ nsObserverService::CollectReports(nsIHandleReportCallback* aHandleReport,
   rv = aHandleReport->Callback(
          /* process */ EmptyCString(),
          NS_LITERAL_CSTRING("observer-service/referent/weak/dead"),
-         KIND_OTHER, UNITS_COUNT, numWeakDead,
+         KIND_OTHER, UNITS_COUNT, totalNumWeakDead,
          NS_LITERAL_CSTRING("The number of weak references held by the "
                             "observer service that are dead."),
          aData);
diff --git a/xpcom/glue/FileUtils.h b/xpcom/glue/FileUtils.h
index 510432473bb1..f6242c9d8d5f 100644
--- a/xpcom/glue/FileUtils.h
+++ b/xpcom/glue/FileUtils.h
@@ -210,4 +210,5 @@ bool ReadSysFile(const char* aFilename, bool* aVal);
 #endif /* (MOZ_WIDGET_GONK || DEBUG) && XP_UNIX */
 
 } // namespace mozilla
+
 #endif
diff --git a/xpcom/glue/Logging.h b/xpcom/glue/Logging.h
index 55b60668a083..b6812ff6ad03 100644
--- a/xpcom/glue/Logging.h
+++ b/xpcom/glue/Logging.h
@@ -50,9 +50,9 @@ inline bool log_test(const PRLogModuleInfo* module, LogLevel level) {
   return module && module->level >= static_cast<int>(level);
 }
 
-}
+} // namespace detail
 
-}
+} // namespace mozilla
 
 #define MOZ_LOG_TEST(_module,_level) mozilla::detail::log_test(_module, _level)
 
diff --git a/xpcom/glue/nsISupportsImpl.h b/xpcom/glue/nsISupportsImpl.h
index 929972ba9f25..7e89881344d1 100644
--- a/xpcom/glue/nsISupportsImpl.h
+++ b/xpcom/glue/nsISupportsImpl.h
@@ -31,14 +31,6 @@
 #include "mozilla/MacroForEach.h"
 #include "mozilla/TypeTraits.h"
 
-namespace mozilla {
-template <typename T>
-struct HasDangerousPublicDestructor
-{
-  static const bool value = false;
-};
-}
-
 #if defined(__clang__)
    // bug 1028428 shows that at least in FreeBSD 10.0 with Clang 3.4 and libc++ 3.4,
    // std::is_destructible is buggy in that it returns false when it should return true
@@ -81,22 +73,15 @@ struct HasDangerousPublicDestructor
       : IsDestructibleFallbackImpl::Selector<T>::type
     {
     };
-  }
+  } // namespace mozilla
 #  define MOZ_IS_DESTRUCTIBLE(X) (mozilla::IsDestructibleFallback<X>::value)
 #endif
 
 #ifdef MOZ_IS_DESTRUCTIBLE
 #define MOZ_ASSERT_TYPE_OK_FOR_REFCOUNTING(X) \
-  static_assert(!MOZ_IS_DESTRUCTIBLE(X) || \
-                mozilla::HasDangerousPublicDestructor<X>::value, \
+  static_assert(!MOZ_IS_DESTRUCTIBLE(X), \
                 "Reference-counted class " #X " should not have a public destructor. " \
-                "Try to make this class's destructor non-public. If that is really " \
-                "not possible, you can whitelist this class by providing a " \
-                "HasDangerousPublicDestructor specialization for it."); \
-  static_assert(!mozilla::HasDangerousPublicDestructor<X>::value || \
-                MOZ_IS_DESTRUCTIBLE(X), \
-                "Class " #X " has no public destructor. That's good! So please " \
-                "remove the HasDangerousPublicDestructor specialization for it.");
+                "Make this class's destructor non-public");
 #else
 #define MOZ_ASSERT_TYPE_OK_FOR_REFCOUNTING(X)
 #endif
@@ -383,7 +368,7 @@ private:
   // but could break pre-existing code that assumes sequential consistency.
   Atomic<nsrefcnt> mValue;
 };
-}
+} // namespace mozilla
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/xpcom/glue/nsMemory.h b/xpcom/glue/nsMemory.h
index ca0d88909778..6f19b811716e 100644
--- a/xpcom/glue/nsMemory.h
+++ b/xpcom/glue/nsMemory.h
@@ -117,7 +117,7 @@ struct AlignmentTestStruct
   char c;
   T t;
 };
-}
+} // namespace mozilla
 
 #define NS_ALIGNMENT_OF(t_) \
   (sizeof(mozilla::AlignmentTestStruct<t_>) - sizeof(t_))
diff --git a/xpcom/glue/nsTArray.h b/xpcom/glue/nsTArray.h
index 5d58ae5849a6..26f9121cee6e 100644
--- a/xpcom/glue/nsTArray.h
+++ b/xpcom/glue/nsTArray.h
@@ -38,8 +38,8 @@ class nsIntRegion;
 namespace mozilla {
 namespace layers {
 struct TileClient;
-}
-}
+} // namespace layers
+} // namespace mozilla
 //
 // nsTArray is a resizable array class, like std::vector.
 //
@@ -310,8 +310,8 @@ struct nsTArray_SafeElementAtHelper<nsRefPtr<E>, Derived>
 namespace mozilla {
 namespace dom {
 template<class T> class OwningNonNull;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 template<class E, class Derived>
 struct nsTArray_SafeElementAtHelper<mozilla::dom::OwningNonNull<E>, Derived>
diff --git a/xpcom/glue/nsThreadUtils.cpp b/xpcom/glue/nsThreadUtils.cpp
index 8127f4efd6aa..8282f36eb876 100644
--- a/xpcom/glue/nsThreadUtils.cpp
+++ b/xpcom/glue/nsThreadUtils.cpp
@@ -304,7 +304,7 @@ nsNameThreadRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 void
 NS_SetThreadName(nsIThread* aThread, const nsACString& aName)
diff --git a/xpcom/glue/tests/gtest/TestArray.cpp b/xpcom/glue/tests/gtest/TestArray.cpp
index 457da879d574..f55da2c7d3e6 100644
--- a/xpcom/glue/tests/gtest/TestArray.cpp
+++ b/xpcom/glue/tests/gtest/TestArray.cpp
@@ -91,7 +91,7 @@ void FillArray(nsISupportsArray* aArray, int32_t aCount)
   }
 }
 
-}
+} // namespace TestArray
 
 using namespace TestArray;
 
diff --git a/xpcom/glue/tests/gtest/TestFileUtils.cpp b/xpcom/glue/tests/gtest/TestFileUtils.cpp
index 8630d9415491..d78a5329c4e6 100644
--- a/xpcom/glue/tests/gtest/TestFileUtils.cpp
+++ b/xpcom/glue/tests/gtest/TestFileUtils.cpp
@@ -279,4 +279,4 @@ TEST(ReadSysFile, Bool) {
 
 #endif /* ReadSysFile_PRESENT */
 
-}
+} // namespace mozilla
diff --git a/xpcom/glue/tests/gtest/TestThreadUtils.cpp b/xpcom/glue/tests/gtest/TestThreadUtils.cpp
index 8f4da04ab48a..9884d2b7e87a 100644
--- a/xpcom/glue/tests/gtest/TestThreadUtils.cpp
+++ b/xpcom/glue/tests/gtest/TestThreadUtils.cpp
@@ -252,7 +252,7 @@ class ThreadUtilsRefCountedDerived
 class ThreadUtilsNonRefCounted
 {};
 
-} // namespace TestThreadUtils;
+} // namespace TestThreadUtils
 
 TEST(ThreadUtils, main)
 {
diff --git a/xpcom/io/Base64.cpp b/xpcom/io/Base64.cpp
index 51ddb74352ac..0f19b36b1397 100644
--- a/xpcom/io/Base64.cpp
+++ b/xpcom/io/Base64.cpp
@@ -225,7 +225,7 @@ EncodeInputStream(nsIInputStream* aInputStream,
   return NS_OK;
 }
 
-} // namespace (anonymous)
+} // namespace
 
 namespace mozilla {
 
diff --git a/xpcom/io/FileUtilsWin.cpp b/xpcom/io/FileUtilsWin.cpp
index 09d3f9daf62c..6781264ecf6c 100644
--- a/xpcom/io/FileUtilsWin.cpp
+++ b/xpcom/io/FileUtilsWin.cpp
@@ -28,7 +28,7 @@ struct ScopedMappedViewTraits
 };
 typedef mozilla::Scoped<ScopedMappedViewTraits> ScopedMappedView;
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 
diff --git a/xpcom/io/SnappyFrameUtils.cpp b/xpcom/io/SnappyFrameUtils.cpp
index c3b5976deb9b..197315210269 100644
--- a/xpcom/io/SnappyFrameUtils.cpp
+++ b/xpcom/io/SnappyFrameUtils.cpp
@@ -67,7 +67,7 @@ uint32_t MaskChecksum(uint32_t aValue)
   return ((aValue >> 15) | (aValue << 17)) + 0xa282ead8;
 }
 
-} // anonymous namespace
+} // namespace
 
 namespace mozilla {
 namespace detail {
diff --git a/xpcom/io/nsPipe3.cpp b/xpcom/io/nsPipe3.cpp
index 9978b78c68ef..24a0df344d00 100644
--- a/xpcom/io/nsPipe3.cpp
+++ b/xpcom/io/nsPipe3.cpp
@@ -65,7 +65,7 @@ enum SegmentChangeResult
   SegmentDeleted
 };
 
-} // anonymous namespace
+} // namespace
 
 //-----------------------------------------------------------------------------
 
diff --git a/xpcom/libxpcomrt/XPCOMRTStubs.cpp b/xpcom/libxpcomrt/XPCOMRTStubs.cpp
index 9b8dab6dfa21..0820c002b3c0 100644
--- a/xpcom/libxpcomrt/XPCOMRTStubs.cpp
+++ b/xpcom/libxpcomrt/XPCOMRTStubs.cpp
@@ -33,7 +33,7 @@ class nsCString;
 
 namespace base {
   class Histogram;
-}
+} // namespace base
 
 namespace mozilla {
 namespace Telemetry {
@@ -55,5 +55,5 @@ base::Histogram* GetKeyedHistogramById(ID id, const nsAString&)
   return nullptr;
 }
 
-} // Telemetry
-} // mozilla
+} // namespace Telemetry
+} // namespace mozilla
diff --git a/xpcom/reflect/xptinfo/ShimInterfaceInfo.h b/xpcom/reflect/xptinfo/ShimInterfaceInfo.h
index ecfa158605f3..868f503a5972 100644
--- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.h
+++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.h
@@ -20,8 +20,8 @@
 namespace mozilla {
 namespace dom {
 struct NativePropertyHooks;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 class ShimInterfaceInfo final : public nsIInterfaceInfo
 {
diff --git a/xpcom/reflect/xptinfo/XPTInterfaceInfoManager.h b/xpcom/reflect/xptinfo/XPTInterfaceInfoManager.h
index 2ad966a169d5..e72153ad2164 100644
--- a/xpcom/reflect/xptinfo/XPTInterfaceInfoManager.h
+++ b/xpcom/reflect/xptinfo/XPTInterfaceInfoManager.h
@@ -114,6 +114,6 @@ private:
     Mutex                        mResolveLock;
 };
 
-}
+} // namespace mozilla
 
 #endif
diff --git a/xpcom/tests/TestHashtables.cpp b/xpcom/tests/TestHashtables.cpp
index 06e7d7fbbd58..ba9ab1e19dce 100644
--- a/xpcom/tests/TestHashtables.cpp
+++ b/xpcom/tests/TestHashtables.cpp
@@ -366,7 +366,7 @@ nsIEnum2(nsISupports* aKey, uint32_t& aData, void* userArg) {
   return PL_DHASH_NEXT;
 }
 
-}
+} // namespace TestHashtables
 
 using namespace TestHashtables;
 
diff --git a/xpcom/tests/TestTArray.cpp b/xpcom/tests/TestTArray.cpp
index df38cc7cd9e3..8ff5a9a72cae 100644
--- a/xpcom/tests/TestTArray.cpp
+++ b/xpcom/tests/TestTArray.cpp
@@ -1199,7 +1199,7 @@ static const struct Test {
   { nullptr, nullptr }
 };
 
-}
+} // namespace TestTArray
 
 using namespace TestTArray;
 
diff --git a/xpcom/tests/gtest/TestCRT.cpp b/xpcom/tests/gtest/TestCRT.cpp
index da4f17da8784..9fa73140426f 100644
--- a/xpcom/tests/gtest/TestCRT.cpp
+++ b/xpcom/tests/gtest/TestCRT.cpp
@@ -83,4 +83,4 @@ TEST(CRT, main)
   }
 }
 
-}
+} // namespace TestCRT
diff --git a/xpcom/tests/gtest/TestExpirationTracker.cpp b/xpcom/tests/gtest/TestExpirationTracker.cpp
index 4ca562648085..6ebd64f3b6f0 100644
--- a/xpcom/tests/gtest/TestExpirationTracker.cpp
+++ b/xpcom/tests/gtest/TestExpirationTracker.cpp
@@ -181,4 +181,4 @@ TEST(ExpirationTracker, main)
   }
 }
 
-}
+} // namespace TestExpirationTracker
diff --git a/xpcom/tests/gtest/TestPLDHash.cpp b/xpcom/tests/gtest/TestPLDHash.cpp
index 33fc6819a0ec..50391bd117b9 100644
--- a/xpcom/tests/gtest/TestPLDHash.cpp
+++ b/xpcom/tests/gtest/TestPLDHash.cpp
@@ -10,23 +10,109 @@
 // This test mostly focuses on edge cases. But more coverage of normal
 // operations wouldn't be a bad thing.
 
+#ifdef XP_UNIX
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+// This global variable is defined in toolkit/xre/nsSigHandlers.cpp.
+extern unsigned int _gdb_sleep_duration;
+#endif
+
+// We can test that certain operations cause expected aborts by forking
+// and then checking that the child aborted in the expected way (i.e. via
+// MOZ_CRASH). We skip this for the following configurations.
+// - On Windows, because it doesn't have fork().
+// - On non-DEBUG builds, because the crashes cause the crash reporter to pop
+//   up when running this test locally, which is surprising and annoying.
+// - On ASAN builds, because ASAN alters the way a MOZ_CRASHing process
+//   terminates, which makes it harder to test if the right thing has occurred.
+void
+TestCrashyOperation(void (*aCrashyOperation)())
+{
+#if defined(XP_UNIX) && defined(DEBUG) && !defined(MOZ_ASAN)
+  // We're about to trigger a crash. When it happens don't pause to allow GDB
+  // to be attached.
+  unsigned int old_gdb_sleep_duration = _gdb_sleep_duration;
+  _gdb_sleep_duration = 0;
+
+  int pid = fork();
+  ASSERT_NE(pid, -1);
+
+  if (pid == 0) {
+    // Child: perform the crashy operation.
+    aCrashyOperation();
+    fprintf(stderr, "TestCrashyOperation: didn't crash?!\n");
+    ASSERT_TRUE(false);   // shouldn't reach here
+  }
+
+  // Parent: check that child crashed as expected.
+  int status;
+  ASSERT_NE(waitpid(pid, &status, 0), -1);
+
+  // The path taken here depends on the platform and configuration.
+  ASSERT_TRUE(WIFEXITED(status) || WTERMSIG(status));
+  if (WIFEXITED(status)) {
+    // This occurs if the ah_crap_handler() is run, i.e. we caught the crash.
+    // It returns the number of the caught signal.
+    int signum = WEXITSTATUS(status);
+    if (signum != SIGSEGV && signum != SIGBUS) {
+      fprintf(stderr, "TestCrashyOperation 'exited' failure: %d\n", signum);
+      ASSERT_TRUE(false);
+    }
+  } else if (WIFSIGNALED(status)) {
+    // This one occurs if we didn't catch the crash. The exit code is the
+    // number of the terminating signal.
+    int signum = WTERMSIG(status);
+    if (signum != SIGSEGV && signum != SIGBUS) {
+      fprintf(stderr, "TestCrashyOperation 'signaled' failure: %d\n", signum);
+      ASSERT_TRUE(false);
+    }
+  }
+
+  _gdb_sleep_duration = old_gdb_sleep_duration;
+#endif
+}
+
+void
+InitCapacityOk_InitialLengthTooBig()
+{
+  PLDHashTable t(PL_DHashGetStubOps(), sizeof(PLDHashEntryStub),
+                 PL_DHASH_MAX_INITIAL_LENGTH + 1);
+}
+
+void
+InitCapacityOk_InitialEntryStoreTooBig()
+{
+  // Try the smallest disallowed power-of-two entry store size, which is 2^32
+  // bytes (which overflows to 0). (Note that the 2^23 *length* gets converted
+  // to a 2^24 *capacity*.)
+  PLDHashTable t(PL_DHashGetStubOps(), (uint32_t)1 << 23, (uint32_t)1 << 8);
+}
+
 TEST(PLDHashTableTest, InitCapacityOk)
 {
   // Try the largest allowed capacity.  With PL_DHASH_MAX_CAPACITY==1<<26, this
   // would allocate (if we added an element) 0.5GB of entry store on 32-bit
   // platforms and 1GB on 64-bit platforms.
-  //
-  // Ideally we'd also try (a) a too-large capacity, and (b) a large capacity
-  // combined with a large entry size that when multipled overflow. But those
-  // cases would cause the test to abort immediately.
-  //
-  // Furthermore, ideally we'd also try a large-but-ok capacity that almost but
-  // doesn't quite overflow, but that would result in allocating just under 4GB
-  // of entry storage.  That's very likely to fail on 32-bit platforms, so such
-  // a test wouldn't be reliable.
-  //
-  PLDHashTable t(PL_DHashGetStubOps(), sizeof(PLDHashEntryStub),
+  PLDHashTable t1(PL_DHashGetStubOps(), sizeof(PLDHashEntryStub),
                  PL_DHASH_MAX_INITIAL_LENGTH);
+
+  // Try the largest allowed power-of-two entry store size, which is 2^31 bytes
+  // (Note that the 2^23 *length* gets converted to a 2^24 *capacity*.)
+  PLDHashTable t2(PL_DHashGetStubOps(), (uint32_t)1 << 23, (uint32_t)1 << 7);
+
+  // Try a too-large capacity (which aborts).
+  TestCrashyOperation(InitCapacityOk_InitialLengthTooBig);
+
+  // Try a large capacity combined with a large entry size that when multiplied
+  // overflow (causing abort).
+  TestCrashyOperation(InitCapacityOk_InitialEntryStoreTooBig);
+
+  // Ideally we'd also try a large-but-ok capacity that almost but doesn't
+  // quite overflow, but that would result in allocating slightly less than 4
+  // GiB of entry storage. That would be very likely to fail on 32-bit
+  // platforms, so such a test wouldn't be reliable.
 }
 
 TEST(PLDHashTableTest, LazyStorage)
@@ -141,7 +227,7 @@ TEST(PLDHashTableTest, Clear)
   ASSERT_EQ(t1.EntryCount(), 0u);
 }
 
-TEST(PLDHashTableIterator, Iterator)
+TEST(PLDHashTableTest, Iterator)
 {
   PLDHashTable t(&trivialOps, sizeof(PLDHashEntryStub));
 
diff --git a/xpcom/tests/gtest/TestPipes.cpp b/xpcom/tests/gtest/TestPipes.cpp
index 35cce9e6cc42..5cded29b7bb6 100644
--- a/xpcom/tests/gtest/TestPipes.cpp
+++ b/xpcom/tests/gtest/TestPipes.cpp
@@ -423,7 +423,7 @@ static void TestPipe2(uint32_t aNumBytes,
   testing::ConsumeAndValidateStream(reader, inputData);
 }
 
-} // anonymous namespace
+} // namespace
 
 TEST(Pipes, Blocking_32k)
 {
@@ -602,7 +602,7 @@ static void TestPipeClone(uint32_t aTotalBytes,
   }
 }
 
-} // anonymous namespace
+} // namespace
 
 TEST(Pipes, Clone_BeforeWrite_ReadAtEnd)
 {
@@ -852,7 +852,7 @@ TestCloseDuringRead(uint32_t aSegmentSize, uint32_t aDataSize)
   ASSERT_EQ(NS_BASE_STREAM_CLOSED, rv);
 }
 
-} // anonymous namespace
+} // namespace
 
 TEST(Pipes, Close_During_Read_Partial_Segment)
 {
diff --git a/xpcom/tests/gtest/TestSnappyStreams.cpp b/xpcom/tests/gtest/TestSnappyStreams.cpp
index f869ba4c8f89..99f41120b868 100644
--- a/xpcom/tests/gtest/TestSnappyStreams.cpp
+++ b/xpcom/tests/gtest/TestSnappyStreams.cpp
@@ -98,7 +98,7 @@ static void TestUncompressCorrupt(const char* aCorruptData,
   ASSERT_EQ(NS_ERROR_CORRUPTED_CONTENT, rv);
 }
 
-} // anonymous namespace
+} // namespace
 
 TEST(SnappyStream, Compress_32k)
 {
diff --git a/xpcom/tests/gtest/TestStorageStream.cpp b/xpcom/tests/gtest/TestStorageStream.cpp
index 6ec0b12e9189..215d1b560938 100644
--- a/xpcom/tests/gtest/TestStorageStream.cpp
+++ b/xpcom/tests/gtest/TestStorageStream.cpp
@@ -24,7 +24,7 @@ WriteData(nsIOutputStream* aOut, nsTArray<char>& aData, uint32_t aNumBytes,
   aDataWritten.Append(aData.Elements(), aNumBytes);
 }
 
-} // anonymous namespace
+} // namespace
 TEST(StorageStreams, Main)
 {
   // generate some test data we will write in 4k chunks to the stream
diff --git a/xpcom/tests/gtest/TestStringStream.cpp b/xpcom/tests/gtest/TestStringStream.cpp
index 592b39377f88..141f11364ecd 100644
--- a/xpcom/tests/gtest/TestStringStream.cpp
+++ b/xpcom/tests/gtest/TestStringStream.cpp
@@ -49,7 +49,7 @@ static void TestStringStreamClone(uint32_t aNumBytes)
   testing::ConsumeAndValidateStream(clone, inputString);
 }
 
-} // anonymous namespace
+} // namespace
 
 TEST(StringStream, Simple_4k)
 {
diff --git a/xpcom/tests/gtest/TestStrings.cpp b/xpcom/tests/gtest/TestStrings.cpp
index c9ec5e995c7a..a0992dbe704d 100644
--- a/xpcom/tests/gtest/TestStrings.cpp
+++ b/xpcom/tests/gtest/TestStrings.cpp
@@ -979,4 +979,4 @@ TEST(Strings, todouble)
   test_todouble_helper(NS_LITERAL_STRING("foo"), 0, false);
 }
 
-}
+} // namespace TestStrings
diff --git a/xpcom/tests/gtest/TestTArray.cpp b/xpcom/tests/gtest/TestTArray.cpp
index 86364de3e6b2..5e6581a34bc4 100644
--- a/xpcom/tests/gtest/TestTArray.cpp
+++ b/xpcom/tests/gtest/TestTArray.cpp
@@ -54,4 +54,4 @@ TEST(TArray, assign)
   ASSERT_EQ(DummyArray(), array2);
 }
 
-}
+} // namespace TestTArray
diff --git a/xpcom/tests/gtest/TestUTF.cpp b/xpcom/tests/gtest/TestUTF.cpp
index 2665c374fb8b..ddd54e22d389 100644
--- a/xpcom/tests/gtest/TestUTF.cpp
+++ b/xpcom/tests/gtest/TestUTF.cpp
@@ -122,4 +122,4 @@ TEST(UTF, Hash16)
 #endif
 }
 
-}
+} // namespace TestUTF
diff --git a/xpcom/threads/BackgroundHangMonitor.h b/xpcom/threads/BackgroundHangMonitor.h
index 774b0d52581e..edb29f15eaf5 100644
--- a/xpcom/threads/BackgroundHangMonitor.h
+++ b/xpcom/threads/BackgroundHangMonitor.h
@@ -19,7 +19,7 @@ namespace mozilla {
 
 namespace Telemetry {
 class ThreadHangStats;
-};
+} // namespace Telemetry
 
 class BackgroundHangThread;
 class BackgroundHangManager;
diff --git a/xpcom/threads/ThreadStackHelper.cpp b/xpcom/threads/ThreadStackHelper.cpp
index ba40cd8f9244..7d97518d3725 100644
--- a/xpcom/threads/ThreadStackHelper.cpp
+++ b/xpcom/threads/ThreadStackHelper.cpp
@@ -217,7 +217,7 @@ public:
   ScopedSetPtr(T*& p, T* val) : mPtr(p) { mPtr = val; }
   ~ScopedSetPtr() { mPtr = nullptr; }
 };
-}
+} // namespace
 
 void
 ThreadStackHelper::GetStack(Stack& aStack)
diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp
index fc3aa2ae1dfa..45e63971f4c2 100644
--- a/xpcom/threads/TimerThread.cpp
+++ b/xpcom/threads/TimerThread.cpp
@@ -78,7 +78,7 @@ TimerObserverRunnable::Run()
   return NS_OK;
 }
 
-} // anonymous namespace
+} // namespace
 
 nsresult
 TimerThread::Init()
diff --git a/xpcom/threads/TimerThread.h b/xpcom/threads/TimerThread.h
index 02ebc15d5852..8af852212b60 100644
--- a/xpcom/threads/TimerThread.h
+++ b/xpcom/threads/TimerThread.h
@@ -22,7 +22,7 @@
 
 namespace mozilla {
 class TimeStamp;
-}
+} // namespace mozilla
 
 class TimerThread final
   : public nsIRunnable
diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp
index e1267027bbf7..7c5b71005d10 100644
--- a/xpcom/threads/nsTimerImpl.cpp
+++ b/xpcom/threads/nsTimerImpl.cpp
@@ -111,7 +111,7 @@ public:
   void Free(void* aPtr);
 };
 
-} // anonymous namespace
+} // namespace
 
 class nsTimerEvent : public nsRunnable
 {
@@ -213,7 +213,7 @@ TimerEventAllocator::Free(void* aPtr)
   mFirstFree = entry;
 }
 
-} // anonymous namespace
+} // namespace
 
 NS_IMPL_QUERY_INTERFACE(nsTimerImpl, nsITimer)
 NS_IMPL_ADDREF(nsTimerImpl)
diff --git a/xpfe/appshell/nsXULWindow.h b/xpfe/appshell/nsXULWindow.h
index c08530d92781..33d1fa565dcb 100644
--- a/xpfe/appshell/nsXULWindow.h
+++ b/xpfe/appshell/nsXULWindow.h
@@ -37,8 +37,8 @@
 namespace mozilla {
 namespace dom {
 class Element;
-}
-}
+} // namespace dom
+} // namespace mozilla
 
 // nsXULWindow