From 196cd64e9e3c0e9177d255e266ad1f14c7db7d9a Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Fri, 17 Jul 2015 14:52:00 +0200
Subject: [PATCH 01/20] Bug 1139953 - Pass a dummy channel into the cookie
 service so that nsICookiePermission can compute private browsing mode
 correctly. r=jdm

---
 .../privatebrowsing/test/browser/browser.ini  |  1 -
 netwerk/cookie/CookieServiceParent.cpp        | 44 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/browser/components/privatebrowsing/test/browser/browser.ini b/browser/components/privatebrowsing/test/browser/browser.ini
index 48410bc5df0..4004c622beb 100644
--- a/browser/components/privatebrowsing/test/browser/browser.ini
+++ b/browser/components/privatebrowsing/test/browser/browser.ini
@@ -23,7 +23,6 @@ support-files =
 [browser_privatebrowsing_certexceptionsui.js]
 [browser_privatebrowsing_concurrent.js]
 [browser_privatebrowsing_cookieacceptdialog.js]
-skip-if = e10s # Bug 1139953 - Accept cookie dialog shown in private window when e10s enabled
 [browser_privatebrowsing_crh.js]
 [browser_privatebrowsing_downloadLastDir.js]
 [browser_privatebrowsing_downloadLastDir_c.js]
diff --git a/netwerk/cookie/CookieServiceParent.cpp b/netwerk/cookie/CookieServiceParent.cpp
index 5fa863b7fff..4a929b5ca2e 100644
--- a/netwerk/cookie/CookieServiceParent.cpp
+++ b/netwerk/cookie/CookieServiceParent.cpp
@@ -9,6 +9,8 @@
 
 #include "mozilla/ipc/URIUtils.h"
 #include "nsCookieService.h"
+#include "nsIScriptSecurityManager.h"
+#include "nsIPrivateBrowsingChannel.h"
 #include "nsNetCID.h"
 #include "nsPrintfCString.h"
 #include "SerializedLoadContext.h"
@@ -17,6 +19,33 @@ using namespace mozilla::ipc;
 using mozilla::dom::PContentParent;
 using mozilla::net::NeckoParent;
 
+namespace {
+
+bool
+CreateDummyChannel(nsIURI* aHostURI, bool aIsPrivate, nsIChannel **aChannel)
+{
+  nsCOMPtr<nsIPrincipal> principal;
+  nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
+  nsresult rv = ssm->GetNoAppCodebasePrincipal(aHostURI, getter_AddRefs(principal));
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  nsCOMPtr<nsIChannel> dummyChannel;
+  NS_NewChannel(getter_AddRefs(dummyChannel), aHostURI, principal,
+                nsILoadInfo::SEC_NORMAL, nsIContentPolicy::TYPE_INVALID);
+  nsCOMPtr<nsIPrivateBrowsingChannel> pbChannel = do_QueryInterface(dummyChannel);
+  if (!pbChannel) {
+    return false;
+  }
+
+  pbChannel->SetPrivate(aIsPrivate);
+  dummyChannel.forget(aChannel);
+  return true;
+}
+
+}
+
 namespace mozilla {
 namespace net {
 
@@ -126,11 +155,22 @@ CookieServiceParent::RecvSetCookieString(const URIParams& aHost,
     return false;
   }
 
+  // This is a gross hack. We've already computed everything we need to know
+  // for whether to set this cookie or not, but we need to communicate all of
+  // this information through to nsICookiePermission, which indirectly
+  // computes the information from the channel. We only care about the
+  // aIsPrivate argument as nsCookieService::SetCookieStringInternal deals
+  // with aIsForeign before we have to worry about nsCookiePermission trying
+  // to use the channel to inspect it.
+  nsCOMPtr<nsIChannel> dummyChannel;
+  if (!CreateDummyChannel(hostURI, isPrivate, getter_AddRefs(dummyChannel))) {
+    return false;
+  }
+
   nsDependentCString cookieString(aCookieString, 0);
-  //TODO: bug 812475, pass a real channel object
   mCookieService->SetCookieStringInternal(hostURI, aIsForeign, cookieString,
                                           aServerTime, aFromHttp, appId,
-                                          isInBrowserElement, isPrivate, nullptr);
+                                          isInBrowserElement, isPrivate, dummyChannel);
   return true;
 }
 

From ea0e1b5e867e2f72de78dedbd3e35c87f04688a3 Mon Sep 17 00:00:00 2001
From: John Pavlicek <sr71pav@gmail.com>
Date: Tue, 7 Jul 2015 13:40:00 +0200
Subject: [PATCH 02/20] Bug 1159725 - Links in markup-view attributes should
 open with middle-click; r=pbro

---
 browser/devtools/inspector/inspector-panel.js |  31 ++++-
 browser/devtools/inspector/inspector.xul      |   4 +-
 browser/devtools/markupview/markup-view.js    |   9 ++
 browser/devtools/markupview/test/browser.ini  |   1 +
 .../test/browser_markupview_links_05.js       |   6 +-
 .../test/browser_markupview_links_06.js       |   4 +-
 .../test/browser_markupview_links_07.js       | 118 ++++++++++++++++++
 7 files changed, 160 insertions(+), 13 deletions(-)
 create mode 100644 browser/devtools/markupview/test/browser_markupview_links_07.js

diff --git a/browser/devtools/inspector/inspector-panel.js b/browser/devtools/inspector/inspector-panel.js
index ba51e4a777a..192e8afb554 100644
--- a/browser/devtools/inspector/inspector-panel.js
+++ b/browser/devtools/inspector/inspector-panel.js
@@ -1176,13 +1176,25 @@ InspectorPanel.prototype = {
 
   /**
    * This method is here for the benefit of the node-menu-link-follow menu item
-   * in the inspector contextual-menu. It's behavior depends on which node was
-   * right-clicked when the menu was opened.
+   * in the inspector contextual-menu.
    */
-  followAttributeLink: function(e) {
+  onFollowLink: function() {
     let type = this.panelDoc.popupNode.dataset.type;
     let link = this.panelDoc.popupNode.dataset.link;
 
+    this.followAttributeLink(type, link);
+  },
+
+  /**
+   * Given a type and link found in a node's attribute in the markup-view,
+   * attempt to follow that link (which may result in opening a new tab, the
+   * style editor or debugger).
+   */
+  followAttributeLink: function(type, link) {
+    if (!type || !link) {
+      return;
+    }
+
     if (type === "uri" || type === "cssresource" || type === "jsresource") {
       // Open link in a new tab.
       // When the inspector menu was setup on click (see _setupNodeLinkMenu), we
@@ -1213,11 +1225,18 @@ InspectorPanel.prototype = {
 
   /**
    * This method is here for the benefit of the node-menu-link-copy menu item
-   * in the inspector contextual-menu. It's behavior depends on which node was
-   * right-clicked when the menu was opened.
+   * in the inspector contextual-menu.
    */
-  copyAttributeLink: function(e) {
+  onCopyLink: function() {
     let link = this.panelDoc.popupNode.dataset.link;
+
+    this.copyAttributeLink(link);
+  },
+
+  /**
+   * This method is here for the benefit of copying links.
+   */
+  copyAttributeLink: function(link) {
     // When the inspector menu was setup on click (see _setupNodeLinkMenu), we
     // already checked that resolveRelativeURL existed.
     this.inspector.resolveRelativeURL(link, this.selection.nodeFront).then(url => {
diff --git a/browser/devtools/inspector/inspector.xul b/browser/devtools/inspector/inspector.xul
index d4bb848c912..d8715bcf0eb 100644
--- a/browser/devtools/inspector/inspector.xul
+++ b/browser/devtools/inspector/inspector.xul
@@ -106,9 +106,9 @@
         oncommand="inspector.deleteNode()"/>
       <menuseparator id="node-menu-link-separator"/>
       <menuitem id="node-menu-link-follow"
-        oncommand="inspector.followAttributeLink()"/>
+        oncommand="inspector.onFollowLink()"/>
       <menuitem id="node-menu-link-copy"
-        oncommand="inspector.copyAttributeLink()"/>
+        oncommand="inspector.onCopyLink()"/>
       <menuseparator/>
       <menuitem id="node-menu-pseudo-hover"
         label=":hover" type="checkbox"
diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index f394afa8653..277849c3e9f 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -1933,6 +1933,15 @@ MarkupContainer.prototype = {
       event.preventDefault();
     }
 
+    let isMiddleClick = event.button === 1;
+    let isMetaClick = event.button === 0 && (event.metaKey || event.ctrlKey);
+
+    if (isMiddleClick || isMetaClick) {
+      let link = target.dataset.link;
+      let type = target.dataset.type;
+      this.markup._inspector.followAttributeLink(type, link);
+    }
+
     // Start dragging the container after a delay.
     this.markup._dragStartEl = target;
     setTimeout(() => {
diff --git a/browser/devtools/markupview/test/browser.ini b/browser/devtools/markupview/test/browser.ini
index 53da26b0d22..1af2b0b9376 100644
--- a/browser/devtools/markupview/test/browser.ini
+++ b/browser/devtools/markupview/test/browser.ini
@@ -79,6 +79,7 @@ skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
 [browser_markupview_links_04.js]
 [browser_markupview_links_05.js]
 [browser_markupview_links_06.js]
+[browser_markupview_links_07.js]
 [browser_markupview_load_01.js]
 [browser_markupview_html_edit_01.js]
 [browser_markupview_html_edit_02.js]
diff --git a/browser/devtools/markupview/test/browser_markupview_links_05.js b/browser/devtools/markupview/test/browser_markupview_links_05.js
index 93060d0a7a6..8e635fef52c 100644
--- a/browser/devtools/markupview/test/browser_markupview_links_05.js
+++ b/browser/devtools/markupview/test/browser_markupview_links_05.js
@@ -22,7 +22,7 @@ add_task(function*() {
 
   info("Follow the link and wait for the new tab to open");
   let onTabOpened = once(gBrowser.tabContainer, "TabOpen");
-  inspector.followAttributeLink();
+  inspector.onFollowLink();
   let {target: tab} = yield onTabOpened;
   yield waitForTabLoad(tab);
 
@@ -41,7 +41,7 @@ add_task(function*() {
 
   info("Follow the link and wait for the new node to be selected");
   let onSelection = inspector.selection.once("new-node-front");
-  inspector.followAttributeLink();
+  inspector.onFollowLink();
   yield onSelection;
 
   ok(true, "A new node was selected");
@@ -57,7 +57,7 @@ add_task(function*() {
 
   info("Try to follow the link and check that no new node were selected");
   let onFailed = inspector.once("idref-attribute-link-failed");
-  inspector.followAttributeLink();
+  inspector.onFollowLink();
   yield onFailed;
 
   ok(true, "The node selection failed");
diff --git a/browser/devtools/markupview/test/browser_markupview_links_06.js b/browser/devtools/markupview/test/browser_markupview_links_06.js
index 8a0f57475bf..8c15478c134 100644
--- a/browser/devtools/markupview/test/browser_markupview_links_06.js
+++ b/browser/devtools/markupview/test/browser_markupview_links_06.js
@@ -22,7 +22,7 @@ add_task(function*() {
 
   info("Follow the link and wait for the style-editor to open");
   let onStyleEditorReady = toolbox.once("styleeditor-ready");
-  inspector.followAttributeLink();
+  inspector.onFollowLink();
   yield onStyleEditorReady;
 
   // No real need to test that the editor opened on the right file here as this
@@ -42,7 +42,7 @@ add_task(function*() {
 
   info("Follow the link and wait for the debugger to open");
   let onDebuggerReady = toolbox.once("jsdebugger-ready");
-  inspector.followAttributeLink();
+  inspector.onFollowLink();
   yield onDebuggerReady;
 
   // No real need to test that the debugger opened on the right file here as
diff --git a/browser/devtools/markupview/test/browser_markupview_links_07.js b/browser/devtools/markupview/test/browser_markupview_links_07.js
new file mode 100644
index 00000000000..beb4866a9a0
--- /dev/null
+++ b/browser/devtools/markupview/test/browser_markupview_links_07.js
@@ -0,0 +1,118 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that a middle-click or meta/ctrl-click on links in attributes actually
+// do follows the link.
+
+const TEST_URL = TEST_URL_ROOT + "doc_markup_links.html";
+
+add_task(function*() {
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  info("Select a node with a URI attribute");
+  yield selectNode("video", inspector);
+
+  info("Find the link element from the markup-view");
+  let {editor} = yield getContainerForSelector("video", inspector);
+  let linkEl = editor.attrElements.get("poster").querySelector(".link");
+
+  info("Follow the link with middle-click and wait for the new tab to open");
+  yield followLinkWaitForTab(linkEl, false,
+                             TEST_URL_ROOT + "doc_markup_tooltip.png");
+
+  info("Follow the link with meta/ctrl-click and wait for the new tab to open");
+  yield followLinkWaitForTab(linkEl, true,
+                             TEST_URL_ROOT + "doc_markup_tooltip.png");
+
+  info("Select a node with a IDREF attribute");
+  yield selectNode("label", inspector);
+
+  info("Find the link element from the markup-view that contains the ref");
+  ({editor} = yield getContainerForSelector("label", inspector));
+  linkEl = editor.attrElements.get("for").querySelector(".link");
+
+  info("Follow link with middle-click, wait for new node to be selected.");
+  yield followLinkWaitForNewNode(linkEl, false, inspector);
+
+  info("Follow link with ctrl/meta-click, wait for new node to be selected.");
+  yield followLinkWaitForNewNode(linkEl, true, inspector);
+
+  info("Select a node with an invalid IDREF attribute");
+  yield selectNode("output", inspector);
+
+  info("Find the link element from the markup-view that contains the ref");
+  ({editor} = yield getContainerForSelector("output", inspector));
+  linkEl = editor.attrElements.get("for").querySelectorAll(".link")[2];
+
+  info("Try to follow link wiith middle-click, check no new node selected");
+  yield followLinkNoNewNode(linkEl, false, inspector);
+
+  info("Try to follow link wiith meta/ctrl-click, check no new node selected");
+  yield followLinkNoNewNode(linkEl, true, inspector);
+});
+
+function waitForTabLoad(tab) {
+  let def = promise.defer();
+  tab.addEventListener("load", function onLoad() {
+    // Skip load event for about:blank
+    if (tab.linkedBrowser.currentURI.spec === "about:blank") {
+      return;
+    }
+    tab.removeEventListener("load", onLoad);
+    def.resolve();
+  });
+  return def.promise;
+}
+
+function performMouseDown(linkEl, metactrl) {
+  let evt = linkEl.ownerDocument.createEvent("MouseEvents");
+
+  let button = -1;
+
+  if (metactrl) {
+    info("Performing Meta/Ctrl+Left Click");
+    button = 0;
+  } else {
+    info("Performing Middle Click");
+    button = 1;
+  }
+
+  evt.initMouseEvent("mousedown", true, true,
+      linkEl.ownerDocument.defaultView, 1, 0, 0, 0, 0, metactrl,
+      false, false, metactrl, button, null);
+
+  linkEl.dispatchEvent(evt);
+}
+
+function* followLinkWaitForTab(linkEl, isMetaClick, expectedTabURI) {
+  let onTabOpened = once(gBrowser.tabContainer, "TabOpen");
+  performMouseDown(linkEl, isMetaClick);
+  let {target} = yield onTabOpened;
+  yield waitForTabLoad(target);
+  ok(true, "A new tab opened");
+  is(target.linkedBrowser.currentURI.spec, expectedTabURI,
+     "The URL for the new tab is correct");
+  gBrowser.removeTab(target);
+}
+
+function* followLinkWaitForNewNode(linkEl, isMetaClick, inspector) {
+  let onSelection = inspector.selection.once("new-node-front");
+  performMouseDown(linkEl, isMetaClick);
+  yield onSelection;
+
+  ok(true, "A new node was selected");
+  is(inspector.selection.nodeFront.id, "name", "The right node was selected");
+}
+
+function* followLinkNoNewNode(linkEl, isMetaClick, inspector) {
+  let onFailed = inspector.once("idref-attribute-link-failed");
+  performMouseDown(linkEl, isMetaClick);
+  yield onFailed;
+
+  ok(true, "The node selection failed");
+  is(inspector.selection.nodeFront.tagName.toLowerCase(), "output",
+    "The <output> node is still selected");
+}

From 43302a4fb400b2876df7d1baeb6bfd1634e9fc7b Mon Sep 17 00:00:00 2001
From: Justin Crawford <hoosteeno@mozilla.com>
Date: Tue, 21 Jul 2015 14:30:32 -0600
Subject: [PATCH 03/20] Bug 1169241 - Add hover style to footer links in newtab
 intro. r=emtwo

---
 browser/base/content/newtab/newTab.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/base/content/newtab/newTab.css b/browser/base/content/newtab/newTab.css
index 0ee040ada8c..fe095bb30fe 100644
--- a/browser/base/content/newtab/newTab.css
+++ b/browser/base/content/newtab/newTab.css
@@ -724,6 +724,10 @@ input[type=button] {
   color: #4A90E2;
 }
 
+#newtab-intro-footer > ul > li > a:hover {
+  color: #000000;
+}
+
 #newtab-intro-body {
   position: relative;
   display: block;

From 9f7118e076761eba25e3f4fb0761a36949dfb693 Mon Sep 17 00:00:00 2001
From: Amogh Pradeep <amoghbl1@gmail.com>
Date: Sat, 20 Jun 2015 01:13:47 -0500
Subject: [PATCH 04/20] Bug 1169421 - Switch Fennec to use ch.boye instead of
 org.apache.http to allow for building with Android M SDK 23. r=mfinkle

---
 mobile/android/base/distribution/Distribution.java |  2 +-
 mobile/android/base/favicons/LoadFaviconTask.java  | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/distribution/Distribution.java b/mobile/android/base/distribution/Distribution.java
index 5f7bf56dd50..1cb9d508711 100644
--- a/mobile/android/base/distribution/Distribution.java
+++ b/mobile/android/base/distribution/Distribution.java
@@ -32,7 +32,7 @@ import java.util.zip.ZipFile;
 
 import javax.net.ssl.SSLException;
 
-import org.apache.http.protocol.HTTP;
+import ch.boye.httpclientandroidlib.protocol.HTTP;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/mobile/android/base/favicons/LoadFaviconTask.java b/mobile/android/base/favicons/LoadFaviconTask.java
index 77bf3e1fe3d..9c942d26e30 100644
--- a/mobile/android/base/favicons/LoadFaviconTask.java
+++ b/mobile/android/base/favicons/LoadFaviconTask.java
@@ -8,13 +8,13 @@ package org.mozilla.gecko.favicons;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.net.http.AndroidHttpClient;
+import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
 import android.text.TextUtils;
 import android.util.Log;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
+import ch.boye.httpclientandroidlib.Header;
+import ch.boye.httpclientandroidlib.HttpEntity;
+import ch.boye.httpclientandroidlib.HttpResponse;
+import ch.boye.httpclientandroidlib.client.methods.HttpGet;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.db.BrowserDB;
@@ -72,7 +72,7 @@ public class LoadFaviconTask {
     private LinkedList<LoadFaviconTask> chainees;
     private boolean isChaining;
 
-    static AndroidHttpClient httpClient = AndroidHttpClient.newInstance(GeckoAppShell.getGeckoInterface().getDefaultUAString());
+    static DefaultHttpClient httpClient = new DefaultHttpClient();
 
     public LoadFaviconTask(Context context, String pageURL, String faviconURL, int flags, OnFaviconLoadedListener listener) {
         this(context, pageURL, faviconURL, flags, listener, -1, false);
@@ -128,6 +128,7 @@ public class LoadFaviconTask {
         }
 
         HttpGet request = new HttpGet(faviconURI);
+        request.setHeader("User-Agent", GeckoAppShell.getGeckoInterface().getDefaultUAString());
         HttpResponse response = httpClient.execute(request);
         if (response == null) {
             return null;

From ea43bd80652741770a8a2409add90322d80754cc Mon Sep 17 00:00:00 2001
From: Brittany Storoz <brittanystoroz@gmail.com>
Date: Fri, 17 Jul 2015 17:09:00 +0200
Subject: [PATCH 05/20] Bug 1185005 - Fix panel-header font-size on WebIDE
 sidebars; r=jryans

---
 browser/devtools/webide/themes/panel-listing.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/devtools/webide/themes/panel-listing.css b/browser/devtools/webide/themes/panel-listing.css
index 5337ad2aaa9..165ff2494aa 100644
--- a/browser/devtools/webide/themes/panel-listing.css
+++ b/browser/devtools/webide/themes/panel-listing.css
@@ -35,7 +35,6 @@ label,
   text-transform: uppercase;
   line-height: 200%;
   margin: 5px 5px 0 5px;
-  font-size: 10%;
   font-weight: 700;
   width: 100%;
 }

From 557f96fb0c53e8be35ad2474a1558ae525804208 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Wed, 22 Jul 2015 19:31:06 +0900
Subject: [PATCH 06/20] Bug 1184508 - Remember registry hash for later use on
 Win8+. r=jimm

---
 .../shell/nsWindowsShellService.cpp           | 310 +++++++++++++++---
 1 file changed, 260 insertions(+), 50 deletions(-)

diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
index 43fecf2aec0..caa5252000f 100644
--- a/browser/components/shell/nsWindowsShellService.cpp
+++ b/browser/components/shell/nsWindowsShellService.cpp
@@ -3,6 +3,8 @@
  * 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 "nsWindowsShellService.h"
+
 #include "imgIContainer.h"
 #include "imgIRequest.h"
 #include "mozilla/gfx/2D.h"
@@ -17,7 +19,6 @@
 #include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "nsShellService.h"
-#include "nsWindowsShellService.h"
 #include "nsIProcess.h"
 #include "nsICategoryManager.h"
 #include "nsBrowserCompsCID.h"
@@ -85,6 +86,38 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
   return NS_OK;
 }
 
+static bool
+GetPrefString(const nsCString& aPrefName, nsAString& aValue)
+{
+  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (!prefs) {
+    return false;
+  }
+
+  nsAutoCString prefCStr;
+  nsresult rv = prefs->GetCharPref(aPrefName.get(),
+                                   getter_Copies(prefCStr));
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+  CopyUTF8toUTF16(prefCStr, aValue);
+
+  return true;
+}
+
+static bool
+SetPrefString(const nsCString& aPrefName, const nsString& aValue)
+{
+  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (!prefs) {
+    return false;
+  }
+
+  nsresult rv = prefs->SetCharPref(aPrefName.get(),
+                                   NS_ConvertUTF16toUTF8(aValue).get());
+  return NS_SUCCEEDED(rv);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Default Browser Registry Settings
 //
@@ -322,38 +355,219 @@ nsWindowsShellService::ShortcutMaintenance()
 }
 
 static bool
-IsAARDefaultHTTP(IApplicationAssociationRegistration* pAAR,
-                 bool* aIsDefaultBrowser)
+IsAARDefault(const nsRefPtr<IApplicationAssociationRegistration>& pAAR,
+             LPCWSTR aClassName)
 {
   // Make sure the Prog ID matches what we have
   LPWSTR registeredApp;
-  HRESULT hr = pAAR->QueryCurrentDefault(L"http", AT_URLPROTOCOL, AL_EFFECTIVE,
+  bool isProtocol = *aClassName != L'.';
+  ASSOCIATIONTYPE queryType = isProtocol ? AT_URLPROTOCOL : AT_FILEEXTENSION;
+  HRESULT hr = pAAR->QueryCurrentDefault(aClassName, queryType, AL_EFFECTIVE,
                                          &registeredApp);
-  if (SUCCEEDED(hr)) {
-    LPCWSTR firefoxHTTPProgID = L"FirefoxURL";
-    *aIsDefaultBrowser = !wcsicmp(registeredApp, firefoxHTTPProgID);
-    CoTaskMemFree(registeredApp);
-  } else {
-    *aIsDefaultBrowser = false;
+  if (FAILED(hr)) {
+    return false;
   }
-  return SUCCEEDED(hr);
+
+  LPCWSTR progID = isProtocol ? L"FirefoxURL" : L"FirefoxHTML";
+  bool isDefault = !wcsicmp(registeredApp, progID);
+  CoTaskMemFree(registeredApp);
+
+  return isDefault;
+}
+
+static void
+GetUserChoiceKeyName(LPCWSTR aClassName, bool aIsProtocol,
+                     nsAString& aKeyName)
+{
+  aKeyName.AssignLiteral(aIsProtocol
+    ? "Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\"
+    : "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\");
+  aKeyName.Append(aClassName);
+  aKeyName.AppendLiteral("\\UserChoice");
+}
+
+static void
+GetHashPrefName(LPCWSTR aClassName, nsACString& aPrefName)
+{
+  aPrefName.AssignLiteral("browser.shell.associationHash.");
+  aPrefName.Append(NS_ConvertUTF16toUTF8(*aClassName == L'.' ? aClassName + 1
+                                                             : aClassName));
 }
 
 static bool
-IsAARDefaultHTML(IApplicationAssociationRegistration* pAAR,
-                 bool* aIsDefaultBrowser)
+SaveWin8RegistryHash(const nsRefPtr<IApplicationAssociationRegistration>& pAAR,
+                     LPCWSTR aClassName)
 {
-  LPWSTR registeredApp;
-  HRESULT hr = pAAR->QueryCurrentDefault(L".html", AT_FILEEXTENSION, AL_EFFECTIVE,
-                                         &registeredApp);
-  if (SUCCEEDED(hr)) {
-    LPCWSTR firefoxHTMLProgID = L"FirefoxHTML";
-    *aIsDefaultBrowser = !wcsicmp(registeredApp, firefoxHTMLProgID);
-    CoTaskMemFree(registeredApp);
-  } else {
-    *aIsDefaultBrowser = false;
+  bool isProtocol = *aClassName != L'.';
+  bool isDefault = IsAARDefault(pAAR, aClassName);
+  // We can save the value only if Firefox is the default.
+  if (!isDefault) {
+    return isDefault;
   }
-  return SUCCEEDED(hr);
+
+  nsAutoString keyName;
+  GetUserChoiceKeyName(aClassName, isProtocol, keyName);
+
+  nsCOMPtr<nsIWindowsRegKey> regKey =
+    do_CreateInstance("@mozilla.org/windows-registry-key;1");
+  if (!regKey) {
+    return isDefault;
+  }
+
+  nsresult rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER,
+                             keyName, nsIWindowsRegKey::ACCESS_READ);
+  if (NS_FAILED(rv)) {
+    return isDefault;
+  }
+
+  nsAutoString hash;
+  rv = regKey->ReadStringValue(NS_LITERAL_STRING("Hash"), hash);
+  if (NS_FAILED(rv)) {
+    return isDefault;
+  }
+
+  nsAutoCString prefName;
+  GetHashPrefName(aClassName, prefName);
+  SetPrefString(prefName, hash);
+
+  return isDefault;
+}
+
+static bool
+RestoreWin8RegistryHash(const nsRefPtr<IApplicationAssociationRegistration>& pAAR,
+                        LPCWSTR aClassName)
+{
+  nsAutoCString prefName;
+  GetHashPrefName(aClassName, prefName);
+  nsAutoString hash;
+  if (!GetPrefString(prefName, hash)) {
+    return false;
+  }
+
+  bool isProtocol = *aClassName != L'.';
+  nsString progId = isProtocol ? NS_LITERAL_STRING("FirefoxURL")
+                               : NS_LITERAL_STRING("FirefoxHTML");
+
+  nsAutoString keyName;
+  GetUserChoiceKeyName(aClassName, isProtocol, keyName);
+
+  nsCOMPtr<nsIWindowsRegKey> regKey =
+    do_CreateInstance("@mozilla.org/windows-registry-key;1");
+  if (!regKey) {
+    return false;
+  }
+
+  nsresult rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER,
+                             keyName, nsIWindowsRegKey::ACCESS_READ);
+  if (NS_SUCCEEDED(rv)) {
+    nsAutoString currValue;
+    if (NS_SUCCEEDED(regKey->ReadStringValue(NS_LITERAL_STRING("Hash"),
+                                             currValue)) &&
+        currValue.Equals(hash) &&
+        NS_SUCCEEDED(regKey->ReadStringValue(NS_LITERAL_STRING("ProgId"),
+                                             currValue)) &&
+        currValue.Equals(progId)) {
+      // The value is already set.
+      return true;
+    }
+    // We need to close this explicitly because nsIWindowsRegKey::SetKey
+    // does not close the old key.
+    regKey->Close();
+  }
+
+  // We have to use the registry function directly because
+  // nsIWindowsRegKey::Create will only return NS_ERROR_FAILURE
+  // on failure.
+  HKEY theKey;
+  DWORD res = ::RegOpenKeyExW(HKEY_CURRENT_USER, keyName.get(), 0,
+                              KEY_READ | KEY_SET_VALUE, &theKey);
+  if (REG_FAILED(res)) {
+    if (res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) {
+      return false;
+    }
+    if (res == ERROR_ACCESS_DENIED) {
+      res = ::RegDeleteKeyW(HKEY_CURRENT_USER, keyName.get());
+      if (REG_FAILED(res)) {
+        return false;
+      }
+    }
+    res = ::RegCreateKeyExW(HKEY_CURRENT_USER, keyName.get(), 0,
+                            nullptr, 0, KEY_READ | KEY_SET_VALUE,
+                            nullptr, &theKey, nullptr);
+    if (REG_FAILED(res)) {
+      return false;
+    }
+  }
+  regKey->SetKey(theKey);
+
+  rv = regKey->WriteStringValue(NS_LITERAL_STRING("Hash"), hash);
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  rv = regKey->WriteStringValue(NS_LITERAL_STRING("ProgId"), progId);
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  return IsAARDefault(pAAR, aClassName);
+}
+
+static void
+SaveWin8RegistryHashes(bool aCheckAllTypes, bool* aIsDefaultBrowser)
+{
+  nsRefPtr<IApplicationAssociationRegistration> pAAR;
+  HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
+                                nullptr,
+                                CLSCTX_INPROC,
+                                IID_IApplicationAssociationRegistration,
+                                getter_AddRefs(pAAR));
+  if (FAILED(hr)) {
+    return;
+  }
+
+  bool res = SaveWin8RegistryHash(pAAR, L"http");
+  if (*aIsDefaultBrowser) {
+    *aIsDefaultBrowser = res;
+  }
+  SaveWin8RegistryHash(pAAR, L"https");
+  SaveWin8RegistryHash(pAAR, L"ftp");
+  res = SaveWin8RegistryHash(pAAR, L".html");
+  if (*aIsDefaultBrowser && aCheckAllTypes) {
+    *aIsDefaultBrowser = res;
+  }
+  SaveWin8RegistryHash(pAAR, L".htm");
+  SaveWin8RegistryHash(pAAR, L".shtml");
+  SaveWin8RegistryHash(pAAR, L".xhtml");
+  SaveWin8RegistryHash(pAAR, L".xht");
+}
+
+static bool
+RestoreWin8RegistryHashes(bool aClaimAllTypes)
+{
+  nsRefPtr<IApplicationAssociationRegistration> pAAR;
+  HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
+                                nullptr,
+                                CLSCTX_INPROC,
+                                IID_IApplicationAssociationRegistration,
+                                getter_AddRefs(pAAR));
+  if (FAILED(hr)) {
+    return false;
+  }
+
+  bool res = RestoreWin8RegistryHash(pAAR, L"http");
+  res = RestoreWin8RegistryHash(pAAR, L"https") && res;
+  RestoreWin8RegistryHash(pAAR, L"ftp");
+  bool res2 = RestoreWin8RegistryHash(pAAR, L".html");
+  res2 = RestoreWin8RegistryHash(pAAR, L".htm") && res2;
+  if (aClaimAllTypes) {
+    res = res && res2;
+  }
+  RestoreWin8RegistryHash(pAAR, L".shtml");
+  RestoreWin8RegistryHash(pAAR, L".xhtml");
+  RestoreWin8RegistryHash(pAAR, L".xht");
+
+  return res;
 }
 
 /*
@@ -366,37 +580,27 @@ bool
 nsWindowsShellService::IsDefaultBrowserVista(bool aCheckAllTypes,
                                              bool* aIsDefaultBrowser)
 {
-  IApplicationAssociationRegistration* pAAR;
+  nsRefPtr<IApplicationAssociationRegistration> pAAR;
   HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
                                 nullptr,
                                 CLSCTX_INPROC,
                                 IID_IApplicationAssociationRegistration,
-                                (void**)&pAAR);
-
-  if (SUCCEEDED(hr)) {
-    if (aCheckAllTypes) {
-      BOOL res;
-      hr = pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE,
-                                      APP_REG_NAME,
-                                      &res);
-      *aIsDefaultBrowser = res;
-
-      // If we have all defaults, let's make sure that our ProgID
-      // is explicitly returned as well. Needed only for Windows 8.
-      if (*aIsDefaultBrowser && IsWin8OrLater()) {
-        IsAARDefaultHTTP(pAAR, aIsDefaultBrowser);
-        if (*aIsDefaultBrowser) {
-          IsAARDefaultHTML(pAAR, aIsDefaultBrowser);
-        }
-      }
-    } else {
-      IsAARDefaultHTTP(pAAR, aIsDefaultBrowser);
-    }
-
-    pAAR->Release();
-    return true;
+                                getter_AddRefs(pAAR));
+  if (FAILED(hr)) {
+    return false;
   }
-  return false;
+
+  if (aCheckAllTypes) {
+    BOOL res;
+    hr = pAAR->QueryAppIsDefaultAll(AL_EFFECTIVE,
+                                    APP_REG_NAME,
+                                    &res);
+    *aIsDefaultBrowser = res;
+  } else if (!IsWin8OrLater()) {
+    *aIsDefaultBrowser = IsAARDefault(pAAR, L"http");
+  }
+
+  return true;
 }
 
 NS_IMETHODIMP
@@ -496,6 +700,9 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
   // previous checks show that Firefox is the default browser.
   if (*aIsDefaultBrowser) {
     IsDefaultBrowserVista(aForAllTypes, aIsDefaultBrowser);
+    if (IsWin8OrLater()) {
+      SaveWin8RegistryHashes(aForAllTypes, aIsDefaultBrowser);
+    }
   }
 
   // To handle the case where DDE isn't disabled due for a user because there
@@ -730,7 +937,8 @@ nsWindowsShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers)
   }
 
   nsresult rv = LaunchHelper(appHelperPath);
-  if (NS_SUCCEEDED(rv) && IsWin8OrLater()) {
+  if (NS_SUCCEEDED(rv) && IsWin8OrLater() &&
+      !RestoreWin8RegistryHashes(aClaimAllTypes)) {
     if (aClaimAllTypes) {
       if (IsWin10OrLater()) {
         rv = LaunchModernSettingsDialogDefaultApps();
@@ -760,6 +968,8 @@ nsWindowsShellService::SetDefaultBrowser(bool aClaimAllTypes, bool aForAllUsers)
       if (NS_FAILED(rv)) {
         rv = LaunchControlPanelDefaultsSelectionUI();
       }
+      bool isDefault;
+      SaveWin8RegistryHashes(aClaimAllTypes, &isDefault);
     }
   }
 

From 839d64e35ddc0abb8626be1124a15353b0864a96 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 22 Jul 2015 12:50:18 +0100
Subject: [PATCH 07/20] Bug 1180700 - Fix wrapping of context information when
 comments field contains a long word. r=mikedeboer

---
 browser/components/loop/content/shared/css/common.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css
index 92b03dabdd1..aa13075e8b6 100644
--- a/browser/components/loop/content/shared/css/common.css
+++ b/browser/components/loop/content/shared/css/common.css
@@ -549,6 +549,9 @@ html[dir="rtl"] .context-wrapper > .context-preview {
   flex: 0 1 auto;
   display: block;
   color: black;
+  /* 16px for the preview, plus its .8em margin */
+  max-width: calc(100% - 16px - .8em);
+  word-wrap: break-word;
 }
 
 .context-wrapper > .context-description > .context-url {

From eb435c8a7d07d112fccf0ef98d2f210901c312c5 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 22 Jul 2015 12:50:18 +0100
Subject: [PATCH 08/20] Bug 1186362 - Drop Loop's use of jQuery from the
 desktop UI. r=mikedeboer

---
 browser/components/loop/content/conversation.html     | 1 -
 browser/components/loop/content/js/client.js          | 4 ++--
 browser/components/loop/content/panel.html            | 1 -
 browser/components/loop/jar.mn                        | 1 -
 browser/components/loop/test/desktop-local/index.html | 6 ++++--
 browser/components/loop/test/shared/index.html        | 6 ++++--
 browser/components/loop/test/shared/views_test.js     | 1 -
 browser/components/loop/test/standalone/index.html    | 5 ++++-
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/browser/components/loop/content/conversation.html b/browser/components/loop/content/conversation.html
index a88300687d4..7631a74452e 100644
--- a/browser/components/loop/content/conversation.html
+++ b/browser/components/loop/content/conversation.html
@@ -21,7 +21,6 @@
     <script type="text/javascript" src="loop/js/otconfig.js"></script>
     <script type="text/javascript" src="loop/libs/sdk.js"></script>
     <script type="text/javascript" src="loop/shared/libs/react-0.12.2.js"></script>
-    <script type="text/javascript" src="loop/shared/libs/jquery-2.1.4.js"></script>
     <script type="text/javascript" src="loop/shared/libs/lodash-3.9.3.js"></script>
     <script type="text/javascript" src="loop/shared/libs/backbone-1.2.1.js"></script>
 
diff --git a/browser/components/loop/content/js/client.js b/browser/components/loop/content/js/client.js
index 3be748cbd96..4463146a920 100644
--- a/browser/components/loop/content/js/client.js
+++ b/browser/components/loop/content/js/client.js
@@ -3,7 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var loop = loop || {};
-loop.Client = (function($) {
+loop.Client = (function() {
   "use strict";
 
   // THe expected properties to be returned from the POST /calls request.
@@ -116,4 +116,4 @@ loop.Client = (function($) {
   };
 
   return Client;
-})(jQuery);
+})();
diff --git a/browser/components/loop/content/panel.html b/browser/components/loop/content/panel.html
index d2aa202189b..6af78664cf7 100644
--- a/browser/components/loop/content/panel.html
+++ b/browser/components/loop/content/panel.html
@@ -16,7 +16,6 @@
 
     <script type="text/javascript" src="loop/shared/libs/react-0.12.2.js"></script>
     <script type="text/javascript" src="loop/libs/l10n.js"></script>
-    <script type="text/javascript" src="loop/shared/libs/jquery-2.1.4.js"></script>
     <script type="text/javascript" src="loop/shared/libs/lodash-3.9.3.js"></script>
     <script type="text/javascript" src="loop/shared/libs/backbone-1.2.1.js"></script>
 
diff --git a/browser/components/loop/jar.mn b/browser/components/loop/jar.mn
index 754795cc218..41173728e7f 100644
--- a/browser/components/loop/jar.mn
+++ b/browser/components/loop/jar.mn
@@ -99,7 +99,6 @@ browser.jar:
   content/browser/loop/shared/libs/react-0.12.2.js    (content/shared/libs/react-0.12.2-prod.js)
 #endif
   content/browser/loop/shared/libs/lodash-3.9.3.js    (content/shared/libs/lodash-3.9.3.js)
-  content/browser/loop/shared/libs/jquery-2.1.4.js    (content/shared/libs/jquery-2.1.4.js)
   content/browser/loop/shared/libs/backbone-1.2.1.js  (content/shared/libs/backbone-1.2.1.js)
 
   # Shared sounds
diff --git a/browser/components/loop/test/desktop-local/index.html b/browser/components/loop/test/desktop-local/index.html
index 35f243576eb..d74b99791a9 100644
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -31,7 +31,6 @@
   <!-- libs -->
   <script src="../../content/libs/l10n.js"></script>
   <script src="../../content/shared/libs/react-0.12.2.js"></script>
-  <script src="../../content/shared/libs/jquery-2.1.4.js"></script>
   <script src="../../content/shared/libs/lodash-3.9.3.js"></script>
   <script src="../../content/shared/libs/backbone-1.2.1.js"></script>
 
@@ -101,7 +100,10 @@
     });
 
     mocha.run(function () {
-      $("#mocha").append("<p id='complete'>Complete.</p>");
+      var completeNode = document.createElement("p");
+      completeNode.setAttribute("id", "complete");
+      completeNode.appendChild(document.createTextNode("Complete"));
+      document.getElementById("mocha").appendChild(completeNode);
     });
   </script>
 </body>
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index 84f5f3c5d22..197a3191aa2 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -30,7 +30,6 @@
 
   <!-- libs -->
   <script src="../../content/shared/libs/react-0.12.2.js"></script>
-  <script src="../../content/shared/libs/jquery-2.1.4.js"></script>
   <script src="../../content/shared/libs/lodash-3.9.3.js"></script>
   <script src="../../content/shared/libs/backbone-1.2.1.js"></script>
   <script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
@@ -95,7 +94,10 @@
     });
 
     mocha.run(function () {
-      $("#mocha").append("<p id='complete'>Complete.</p>");
+      var completeNode = document.createElement("p");
+      completeNode.setAttribute("id", "complete");
+      completeNode.appendChild(document.createTextNode("Complete"));
+      document.getElementById("mocha").appendChild(completeNode);
     });
   </script>
 </body>
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index e50d699ef2a..06cbc44fcdc 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -50,7 +50,6 @@ describe("loop.shared.views", function() {
   });
 
   afterEach(function() {
-    $("#fixtures").empty();
     sandbox.restore();
   });
 
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
index 8d6c50d1c2f..bbec590c3ce 100644
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -90,7 +90,10 @@
     });
 
     mocha.run(function () {
-      $("#mocha").append("<p id='complete'>Complete.</p>");
+      var completeNode = document.createElement("p");
+      completeNode.setAttribute("id", "complete");
+      completeNode.appendChild(document.createTextNode("Complete"));
+      document.getElementById("mocha").appendChild(completeNode);
     });
 </script>
 </body>

From a48fafa606b9fd32d036c2590c21695d67f998b0 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 22 Jul 2015 10:48:54 -0400
Subject: [PATCH 09/20] Bug 1148771 - Skip browser_notifications.js on Windows
 as well due to frequent failures.

---
 toolkit/components/passwordmgr/test/browser/browser.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/passwordmgr/test/browser/browser.ini b/toolkit/components/passwordmgr/test/browser/browser.ini
index cb4750cb1e0..2d7bee1622a 100644
--- a/toolkit/components/passwordmgr/test/browser/browser.ini
+++ b/toolkit/components/passwordmgr/test/browser/browser.ini
@@ -7,7 +7,7 @@ support-files =
 [browser_DOMInputPasswordAdded.js]
 [browser_filldoorhanger.js]
 [browser_notifications.js]
-skip-if = os != "win" # Intermittent failures: Bug 1182296
+skip-if = true # Intermittent failures: Bug 1182296, bug 1148771
 [browser_passwordmgr_fields.js]
 [browser_passwordmgr_observers.js]
 [browser_passwordmgr_sort.js]

From 76089e43bfa776ac85741daa858a51b775a35dd6 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 20 Jul 2015 11:55:32 +0200
Subject: [PATCH 10/20] Bug 1184683 - GeckoPreferences: Pass current context to
 RestrictedProfiles instead of relying on GeckoAppShell. r=ally

---
 mobile/android/base/RestrictedProfiles.java           | 2 +-
 mobile/android/base/preferences/GeckoPreferences.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/RestrictedProfiles.java b/mobile/android/base/RestrictedProfiles.java
index f6e74c15d7e..4ce8ba7dc0f 100644
--- a/mobile/android/base/RestrictedProfiles.java
+++ b/mobile/android/base/RestrictedProfiles.java
@@ -181,7 +181,7 @@ public class RestrictedProfiles {
         return isUserRestricted(GeckoAppShell.getContext());
     }
 
-    private static boolean isUserRestricted(final Context context) {
+    public static boolean isUserRestricted(final Context context) {
         // Guest mode is supported in all Android versions.
         if (getInGuest()) {
             return true;
diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
index f187a7660f1..736def42702 100644
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -697,7 +697,7 @@ OnSharedPreferenceChangeListener
                     }
                 }
                 if (PREFS_DEVTOOLS.equals(key) &&
-                    RestrictedProfiles.isUserRestricted()) {
+                    RestrictedProfiles.isUserRestricted(this)) {
                     preferences.removePreference(pref);
                     i--;
                     continue;

From 653e081fc13e2c8efafe7205caac6aa07afb171c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 22 Jul 2015 17:17:32 +0200
Subject: [PATCH 11/20] Bug 1185958 - Windows 10: Only show box-shadow of
 location bar and search field on focus. r=jaws

---
 browser/themes/windows/browser.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 8325ef80432..8bc5129801c 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1238,7 +1238,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
     #urlbar:not(:-moz-lwtheme):hover,
     .searchbar-textbox:not(:-moz-lwtheme):hover {
       border-color: hsl(0,0%,80%);
-      box-shadow: 0 0 0 1px hsl(0,0%,80%) inset;
     }
 
     #urlbar:not(:-moz-lwtheme)[focused],

From a6a05d817f915725cd6e343acdbf42ca2c66e7a2 Mon Sep 17 00:00:00 2001
From: Iaroslav Sheptykin <yarik.sheptykin@googlemail.com>
Date: Mon, 20 Jul 2015 06:54:00 -0400
Subject: [PATCH 12/20] Bug 1174468 - Show Yandex.Translate attribution when
 Yandex engine is selected. r=felipc

---
 browser/components/preferences/content.js     |  5 +++
 browser/components/preferences/content.xul    | 12 ++---
 .../preferences/in-content/content.js         |  5 +++
 .../preferences/in-content/content.xul        | 14 +++---
 .../components/translation/Translation.jsm    | 30 +++++++++++--
 .../test/browser_translation_yandex.js        | 45 +++++++++++++++++++
 .../translation/translation-infobar.xml       | 22 ++++++---
 .../en-US/chrome/browser/translation.dtd      |  9 ++++
 8 files changed, 123 insertions(+), 19 deletions(-)

diff --git a/browser/components/preferences/content.js b/browser/components/preferences/content.js
index 7b78159b9c8..1fe3da35080 100644
--- a/browser/components/preferences/content.js
+++ b/browser/components/preferences/content.js
@@ -18,6 +18,11 @@ var gContentPane = {
     if (Services.prefs.getBoolPref(prefName)) {
       let row = document.getElementById("translationBox");
       row.removeAttribute("hidden");
+      // Showing attribution only for Bing Translator.
+      Components.utils.import("resource:///modules/translation/Translation.jsm");
+      if (Translation.translationEngine == "bing") {
+        document.getElementById("bingAttribution").removeAttribute("hidden");
+      }
     }
 
     let drmInfoURL =
diff --git a/browser/components/preferences/content.xul b/browser/components/preferences/content.xul
index e725597ebc4..da0cb1e1151 100644
--- a/browser/components/preferences/content.xul
+++ b/browser/components/preferences/content.xul
@@ -163,11 +163,13 @@
                         label="&translateWebPages.label;." accesskey="&translateWebPages.accesskey;"
                         onsyncfrompreference="return gContentPane.updateButtons('translateButton',
                                               'browser.translation.detectLanguage');"/>
-              <label>&translation.options.attribution.beforeLogo;</label>
-              <image id="translationAttributionImage" aria-label="Microsoft Translator"
-                     onclick="gContentPane.openTranslationProviderAttribution()"
-                     src="chrome://browser/content/microsoft-translator-attribution.png"/>
-              <label>&translation.options.attribution.afterLogo;</label>
+              <hbox id="bingAttribution" hidden="true">
+                <label>&translation.options.attribution.beforeLogo;</label>
+                <image id="translationAttributionImage" aria-label="Microsoft Translator"
+                       onclick="gContentPane.openTranslationProviderAttribution()"
+                       src="chrome://browser/content/microsoft-translator-attribution.png"/>
+                <label>&translation.options.attribution.afterLogo;</label>
+              </hbox>
             </hbox>
             <button id="translateButton" label="&translateExceptions.label;"
                     oncommand="gContentPane.showTranslationExceptions();"
diff --git a/browser/components/preferences/in-content/content.js b/browser/components/preferences/in-content/content.js
index 3e444f6cdd9..e999afedce9 100644
--- a/browser/components/preferences/in-content/content.js
+++ b/browser/components/preferences/in-content/content.js
@@ -23,6 +23,11 @@ var gContentPane = {
     if (Services.prefs.getBoolPref(prefName)) {
       let row = document.getElementById("translationBox");
       row.removeAttribute("hidden");
+      // Showing attribution only for Bing Translator.
+      Components.utils.import("resource:///modules/translation/Translation.jsm");
+      if (Translation.translationEngine == "bing") {
+        document.getElementById("bingAttribution").removeAttribute("hidden");
+      }
     }
 
     setEventListener("font.language.group", "change",
diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul
index a368e6a7724..74d7277808a 100644
--- a/browser/components/preferences/in-content/content.xul
+++ b/browser/components/preferences/in-content/content.xul
@@ -160,12 +160,14 @@
                 label="&translateWebPages.label;." accesskey="&translateWebPages.accesskey;"
                 onsyncfrompreference="return gContentPane.updateButtons('translateButton',
                                               'browser.translation.detectLanguage');"/>
-      <label>&translation.options.attribution.beforeLogo;</label>
-      <separator orient="vertical" class="thin"/>
-      <image id="translationAttributionImage" aria-label="Microsoft Translator"
-             src="chrome://browser/content/microsoft-translator-attribution.png"/>
-      <separator orient="vertical" class="thin"/>
-      <label>&translation.options.attribution.afterLogo;</label>
+      <hbox id="bingAttribution" hidden="true">
+        <label>&translation.options.attribution.beforeLogo;</label>
+        <separator orient="vertical" class="thin"/>
+        <image id="translationAttributionImage" aria-label="Microsoft Translator"
+               src="chrome://browser/content/microsoft-translator-attribution.png"/>
+        <separator orient="vertical" class="thin"/>
+        <label>&translation.options.attribution.afterLogo;</label>
+      </hbox>
     </hbox>
     <button id="translateButton" label="&translateExceptions.label;"
             accesskey="&translateExceptions.accesskey;"/>
diff --git a/browser/components/translation/Translation.jsm b/browser/components/translation/Translation.jsm
index c014150a7d8..422b9a38166 100644
--- a/browser/components/translation/Translation.jsm
+++ b/browser/components/translation/Translation.jsm
@@ -84,10 +84,34 @@ this.Translation = {
   },
 
   openProviderAttribution: function() {
+    let attribution = this.supportedEngines[this.translationEngine];
     Cu.import("resource:///modules/RecentWindow.jsm");
-    RecentWindow.getMostRecentBrowserWindow().openUILinkIn(
-      "http://aka.ms/MicrosoftTranslatorAttribution", "tab");
-  }
+    RecentWindow.getMostRecentBrowserWindow().openUILinkIn(attribution, "tab");
+  },
+
+  /**
+   * The list of translation engines and their attributions.
+   */
+  supportedEngines: {
+    "bing"    : "http://aka.ms/MicrosoftTranslatorAttribution",
+    "yandex"  : "http://translate.yandex.com/"
+  },
+
+  /**
+   * Fallback engine (currently Bing Translator) if the preferences seem
+   * confusing.
+   */
+  get defaultEngine() {
+    return this.supportedEngines.keys[0];
+  },
+
+  /**
+   * Returns the name of the preferred translation engine.
+   */
+  get translationEngine() {
+    let engine = Services.prefs.getCharPref("browser.translation.engine");
+    return Object.keys(this.supportedEngines).includes(engine) ? engine : this.defaultEngine;
+  },
 };
 
 /* TranslationUI objects keep the information related to translation for
diff --git a/browser/components/translation/test/browser_translation_yandex.js b/browser/components/translation/test/browser_translation_yandex.js
index e6df4a205a4..c126be04219 100644
--- a/browser/components/translation/test/browser_translation_yandex.js
+++ b/browser/components/translation/test/browser_translation_yandex.js
@@ -8,18 +8,22 @@
 
 const kEnginePref = "browser.translation.engine";
 const kApiKeyPref = "browser.translation.yandex.apiKeyOverride";
+const kShowUIPref = "browser.translation.ui.show";
 
 const {YandexTranslator} = Cu.import("resource:///modules/translation/YandexTranslator.jsm", {});
 const {TranslationDocument} = Cu.import("resource:///modules/translation/TranslationDocument.jsm", {});
 const {Promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const {Translation} = Cu.import("resource:///modules/translation/Translation.jsm", {});
 
 add_task(function* setup() {
   Services.prefs.setCharPref(kEnginePref, "yandex");
   Services.prefs.setCharPref(kApiKeyPref, "yandexValidKey");
+  Services.prefs.setBoolPref(kShowUIPref, true);
 
   registerCleanupFunction(function () {
     Services.prefs.clearUserPref(kEnginePref);
     Services.prefs.clearUserPref(kApiKeyPref);
+    Services.prefs.clearUserPref(kShowUIPref);
   });
 });
 
@@ -45,6 +49,38 @@ add_task(function* test_yandex_translation() {
   gBrowser.removeTab(tab);
 });
 
+/**
+ * Ensure that Yandex.Translate is propertly attributed.
+ */
+add_task(function* test_yandex_attribution() {
+  // Loading the fixture page.
+  let url = constructFixtureURL("bug1022725-fr.html");
+  let tab = yield promiseTestPageLoad(url);
+
+  info("Show an info bar saying the current page is in French");
+  let notif = showTranslationUI(tab, "fr");
+  let attribution = notif._getAnonElt("translationEngine").selectedIndex;
+  Assert.equal(attribution, 1, "Yandex attribution should be shown.");
+
+  gBrowser.removeTab(tab);
+});
+
+
+add_task(function* test_preference_attribution() {
+
+    let prefUrl = "about:preferences#content";
+    let tab = yield promiseTestPageLoad(prefUrl);
+
+    let browser = gBrowser.getBrowserForTab(tab);
+    let win = browser.contentWindow;
+    let bingAttribution = win.document.getElementById("bingAttribution");
+    ok(bingAttribution, "Bing attribution should exist.");
+    ok(bingAttribution.hidden, "Bing attribution should be hidden.");
+
+    gBrowser.removeTab(tab);
+
+});
+
 /**
  * A helper function for constructing a URL to a page stored in the
  * local fixture folder.
@@ -79,3 +115,12 @@ function promiseTestPageLoad(url) {
   }, true);
   return deferred.promise;
 }
+
+function showTranslationUI(tab, aDetectedLanguage) {
+  let browser = gBrowser.selectedBrowser;
+  Translation.documentStateReceived(browser, {state: Translation.STATE_OFFER,
+                                              originalShown: true,
+                                              detectedLanguage: aDetectedLanguage});
+  let ui = browser.translationUI;
+  return ui.notificationBox.getNotificationWithValue("translation");
+}
diff --git a/browser/components/translation/translation-infobar.xml b/browser/components/translation/translation-infobar.xml
index 8fd9347620e..501f343a79f 100644
--- a/browser/components/translation/translation-infobar.xml
+++ b/browser/components/translation/translation-infobar.xml
@@ -127,12 +127,17 @@
               <xul:menuitem oncommand="openPreferences('paneContent');"
                             label="&translation.options.preferences.label;"
                             accesskey="&translation.options.preferences.accesskey;"/>
-              <xul:menuitem class="translation-attribution subviewbutton panel-subview-footer"
+              <xul:menuitem class="subviewbutton panel-subview-footer"
                             oncommand="document.getBindingParent(this).openProviderAttribution();">
-                <xul:label>&translation.options.attribution.beforeLogo;</xul:label>
-                <xul:image src="chrome://browser/content/microsoft-translator-attribution.png"
-                           aria-label="Microsoft Translator"/>
-                <xul:label>&translation.options.attribution.afterLogo;</xul:label>
+                <xul:deck anonid="translationEngine" selectedIndex="0">
+                  <xul:hbox class="translation-attribution">
+                    <xul:label>&translation.options.attribution.beforeLogo;</xul:label>
+                    <xul:image src="chrome://browser/content/microsoft-translator-attribution.png"
+                               aria-label="Microsoft Translator"/>
+                    <xul:label>&translation.options.attribution.afterLogo;</xul:label>
+                  </xul:hbox>
+                  <xul:label class="translation-attribution">&translation.options.attribution.yandexTranslate;</xul:label>
+                </xul:deck>
               </xul:menuitem>
             </xul:menupopup>
           </xul:button>
@@ -215,6 +220,13 @@
             if (aTranslation.state)
               this.state = aTranslation.state;
 
+            // Show attribution for the preferred translator.
+            let engineIndex = Object.keys(Translation.supportedEngines)
+              .indexOf(Translation.translationEngine);
+            if (engineIndex != -1) {
+              this._getAnonElt('translationEngine').selectedIndex = engineIndex;
+            }
+
             const kWelcomePref = "browser.translation.ui.welcomeMessageShown";
             if (Services.prefs.prefHasUserValue(kWelcomePref) ||
                 this.translation.browser != gBrowser.selectedBrowser)
diff --git a/browser/locales/en-US/chrome/browser/translation.dtd b/browser/locales/en-US/chrome/browser/translation.dtd
index dbcd4ac05d3..ca8bb9d51a8 100644
--- a/browser/locales/en-US/chrome/browser/translation.dtd
+++ b/browser/locales/en-US/chrome/browser/translation.dtd
@@ -64,3 +64,12 @@
   -->
 <!ENTITY translation.options.attribution.beforeLogo "Translations by">
 <!ENTITY translation.options.attribution.afterLogo "">
+
+<!-- LOCALIZATION NOTE (translation.options.attribution.poweredByYandex,
+                        translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  translation.options.attribution.poweredByYandex is displayed instead of
+  -  the other two strings when yandex translation engine is preferred by the
+  -  user.
+  -->
+<!ENTITY translation.options.attribution.yandexTranslate "Powered by Yandex.Translate">

From bae57cd38273a56eef385c4a06596dc520accc28 Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Wed, 10 Jun 2015 15:56:19 +0200
Subject: [PATCH 13/20] Bug 1147664 - Detailed mode for PerformanceStats
 (low-level). r=jandem

---
 js/src/jsapi.cpp                              |  48 ++-
 js/src/jsapi.h                                |  46 ++-
 js/src/vm/Interpreter.cpp                     | 274 ++++++++++++------
 js/src/vm/Runtime.cpp                         |  67 ++++-
 js/src/vm/Runtime.h                           |  59 ++--
 .../perfmonitoring/nsPerformanceStats.cpp     |  18 ++
 6 files changed, 365 insertions(+), 147 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 2305230a04b..6451c6989f7 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -317,16 +317,21 @@ IterPerformanceStats(JSContext* cx,
     }
 
     JSRuntime* rt = JS_GetRuntime(cx);
-    for (CompartmentsIter c(rt, WithAtoms); !c.done(); c.next()) {
+
+    // First report the shared groups
+    for (CompartmentsIter c(rt, SkipAtoms); !c.done(); c.next()) {
         JSCompartment* compartment = c.get();
-        if (!compartment->performanceMonitoring.isLinked()) {
+        if (!c->principals()) {
+            // Compartments without principals could show up here, but
+            // reporting them doesn't really make sense.
+            continue;
+        }
+        if (!c->performanceMonitoring.hasSharedGroup()) {
             // Don't report compartments that do not even have a PerformanceGroup.
             continue;
         }
-
         js::AutoCompartment autoCompartment(cx, compartment);
-        PerformanceGroup* group = compartment->performanceMonitoring.getGroup(cx);
-
+        PerformanceGroup* group = compartment->performanceMonitoring.getSharedGroup(cx);
         if (group->data.ticks == 0) {
             // Don't report compartments that have never been used.
             continue;
@@ -338,7 +343,9 @@ IterPerformanceStats(JSContext* cx,
             continue;
         }
 
-        if (!(*walker)(cx, group->data, group->uid, closure)) {
+        if (!(*walker)(cx,
+                       group->data, group->uid, nullptr,
+                       closure)) {
             // Issue in callback
             return false;
         }
@@ -347,6 +354,35 @@ IterPerformanceStats(JSContext* cx,
             return false;
         }
     }
+
+    // Then report the own groups
+    for (CompartmentsIter c(rt, SkipAtoms); !c.done(); c.next()) {
+        JSCompartment* compartment = c.get();
+        if (!c->principals()) {
+            // Compartments without principals could show up here, but
+            // reporting them doesn't really make sense.
+            continue;
+        }
+        if (!c->performanceMonitoring.hasOwnGroup()) {
+            // Don't report compartments that do not even have a PerformanceGroup.
+            continue;
+        }
+        js::AutoCompartment autoCompartment(cx, compartment);
+        PerformanceGroup* ownGroup = compartment->performanceMonitoring.getOwnGroup(cx);
+        if (ownGroup->data.ticks == 0) {
+            // Don't report compartments that have never been used.
+            continue;
+        }
+        PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx);
+        if (!(*walker)(cx,
+                       ownGroup->data, ownGroup->uid, &sharedGroup->uid,
+                       closure)) {
+            // Issue in callback
+            return false;
+        }
+    }
+
+    // Finally, report the process stats
     *processStats = rt->stopwatch.performance;
     return true;
 }
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 7b13c55438a..e0f77cf733b 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -5409,7 +5409,7 @@ BuildStackString(JSContext* cx, HandleObject stack, MutableHandleString stringp)
 
 namespace js {
 
-struct AutoStopwatch;
+class AutoStopwatch;
 
 // Container for performance data
 // All values are monotonic.
@@ -5540,21 +5540,30 @@ private:
 };
 
 //
-// Indirection towards a PerformanceGroup.
-// This structure handles reference counting for instances of PerformanceGroup.
+// Each PerformanceGroupHolder handles:
+// - a reference-counted indirection towards a PerformanceGroup shared
+//   by several compartments
+// - a owned PerformanceGroup representing the performance of a single
+//   compartment.
 //
 struct PerformanceGroupHolder {
-    // Get the group.
+    // Get the shared group.
     // On first call, this causes a single Hashtable lookup.
     // Successive calls do not require further lookups.
-    js::PerformanceGroup* getGroup(JSContext*);
+    js::PerformanceGroup* getSharedGroup(JSContext*);
 
-    // `true` if the this holder is currently associated to a
+    // Get the own group.
+    js::PerformanceGroup* getOwnGroup(JSContext*);
+
+    // `true` if the this holder is currently associated to a shared
     // PerformanceGroup, `false` otherwise. Use this method to avoid
     // instantiating a PerformanceGroup if you only need to get
     // available performance data.
-    inline bool isLinked() const {
-        return group_ != nullptr;
+    inline bool hasSharedGroup() const {
+        return sharedGroup_ != nullptr;
+    }
+    inline bool hasOwnGroup() const {
+        return ownGroup_ != nullptr;
     }
 
     // Remove the link to the PerformanceGroup. This method is designed
@@ -5564,10 +5573,12 @@ struct PerformanceGroupHolder {
 
     explicit PerformanceGroupHolder(JSRuntime* runtime)
       : runtime_(runtime)
-      , group_(nullptr)
+      , sharedGroup_(nullptr)
+      , ownGroup_(nullptr)
     {   }
     ~PerformanceGroupHolder();
-private:
+
+  private:
     // Return the key representing this PerformanceGroup in
     // Runtime::Stopwatch.
     // Do not deallocate the key.
@@ -5575,10 +5586,11 @@ private:
 
     JSRuntime *runtime_;
 
-    // The PerformanceGroup held by this object.
-    // Initially set to `nullptr` until the first cal to `getGroup`.
+    // The PerformanceGroups held by this object.
+    // Initially set to `nullptr` until the first call to `getGroup`.
     // May be reset to `nullptr` by a call to `unlink`.
-    js::PerformanceGroup* group_;
+    js::PerformanceGroup* sharedGroup_;
+    js::PerformanceGroup* ownGroup_;
 };
 
 /**
@@ -5604,6 +5616,10 @@ extern JS_PUBLIC_API(bool)
 SetStopwatchIsMonitoringJank(JSRuntime*, bool);
 extern JS_PUBLIC_API(bool)
 GetStopwatchIsMonitoringJank(JSRuntime*);
+extern JS_PUBLIC_API(bool)
+SetStopwatchIsMonitoringPerCompartment(JSRuntime*, bool);
+extern JS_PUBLIC_API(bool)
+GetStopwatchIsMonitoringPerCompartment(JSRuntime*);
 
 extern JS_PUBLIC_API(bool)
 IsStopwatchActive(JSRuntime*);
@@ -5615,7 +5631,9 @@ extern JS_PUBLIC_API(PerformanceData*)
 GetPerformanceData(JSRuntime*);
 
 typedef bool
-(PerformanceStatsWalker)(JSContext* cx, const PerformanceData& stats, uint64_t uid, void* closure);
+(PerformanceStatsWalker)(JSContext* cx,
+                         const PerformanceData& stats, uint64_t uid,
+                         const uint64_t* parentId, void* closure);
 
 /**
  * Extract the performance statistics.
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index e467935df62..682e1241719 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -372,15 +372,49 @@ ExecuteState::pushInterpreterFrame(JSContext* cx)
                                                               scopeChain_, type_, evalInFrame_);
 }
 namespace js {
-
 // Implementation of per-performance group performance measurement.
 //
 //
 // All mutable state is stored in `Runtime::stopwatch` (per-process
 // performance stats and logistics) and in `PerformanceGroup` (per
 // group performance stats).
-struct AutoStopwatch final
+class AutoStopwatch final
 {
+    // The context with which this object was initialized.
+    // Non-null.
+    JSContext* const cx_;
+
+    // An indication of the number of times we have entered the event
+    // loop.  Used only for comparison.
+    uint64_t iteration_;
+
+    // `true` if this object is currently used to monitor performance
+    // for a shared PerformanceGroup, `false` otherwise, i.e. if the
+    // stopwatch mechanism is off or if another stopwatch is already
+    // in charge of monitoring for the same PerformanceGroup.
+    bool isMonitoringForGroup_;
+
+    // `true` if this object is currently used to monitor performance
+    // for a single compartment, `false` otherwise, i.e. if the
+    // stopwatch mechanism is off or if another stopwatch is already
+    // in charge of monitoring for the same PerformanceGroup.
+    bool isMonitoringForSelf_;
+
+    // `true` if this stopwatch is the topmost stopwatch on the stack
+    // for this event, `false` otherwise.
+    bool isMonitoringForTop_;
+
+    // `true` if we are monitoring jank, `false` otherwise.
+    bool isMonitoringJank_;
+    // `true` if we are monitoring CPOW, `false` otherwise.
+    bool isMonitoringCPOW_;
+
+    // Timestamps captured while starting the stopwatch.
+    uint64_t userTimeStart_;
+    uint64_t systemTimeStart_;
+    uint64_t CPOWTimeStart_;
+
+   public:
     // If the stopwatch is active, constructing an instance of
     // AutoStopwatch causes it to become the current owner of the
     // stopwatch.
@@ -389,120 +423,198 @@ struct AutoStopwatch final
     explicit inline AutoStopwatch(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
       : cx_(cx)
       , iteration_(0)
-      , isActive_(false)
-      , isTop_(false)
+      , isMonitoringForGroup_(false)
+      , isMonitoringForSelf_(false)
+      , isMonitoringForTop_(false)
+      , isMonitoringJank_(false)
+      , isMonitoringCPOW_(false)
       , userTimeStart_(0)
       , systemTimeStart_(0)
       , CPOWTimeStart_(0)
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
 
-        JSRuntime* runtime = JS_GetRuntime(cx_);
-        if (!runtime->stopwatch.isMonitoringJank())
-            return;
-
         JSCompartment* compartment = cx_->compartment();
         if (compartment->scheduledForDestruction)
             return;
 
+        JSRuntime* runtime = cx_->runtime();
         iteration_ = runtime->stopwatch.iteration;
 
-        PerformanceGroup *group = compartment->performanceMonitoring.getGroup(cx);
-        MOZ_ASSERT(group);
-
-        if (group->hasStopwatch(iteration_)) {
-            // Someone is already monitoring this group during this
-            // tick, no need for further monitoring.
+        PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx);
+        if (!sharedGroup) {
+            // Either this Runtime is not configured for Performance Monitoring, or we couldn't
+            // allocate the group, or there was a problem with the hashtable.
             return;
         }
 
-        // Start the stopwatch.
-        if (!this->getTimes(runtime, &userTimeStart_, &systemTimeStart_))
-            return;
-        isActive_ = true;
-        CPOWTimeStart_ = runtime->stopwatch.performance.totalCPOWTime;
+        if (!sharedGroup->hasStopwatch(iteration_)) {
+            // We are now in charge of monitoring this group for the tick,
+            // until destruction of `this` or until we enter a nested event
+            // loop and `iteration_` is incremented.
+            sharedGroup->acquireStopwatch(iteration_, this);
+            isMonitoringForGroup_ = true;
+        }
 
-        // We are now in charge of monitoring this group for the tick,
-        // until destruction of `this` or until we enter a nested event
-        // loop and `iteration_` is incremented.
-        group->acquireStopwatch(iteration_, this);
+        PerformanceGroup* ownGroup = nullptr;
+        if (runtime->stopwatch.isMonitoringPerCompartment()) {
+            // As above, but for the group representing just this compartment.
+            ownGroup = compartment->performanceMonitoring.getOwnGroup(cx);
+            if (!ownGroup->hasStopwatch(iteration_)) {
+                ownGroup->acquireStopwatch(iteration_, this);
+                isMonitoringForSelf_ = true;
+            }
+        }
 
         if (runtime->stopwatch.isEmpty) {
             // This is the topmost stopwatch on the stack.
             // It will be in charge of updating the per-process
             // performance data.
             runtime->stopwatch.isEmpty = false;
-            runtime->stopwatch.performance.ticks++;
-            isTop_ = true;
+            isMonitoringForTop_ = true;
+
+            MOZ_ASSERT(isMonitoringForGroup_);
         }
-    }
-    inline ~AutoStopwatch() {
-        if (!isActive_) {
+
+        if (!isMonitoringForGroup_ && !isMonitoringForSelf_) {
             // We are not in charge of monitoring anything.
+            // (isMonitoringForTop_ implies isMonitoringForGroup_,
+            // so we do not need to check it)
+            return;
+        }
+
+        enter();
+    }
+    ~AutoStopwatch() {
+        if (!isMonitoringForGroup_ && !isMonitoringForSelf_) {
+            // We are not in charge of monitoring anything.
+            // (isMonitoringForTop_ implies isMonitoringForGroup_,
+            // so we do not need to check it)
             return;
         }
 
-        JSRuntime* runtime = JS_GetRuntime(cx_);
         JSCompartment* compartment = cx_->compartment();
-
-        MOZ_ASSERT(!compartment->scheduledForDestruction);
-
-        if (!runtime->stopwatch.isMonitoringJank()) {
-            // Monitoring has been stopped while we were
-            // executing the code. Drop everything.
+        if (compartment->scheduledForDestruction)
             return;
-        }
 
+        JSRuntime* runtime = cx_->runtime();
         if (iteration_ != runtime->stopwatch.iteration) {
             // We have entered a nested event loop at some point.
             // Any information we may have is obsolete.
             return;
         }
 
-        PerformanceGroup *group = compartment->performanceMonitoring.getGroup(cx_);
-        MOZ_ASSERT(group);
+        // Finish and commit measures
+        exit();
 
-        // Compute time spent.
-        group->releaseStopwatch(iteration_, this);
-        uint64_t userTimeEnd, systemTimeEnd;
-        if (!this->getTimes(runtime, &userTimeEnd, &systemTimeEnd))
-            return;
+        // Now release groups.
+        if (isMonitoringForGroup_) {
+            PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx_);
+            MOZ_ASSERT(sharedGroup);
+            sharedGroup->releaseStopwatch(iteration_, this);
+        }
 
-        uint64_t userTimeDelta = userTimeEnd - userTimeStart_;
-        uint64_t systemTimeDelta = systemTimeEnd - systemTimeStart_;
-        uint64_t CPOWTimeDelta = runtime->stopwatch.performance.totalCPOWTime - CPOWTimeStart_;
-        group->data.totalUserTime += userTimeDelta;
-        group->data.totalSystemTime += systemTimeDelta;
-        group->data.totalCPOWTime += CPOWTimeDelta;
+        if (isMonitoringForSelf_) {
+            PerformanceGroup* ownGroup = compartment->performanceMonitoring.getOwnGroup(cx_);
+            MOZ_ASSERT(ownGroup);
+            ownGroup->releaseStopwatch(iteration_, this);
+        }
 
-        uint64_t totalTimeDelta = userTimeDelta + systemTimeDelta;
-        updateDurations(totalTimeDelta, group->data.durations);
-        group->data.ticks++;
-
-        if (isTop_) {
-            // This is the topmost stopwatch on the stack.
-            // Record the timing information.
-            runtime->stopwatch.performance.totalUserTime = userTimeEnd;
-            runtime->stopwatch.performance.totalSystemTime = systemTimeEnd;
-            updateDurations(totalTimeDelta, runtime->stopwatch.performance.durations);
+        if (isMonitoringForTop_)
             runtime->stopwatch.isEmpty = true;
+    }
+   private:
+    void enter() {
+        JSRuntime* runtime = cx_->runtime();
+
+        if (runtime->stopwatch.isMonitoringCPOW()) {
+            CPOWTimeStart_ = runtime->stopwatch.performance.totalCPOWTime;
+            isMonitoringCPOW_ = true;
+        }
+
+        if (runtime->stopwatch.isMonitoringJank()) {
+            if (this->getTimes(runtime, &userTimeStart_, &systemTimeStart_)) {
+                isMonitoringJank_ = true;
+            }
+        }
+
+    }
+
+    void exit() {
+        JSRuntime* runtime = cx_->runtime();
+
+        uint64_t userTimeDelta = 0;
+        uint64_t systemTimeDelta = 0;
+        if (isMonitoringJank_ && runtime->stopwatch.isMonitoringJank()) {
+            // We were monitoring jank when we entered and we still are.
+            uint64_t userTimeEnd, systemTimeEnd;
+            if (!this->getTimes(runtime, &userTimeEnd, &systemTimeEnd)) {
+                // We make no attempt to recover from this error. If
+                // we bail out here, we lose nothing of value, plus
+                // I'm nearly sure that this error cannot happen in
+                // practice.
+                return;
+            }
+            userTimeDelta = userTimeEnd - userTimeStart_;
+            systemTimeDelta = systemTimeEnd - systemTimeStart_;
+        }
+
+        uint64_t CPOWTimeDelta = 0;
+        if (isMonitoringCPOW_ && runtime->stopwatch.isMonitoringCPOW()) {
+            // We were monitoring CPOW when we entered and we still are.
+            CPOWTimeDelta = runtime->stopwatch.performance.totalCPOWTime - CPOWTimeStart_;
+
+        }
+        commitDeltasToGroups(userTimeDelta, systemTimeDelta, CPOWTimeDelta);
+    }
+
+    void commitDeltasToGroups(uint64_t userTimeDelta,
+                              uint64_t systemTimeDelta,
+                              uint64_t CPOWTimeDelta)
+    {
+        JSCompartment* compartment = cx_->compartment();
+
+        PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx_);
+        MOZ_ASSERT(sharedGroup);
+        applyDeltas(userTimeDelta, systemTimeDelta, CPOWTimeDelta, sharedGroup->data);
+
+        if (isMonitoringForSelf_) {
+            PerformanceGroup* ownGroup = compartment->performanceMonitoring.getOwnGroup(cx_);
+            MOZ_ASSERT(ownGroup);
+            applyDeltas(userTimeDelta, systemTimeDelta, CPOWTimeDelta, ownGroup->data);
+        }
+
+        if (isMonitoringForTop_) {
+            JSRuntime* runtime = cx_->runtime();
+            applyDeltas(userTimeDelta, systemTimeDelta, CPOWTimeDelta, runtime->stopwatch.performance);
         }
     }
 
- private:
 
-    // Update an array containing the number of times we have missed
-    // at least 2^0 successive ms, 2^1 successive ms, ...
-    // 2^i successive ms.
-    template<int N>
-    void updateDurations(uint64_t totalTimeDelta, uint64_t (&array)[N]) const {
+    void applyDeltas(uint64_t userTimeDelta,
+                     uint64_t systemTimeDelta,
+                     uint64_t CPOWTimeDelta,
+                     PerformanceData& data) const {
+
+        data.ticks++;
+
+        uint64_t totalTimeDelta = userTimeDelta + systemTimeDelta;
+        data.totalUserTime += userTimeDelta;
+        data.totalSystemTime += systemTimeDelta;
+        data.totalCPOWTime += CPOWTimeDelta;
+
+        // Update an array containing the number of times we have missed
+        // at least 2^0 successive ms, 2^1 successive ms, ...
+        // 2^i successive ms.
+
         // Duration of one frame, i.e. 16ms in museconds
         size_t i = 0;
         uint64_t duration = 1000;
         for (i = 0, duration = 1000;
-             i < N && duration < totalTimeDelta;
-             ++i, duration *= 2) {
-            array[i]++;
+             i < ArrayLength(data.durations) && duration < totalTimeDelta;
+             ++i, duration *= 2)
+        {
+            data.durations[i]++;
         }
     }
 
@@ -585,31 +697,9 @@ struct AutoStopwatch final
         return true;
     }
 
-  private:
-    // The context with which this object was initialized.
-    // Non-null.
-    JSContext* const cx_;
 
-    // An indication of the number of times we have entered the event
-    // loop.  Used only for comparison.
-    uint64_t iteration_;
-
-    // `true` if this object is currently used to monitor performance,
-    // `false` otherwise, i.e. if the stopwatch mechanism is off or if
-    // another stopwatch is already in charge of monitoring for the
-    // same PerformanceGroup.
-    bool isActive_;
-
-    // `true` if this stopwatch is the topmost stopwatch on the stack
-    // for this event, `false` otherwise.
-    bool isTop_;
-
-    // Timestamps captured while starting the stopwatch.
-    uint64_t userTimeStart_;
-    uint64_t systemTimeStart_;
-    uint64_t CPOWTimeStart_;
-
-    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+private:
+    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER;
 };
 
 } // namespace js
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index 15e7c7b9301..522835c3209 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -899,6 +899,17 @@ js::GetStopwatchIsMonitoringCPOW(JSRuntime* rt)
     return rt->stopwatch.isMonitoringCPOW();
 }
 
+bool
+js::SetStopwatchIsMonitoringPerCompartment(JSRuntime* rt, bool value)
+{
+    return rt->stopwatch.setIsMonitoringPerCompartment(value);
+}
+bool
+js::GetStopwatchIsMonitoringPerCompartment(JSRuntime* rt)
+{
+    return rt->stopwatch.isMonitoringPerCompartment();
+}
+
 js::PerformanceGroupHolder::~PerformanceGroupHolder()
 {
     unlink();
@@ -918,13 +929,18 @@ js::PerformanceGroupHolder::getHashKey(JSContext* cx)
 void
 js::PerformanceGroupHolder::unlink()
 {
-    if (!group_) {
+    if (ownGroup_) {
+        js_delete(ownGroup_);
+        ownGroup_ = nullptr;
+    }
+
+    if (!sharedGroup_) {
         // The group has never been instantiated.
         return;
     }
 
-    js::PerformanceGroup* group = group_;
-    group_ = nullptr;
+    js::PerformanceGroup* group = sharedGroup_;
+    sharedGroup_ = nullptr;
 
     if (group->decRefCount() > 0) {
         // The group has at least another owner.
@@ -933,32 +949,51 @@ js::PerformanceGroupHolder::unlink()
 
 
     JSRuntime::Stopwatch::Groups::Ptr ptr =
-        runtime_->stopwatch.groups_.lookup(group->key_);
+        runtime_->stopwatch.groups().lookup(group->key_);
     MOZ_ASSERT(ptr);
-    runtime_->stopwatch.groups_.remove(ptr);
+    runtime_->stopwatch.groups().remove(ptr);
     js_delete(group);
 }
 
 PerformanceGroup*
-js::PerformanceGroupHolder::getGroup(JSContext* cx)
+js::PerformanceGroupHolder::getOwnGroup(JSContext* cx)
 {
-    if (group_)
-        return group_;
+    if (ownGroup_)
+        return ownGroup_;
+
+    ownGroup_ = runtime_->new_<PerformanceGroup>(cx, nullptr);
+    return ownGroup_;
+}
+
+PerformanceGroup*
+js::PerformanceGroupHolder::getSharedGroup(JSContext* cx)
+{
+    if (sharedGroup_)
+        return sharedGroup_;
+
+    if (!runtime_->stopwatch.groups().initialized())
+        return nullptr;
 
     void* key = getHashKey(cx);
-    JSRuntime::Stopwatch::Groups::AddPtr ptr =
-        runtime_->stopwatch.groups_.lookupForAdd(key);
+    JSRuntime::Stopwatch::Groups::AddPtr ptr = runtime_->stopwatch.groups().lookupForAdd(key);
     if (ptr) {
-        group_ = ptr->value();
-        MOZ_ASSERT(group_);
+        sharedGroup_ = ptr->value();
+        MOZ_ASSERT(sharedGroup_);
     } else {
-        group_ = runtime_->new_<PerformanceGroup>(cx, key);
-        runtime_->stopwatch.groups_.add(ptr, key, group_);
+        sharedGroup_ = runtime_->new_<PerformanceGroup>(cx, key);
+        if (!sharedGroup_)
+            return nullptr;
+
+        if (!runtime_->stopwatch.groups().add(ptr, key, sharedGroup_)) {
+            js_delete(sharedGroup_);
+            sharedGroup_ = nullptr;
+            return nullptr;
+        }
     }
 
-    group_->incRefCount();
+    sharedGroup_->incRefCount();
 
-    return group_;
+    return sharedGroup_;
 }
 
 PerformanceData*
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 0e72361fd48..36f9375c5f3 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -1483,6 +1483,29 @@ struct JSRuntime : public JS::shadow::Runtime,
        Performance measurements
        ------------------------------------------ */
     struct Stopwatch {
+        /**
+         * A map used to collapse compartments belonging to the same
+         * add-on (respectively to the same webpage, to the platform)
+         * into a single group.
+         *
+         * Keys: for system compartments, a `JSAddonId*` (which may be
+         * `nullptr`), and for webpages, a `JSPrincipals*` (which may
+         * not). Note that compartments may start as non-system
+         * compartments and become compartments later during their
+         * lifetime, which requires an invalidation.
+         *
+         * This map is meant to be accessed only by instances of
+         * PerformanceGroupHolder, which handle both reference-counting
+         * of the values and invalidation of the key/value pairs.
+         */
+        typedef js::HashMap<void*, js::PerformanceGroup*,
+                            js::DefaultHasher<void*>,
+                            js::SystemAllocPolicy> Groups;
+
+        Groups& groups() {
+            return groups_;
+        }
+
         /**
          * The number of times we have entered the event loop.
          * Used to reset counters whenever we enter the loop,
@@ -1523,6 +1546,7 @@ struct JSRuntime : public JS::shadow::Runtime,
           , currentPerfGroupCallback(nullptr)
           , isMonitoringJank_(false)
           , isMonitoringCPOW_(false)
+          , isMonitoringPerCompartment_(false)
           , idCounter_(0)
         { }
 
@@ -1564,6 +1588,21 @@ struct JSRuntime : public JS::shadow::Runtime,
             return isMonitoringJank_;
         }
 
+        bool setIsMonitoringPerCompartment(bool value) {
+            if (isMonitoringPerCompartment_ != value)
+                reset();
+
+            if (value && !groups_.initialized()) {
+                if (!groups_.init(128))
+                    return false;
+            }
+
+            isMonitoringPerCompartment_ = value;
+            return true;
+        }
+        bool isMonitoringPerCompartment() const {
+            return isMonitoringPerCompartment_;
+        }
 
         /**
          * Activate/deactivate stopwatch measurement of CPOW.
@@ -1607,25 +1646,6 @@ struct JSRuntime : public JS::shadow::Runtime,
         MonotonicTimeStamp userTimeFix;
 
     private:
-        /**
-         * A map used to collapse compartments belonging to the same
-         * add-on (respectively to the same webpage, to the platform)
-         * into a single group.
-         *
-         * Keys: for system compartments, a `JSAddonId*` (which may be
-         * `nullptr`), and for webpages, a `JSPrincipals*` (which may
-         * not). Note that compartments may start as non-system
-         * compartments and become compartments later during their
-         * lifetime, which requires an invalidation.
-         *
-         * This map is meant to be accessed only by instances of
-         * PerformanceGroupHolder, which handle both reference-counting
-         * of the values and invalidation of the key/value pairs.
-         */
-        typedef js::HashMap<void*, js::PerformanceGroup*,
-                            js::DefaultHasher<void*>,
-                            js::SystemAllocPolicy> Groups;
-
         Groups groups_;
         friend struct js::PerformanceGroupHolder;
 
@@ -1634,6 +1654,7 @@ struct JSRuntime : public JS::shadow::Runtime,
          */
         bool isMonitoringJank_;
         bool isMonitoringCPOW_;
+        bool isMonitoringPerCompartment_;
 
         /**
          * A counter used to generate unique identifiers for groups.
diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
index 960b238ab04..0d94913caf2 100644
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
+++ b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
@@ -234,6 +234,24 @@ nsPerformanceSnapshot::GetWindowData(JSContext* cx,
 
   doc->GetTitle(title);
   *windowId = ptop->WindowID();
+
+  *memoryUsed = -1;
+  int64_t jsObjectsSize;
+  int64_t jsStringsSize;
+  int64_t jsOtherSize;
+  int64_t domSize;
+  int64_t styleSize;
+  int64_t otherSize;
+  double jsMilliseconds;
+  double nonJSMilliseconds;
+  nsCOMPtr<nsIMemoryReporterManager> manager = nsMemoryReporterManager::GetOrCreate();
+  if (!manager) {
+    return;
+  }
+  nsresult rv = manager->GetSizeOfTab(top, &jsObjectsSize, &jsStringsSize, &jsOtherSize, &domSize, &styleSize, memoryUsed);
+  if (NS_FAILED(rv)) {
+    *memoryUsed = -1;
+  }
 }
 
 /* static */ void

From 477a2a56f57b6c62db4e896909eed8470387326e Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Fri, 12 Jun 2015 21:52:06 +0200
Subject: [PATCH 14/20] Bug 1147664 - Detailed mode for PerformanceStats
 (high-level). r=mossop

---
 .../perfmonitoring/PerformanceStats.jsm       |  75 ++++++++--
 .../perfmonitoring/nsIPerformanceStats.idl    |  23 +++-
 .../perfmonitoring/nsPerformanceStats.cpp     | 129 +++++++++++++-----
 .../tests/browser/browser_compartments.js     |  26 +++-
 .../tests/xpcshell/test_compartments.js       |  51 +++++--
 5 files changed, 244 insertions(+), 60 deletions(-)

diff --git a/toolkit/components/perfmonitoring/PerformanceStats.jsm b/toolkit/components/perfmonitoring/PerformanceStats.jsm
index 6b2ca3e57db..b97878c419f 100644
--- a/toolkit/components/perfmonitoring/PerformanceStats.jsm
+++ b/toolkit/components/perfmonitoring/PerformanceStats.jsm
@@ -146,6 +146,16 @@ Probe.prototype = {
     return this._impl.subtract(a, b);
   },
 
+  importChildren: function(parent, children) {
+    if (!Array.isArray(children)) {
+      throw new TypeError();
+    }
+    if (!parent || !(parent instanceof PerformanceData)) {
+      throw new TypeError();
+    }
+    return this._impl.importChildren(parent, children);
+  },
+
   /**
    * The name of the probe.
    */
@@ -228,7 +238,8 @@ let Probes = {
       }
       result.longestDuration = lastNonZero(result.durations);
       return result;
-    }
+    },
+    importChildren: function() { /* nothing to do */ },
   }),
 
   /**
@@ -258,7 +269,8 @@ let Probes = {
       return {
         totalCPOWTime: a.totalCPOWTime - b.totalCPOWTime
       };
-    }
+    },
+    importChildren: function() { /* nothing to do */ },
   }),
 
   /**
@@ -287,7 +299,8 @@ let Probes = {
       return {
         ticks: a.ticks - b.ticks
       };
-    }
+    },
+    importChildren: function() { /* nothing to do */ },
   }),
 
   "jank-content": new Probe("jank-content", {
@@ -299,7 +312,6 @@ let Probes = {
       } else {
         Process.broadcast("release", ["jank"]);
       }
-    },
     get isActive() {
       return this._isActive;
     },
@@ -323,7 +335,6 @@ let Probes = {
       } else {
         Process.broadcast("release", ["cpow"]);
       }
-    },
     get isActive() {
       return this._isActive;
     },
@@ -339,11 +350,16 @@ let Probes = {
   }),
 
   "ticks-content": new Probe("ticks-content", {
+    _isActive: false,
     set isActive(x) {
-      // Ignore: This probe is always active.
-    },
+      this._isActive = x;
+      if (x) {
+        Process.broadcast("acquire", ["ticks"]);
+      } else {
+        Process.broadcast("release", ["ticks"]);
+      }
     get isActive() {
-      return true;
+      return this._isActive;
     },
     extract: function(xpcom) {
       return {};
@@ -355,6 +371,27 @@ let Probes = {
       return null;
     }
   }),
+
+  compartments: new Probe("compartments", {
+    set isActive(x) {
+      performanceStatsService.isMonitoringPerCompartment = x;
+    },
+    get isActive() {
+      return performanceStatsService.isMonitoringPerCompartment;
+    },
+    extract: function(xpcom) {
+      return null;
+    },
+    isEqual: function(a, b) {
+      return true;
+    },
+    subtract: function(a, b) {
+      return true;
+    },
+    importChildren: function(parent, children) {
+      parent.children = children;
+    },
+  })
 };
 
 
@@ -657,16 +694,32 @@ function PerformanceDiff(current, old = null) {
 function Snapshot({xpcom, childProcesses, probes}) {
   this.componentsData = [];
 
-  // Parent process
+  // Current process
   if (xpcom) {
+    let children = new Map();
     let enumeration = xpcom.getComponentsData().enumerate();
     while (enumeration.hasMoreElements()) {
       let xpcom = enumeration.getNext().QueryInterface(Ci.nsIPerformanceStats);
-      this.componentsData.push(new PerformanceData({xpcom, probes}));
+      let stat = new PerformanceData({xpcom, probes});
+      if (!stat.parentId) {
+        this.componentsData.push(stat);
+      } else {
+        let siblings = children.get(stat.parentId);
+        if (!siblings) {
+          children.set(stat.parentId, (siblings = []));
+        }
+        siblings.push(stat);
+      }
+    }
+
+    for (let parent of this.componentsData) {
+      for (let probe of probes) {
+        probe.importChildren(parent, children.get(parent.groupId) || []);
+      }
     }
   }
 
-  // Content processes
+  // Child processes
   if (childProcesses) {
     for (let {componentsData} of childProcesses) {
       // We are only interested in `componentsData` for the time being.
diff --git a/toolkit/components/perfmonitoring/nsIPerformanceStats.idl b/toolkit/components/perfmonitoring/nsIPerformanceStats.idl
index 272178e253d..dc1d11ba84a 100644
--- a/toolkit/components/perfmonitoring/nsIPerformanceStats.idl
+++ b/toolkit/components/perfmonitoring/nsIPerformanceStats.idl
@@ -17,12 +17,12 @@
 
 /**
  * Snapshot of the performance of a component, e.g. an add-on, a web
- * page, system built-ins, or the entire process itself.
+ * page, system built-ins, a module or the entire process itself.
  *
  * All values are monotonic and are updated only when
  * `nsIPerformanceStatsService.isStopwatchActive` is `true`.
  */
-[scriptable, uuid(47f8d36d-1d67-43cb-befd-d2f4720ac568)]
+[scriptable, uuid(1bc2d016-e9ae-4186-97c6-9478eddda245)]
 interface nsIPerformanceStats: nsISupports {
   /**
    * An identifier unique to the component.
@@ -32,6 +32,16 @@ interface nsIPerformanceStats: nsISupports {
    */
   readonly attribute AString groupId;
 
+  /**
+   * If this component is part of a larger component, the larger
+   * component. Otherwise, null.
+   *
+   * As of this writing, there can be at most two levels of components:
+   * - compartments (a single module, iframe, etc.);
+   * - groups (an entire add-on, an entire webpage, etc.).
+   */
+  readonly attribute AString parentId;
+
   /**
    * The name of the component:
    * - for the process itself, "<process>";
@@ -112,7 +122,7 @@ interface nsIPerformanceSnapshot: nsISupports {
   nsIPerformanceStats getProcessData();
 };
 
-[scriptable, builtinclass, uuid(0469e6af-95c3-4961-a385-4bc009128939)]
+[scriptable, builtinclass, uuid(60973d54-13e2-455c-a3c6-84dea5dfc8b9)]
 interface nsIPerformanceStatsService : nsISupports {
   /**
    * `true` if we should monitor CPOW, `false` otherwise.
@@ -124,6 +134,13 @@ interface nsIPerformanceStatsService : nsISupports {
    */
   [implicit_jscontext] attribute bool isMonitoringJank;
 
+  /**
+   * `true` if all compartments need to be monitored individually,
+   * `false` if only performance groups (i.e. entire add-ons, entire
+   * webpages, etc.) need to be monitored.
+   */
+  [implicit_jscontext] attribute bool isMonitoringPerCompartment;
+
   /**
    * Capture a snapshot of the performance data.
    */
diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
index 0d94913caf2..16ddfe28ae3 100644
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
+++ b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
@@ -30,6 +30,7 @@
 class nsPerformanceStats: public nsIPerformanceStats {
 public:
   nsPerformanceStats(const nsAString& aName,
+                     nsIPerformanceStats* aParent,
                      const nsAString& aGroupId,
                      const nsAString& aAddonId,
                      const nsAString& aTitle,
@@ -44,6 +45,10 @@ public:
     , mIsSystem(aIsSystem)
     , mPerformanceData(aPerformanceData)
   {
+    if (aParent) {
+      mozilla::DebugOnly<nsresult> rv = aParent->GetGroupId(mParentId);
+      MOZ_ASSERT(NS_SUCCEEDED(rv));
+    }
   }
   explicit nsPerformanceStats() {}
 
@@ -61,6 +66,12 @@ public:
     return NS_OK;
   };
 
+  /* readonly attribute AString parentId; */
+  NS_IMETHOD GetParentId(nsAString& aParentId) override {
+    aParentId.Assign(mParentId);
+    return NS_OK;
+  };
+
   /* readonly attribute AString addonId; */
   NS_IMETHOD GetAddonId(nsAString& aAddonId) override {
     aAddonId.Assign(mAddonId);
@@ -124,6 +135,7 @@ public:
 
 private:
   nsString mName;
+  nsString mParentId;
   nsString mGroupId;
   nsString mAddonId;
   nsString mTitle;
@@ -159,13 +171,18 @@ private:
    * entire process, rather than the statistics for a specific set of
    * compartments.
    */
-  already_AddRefed<nsIPerformanceStats> ImportStats(JSContext* cx, const js::PerformanceData& data, uint64_t uid);
+  already_AddRefed<nsIPerformanceStats> ImportStats(JSContext* cx, const js::PerformanceData& data, uint64_t uid, nsIPerformanceStats* parent);
 
   /**
    * Callbacks for iterating through the `PerformanceStats` of a runtime.
    */
-  bool IterPerformanceStatsCallbackInternal(JSContext* cx, const js::PerformanceData& stats, uint64_t uid);
-  static bool IterPerformanceStatsCallback(JSContext* cx, const js::PerformanceData& stats, uint64_t uid, void* self);
+  bool IterPerformanceStatsCallbackInternal(JSContext* cx,
+                                            const js::PerformanceData& ownStats, const uint64_t ownId,
+                                            const uint64_t* parentId);
+  static bool IterPerformanceStatsCallback(JSContext* cx,
+                                           const js::PerformanceData& ownStats, const uint64_t ownId,
+                                           const uint64_t* parentId,
+                                           void* self);
 
   // If the context represents a window, extract the title and window ID.
   // Otherwise, extract "" and 0.
@@ -175,6 +192,11 @@ private:
   void GetGroupId(JSContext*,
                   uint64_t uid,
                   nsString& groupId);
+
+  static void GetName(JSContext*,
+                      JS::Handle<JSObject*> global,
+                      nsString& name);
+
   // If the context presents an add-on, extract the addon ID.
   // Otherwise, extract "".
   static void GetAddonId(JSContext*,
@@ -188,6 +210,7 @@ private:
 private:
   nsCOMArray<nsIPerformanceStats> mComponentsData;
   nsCOMPtr<nsIPerformanceStats> mProcessData;
+  nsBaseHashtable<nsUint64HashKey, nsCOMPtr<nsIPerformanceStats>, nsCOMPtr<nsIPerformanceStats> > mCachedStats;
   uint64_t mProcessId;
 };
 
@@ -234,24 +257,6 @@ nsPerformanceSnapshot::GetWindowData(JSContext* cx,
 
   doc->GetTitle(title);
   *windowId = ptop->WindowID();
-
-  *memoryUsed = -1;
-  int64_t jsObjectsSize;
-  int64_t jsStringsSize;
-  int64_t jsOtherSize;
-  int64_t domSize;
-  int64_t styleSize;
-  int64_t otherSize;
-  double jsMilliseconds;
-  double nonJSMilliseconds;
-  nsCOMPtr<nsIMemoryReporterManager> manager = nsMemoryReporterManager::GetOrCreate();
-  if (!manager) {
-    return;
-  }
-  nsresult rv = manager->GetSizeOfTab(top, &jsObjectsSize, &jsStringsSize, &jsOtherSize, &domSize, &styleSize, memoryUsed);
-  if (NS_FAILED(rv)) {
-    *memoryUsed = -1;
-  }
 }
 
 /* static */ void
@@ -291,8 +296,44 @@ nsPerformanceSnapshot::GetIsSystem(JSContext*,
   return nsContentUtils::IsSystemPrincipal(nsContentUtils::ObjectPrincipal(global));
 }
 
+/* static */
+void
+nsPerformanceSnapshot::GetName(JSContext* cx,
+                               JS::Handle<JSObject*> global,
+                               nsString& name)
+{
+  nsAutoCString cname;
+  do {
+    // Attempt to use the URL as name.
+    nsCOMPtr<nsIPrincipal> principal = nsContentUtils::ObjectPrincipal(global);
+    if (!principal) {
+      break;
+    }
+
+    nsCOMPtr<nsIURI> uri;
+    nsresult rv = principal->GetURI(getter_AddRefs(uri));
+    if (NS_FAILED(rv) || !uri) {
+      break;
+    }
+
+    rv = uri->GetSpec(cname);
+    if (NS_FAILED(rv)) {
+      break;
+    }
+
+    name.Assign(NS_ConvertUTF8toUTF16(cname));
+    return;
+  } while(false);
+  xpc::GetCurrentCompartmentName(cx, cname);
+  name.Assign(NS_ConvertUTF8toUTF16(cname));
+}
+
 already_AddRefed<nsIPerformanceStats>
-nsPerformanceSnapshot::ImportStats(JSContext* cx, const js::PerformanceData& performance, const uint64_t uid) {
+nsPerformanceSnapshot::ImportStats(JSContext* cx, const js::PerformanceData& performance, const uint64_t uid, nsIPerformanceStats* parent) {
+  if (performance.ticks == 0) {
+    // Ignore compartments with no activity.
+    return nullptr;
+  }
   JS::RootedObject global(cx, JS::CurrentGlobalOrNull(cx));
 
   if (!global) {
@@ -311,28 +352,34 @@ nsPerformanceSnapshot::ImportStats(JSContext* cx, const js::PerformanceData& per
   uint64_t windowId;
   GetWindowData(cx, title, &windowId);
 
-  nsAutoString name;
-  nsAutoCString cname;
-  xpc::GetCurrentCompartmentName(cx, cname);
-  name.Assign(NS_ConvertUTF8toUTF16(cname));
+  nsString name;
+  GetName(cx, global, name);
 
   bool isSystem = GetIsSystem(cx, global);
 
   nsCOMPtr<nsIPerformanceStats> result =
-    new nsPerformanceStats(name, groupId, addonId, title, windowId, isSystem, performance);
+    new nsPerformanceStats(name, parent, groupId, addonId, title, windowId, isSystem, performance);
   return result.forget();
 }
 
 /*static*/ bool
-nsPerformanceSnapshot::IterPerformanceStatsCallback(JSContext* cx, const js::PerformanceData& stats, const uint64_t uid, void* self) {
-  return reinterpret_cast<nsPerformanceSnapshot*>(self)->IterPerformanceStatsCallbackInternal(cx, stats, uid);
+nsPerformanceSnapshot::IterPerformanceStatsCallback(JSContext* cx,
+                                                    const js::PerformanceData& stats, const uint64_t id,
+                                                    const uint64_t* parentId,
+                                                    void* self) {
+  return reinterpret_cast<nsPerformanceSnapshot*>(self)->IterPerformanceStatsCallbackInternal(cx, stats, id, parentId);
 }
 
 bool
-nsPerformanceSnapshot::IterPerformanceStatsCallbackInternal(JSContext* cx, const js::PerformanceData& stats, const uint64_t uid) {
-  nsCOMPtr<nsIPerformanceStats> result = ImportStats(cx, stats, uid);
+nsPerformanceSnapshot::IterPerformanceStatsCallbackInternal(JSContext* cx,
+                                                            const js::PerformanceData& stats, const uint64_t id,
+                                                            const uint64_t* parentId) {
+
+  nsCOMPtr<nsIPerformanceStats> parent = parentId ? mCachedStats.Get(*parentId) : nullptr;
+  nsCOMPtr<nsIPerformanceStats> result = ImportStats(cx, stats, id, parent);
   if (result) {
     mComponentsData.AppendElement(result);
+    mCachedStats.Put(id, result);
   }
 
   return true;
@@ -346,8 +393,12 @@ nsPerformanceSnapshot::Init(JSContext* cx, uint64_t processId) {
     return NS_ERROR_UNEXPECTED;
   }
 
+  nsAutoString processGroupId;
+  processGroupId.AssignLiteral("process: ");
+  processGroupId.AppendInt(processId);
   mProcessData = new nsPerformanceStats(NS_LITERAL_STRING("<process>"), // name
-                                        NS_LITERAL_STRING("<process:?>"), // group id
+                                        nullptr,                        // parent
+                                        processGroupId,                 // group id
                                         NS_LITERAL_STRING(""),          // add-on id
                                         NS_LITERAL_STRING(""),          // title
                                         0,                              // window id
@@ -423,6 +474,20 @@ NS_IMETHODIMP nsPerformanceStatsService::SetIsMonitoringJank(JSContext* cx, bool
   }
   return NS_OK;
 }
+NS_IMETHODIMP nsPerformanceStatsService::GetIsMonitoringPerCompartment(JSContext* cx, bool *aIsStopwatchActive)
+{
+  JSRuntime *runtime = JS_GetRuntime(cx);
+  *aIsStopwatchActive = js::GetStopwatchIsMonitoringPerCompartment(runtime);
+  return NS_OK;
+}
+NS_IMETHODIMP nsPerformanceStatsService::SetIsMonitoringPerCompartment(JSContext* cx, bool aIsStopwatchActive)
+{
+  JSRuntime *runtime = JS_GetRuntime(cx);
+  if (!js::SetStopwatchIsMonitoringPerCompartment(runtime, aIsStopwatchActive)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return NS_OK;
+}
 
 /* readonly attribute nsIPerformanceSnapshot snapshot; */
 NS_IMETHODIMP nsPerformanceStatsService::GetSnapshot(JSContext* cx, nsIPerformanceSnapshot * *aSnapshot)
diff --git a/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js b/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
index 360b6a1f9b6..4492a4c55cf 100644
--- a/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
+++ b/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
@@ -28,7 +28,7 @@ function frameScript() {
       getService(Ci.nsIPerformanceStatsService);
 
     // Make sure that the stopwatch is now active.
-    let monitor = PerformanceStats.getMonitor(["jank", "cpow", "ticks"]);
+    let monitor = PerformanceStats.getMonitor(["jank", "cpow", "ticks", "compartments"]);
 
     addMessageListener("compartments-test:getStatistics", () => {
       try {
@@ -158,8 +158,10 @@ function monotinicity_tester(source, testName) {
         ["jank", "totalSystemTime"],
         ["cpow", "totalCPOWTime"]
       ]) {
-        SilentAssert.leq(item[probe][k], snapshot.processData[probe][k],
-          `Sanity check (${testName}): component has a lower ${k} than process`);
+        // Note that we cannot expect components data to be always smaller
+        // than process data, as `getrusage` & co are not monotonic.
+        SilentAssert.leq(item[probe][k], 2 * snapshot.processData[probe][k],
+          `Sanity check (${testName}): ${k} of component is not impossibly larger than that of process`);
       }
 
       let key = item.groupId;
@@ -169,6 +171,24 @@ function monotinicity_tester(source, testName) {
       }
       map.set(key, item);
     }
+    for (let item of snapshot.componentsData) {
+      if (!item.parentId) {
+        continue;
+      }
+      let parent = map.get(item.parentId);
+      SilentAssert.ok(parent, `The parent exists ${item.parentId}`);
+
+      for (let [probe, k] of [
+        ["jank", "totalUserTime"],
+        ["jank", "totalSystemTime"],
+        ["cpow", "totalCPOWTime"]
+      ]) {
+        // Note that we cannot expect components data to be always smaller
+        // than parent data, as `getrusage` & co are not monotonic.
+        SilentAssert.leq(item[probe][k], 2 * parent[probe][k],
+          `Sanity check (${testName}): ${k} of component is not impossibly larger than that of parent`);
+      }
+    }
     for (let [key, item] of map) {
       sanityCheck(previous.componentsMap.get(key), item);
       previous.componentsMap.set(key, item);
diff --git a/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js b/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js
index 44a10a08ba3..f4c7d562f38 100644
--- a/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js
+++ b/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js
@@ -19,10 +19,12 @@ let promiseStatistics = Task.async(function*(name) {
   let componentsData = [];
   let componentsEnum = snapshot.getComponentsData().enumerate();
   while (componentsEnum.hasMoreElements()) {
-    componentsData.push(componentsEnum.getNext().QueryInterface(Ci.nsIPerformanceStats));
+    let data = componentsEnum.getNext().QueryInterface(Ci.nsIPerformanceStats);
+    let normalized = JSON.parse(JSON.stringify(data));
+    componentsData.push(data);
   }
   return {
-    processData: snapshot.getProcessData(),
+    processData: JSON.parse(JSON.stringify(snapshot.getProcessData())),
     componentsData
   };
 });
@@ -35,11 +37,19 @@ let promiseSetMonitoring = Task.async(function*(to) {
   yield Promise.resolve();
 });
 
+let promiseSetPerCompartment = Task.async(function*(to) {
+  let service = Cc["@mozilla.org/toolkit/performance-stats-service;1"].
+    getService(Ci.nsIPerformanceStatsService);
+  service.isMonitoringPerCompartment = to;
+  yield Promise.resolve();
+});
+
 function getBuiltinStatistics(name, snapshot) {
   let stats = snapshot.componentsData.find(stats =>
     stats.isSystem && !stats.addonId
   );
   do_print(`Built-in statistics for ${name} were ${stats?"":"not "}found`);
+  do_print(JSON.stringify(snapshot.componentsData, null, "\t"));
   return stats;
 }
 
@@ -57,17 +67,25 @@ function burnCPU(ms) {
 }
 
 function ensureEquals(snap1, snap2, name) {
-  Assert.equal(
-    JSON.stringify(snap1.processData),
-    JSON.stringify(snap2.processData),
-    "Same process data: " + name);
+  for (let k of Object.keys(snap1.processData)) {
+    if (k == "ticks") {
+      // Ticks monitoring cannot be deactivated
+      continue;
+    }
+    Assert.equal(snap1.processData[k], snap2.processData[k], `Same process data value ${k} (${name})`)
+  }
   let stats1 = snap1.componentsData.sort((a, b) => a.name <= b.name);
   let stats2 = snap2.componentsData.sort((a, b) => a.name <= b.name);
-  Assert.equal(
-    JSON.stringify(stats1),
-    JSON.stringify(stats2),
-    "Same components data: " + name
-  );
+  Assert.equal(stats1.length, stats2.length, `Same number of components (${name})`);
+  for (let i = 0; i < stats1.length; ++i) {
+    for (let k of Object.keys(stats1[i])) {
+      if (k == "ticks") {
+        // Ticks monitoring cannot be deactivated
+        continue;
+      }
+      Assert.equal(stats1[i][k], stats1[i][k], `Same component data value ${i} ${k} (${name})`)
+    }
+  }
 }
 
 function hasLowPrecision() {
@@ -88,6 +106,7 @@ function hasLowPrecision() {
 
 add_task(function* test_measure() {
   let skipPrecisionTests = hasLowPrecision();
+  yield promiseSetPerCompartment(false);
 
   do_print("Burn CPU without the stopwatch");
   yield promiseSetMonitoring(false);
@@ -137,4 +156,14 @@ add_task(function* test_measure() {
   Assert.equal(builtin2.totalCPOWTime, builtin1.totalCPOWTime, "No CPOW for built-in statistics");
   Assert.equal(builtin4.totalUserTime, builtin3.totalUserTime, "After deactivating the stopwatch, we didn't count any time for the built-in");
   Assert.equal(builtin4.totalCPOWTime, builtin3.totalCPOWTime, "After deactivating the stopwatch, we didn't count any CPOW time for the built-in");
+
+  // Ideally, we should be able to look for test_compartments.js, but
+  // it doesn't have its own compartment.
+  for (let stats of [stats1, stats2, stats3, stats4]) {
+    Assert.ok(!stats.componentsData.find(x => x.name.includes("Task.jsm")), "At this stage, Task.jsm doesn't show up in the components data");
+  }
+  yield promiseSetPerCompartment(true);
+  burnCPU(300);
+  let stats5 = yield promiseStatistics("With per-compartment monitoring");
+  Assert.ok(stats5.componentsData.find(x => x.name.includes("Task.jsm")), "With per-compartment monitoring, test_compartments.js shows up");
 });

From ea36f00dd7b931d0f535f6215348e5711896502b Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 22 Jul 2015 16:35:39 +0100
Subject: [PATCH 15/20] Bug 1180179 - Part 2. Create a new shared media layout
 component. r=mikedeboer

---
 .../loop/content/shared/js/store.js           |   6 ++
 .../loop/content/shared/js/views.js           |  76 +++++++++++++
 .../loop/content/shared/js/views.jsx          |  76 +++++++++++++
 .../content/js/standaloneRoomViews.js         |  75 ++++---------
 .../content/js/standaloneRoomViews.jsx        |  75 ++++---------
 .../components/loop/test/shared/views_test.js | 101 ++++++++++++++++++
 .../loop/test/standalone/index.html           |   2 +-
 .../standalone/standaloneRoomViews_test.js    |   2 +-
 8 files changed, 303 insertions(+), 110 deletions(-)

diff --git a/browser/components/loop/content/shared/js/store.js b/browser/components/loop/content/shared/js/store.js
index e537d6d4256..20301cdcee4 100644
--- a/browser/components/loop/content/shared/js/store.js
+++ b/browser/components/loop/content/shared/js/store.js
@@ -143,5 +143,11 @@ loop.store.StoreMixin = (function() {
   StoreMixin.register = function(stores) {
     _.extend(_stores, stores);
   };
+  /**
+   * Used for test purposes, to clear the list of registered stores.
+   */
+  StoreMixin.clearRegisteredStores = function() {
+    _stores = {};
+  };
   return StoreMixin;
 })();
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 98c410de6b5..4384485bbcc 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -944,6 +944,81 @@ loop.shared.views = (function(_, mozL10n) {
     }
   });
 
+  var MediaLayoutView = React.createClass({displayName: "MediaLayoutView",
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      displayScreenShare: React.PropTypes.bool.isRequired,
+      isLocalLoading: React.PropTypes.bool.isRequired,
+      isRemoteLoading: React.PropTypes.bool.isRequired,
+      isScreenShareLoading: React.PropTypes.bool.isRequired,
+      // The poster URLs are for UI-showcase testing and development.
+      localPosterUrl: React.PropTypes.string,
+      localSrcVideoObject: React.PropTypes.object,
+      localVideoMuted: React.PropTypes.bool.isRequired,
+      remotePosterUrl: React.PropTypes.string,
+      remoteSrcVideoObject: React.PropTypes.object,
+      renderRemoteVideo: React.PropTypes.bool.isRequired,
+      screenSharePosterUrl: React.PropTypes.string,
+      screenShareVideoObject: React.PropTypes.object,
+      showContextRoomName: React.PropTypes.bool.isRequired,
+      useDesktopPaths: React.PropTypes.bool.isRequired
+    },
+
+    render: function() {
+      var remoteStreamClasses = React.addons.classSet({
+        "remote": true,
+        "focus-stream": !this.props.displayScreenShare
+      });
+
+      var screenShareStreamClasses = React.addons.classSet({
+        "screen": true,
+        "focus-stream": this.props.displayScreenShare
+      });
+
+      var mediaWrapperClasses = React.addons.classSet({
+        "media-wrapper": true,
+        "receiving-screen-share": this.props.displayScreenShare,
+        "showing-local-streams": this.props.localSrcVideoObject ||
+          this.props.localPosterUrl
+      });
+
+      return (
+        React.createElement("div", {className: "media-layout"}, 
+          React.createElement("div", {className: mediaWrapperClasses}, 
+            React.createElement("span", {className: "self-view-hidden-message"}, 
+              mozL10n.get("self_view_hidden_message")
+            ), 
+            React.createElement("div", {className: remoteStreamClasses}, 
+              React.createElement(MediaView, {displayAvatar: !this.props.renderRemoteVideo, 
+                isLoading: this.props.isRemoteLoading, 
+                mediaType: "remote", 
+                posterUrl: this.props.remotePosterUrl, 
+                srcVideoObject: this.props.remoteSrcVideoObject})
+            ), 
+            React.createElement("div", {className: screenShareStreamClasses}, 
+              React.createElement(MediaView, {displayAvatar: false, 
+                isLoading: this.props.isScreenShareLoading, 
+                mediaType: "screen-share", 
+                posterUrl: this.props.screenSharePosterUrl, 
+                srcVideoObject: this.props.screenShareVideoObject})
+            ), 
+            React.createElement(loop.shared.views.chat.TextChatView, {
+              dispatcher: this.props.dispatcher, 
+              showRoomName: this.props.showContextRoomName, 
+              useDesktopPaths: false}), 
+            React.createElement("div", {className: "local"}, 
+              React.createElement(MediaView, {displayAvatar: this.props.localVideoMuted, 
+                isLoading: this.props.isLocalLoading, 
+                mediaType: "local", 
+                posterUrl: this.props.localPosterUrl, 
+                srcVideoObject: this.props.localSrcVideoObject})
+            )
+          )
+        )
+      );
+    }
+  });
+
   return {
     AvatarView: AvatarView,
     Button: Button,
@@ -953,6 +1028,7 @@ loop.shared.views = (function(_, mozL10n) {
     ConversationView: ConversationView,
     ConversationToolbar: ConversationToolbar,
     MediaControlButton: MediaControlButton,
+    MediaLayoutView: MediaLayoutView,
     MediaView: MediaView,
     LoadingView: LoadingView,
     ScreenShareControlButton: ScreenShareControlButton,
diff --git a/browser/components/loop/content/shared/js/views.jsx b/browser/components/loop/content/shared/js/views.jsx
index 346fa038f5f..48442014ed3 100644
--- a/browser/components/loop/content/shared/js/views.jsx
+++ b/browser/components/loop/content/shared/js/views.jsx
@@ -944,6 +944,81 @@ loop.shared.views = (function(_, mozL10n) {
     }
   });
 
+  var MediaLayoutView = React.createClass({
+    propTypes: {
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      displayScreenShare: React.PropTypes.bool.isRequired,
+      isLocalLoading: React.PropTypes.bool.isRequired,
+      isRemoteLoading: React.PropTypes.bool.isRequired,
+      isScreenShareLoading: React.PropTypes.bool.isRequired,
+      // The poster URLs are for UI-showcase testing and development.
+      localPosterUrl: React.PropTypes.string,
+      localSrcVideoObject: React.PropTypes.object,
+      localVideoMuted: React.PropTypes.bool.isRequired,
+      remotePosterUrl: React.PropTypes.string,
+      remoteSrcVideoObject: React.PropTypes.object,
+      renderRemoteVideo: React.PropTypes.bool.isRequired,
+      screenSharePosterUrl: React.PropTypes.string,
+      screenShareVideoObject: React.PropTypes.object,
+      showContextRoomName: React.PropTypes.bool.isRequired,
+      useDesktopPaths: React.PropTypes.bool.isRequired
+    },
+
+    render: function() {
+      var remoteStreamClasses = React.addons.classSet({
+        "remote": true,
+        "focus-stream": !this.props.displayScreenShare
+      });
+
+      var screenShareStreamClasses = React.addons.classSet({
+        "screen": true,
+        "focus-stream": this.props.displayScreenShare
+      });
+
+      var mediaWrapperClasses = React.addons.classSet({
+        "media-wrapper": true,
+        "receiving-screen-share": this.props.displayScreenShare,
+        "showing-local-streams": this.props.localSrcVideoObject ||
+          this.props.localPosterUrl
+      });
+
+      return (
+        <div className="media-layout">
+          <div className={mediaWrapperClasses}>
+            <span className="self-view-hidden-message">
+              {mozL10n.get("self_view_hidden_message")}
+            </span>
+            <div className={remoteStreamClasses}>
+              <MediaView displayAvatar={!this.props.renderRemoteVideo}
+                isLoading={this.props.isRemoteLoading}
+                mediaType="remote"
+                posterUrl={this.props.remotePosterUrl}
+                srcVideoObject={this.props.remoteSrcVideoObject} />
+            </div>
+            <div className={screenShareStreamClasses}>
+              <MediaView displayAvatar={false}
+                isLoading={this.props.isScreenShareLoading}
+                mediaType="screen-share"
+                posterUrl={this.props.screenSharePosterUrl}
+                srcVideoObject={this.props.screenShareVideoObject} />
+            </div>
+            <loop.shared.views.chat.TextChatView
+              dispatcher={this.props.dispatcher}
+              showRoomName={this.props.showContextRoomName}
+              useDesktopPaths={false} />
+            <div className="local">
+              <MediaView displayAvatar={this.props.localVideoMuted}
+                isLoading={this.props.isLocalLoading}
+                mediaType="local"
+                posterUrl={this.props.localPosterUrl}
+                srcVideoObject={this.props.localSrcVideoObject} />
+            </div>
+          </div>
+        </div>
+      );
+    }
+  });
+
   return {
     AvatarView: AvatarView,
     Button: Button,
@@ -953,6 +1028,7 @@ loop.shared.views = (function(_, mozL10n) {
     ConversationView: ConversationView,
     ConversationToolbar: ConversationToolbar,
     MediaControlButton: MediaControlButton,
+    MediaLayoutView: MediaLayoutView,
     MediaView: MediaView,
     LoadingView: LoadingView,
     ScreenShareControlButton: ScreenShareControlButton,
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.js b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
index 9e139b9c4df..57c63121c7e 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -401,7 +401,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @returns {boolean}
      * @private
      */
-    _shouldRenderLocalLoading: function () {
+    _isLocalLoading: function () {
       return this.state.roomState === ROOM_STATES.MEDIA_WAIT &&
              !this.state.localSrcVideoObject;
     },
@@ -413,7 +413,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @returns {boolean}
      * @private
      */
-    _shouldRenderRemoteLoading: function() {
+    _isRemoteLoading: function() {
       return !!(this.state.roomState === ROOM_STATES.HAS_PARTICIPANTS &&
                 !this.state.remoteSrcVideoObject &&
                 !this.state.mediaConnected);
@@ -426,31 +426,14 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @returns {boolean}
      * @private
      */
-    _shouldRenderScreenShareLoading: function() {
+    _isScreenShareLoading: function() {
       return this.state.receivingScreenShare &&
              !this.state.screenShareVideoObject;
     },
 
     render: function() {
-      var displayScreenShare = this.state.receivingScreenShare ||
-        this.props.screenSharePosterUrl;
-
-      var remoteStreamClasses = React.addons.classSet({
-        "remote": true,
-        "focus-stream": !displayScreenShare
-      });
-
-      var screenShareStreamClasses = React.addons.classSet({
-        "screen": true,
-        "focus-stream": displayScreenShare
-      });
-
-      var mediaWrapperClasses = React.addons.classSet({
-        "media-wrapper": true,
-        "receiving-screen-share": displayScreenShare,
-        "showing-local-streams": this.state.localSrcVideoObject ||
-          this.props.localPosterUrl
-      });
+      var displayScreenShare = !!(this.state.receivingScreenShare ||
+        this.props.screenSharePosterUrl);
 
       return (
         React.createElement("div", {className: "room-conversation-wrapper standalone-room-wrapper"}, 
@@ -463,38 +446,22 @@ loop.standaloneRoomViews = (function(mozL10n) {
                                   joinRoom: this.joinRoom, 
                                   roomState: this.state.roomState, 
                                   roomUsed: this.state.used}), 
-          React.createElement("div", {className: "media-layout"}, 
-            React.createElement("div", {className: mediaWrapperClasses}, 
-              React.createElement("span", {className: "self-view-hidden-message"}, 
-                mozL10n.get("self_view_hidden_message")
-              ), 
-              React.createElement("div", {className: remoteStreamClasses}, 
-                React.createElement(sharedViews.MediaView, {displayAvatar: !this.shouldRenderRemoteVideo(), 
-                  isLoading: this._shouldRenderRemoteLoading(), 
-                  mediaType: "remote", 
-                  posterUrl: this.props.remotePosterUrl, 
-                  srcVideoObject: this.state.remoteSrcVideoObject})
-              ), 
-              React.createElement("div", {className: screenShareStreamClasses}, 
-                React.createElement(sharedViews.MediaView, {displayAvatar: false, 
-                  isLoading: this._shouldRenderScreenShareLoading(), 
-                  mediaType: "screen-share", 
-                  posterUrl: this.props.screenSharePosterUrl, 
-                  srcVideoObject: this.state.screenShareVideoObject})
-              ), 
-              React.createElement(sharedViews.chat.TextChatView, {
-                dispatcher: this.props.dispatcher, 
-                showRoomName: true, 
-                useDesktopPaths: false}), 
-              React.createElement("div", {className: "local"}, 
-                React.createElement(sharedViews.MediaView, {displayAvatar: this.state.videoMuted, 
-                  isLoading: this._shouldRenderLocalLoading(), 
-                  mediaType: "local", 
-                  posterUrl: this.props.localPosterUrl, 
-                  srcVideoObject: this.state.localSrcVideoObject})
-              )
-            )
-          ), 
+          React.createElement(sharedViews.MediaLayoutView, {
+            dispatcher: this.props.dispatcher, 
+            displayScreenShare: displayScreenShare, 
+            isLocalLoading: this._isLocalLoading(), 
+            isRemoteLoading: this._isRemoteLoading(), 
+            isScreenShareLoading: this._isScreenShareLoading(), 
+            localPosterUrl: this.props.localPosterUrl, 
+            localSrcVideoObject: this.state.localSrcVideoObject, 
+            localVideoMuted: this.state.videoMuted, 
+            remotePosterUrl: this.props.remotePosterUrl, 
+            remoteSrcVideoObject: this.state.remoteSrcVideoObject, 
+            renderRemoteVideo: this.shouldRenderRemoteVideo(), 
+            screenSharePosterUrl: this.props.screenSharePosterUrl, 
+            screenShareVideoObject: this.state.screenShareVideoObject, 
+            showContextRoomName: true, 
+            useDesktopPaths: false}), 
           React.createElement(sharedViews.ConversationToolbar, {
             audio: {enabled: !this.state.audioMuted,
                     visible: this._roomIsActive()}, 
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
index 2cc61164eb8..1b557af28ac 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -401,7 +401,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @returns {boolean}
      * @private
      */
-    _shouldRenderLocalLoading: function () {
+    _isLocalLoading: function () {
       return this.state.roomState === ROOM_STATES.MEDIA_WAIT &&
              !this.state.localSrcVideoObject;
     },
@@ -413,7 +413,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @returns {boolean}
      * @private
      */
-    _shouldRenderRemoteLoading: function() {
+    _isRemoteLoading: function() {
       return !!(this.state.roomState === ROOM_STATES.HAS_PARTICIPANTS &&
                 !this.state.remoteSrcVideoObject &&
                 !this.state.mediaConnected);
@@ -426,31 +426,14 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @returns {boolean}
      * @private
      */
-    _shouldRenderScreenShareLoading: function() {
+    _isScreenShareLoading: function() {
       return this.state.receivingScreenShare &&
              !this.state.screenShareVideoObject;
     },
 
     render: function() {
-      var displayScreenShare = this.state.receivingScreenShare ||
-        this.props.screenSharePosterUrl;
-
-      var remoteStreamClasses = React.addons.classSet({
-        "remote": true,
-        "focus-stream": !displayScreenShare
-      });
-
-      var screenShareStreamClasses = React.addons.classSet({
-        "screen": true,
-        "focus-stream": displayScreenShare
-      });
-
-      var mediaWrapperClasses = React.addons.classSet({
-        "media-wrapper": true,
-        "receiving-screen-share": displayScreenShare,
-        "showing-local-streams": this.state.localSrcVideoObject ||
-          this.props.localPosterUrl
-      });
+      var displayScreenShare = !!(this.state.receivingScreenShare ||
+        this.props.screenSharePosterUrl);
 
       return (
         <div className="room-conversation-wrapper standalone-room-wrapper">
@@ -463,38 +446,22 @@ loop.standaloneRoomViews = (function(mozL10n) {
                                   joinRoom={this.joinRoom}
                                   roomState={this.state.roomState}
                                   roomUsed={this.state.used} />
-          <div className="media-layout">
-            <div className={mediaWrapperClasses}>
-              <span className="self-view-hidden-message">
-                {mozL10n.get("self_view_hidden_message")}
-              </span>
-              <div className={remoteStreamClasses}>
-                <sharedViews.MediaView displayAvatar={!this.shouldRenderRemoteVideo()}
-                  isLoading={this._shouldRenderRemoteLoading()}
-                  mediaType="remote"
-                  posterUrl={this.props.remotePosterUrl}
-                  srcVideoObject={this.state.remoteSrcVideoObject} />
-              </div>
-              <div className={screenShareStreamClasses}>
-                <sharedViews.MediaView displayAvatar={false}
-                  isLoading={this._shouldRenderScreenShareLoading()}
-                  mediaType="screen-share"
-                  posterUrl={this.props.screenSharePosterUrl}
-                  srcVideoObject={this.state.screenShareVideoObject} />
-              </div>
-              <sharedViews.chat.TextChatView
-                dispatcher={this.props.dispatcher}
-                showRoomName={true}
-                useDesktopPaths={false} />
-              <div className="local">
-                <sharedViews.MediaView displayAvatar={this.state.videoMuted}
-                  isLoading={this._shouldRenderLocalLoading()}
-                  mediaType="local"
-                  posterUrl={this.props.localPosterUrl}
-                  srcVideoObject={this.state.localSrcVideoObject} />
-              </div>
-            </div>
-          </div>
+          <sharedViews.MediaLayoutView
+            dispatcher={this.props.dispatcher}
+            displayScreenShare={displayScreenShare}
+            isLocalLoading={this._isLocalLoading()}
+            isRemoteLoading={this._isRemoteLoading()}
+            isScreenShareLoading={this._isScreenShareLoading()}
+            localPosterUrl={this.props.localPosterUrl}
+            localSrcVideoObject={this.state.localSrcVideoObject}
+            localVideoMuted={this.state.videoMuted}
+            remotePosterUrl={this.props.remotePosterUrl}
+            remoteSrcVideoObject={this.state.remoteSrcVideoObject}
+            renderRemoteVideo={this.shouldRenderRemoteVideo()}
+            screenSharePosterUrl={this.props.screenSharePosterUrl}
+            screenShareVideoObject={this.state.screenShareVideoObject}
+            showContextRoomName={true}
+            useDesktopPaths={false} />
           <sharedViews.ConversationToolbar
             audio={{enabled: !this.state.audioMuted,
                     visible: this._roomIsActive()}}
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index 06cbc44fcdc..546a586d0b9 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -50,6 +50,7 @@ describe("loop.shared.views", function() {
   });
 
   afterEach(function() {
+    loop.store.StoreMixin.clearRegisteredStores();
     sandbox.restore();
   });
 
@@ -1044,4 +1045,104 @@ describe("loop.shared.views", function() {
       });
     });
   });
+
+  describe("MediaLayoutView", function() {
+    var textChatStore, view;
+
+    function mountTestComponent(extraProps) {
+      var defaultProps = {
+        dispatcher: dispatcher,
+        displayScreenShare: false,
+        isLocalLoading: false,
+        isRemoteLoading: false,
+        isScreenShareLoading: false,
+        localVideoMuted: false,
+        renderRemoteVideo: false,
+        showContextRoomName: false,
+        useDesktopPaths: false
+      };
+
+      return TestUtils.renderIntoDocument(
+        React.createElement(sharedViews.MediaLayoutView,
+          _.extend(defaultProps, extraProps)));
+    }
+
+    beforeEach(function() {
+      textChatStore = new loop.store.TextChatStore(dispatcher, {
+        sdkDriver: {}
+      });
+
+      loop.store.StoreMixin.register({textChatStore: textChatStore});
+    });
+
+    it("should mark the remote stream as the focus stream when not displaying screen share", function() {
+      view = mountTestComponent({
+        displayScreenShare: false
+      });
+
+      var node = view.getDOMNode();
+
+      expect(node.querySelector(".remote").classList.contains("focus-stream")).eql(true);
+      expect(node.querySelector(".screen").classList.contains("focus-stream")).eql(false);
+    });
+
+    it("should mark the screen share stream as the focus stream when displaying screen share", function() {
+      view = mountTestComponent({
+        displayScreenShare: true
+      });
+
+      var node = view.getDOMNode();
+
+      expect(node.querySelector(".remote").classList.contains("focus-stream")).eql(false);
+      expect(node.querySelector(".screen").classList.contains("focus-stream")).eql(true);
+    });
+
+    it("should not mark the wrapper as receiving screen share when not displaying a screen share", function() {
+      view = mountTestComponent({
+        displayScreenShare: false
+      });
+
+      expect(view.getDOMNode().querySelector(".media-wrapper")
+        .classList.contains("receiving-screen-share")).eql(false);
+    });
+
+    it("should mark the wrapper as receiving screen share when displaying a screen share", function() {
+      view = mountTestComponent({
+        displayScreenShare: true
+      });
+
+      expect(view.getDOMNode().querySelector(".media-wrapper")
+        .classList.contains("receiving-screen-share")).eql(true);
+    });
+
+    it("should not mark the wrapper as showing local streams when not displaying a stream", function() {
+      view = mountTestComponent({
+        localSrcVideoObject: null,
+        localPosterUrl: null
+      });
+
+      expect(view.getDOMNode().querySelector(".media-wrapper")
+        .classList.contains("showing-local-streams")).eql(false);
+    });
+
+    it("should mark the wrapper as showing local streams when displaying a stream", function() {
+      view = mountTestComponent({
+        localSrcVideoObject: {},
+        localPosterUrl: null
+      });
+
+      expect(view.getDOMNode().querySelector(".media-wrapper")
+        .classList.contains("showing-local-streams")).eql(true);
+    });
+
+    it("should mark the wrapper as showing local streams when displaying a poster url", function() {
+      view = mountTestComponent({
+        localSrcVideoObject: {},
+        localPosterUrl: "fake/url"
+      });
+
+      expect(view.getDOMNode().querySelector(".media-wrapper")
+        .classList.contains("showing-local-streams")).eql(true);
+    });
+  });
 });
diff --git a/browser/components/loop/test/standalone/index.html b/browser/components/loop/test/standalone/index.html
index bbec590c3ce..08ffebc438c 100644
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -85,7 +85,7 @@
 
     describe("Unexpected Warnings Check", function() {
       it("should long only the warnings we expect", function() {
-        chai.expect(caughtWarnings.length).to.eql(11);
+        chai.expect(caughtWarnings.length).to.eql(10);
       });
     });
 
diff --git a/browser/components/loop/test/standalone/standaloneRoomViews_test.js b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
index 3bf177c43e3..5514c6cb17c 100644
--- a/browser/components/loop/test/standalone/standaloneRoomViews_test.js
+++ b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
@@ -431,7 +431,7 @@ describe("loop.standaloneRoomViews", function() {
           "remoteSrcVideoObject is false, mediaConnected is true", function() {
           activeRoomStore.setStoreState({
             roomState: ROOM_STATES.HAS_PARTICIPANTS,
-            remoteSrcVideoObject: false,
+            remoteSrcVideoObject: null,
             remoteVideoEnabled: false,
             mediaConnected: true
           });

From 325f491709c954aa6661b8f71eb14ecda42a0606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 22 Jul 2015 18:11:34 +0200
Subject: [PATCH 16/20] Bug 1185362 - Fix and consolidate margin and padding
 styling around the identity block. r=paolo

---
 browser/themes/linux/browser.css              | 64 ++---------------
 browser/themes/linux/searchbar.css            |  7 +-
 browser/themes/osx/browser.css                | 70 ++++---------------
 .../identity-block/identity-block.inc.css     | 44 ++++++++++++
 browser/themes/windows/browser.css            | 69 ++----------------
 5 files changed, 69 insertions(+), 185 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 7670a2ac62f..e95f2a2dcd2 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -19,6 +19,8 @@
 %define conditionalForwardWithUrlbarWidth 30
 
 :root {
+  --backbutton-urlbar-overlap: 5px;
+
   --toolbarbutton-hover-background: hsla(0,0%,100%,.3) linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.2));
   --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0,0%,100%,.3) inset, 0 0 0 1px hsla(0,0%,100%,.2) inset, 0 1px 0 hsla(0,0%,0%,.03);
   --toolbarbutton-hover-bordercolor: rgb(154,154,154);
@@ -846,7 +848,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 1px;
+  padding: 0;
   border: 1px solid ThreeDShadow;
   border-radius: 2px;
   margin: 0 3px;
@@ -895,7 +897,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 
 @conditionalForwardWithUrlbar@ {
   clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");
-  -moz-margin-start: -5px;
+  margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap));
 }
 
 @conditionalForwardWithUrlbar@:-moz-locale-dir(rtl),
@@ -973,14 +975,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 
 /* identity box */
 
-#identity-box {
-  margin: -1px;
-  -moz-margin-end: 4px;
-  padding: 2px;
-  -moz-padding-end: 1px;
-  font-size: .9em;
-}
-
 #identity-box:-moz-locale-dir(ltr) {
   border-top-left-radius: 1.5px;
   border-bottom-left-radius: 1.5px;
@@ -991,42 +985,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   border-bottom-right-radius: 1.5px;
 }
 
-#notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px;
-  border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #urlbar > #identity-box {
-  border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) > #urlbar > #identity-box {
-  transition: padding-left, padding-right;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  padding-left: 5px;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  padding-right: 5px;
-}
-
-@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box {
-  /* forward button hiding is delayed when hovered */
-  transition-delay: 100s;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-left: 5.01px;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-right: 5.01px;
-}
-
 #identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) {
   background-color: var(--verified-identity-box-backgroundcolor);
 }
@@ -1036,20 +994,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   outline-offset: -3px;
 }
 
-#identity-icon-labels {
-  -moz-padding-start: 2px;
-  -moz-padding-end: 5px;
-}
-
 %include ../shared/identity-block/identity-block.inc.css
 
-#page-proxy-favicon {
-  margin-top: 1px;
-  margin-bottom: 1px;
-  -moz-margin-start: 3px;
-  -moz-margin-end: 1px;
-}
-
 %include ../shared/notification-icons.inc.css
 
 .popup-notification-body[popupid="addon-progress"],
@@ -1065,8 +1011,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 /* Notification icon box */
 #notification-popup-box {
   border-radius: 2.5px 0 0 2.5px;
-  margin-top: -1px;
-  margin-bottom: -1px;
 }
 
 .notification-anchor-icon:-moz-focusring {
diff --git a/browser/themes/linux/searchbar.css b/browser/themes/linux/searchbar.css
index 4627bbad4ec..08fd9dd6bca 100644
--- a/browser/themes/linux/searchbar.css
+++ b/browser/themes/linux/searchbar.css
@@ -7,11 +7,6 @@
   padding: 1px;
 }
 
-.searchbar-textbox {
-  min-height: 22px;
-  background-color: -moz-field;
-}
-
 .autocomplete-textbox-container {
   -moz-box-align: stretch;
 }
@@ -81,6 +76,8 @@ menuitem[cmd="cmd_clearhistory"][disabled] {
 .searchbar-search-button {
   list-style-image: url("chrome://browser/skin/search-indicator.png");
   -moz-image-region: rect(0, 20px, 20px, 0);
+  margin-top: 1px;
+  margin-bottom: 1px;
   -moz-margin-start: 2px;
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index ad289321239..deb19cff6b0 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -18,8 +18,10 @@
 
 :root {
   --space-above-tabbar: 9px;
-
   --tabs-toolbar-color: #333;
+
+  --backbutton-urlbar-overlap: 6px;
+
   --toolbarbutton-hover-background: hsla(0,0%,100%,.1) linear-gradient(hsla(0,0%,100%,.3), hsla(0,0%,100%,.1)) padding-box;
   --toolbarbutton-hover-bordercolor: hsla(0,0%,0%,.2);
   --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0,0%,100%,.5),
@@ -1633,7 +1635,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 
 @conditionalForwardWithUrlbar@ {
   clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");
-  -moz-margin-start: -6px;
+  margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap));
 }
 
 @conditionalForwardWithUrlbar@:-moz-locale-dir(rtl),
@@ -1646,24 +1648,19 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   -moz-box-direction: reverse;
 }
 
-#identity-box {
-  margin: 0;
-  -moz-margin-end: 3px;
-  padding: 1px 4px;
-  font-size: .9em;
-}
-
 #urlbar:not([focused="true"]) > #identity-box {
-  margin: -1px 0;
-  -moz-margin-end: 3px;
-  padding: 2px 4px;
+  margin-top: -1px;
+  margin-bottom: -1px;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
 
 @media (-moz-mac-yosemite-theme) {
   #urlbar:not([focused="true"]):not(:-moz-window-inactive) > #identity-box {
-    margin: -2px 0;
-    -moz-margin-end: 3px;
-    padding: 3px 4px;
+    margin-top: -2px;
+    margin-bottom: -2px;
+    padding-top: 4px;
+    padding-bottom: 4px;
   }
   #identity-box {
     --identity-box-selected-background-color: rgb(240,237,237);
@@ -1680,40 +1677,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   border-bottom-right-radius: 2px;
 }
 
-#notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px !important;
-  border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #urlbar > #identity-box {
-  border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) > #urlbar > #identity-box {
-  transition: padding-left, padding-right;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  padding-left: 10px;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  padding-right: 10px;
-}
-
-@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box {
-  /* forward button hiding is delayed when hovered */
-  transition-delay: 100s;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  padding-left: 10.01px;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  padding-right: 10.01px;
-}
-
 #identity-box:-moz-focusring {
   box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
               0 0 2px 2px -moz-mac-focusring;
@@ -1721,10 +1684,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   -moz-padding-end: 5px;
 }
 
-#identity-icon-labels {
-  -moz-margin-start: 4px;
-}
-
 .urlbar-input-box {
   -moz-margin-start: 0;
   padding: 3px 0 2px;
@@ -1807,11 +1766,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 
 %include ../shared/identity-block/identity-block.inc.css
 
-#page-proxy-favicon {
-  margin: 0px;
-  padding: 0px;
-}
-
 #wrapper-urlbar-container[place="palette"] {
   max-width: 20em;
 }
diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css
index 62d85c5efdc..ed2f8649efc 100644
--- a/browser/themes/shared/identity-block/identity-block.inc.css
+++ b/browser/themes/shared/identity-block/identity-block.inc.css
@@ -48,6 +48,9 @@
   background-size: 1px;
   background-repeat: no-repeat;
   background-image: var(--identity-box-background-image);
+  font-size: .9em;
+  padding: 2px 5px;
+  margin-inline-end: 4px;
 }
 
 #identity-box:-moz-locale-dir(rtl) {
@@ -69,11 +72,52 @@
   background-image: var(--identity-box-chrome-background-image);
 }
 
+#identity-icon-labels {
+  padding-inline-start: 2px;
+}
+
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+  border-radius: 0;
+}
+
+@conditionalForwardWithUrlbar@ > #urlbar > #identity-box {
+  border-radius: 0;
+}
+
+@conditionalForwardWithUrlbar@:not([switchingtabs]) > #urlbar > #identity-box {
+  transition: padding-left, padding-right;
+}
+
+@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  padding-left: calc(var(--backbutton-urlbar-overlap) + 4px);
+}
+
+@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  padding-right: calc(var(--backbutton-urlbar-overlap) + 4px);
+}
+
+@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box {
+  /* forward button hiding is delayed when hovered */
+  transition-delay: 100s;
+}
+
+@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-left: calc(var(--backbutton-urlbar-overlap) + 4.01px);
+}
+
+@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-right: calc(var(--backbutton-urlbar-overlap) + 4.01px);
+}
+
 /* TRACKING PROTECTION ICON */
 
 #tracking-protection-icon {
   width: 16px;
   height: 16px;
+  margin-inline-end: 2px;
   list-style-image: url(chrome://browser/skin/tracking-protection-16.svg);
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 8bc5129801c..934b87e2596 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -20,6 +20,8 @@
 :root {
   --space-above-tabbar: 15px;
 
+  --backbutton-urlbar-overlap: 5px;
+
   --toolbarbutton-vertical-inner-padding: 2px;
   --toolbarbutton-vertical-outer-padding: 8px;
 
@@ -1303,13 +1305,16 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
 
 @conditionalForwardWithUrlbar@ {
   clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");
-  -moz-margin-start: -5px;
+  margin-inline-start: calc(-1 * var(--backbutton-urlbar-overlap));
 }
 
 @media (-moz-os-version: windows-win10) {
   @conditionalForwardWithUrlbar@ {
     clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path-win10");
-    -moz-margin-start: -8px;
+  }
+
+  :root {
+    --backbutton-urlbar-overlap: 8px;
   }
 }
 
@@ -1419,12 +1424,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 /* identity box */
 
-#identity-box {
-  padding: 2px;
-  font-size: .9em;
-  -moz-margin-end: 4px;
-}
-
 #identity-box:-moz-locale-dir(ltr) {
   border-top-left-radius: 1.5px;
   border-bottom-left-radius: 1.5px;
@@ -1435,42 +1434,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   border-bottom-right-radius: 1.5px;
 }
 
-#notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px;
-  border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@ > #urlbar > #identity-box {
-  border-radius: 0;
-}
-
-@conditionalForwardWithUrlbar@:not([switchingtabs]) > #urlbar > #identity-box {
-  transition: padding-left, padding-right;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  padding-left: 5px;
-}
-
-@conditionalForwardWithUrlbar@ > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  padding-right: 5px;
-}
-
-@conditionalForwardWithUrlbar@:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box {
-  /* forward button hiding is delayed when hovered */
-  transition-delay: 100s;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-left: 5.01px;
-}
-
-@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] + #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
-  padding-right: 5.01px;
-}
-
 #identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) {
   background-color: var(--verified-identity-box-backgroundcolor);
 }
@@ -1480,11 +1443,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   outline-offset: -3px;
 }
 
-#identity-icon-labels {
-  -moz-padding-start: 2px;
-  -moz-padding-end: 5px;
-}
-
 /* Location bar dropmarker */
 
 .urlbar-history-dropmarker {
@@ -1532,19 +1490,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 %include ../shared/identity-block/identity-block.inc.css
 
-#page-proxy-favicon {
-  margin-top: 1px;
-  margin-bottom: 1px;
-  -moz-margin-start: 3px;
-  -moz-margin-end: 1px;
-}
-
-@media (-moz-os-version: windows-win10) {
-  #page-proxy-favicon {
-    -moz-margin-start: 6px;
-  }
-}
-
 /* autocomplete */
 
 #treecolAutoCompleteImage {

From 9e6243ae9a5da99e9efc6fe36b42dae89259cfaf Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Wed, 22 Jul 2015 09:31:15 -0700
Subject: [PATCH 17/20] Bug 1181978 - Use the system Highlight color for the
 identity popup subview back button. r=ttaubert

---
 browser/themes/shared/controlcenter/panel.inc.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css
index 58a58edecda..58f709a0550 100644
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -140,9 +140,10 @@
 
 .identity-popup-expander[panel-multiview-anchor] {
   transition: background-color 250ms ease-in;
-  background-color: #0069d9;
+  background-color: Highlight;
   background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"),
                     linear-gradient(rgba(255,255,255,0.3), transparent);
+  color: HighlightText;
 }
 
 @media (min-resolution: 1.1dppx) {

From bacc39e9d5913487590b8cbd799a9535529869e2 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Wed, 22 Jul 2015 08:04:00 -0700
Subject: [PATCH 18/20] Bug 1185889 - Fix devedition tab close button on
 Windows. r=dao

---
 browser/themes/windows/devedition.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/themes/windows/devedition.css b/browser/themes/windows/devedition.css
index 538fa9c963c..f1954647c73 100644
--- a/browser/themes/windows/devedition.css
+++ b/browser/themes/windows/devedition.css
@@ -106,13 +106,13 @@
 
 /* Tab styling - make sure to use an inverted icon for the selected tab
    (brighttext only covers the unselected tabs) */
-.tab-close-button[visuallyselected=true]:not(:hover) {
-  -moz-image-region: rect(0, 64px, 16px, 48px);
+.tab-close-button[visuallyselected=true] {
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
 }
 
 @media (min-resolution: 1.1dppx) {
-  .tab-close-button[visuallyselected=true]:not(:hover) {
-    -moz-image-region: rect(0, 128px, 32px, 96px);
+  .tab-close-button[visuallyselected=true] {
+    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
   }
 }
 

From 24d59749a3844289c2fc07f6bcb6afa160382e49 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Wed, 22 Jul 2015 11:59:39 +0200
Subject: [PATCH 19/20] Bug 1186168 - Fix intermittent browser_607016.js
 failures by using ss.getTabState() instead of closing tabs to check their
 state r=mconley

---
 .../sessionstore/test/browser_607016.js       | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/browser/components/sessionstore/test/browser_607016.js b/browser/components/sessionstore/test/browser_607016.js
index 9686c8cc2e4..6e9614d6394 100644
--- a/browser/components/sessionstore/test/browser_607016.js
+++ b/browser/components/sessionstore/test/browser_607016.js
@@ -40,33 +40,29 @@ add_task(function* () {
     // Now we'll set a new unique value on 1 of the tabs
     let newUniq = r();
     ss.setTabValue(gBrowser.tabs[1], "uniq", newUniq);
-    yield promiseRemoveTab(gBrowser.tabs[1]);
-    let closedTabData = (JSON.parse(ss.getClosedTabData(window)))[0];
-    is(closedTabData.state.extData.uniq, newUniq,
+    let tabState = JSON.parse(ss.getTabState(gBrowser.tabs[1]));
+    is(tabState.extData.uniq, newUniq,
        "(overwriting) new data is stored in extData");
 
     // hide the next tab before closing it
-    gBrowser.hideTab(gBrowser.tabs[1]);
-    yield promiseRemoveTab(gBrowser.tabs[1]);
-    closedTabData = (JSON.parse(ss.getClosedTabData(window)))[0];
-    ok(closedTabData.state.hidden, "(hiding) tab data has hidden == true");
+    gBrowser.hideTab(gBrowser.tabs[2]);
+    tabState = JSON.parse(ss.getTabState(gBrowser.tabs[2]));
+    ok(tabState.hidden, "(hiding) tab data has hidden == true");
 
     // set data that's not in a conflicting key
     let stillUniq = r();
-    ss.setTabValue(gBrowser.tabs[1], "stillUniq", stillUniq);
-    yield promiseRemoveTab(gBrowser.tabs[1]);
-    closedTabData = (JSON.parse(ss.getClosedTabData(window)))[0];
-    is(closedTabData.state.extData.stillUniq, stillUniq,
+    ss.setTabValue(gBrowser.tabs[3], "stillUniq", stillUniq);
+    tabState = JSON.parse(ss.getTabState(gBrowser.tabs[3]));
+    is(tabState.extData.stillUniq, stillUniq,
        "(adding) new data is stored in extData");
 
     // remove the uniq value and make sure it's not there in the closed data
-    ss.deleteTabValue(gBrowser.tabs[1], "uniq");
-    yield promiseRemoveTab(gBrowser.tabs[1]);
-    closedTabData = (JSON.parse(ss.getClosedTabData(window)))[0];
+    ss.deleteTabValue(gBrowser.tabs[4], "uniq");
+    tabState = JSON.parse(ss.getTabState(gBrowser.tabs[4]));
     // Since Panorama might have put data in, first check if there is extData.
     // If there is explicitly check that "uniq" isn't in it. Otherwise, we're ok
-    if ("extData" in closedTabData.state) {
-      ok(!("uniq" in closedTabData.state.extData),
+    if ("extData" in tabState) {
+      ok(!("uniq" in tabState.extData),
          "(deleting) uniq not in existing extData");
     }
     else {
@@ -75,11 +71,14 @@ add_task(function* () {
 
     // set unique data on the tab that never had any set, make sure that's saved
     let newUniq2 = r();
-    ss.setTabValue(gBrowser.tabs[1], "uniq", newUniq2);
-    yield promiseRemoveTab(gBrowser.tabs[1]);
-    closedTabData = (JSON.parse(ss.getClosedTabData(window)))[0];
-    is(closedTabData.state.extData.uniq, newUniq2,
+    ss.setTabValue(gBrowser.tabs[5], "uniq", newUniq2);
+    tabState = JSON.parse(ss.getTabState(gBrowser.tabs[5]));
+    is(tabState.extData.uniq, newUniq2,
        "(creating) new data is stored in extData where there was none");
+
+    while (gBrowser.tabs.length > 1) {
+      yield promiseRemoveTab(gBrowser.tabs[1]);
+    }
   }
 
   // Set the test state.

From 43946ce3493fdb7e9051aef602e9bf13d7775dc2 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 22 Jul 2015 13:18:54 -0400
Subject: [PATCH 20/20] Backed out changesets 9eb2e0c7b864 and 19bdfb755eeb
 (bug 1147664) for various test failures.

---
 js/src/jsapi.cpp                              |  48 +--
 js/src/jsapi.h                                |  46 +--
 js/src/vm/Interpreter.cpp                     | 278 ++++++------------
 js/src/vm/Runtime.cpp                         |  67 +----
 js/src/vm/Runtime.h                           |  59 ++--
 .../perfmonitoring/PerformanceStats.jsm       |  75 +----
 .../perfmonitoring/nsIPerformanceStats.idl    |  23 +-
 .../perfmonitoring/nsPerformanceStats.cpp     | 111 +------
 .../tests/browser/browser_compartments.js     |  26 +-
 .../tests/xpcshell/test_compartments.js       |  51 +---
 10 files changed, 191 insertions(+), 593 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 6451c6989f7..2305230a04b 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -317,21 +317,16 @@ IterPerformanceStats(JSContext* cx,
     }
 
     JSRuntime* rt = JS_GetRuntime(cx);
-
-    // First report the shared groups
-    for (CompartmentsIter c(rt, SkipAtoms); !c.done(); c.next()) {
+    for (CompartmentsIter c(rt, WithAtoms); !c.done(); c.next()) {
         JSCompartment* compartment = c.get();
-        if (!c->principals()) {
-            // Compartments without principals could show up here, but
-            // reporting them doesn't really make sense.
-            continue;
-        }
-        if (!c->performanceMonitoring.hasSharedGroup()) {
+        if (!compartment->performanceMonitoring.isLinked()) {
             // Don't report compartments that do not even have a PerformanceGroup.
             continue;
         }
+
         js::AutoCompartment autoCompartment(cx, compartment);
-        PerformanceGroup* group = compartment->performanceMonitoring.getSharedGroup(cx);
+        PerformanceGroup* group = compartment->performanceMonitoring.getGroup(cx);
+
         if (group->data.ticks == 0) {
             // Don't report compartments that have never been used.
             continue;
@@ -343,9 +338,7 @@ IterPerformanceStats(JSContext* cx,
             continue;
         }
 
-        if (!(*walker)(cx,
-                       group->data, group->uid, nullptr,
-                       closure)) {
+        if (!(*walker)(cx, group->data, group->uid, closure)) {
             // Issue in callback
             return false;
         }
@@ -354,35 +347,6 @@ IterPerformanceStats(JSContext* cx,
             return false;
         }
     }
-
-    // Then report the own groups
-    for (CompartmentsIter c(rt, SkipAtoms); !c.done(); c.next()) {
-        JSCompartment* compartment = c.get();
-        if (!c->principals()) {
-            // Compartments without principals could show up here, but
-            // reporting them doesn't really make sense.
-            continue;
-        }
-        if (!c->performanceMonitoring.hasOwnGroup()) {
-            // Don't report compartments that do not even have a PerformanceGroup.
-            continue;
-        }
-        js::AutoCompartment autoCompartment(cx, compartment);
-        PerformanceGroup* ownGroup = compartment->performanceMonitoring.getOwnGroup(cx);
-        if (ownGroup->data.ticks == 0) {
-            // Don't report compartments that have never been used.
-            continue;
-        }
-        PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx);
-        if (!(*walker)(cx,
-                       ownGroup->data, ownGroup->uid, &sharedGroup->uid,
-                       closure)) {
-            // Issue in callback
-            return false;
-        }
-    }
-
-    // Finally, report the process stats
     *processStats = rt->stopwatch.performance;
     return true;
 }
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index e0f77cf733b..7b13c55438a 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -5409,7 +5409,7 @@ BuildStackString(JSContext* cx, HandleObject stack, MutableHandleString stringp)
 
 namespace js {
 
-class AutoStopwatch;
+struct AutoStopwatch;
 
 // Container for performance data
 // All values are monotonic.
@@ -5540,30 +5540,21 @@ private:
 };
 
 //
-// Each PerformanceGroupHolder handles:
-// - a reference-counted indirection towards a PerformanceGroup shared
-//   by several compartments
-// - a owned PerformanceGroup representing the performance of a single
-//   compartment.
+// Indirection towards a PerformanceGroup.
+// This structure handles reference counting for instances of PerformanceGroup.
 //
 struct PerformanceGroupHolder {
-    // Get the shared group.
+    // Get the group.
     // On first call, this causes a single Hashtable lookup.
     // Successive calls do not require further lookups.
-    js::PerformanceGroup* getSharedGroup(JSContext*);
+    js::PerformanceGroup* getGroup(JSContext*);
 
-    // Get the own group.
-    js::PerformanceGroup* getOwnGroup(JSContext*);
-
-    // `true` if the this holder is currently associated to a shared
+    // `true` if the this holder is currently associated to a
     // PerformanceGroup, `false` otherwise. Use this method to avoid
     // instantiating a PerformanceGroup if you only need to get
     // available performance data.
-    inline bool hasSharedGroup() const {
-        return sharedGroup_ != nullptr;
-    }
-    inline bool hasOwnGroup() const {
-        return ownGroup_ != nullptr;
+    inline bool isLinked() const {
+        return group_ != nullptr;
     }
 
     // Remove the link to the PerformanceGroup. This method is designed
@@ -5573,12 +5564,10 @@ struct PerformanceGroupHolder {
 
     explicit PerformanceGroupHolder(JSRuntime* runtime)
       : runtime_(runtime)
-      , sharedGroup_(nullptr)
-      , ownGroup_(nullptr)
+      , group_(nullptr)
     {   }
     ~PerformanceGroupHolder();
-
-  private:
+private:
     // Return the key representing this PerformanceGroup in
     // Runtime::Stopwatch.
     // Do not deallocate the key.
@@ -5586,11 +5575,10 @@ struct PerformanceGroupHolder {
 
     JSRuntime *runtime_;
 
-    // The PerformanceGroups held by this object.
-    // Initially set to `nullptr` until the first call to `getGroup`.
+    // The PerformanceGroup held by this object.
+    // Initially set to `nullptr` until the first cal to `getGroup`.
     // May be reset to `nullptr` by a call to `unlink`.
-    js::PerformanceGroup* sharedGroup_;
-    js::PerformanceGroup* ownGroup_;
+    js::PerformanceGroup* group_;
 };
 
 /**
@@ -5616,10 +5604,6 @@ extern JS_PUBLIC_API(bool)
 SetStopwatchIsMonitoringJank(JSRuntime*, bool);
 extern JS_PUBLIC_API(bool)
 GetStopwatchIsMonitoringJank(JSRuntime*);
-extern JS_PUBLIC_API(bool)
-SetStopwatchIsMonitoringPerCompartment(JSRuntime*, bool);
-extern JS_PUBLIC_API(bool)
-GetStopwatchIsMonitoringPerCompartment(JSRuntime*);
 
 extern JS_PUBLIC_API(bool)
 IsStopwatchActive(JSRuntime*);
@@ -5631,9 +5615,7 @@ extern JS_PUBLIC_API(PerformanceData*)
 GetPerformanceData(JSRuntime*);
 
 typedef bool
-(PerformanceStatsWalker)(JSContext* cx,
-                         const PerformanceData& stats, uint64_t uid,
-                         const uint64_t* parentId, void* closure);
+(PerformanceStatsWalker)(JSContext* cx, const PerformanceData& stats, uint64_t uid, void* closure);
 
 /**
  * Extract the performance statistics.
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 682e1241719..e467935df62 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -372,49 +372,15 @@ ExecuteState::pushInterpreterFrame(JSContext* cx)
                                                               scopeChain_, type_, evalInFrame_);
 }
 namespace js {
+
 // Implementation of per-performance group performance measurement.
 //
 //
 // All mutable state is stored in `Runtime::stopwatch` (per-process
 // performance stats and logistics) and in `PerformanceGroup` (per
 // group performance stats).
-class AutoStopwatch final
+struct AutoStopwatch final
 {
-    // The context with which this object was initialized.
-    // Non-null.
-    JSContext* const cx_;
-
-    // An indication of the number of times we have entered the event
-    // loop.  Used only for comparison.
-    uint64_t iteration_;
-
-    // `true` if this object is currently used to monitor performance
-    // for a shared PerformanceGroup, `false` otherwise, i.e. if the
-    // stopwatch mechanism is off or if another stopwatch is already
-    // in charge of monitoring for the same PerformanceGroup.
-    bool isMonitoringForGroup_;
-
-    // `true` if this object is currently used to monitor performance
-    // for a single compartment, `false` otherwise, i.e. if the
-    // stopwatch mechanism is off or if another stopwatch is already
-    // in charge of monitoring for the same PerformanceGroup.
-    bool isMonitoringForSelf_;
-
-    // `true` if this stopwatch is the topmost stopwatch on the stack
-    // for this event, `false` otherwise.
-    bool isMonitoringForTop_;
-
-    // `true` if we are monitoring jank, `false` otherwise.
-    bool isMonitoringJank_;
-    // `true` if we are monitoring CPOW, `false` otherwise.
-    bool isMonitoringCPOW_;
-
-    // Timestamps captured while starting the stopwatch.
-    uint64_t userTimeStart_;
-    uint64_t systemTimeStart_;
-    uint64_t CPOWTimeStart_;
-
-   public:
     // If the stopwatch is active, constructing an instance of
     // AutoStopwatch causes it to become the current owner of the
     // stopwatch.
@@ -423,198 +389,120 @@ class AutoStopwatch final
     explicit inline AutoStopwatch(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
       : cx_(cx)
       , iteration_(0)
-      , isMonitoringForGroup_(false)
-      , isMonitoringForSelf_(false)
-      , isMonitoringForTop_(false)
-      , isMonitoringJank_(false)
-      , isMonitoringCPOW_(false)
+      , isActive_(false)
+      , isTop_(false)
       , userTimeStart_(0)
       , systemTimeStart_(0)
       , CPOWTimeStart_(0)
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
 
+        JSRuntime* runtime = JS_GetRuntime(cx_);
+        if (!runtime->stopwatch.isMonitoringJank())
+            return;
+
         JSCompartment* compartment = cx_->compartment();
         if (compartment->scheduledForDestruction)
             return;
 
-        JSRuntime* runtime = cx_->runtime();
         iteration_ = runtime->stopwatch.iteration;
 
-        PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx);
-        if (!sharedGroup) {
-            // Either this Runtime is not configured for Performance Monitoring, or we couldn't
-            // allocate the group, or there was a problem with the hashtable.
+        PerformanceGroup *group = compartment->performanceMonitoring.getGroup(cx);
+        MOZ_ASSERT(group);
+
+        if (group->hasStopwatch(iteration_)) {
+            // Someone is already monitoring this group during this
+            // tick, no need for further monitoring.
             return;
         }
 
-        if (!sharedGroup->hasStopwatch(iteration_)) {
-            // We are now in charge of monitoring this group for the tick,
-            // until destruction of `this` or until we enter a nested event
-            // loop and `iteration_` is incremented.
-            sharedGroup->acquireStopwatch(iteration_, this);
-            isMonitoringForGroup_ = true;
-        }
+        // Start the stopwatch.
+        if (!this->getTimes(runtime, &userTimeStart_, &systemTimeStart_))
+            return;
+        isActive_ = true;
+        CPOWTimeStart_ = runtime->stopwatch.performance.totalCPOWTime;
 
-        PerformanceGroup* ownGroup = nullptr;
-        if (runtime->stopwatch.isMonitoringPerCompartment()) {
-            // As above, but for the group representing just this compartment.
-            ownGroup = compartment->performanceMonitoring.getOwnGroup(cx);
-            if (!ownGroup->hasStopwatch(iteration_)) {
-                ownGroup->acquireStopwatch(iteration_, this);
-                isMonitoringForSelf_ = true;
-            }
-        }
+        // We are now in charge of monitoring this group for the tick,
+        // until destruction of `this` or until we enter a nested event
+        // loop and `iteration_` is incremented.
+        group->acquireStopwatch(iteration_, this);
 
         if (runtime->stopwatch.isEmpty) {
             // This is the topmost stopwatch on the stack.
             // It will be in charge of updating the per-process
             // performance data.
             runtime->stopwatch.isEmpty = false;
-            isMonitoringForTop_ = true;
-
-            MOZ_ASSERT(isMonitoringForGroup_);
+            runtime->stopwatch.performance.ticks++;
+            isTop_ = true;
         }
-
-        if (!isMonitoringForGroup_ && !isMonitoringForSelf_) {
-            // We are not in charge of monitoring anything.
-            // (isMonitoringForTop_ implies isMonitoringForGroup_,
-            // so we do not need to check it)
-            return;
-        }
-
-        enter();
     }
-    ~AutoStopwatch() {
-        if (!isMonitoringForGroup_ && !isMonitoringForSelf_) {
+    inline ~AutoStopwatch() {
+        if (!isActive_) {
             // We are not in charge of monitoring anything.
-            // (isMonitoringForTop_ implies isMonitoringForGroup_,
-            // so we do not need to check it)
             return;
         }
 
+        JSRuntime* runtime = JS_GetRuntime(cx_);
         JSCompartment* compartment = cx_->compartment();
-        if (compartment->scheduledForDestruction)
-            return;
 
-        JSRuntime* runtime = cx_->runtime();
+        MOZ_ASSERT(!compartment->scheduledForDestruction);
+
+        if (!runtime->stopwatch.isMonitoringJank()) {
+            // Monitoring has been stopped while we were
+            // executing the code. Drop everything.
+            return;
+        }
+
         if (iteration_ != runtime->stopwatch.iteration) {
             // We have entered a nested event loop at some point.
             // Any information we may have is obsolete.
             return;
         }
 
-        // Finish and commit measures
-        exit();
+        PerformanceGroup *group = compartment->performanceMonitoring.getGroup(cx_);
+        MOZ_ASSERT(group);
 
-        // Now release groups.
-        if (isMonitoringForGroup_) {
-            PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx_);
-            MOZ_ASSERT(sharedGroup);
-            sharedGroup->releaseStopwatch(iteration_, this);
-        }
+        // Compute time spent.
+        group->releaseStopwatch(iteration_, this);
+        uint64_t userTimeEnd, systemTimeEnd;
+        if (!this->getTimes(runtime, &userTimeEnd, &systemTimeEnd))
+            return;
 
-        if (isMonitoringForSelf_) {
-            PerformanceGroup* ownGroup = compartment->performanceMonitoring.getOwnGroup(cx_);
-            MOZ_ASSERT(ownGroup);
-            ownGroup->releaseStopwatch(iteration_, this);
-        }
-
-        if (isMonitoringForTop_)
-            runtime->stopwatch.isEmpty = true;
-    }
-   private:
-    void enter() {
-        JSRuntime* runtime = cx_->runtime();
-
-        if (runtime->stopwatch.isMonitoringCPOW()) {
-            CPOWTimeStart_ = runtime->stopwatch.performance.totalCPOWTime;
-            isMonitoringCPOW_ = true;
-        }
-
-        if (runtime->stopwatch.isMonitoringJank()) {
-            if (this->getTimes(runtime, &userTimeStart_, &systemTimeStart_)) {
-                isMonitoringJank_ = true;
-            }
-        }
-
-    }
-
-    void exit() {
-        JSRuntime* runtime = cx_->runtime();
-
-        uint64_t userTimeDelta = 0;
-        uint64_t systemTimeDelta = 0;
-        if (isMonitoringJank_ && runtime->stopwatch.isMonitoringJank()) {
-            // We were monitoring jank when we entered and we still are.
-            uint64_t userTimeEnd, systemTimeEnd;
-            if (!this->getTimes(runtime, &userTimeEnd, &systemTimeEnd)) {
-                // We make no attempt to recover from this error. If
-                // we bail out here, we lose nothing of value, plus
-                // I'm nearly sure that this error cannot happen in
-                // practice.
-                return;
-            }
-            userTimeDelta = userTimeEnd - userTimeStart_;
-            systemTimeDelta = systemTimeEnd - systemTimeStart_;
-        }
-
-        uint64_t CPOWTimeDelta = 0;
-        if (isMonitoringCPOW_ && runtime->stopwatch.isMonitoringCPOW()) {
-            // We were monitoring CPOW when we entered and we still are.
-            CPOWTimeDelta = runtime->stopwatch.performance.totalCPOWTime - CPOWTimeStart_;
-
-        }
-        commitDeltasToGroups(userTimeDelta, systemTimeDelta, CPOWTimeDelta);
-    }
-
-    void commitDeltasToGroups(uint64_t userTimeDelta,
-                              uint64_t systemTimeDelta,
-                              uint64_t CPOWTimeDelta)
-    {
-        JSCompartment* compartment = cx_->compartment();
-
-        PerformanceGroup* sharedGroup = compartment->performanceMonitoring.getSharedGroup(cx_);
-        MOZ_ASSERT(sharedGroup);
-        applyDeltas(userTimeDelta, systemTimeDelta, CPOWTimeDelta, sharedGroup->data);
-
-        if (isMonitoringForSelf_) {
-            PerformanceGroup* ownGroup = compartment->performanceMonitoring.getOwnGroup(cx_);
-            MOZ_ASSERT(ownGroup);
-            applyDeltas(userTimeDelta, systemTimeDelta, CPOWTimeDelta, ownGroup->data);
-        }
-
-        if (isMonitoringForTop_) {
-            JSRuntime* runtime = cx_->runtime();
-            applyDeltas(userTimeDelta, systemTimeDelta, CPOWTimeDelta, runtime->stopwatch.performance);
-        }
-    }
-
-
-    void applyDeltas(uint64_t userTimeDelta,
-                     uint64_t systemTimeDelta,
-                     uint64_t CPOWTimeDelta,
-                     PerformanceData& data) const {
-
-        data.ticks++;
+        uint64_t userTimeDelta = userTimeEnd - userTimeStart_;
+        uint64_t systemTimeDelta = systemTimeEnd - systemTimeStart_;
+        uint64_t CPOWTimeDelta = runtime->stopwatch.performance.totalCPOWTime - CPOWTimeStart_;
+        group->data.totalUserTime += userTimeDelta;
+        group->data.totalSystemTime += systemTimeDelta;
+        group->data.totalCPOWTime += CPOWTimeDelta;
 
         uint64_t totalTimeDelta = userTimeDelta + systemTimeDelta;
-        data.totalUserTime += userTimeDelta;
-        data.totalSystemTime += systemTimeDelta;
-        data.totalCPOWTime += CPOWTimeDelta;
+        updateDurations(totalTimeDelta, group->data.durations);
+        group->data.ticks++;
 
-        // Update an array containing the number of times we have missed
-        // at least 2^0 successive ms, 2^1 successive ms, ...
-        // 2^i successive ms.
+        if (isTop_) {
+            // This is the topmost stopwatch on the stack.
+            // Record the timing information.
+            runtime->stopwatch.performance.totalUserTime = userTimeEnd;
+            runtime->stopwatch.performance.totalSystemTime = systemTimeEnd;
+            updateDurations(totalTimeDelta, runtime->stopwatch.performance.durations);
+            runtime->stopwatch.isEmpty = true;
+        }
+    }
 
+ private:
+
+    // Update an array containing the number of times we have missed
+    // at least 2^0 successive ms, 2^1 successive ms, ...
+    // 2^i successive ms.
+    template<int N>
+    void updateDurations(uint64_t totalTimeDelta, uint64_t (&array)[N]) const {
         // Duration of one frame, i.e. 16ms in museconds
         size_t i = 0;
         uint64_t duration = 1000;
         for (i = 0, duration = 1000;
-             i < ArrayLength(data.durations) && duration < totalTimeDelta;
-             ++i, duration *= 2)
-        {
-            data.durations[i]++;
+             i < N && duration < totalTimeDelta;
+             ++i, duration *= 2) {
+            array[i]++;
         }
     }
 
@@ -697,9 +585,31 @@ class AutoStopwatch final
         return true;
     }
 
+  private:
+    // The context with which this object was initialized.
+    // Non-null.
+    JSContext* const cx_;
 
-private:
-    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER;
+    // An indication of the number of times we have entered the event
+    // loop.  Used only for comparison.
+    uint64_t iteration_;
+
+    // `true` if this object is currently used to monitor performance,
+    // `false` otherwise, i.e. if the stopwatch mechanism is off or if
+    // another stopwatch is already in charge of monitoring for the
+    // same PerformanceGroup.
+    bool isActive_;
+
+    // `true` if this stopwatch is the topmost stopwatch on the stack
+    // for this event, `false` otherwise.
+    bool isTop_;
+
+    // Timestamps captured while starting the stopwatch.
+    uint64_t userTimeStart_;
+    uint64_t systemTimeStart_;
+    uint64_t CPOWTimeStart_;
+
+    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
 } // namespace js
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index 522835c3209..15e7c7b9301 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -899,17 +899,6 @@ js::GetStopwatchIsMonitoringCPOW(JSRuntime* rt)
     return rt->stopwatch.isMonitoringCPOW();
 }
 
-bool
-js::SetStopwatchIsMonitoringPerCompartment(JSRuntime* rt, bool value)
-{
-    return rt->stopwatch.setIsMonitoringPerCompartment(value);
-}
-bool
-js::GetStopwatchIsMonitoringPerCompartment(JSRuntime* rt)
-{
-    return rt->stopwatch.isMonitoringPerCompartment();
-}
-
 js::PerformanceGroupHolder::~PerformanceGroupHolder()
 {
     unlink();
@@ -929,18 +918,13 @@ js::PerformanceGroupHolder::getHashKey(JSContext* cx)
 void
 js::PerformanceGroupHolder::unlink()
 {
-    if (ownGroup_) {
-        js_delete(ownGroup_);
-        ownGroup_ = nullptr;
-    }
-
-    if (!sharedGroup_) {
+    if (!group_) {
         // The group has never been instantiated.
         return;
     }
 
-    js::PerformanceGroup* group = sharedGroup_;
-    sharedGroup_ = nullptr;
+    js::PerformanceGroup* group = group_;
+    group_ = nullptr;
 
     if (group->decRefCount() > 0) {
         // The group has at least another owner.
@@ -949,51 +933,32 @@ js::PerformanceGroupHolder::unlink()
 
 
     JSRuntime::Stopwatch::Groups::Ptr ptr =
-        runtime_->stopwatch.groups().lookup(group->key_);
+        runtime_->stopwatch.groups_.lookup(group->key_);
     MOZ_ASSERT(ptr);
-    runtime_->stopwatch.groups().remove(ptr);
+    runtime_->stopwatch.groups_.remove(ptr);
     js_delete(group);
 }
 
 PerformanceGroup*
-js::PerformanceGroupHolder::getOwnGroup(JSContext* cx)
+js::PerformanceGroupHolder::getGroup(JSContext* cx)
 {
-    if (ownGroup_)
-        return ownGroup_;
-
-    ownGroup_ = runtime_->new_<PerformanceGroup>(cx, nullptr);
-    return ownGroup_;
-}
-
-PerformanceGroup*
-js::PerformanceGroupHolder::getSharedGroup(JSContext* cx)
-{
-    if (sharedGroup_)
-        return sharedGroup_;
-
-    if (!runtime_->stopwatch.groups().initialized())
-        return nullptr;
+    if (group_)
+        return group_;
 
     void* key = getHashKey(cx);
-    JSRuntime::Stopwatch::Groups::AddPtr ptr = runtime_->stopwatch.groups().lookupForAdd(key);
+    JSRuntime::Stopwatch::Groups::AddPtr ptr =
+        runtime_->stopwatch.groups_.lookupForAdd(key);
     if (ptr) {
-        sharedGroup_ = ptr->value();
-        MOZ_ASSERT(sharedGroup_);
+        group_ = ptr->value();
+        MOZ_ASSERT(group_);
     } else {
-        sharedGroup_ = runtime_->new_<PerformanceGroup>(cx, key);
-        if (!sharedGroup_)
-            return nullptr;
-
-        if (!runtime_->stopwatch.groups().add(ptr, key, sharedGroup_)) {
-            js_delete(sharedGroup_);
-            sharedGroup_ = nullptr;
-            return nullptr;
-        }
+        group_ = runtime_->new_<PerformanceGroup>(cx, key);
+        runtime_->stopwatch.groups_.add(ptr, key, group_);
     }
 
-    sharedGroup_->incRefCount();
+    group_->incRefCount();
 
-    return sharedGroup_;
+    return group_;
 }
 
 PerformanceData*
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 36f9375c5f3..0e72361fd48 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -1483,29 +1483,6 @@ struct JSRuntime : public JS::shadow::Runtime,
        Performance measurements
        ------------------------------------------ */
     struct Stopwatch {
-        /**
-         * A map used to collapse compartments belonging to the same
-         * add-on (respectively to the same webpage, to the platform)
-         * into a single group.
-         *
-         * Keys: for system compartments, a `JSAddonId*` (which may be
-         * `nullptr`), and for webpages, a `JSPrincipals*` (which may
-         * not). Note that compartments may start as non-system
-         * compartments and become compartments later during their
-         * lifetime, which requires an invalidation.
-         *
-         * This map is meant to be accessed only by instances of
-         * PerformanceGroupHolder, which handle both reference-counting
-         * of the values and invalidation of the key/value pairs.
-         */
-        typedef js::HashMap<void*, js::PerformanceGroup*,
-                            js::DefaultHasher<void*>,
-                            js::SystemAllocPolicy> Groups;
-
-        Groups& groups() {
-            return groups_;
-        }
-
         /**
          * The number of times we have entered the event loop.
          * Used to reset counters whenever we enter the loop,
@@ -1546,7 +1523,6 @@ struct JSRuntime : public JS::shadow::Runtime,
           , currentPerfGroupCallback(nullptr)
           , isMonitoringJank_(false)
           , isMonitoringCPOW_(false)
-          , isMonitoringPerCompartment_(false)
           , idCounter_(0)
         { }
 
@@ -1588,21 +1564,6 @@ struct JSRuntime : public JS::shadow::Runtime,
             return isMonitoringJank_;
         }
 
-        bool setIsMonitoringPerCompartment(bool value) {
-            if (isMonitoringPerCompartment_ != value)
-                reset();
-
-            if (value && !groups_.initialized()) {
-                if (!groups_.init(128))
-                    return false;
-            }
-
-            isMonitoringPerCompartment_ = value;
-            return true;
-        }
-        bool isMonitoringPerCompartment() const {
-            return isMonitoringPerCompartment_;
-        }
 
         /**
          * Activate/deactivate stopwatch measurement of CPOW.
@@ -1646,6 +1607,25 @@ struct JSRuntime : public JS::shadow::Runtime,
         MonotonicTimeStamp userTimeFix;
 
     private:
+        /**
+         * A map used to collapse compartments belonging to the same
+         * add-on (respectively to the same webpage, to the platform)
+         * into a single group.
+         *
+         * Keys: for system compartments, a `JSAddonId*` (which may be
+         * `nullptr`), and for webpages, a `JSPrincipals*` (which may
+         * not). Note that compartments may start as non-system
+         * compartments and become compartments later during their
+         * lifetime, which requires an invalidation.
+         *
+         * This map is meant to be accessed only by instances of
+         * PerformanceGroupHolder, which handle both reference-counting
+         * of the values and invalidation of the key/value pairs.
+         */
+        typedef js::HashMap<void*, js::PerformanceGroup*,
+                            js::DefaultHasher<void*>,
+                            js::SystemAllocPolicy> Groups;
+
         Groups groups_;
         friend struct js::PerformanceGroupHolder;
 
@@ -1654,7 +1634,6 @@ struct JSRuntime : public JS::shadow::Runtime,
          */
         bool isMonitoringJank_;
         bool isMonitoringCPOW_;
-        bool isMonitoringPerCompartment_;
 
         /**
          * A counter used to generate unique identifiers for groups.
diff --git a/toolkit/components/perfmonitoring/PerformanceStats.jsm b/toolkit/components/perfmonitoring/PerformanceStats.jsm
index b97878c419f..6b2ca3e57db 100644
--- a/toolkit/components/perfmonitoring/PerformanceStats.jsm
+++ b/toolkit/components/perfmonitoring/PerformanceStats.jsm
@@ -146,16 +146,6 @@ Probe.prototype = {
     return this._impl.subtract(a, b);
   },
 
-  importChildren: function(parent, children) {
-    if (!Array.isArray(children)) {
-      throw new TypeError();
-    }
-    if (!parent || !(parent instanceof PerformanceData)) {
-      throw new TypeError();
-    }
-    return this._impl.importChildren(parent, children);
-  },
-
   /**
    * The name of the probe.
    */
@@ -238,8 +228,7 @@ let Probes = {
       }
       result.longestDuration = lastNonZero(result.durations);
       return result;
-    },
-    importChildren: function() { /* nothing to do */ },
+    }
   }),
 
   /**
@@ -269,8 +258,7 @@ let Probes = {
       return {
         totalCPOWTime: a.totalCPOWTime - b.totalCPOWTime
       };
-    },
-    importChildren: function() { /* nothing to do */ },
+    }
   }),
 
   /**
@@ -299,8 +287,7 @@ let Probes = {
       return {
         ticks: a.ticks - b.ticks
       };
-    },
-    importChildren: function() { /* nothing to do */ },
+    }
   }),
 
   "jank-content": new Probe("jank-content", {
@@ -312,6 +299,7 @@ let Probes = {
       } else {
         Process.broadcast("release", ["jank"]);
       }
+    },
     get isActive() {
       return this._isActive;
     },
@@ -335,6 +323,7 @@ let Probes = {
       } else {
         Process.broadcast("release", ["cpow"]);
       }
+    },
     get isActive() {
       return this._isActive;
     },
@@ -350,16 +339,11 @@ let Probes = {
   }),
 
   "ticks-content": new Probe("ticks-content", {
-    _isActive: false,
     set isActive(x) {
-      this._isActive = x;
-      if (x) {
-        Process.broadcast("acquire", ["ticks"]);
-      } else {
-        Process.broadcast("release", ["ticks"]);
-      }
+      // Ignore: This probe is always active.
+    },
     get isActive() {
-      return this._isActive;
+      return true;
     },
     extract: function(xpcom) {
       return {};
@@ -371,27 +355,6 @@ let Probes = {
       return null;
     }
   }),
-
-  compartments: new Probe("compartments", {
-    set isActive(x) {
-      performanceStatsService.isMonitoringPerCompartment = x;
-    },
-    get isActive() {
-      return performanceStatsService.isMonitoringPerCompartment;
-    },
-    extract: function(xpcom) {
-      return null;
-    },
-    isEqual: function(a, b) {
-      return true;
-    },
-    subtract: function(a, b) {
-      return true;
-    },
-    importChildren: function(parent, children) {
-      parent.children = children;
-    },
-  })
 };
 
 
@@ -694,32 +657,16 @@ function PerformanceDiff(current, old = null) {
 function Snapshot({xpcom, childProcesses, probes}) {
   this.componentsData = [];
 
-  // Current process
+  // Parent process
   if (xpcom) {
-    let children = new Map();
     let enumeration = xpcom.getComponentsData().enumerate();
     while (enumeration.hasMoreElements()) {
       let xpcom = enumeration.getNext().QueryInterface(Ci.nsIPerformanceStats);
-      let stat = new PerformanceData({xpcom, probes});
-      if (!stat.parentId) {
-        this.componentsData.push(stat);
-      } else {
-        let siblings = children.get(stat.parentId);
-        if (!siblings) {
-          children.set(stat.parentId, (siblings = []));
-        }
-        siblings.push(stat);
-      }
-    }
-
-    for (let parent of this.componentsData) {
-      for (let probe of probes) {
-        probe.importChildren(parent, children.get(parent.groupId) || []);
-      }
+      this.componentsData.push(new PerformanceData({xpcom, probes}));
     }
   }
 
-  // Child processes
+  // Content processes
   if (childProcesses) {
     for (let {componentsData} of childProcesses) {
       // We are only interested in `componentsData` for the time being.
diff --git a/toolkit/components/perfmonitoring/nsIPerformanceStats.idl b/toolkit/components/perfmonitoring/nsIPerformanceStats.idl
index dc1d11ba84a..272178e253d 100644
--- a/toolkit/components/perfmonitoring/nsIPerformanceStats.idl
+++ b/toolkit/components/perfmonitoring/nsIPerformanceStats.idl
@@ -17,12 +17,12 @@
 
 /**
  * Snapshot of the performance of a component, e.g. an add-on, a web
- * page, system built-ins, a module or the entire process itself.
+ * page, system built-ins, or the entire process itself.
  *
  * All values are monotonic and are updated only when
  * `nsIPerformanceStatsService.isStopwatchActive` is `true`.
  */
-[scriptable, uuid(1bc2d016-e9ae-4186-97c6-9478eddda245)]
+[scriptable, uuid(47f8d36d-1d67-43cb-befd-d2f4720ac568)]
 interface nsIPerformanceStats: nsISupports {
   /**
    * An identifier unique to the component.
@@ -32,16 +32,6 @@ interface nsIPerformanceStats: nsISupports {
    */
   readonly attribute AString groupId;
 
-  /**
-   * If this component is part of a larger component, the larger
-   * component. Otherwise, null.
-   *
-   * As of this writing, there can be at most two levels of components:
-   * - compartments (a single module, iframe, etc.);
-   * - groups (an entire add-on, an entire webpage, etc.).
-   */
-  readonly attribute AString parentId;
-
   /**
    * The name of the component:
    * - for the process itself, "<process>";
@@ -122,7 +112,7 @@ interface nsIPerformanceSnapshot: nsISupports {
   nsIPerformanceStats getProcessData();
 };
 
-[scriptable, builtinclass, uuid(60973d54-13e2-455c-a3c6-84dea5dfc8b9)]
+[scriptable, builtinclass, uuid(0469e6af-95c3-4961-a385-4bc009128939)]
 interface nsIPerformanceStatsService : nsISupports {
   /**
    * `true` if we should monitor CPOW, `false` otherwise.
@@ -134,13 +124,6 @@ interface nsIPerformanceStatsService : nsISupports {
    */
   [implicit_jscontext] attribute bool isMonitoringJank;
 
-  /**
-   * `true` if all compartments need to be monitored individually,
-   * `false` if only performance groups (i.e. entire add-ons, entire
-   * webpages, etc.) need to be monitored.
-   */
-  [implicit_jscontext] attribute bool isMonitoringPerCompartment;
-
   /**
    * Capture a snapshot of the performance data.
    */
diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
index 16ddfe28ae3..960b238ab04 100644
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
+++ b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
@@ -30,7 +30,6 @@
 class nsPerformanceStats: public nsIPerformanceStats {
 public:
   nsPerformanceStats(const nsAString& aName,
-                     nsIPerformanceStats* aParent,
                      const nsAString& aGroupId,
                      const nsAString& aAddonId,
                      const nsAString& aTitle,
@@ -45,10 +44,6 @@ public:
     , mIsSystem(aIsSystem)
     , mPerformanceData(aPerformanceData)
   {
-    if (aParent) {
-      mozilla::DebugOnly<nsresult> rv = aParent->GetGroupId(mParentId);
-      MOZ_ASSERT(NS_SUCCEEDED(rv));
-    }
   }
   explicit nsPerformanceStats() {}
 
@@ -66,12 +61,6 @@ public:
     return NS_OK;
   };
 
-  /* readonly attribute AString parentId; */
-  NS_IMETHOD GetParentId(nsAString& aParentId) override {
-    aParentId.Assign(mParentId);
-    return NS_OK;
-  };
-
   /* readonly attribute AString addonId; */
   NS_IMETHOD GetAddonId(nsAString& aAddonId) override {
     aAddonId.Assign(mAddonId);
@@ -135,7 +124,6 @@ public:
 
 private:
   nsString mName;
-  nsString mParentId;
   nsString mGroupId;
   nsString mAddonId;
   nsString mTitle;
@@ -171,18 +159,13 @@ private:
    * entire process, rather than the statistics for a specific set of
    * compartments.
    */
-  already_AddRefed<nsIPerformanceStats> ImportStats(JSContext* cx, const js::PerformanceData& data, uint64_t uid, nsIPerformanceStats* parent);
+  already_AddRefed<nsIPerformanceStats> ImportStats(JSContext* cx, const js::PerformanceData& data, uint64_t uid);
 
   /**
    * Callbacks for iterating through the `PerformanceStats` of a runtime.
    */
-  bool IterPerformanceStatsCallbackInternal(JSContext* cx,
-                                            const js::PerformanceData& ownStats, const uint64_t ownId,
-                                            const uint64_t* parentId);
-  static bool IterPerformanceStatsCallback(JSContext* cx,
-                                           const js::PerformanceData& ownStats, const uint64_t ownId,
-                                           const uint64_t* parentId,
-                                           void* self);
+  bool IterPerformanceStatsCallbackInternal(JSContext* cx, const js::PerformanceData& stats, uint64_t uid);
+  static bool IterPerformanceStatsCallback(JSContext* cx, const js::PerformanceData& stats, uint64_t uid, void* self);
 
   // If the context represents a window, extract the title and window ID.
   // Otherwise, extract "" and 0.
@@ -192,11 +175,6 @@ private:
   void GetGroupId(JSContext*,
                   uint64_t uid,
                   nsString& groupId);
-
-  static void GetName(JSContext*,
-                      JS::Handle<JSObject*> global,
-                      nsString& name);
-
   // If the context presents an add-on, extract the addon ID.
   // Otherwise, extract "".
   static void GetAddonId(JSContext*,
@@ -210,7 +188,6 @@ private:
 private:
   nsCOMArray<nsIPerformanceStats> mComponentsData;
   nsCOMPtr<nsIPerformanceStats> mProcessData;
-  nsBaseHashtable<nsUint64HashKey, nsCOMPtr<nsIPerformanceStats>, nsCOMPtr<nsIPerformanceStats> > mCachedStats;
   uint64_t mProcessId;
 };
 
@@ -296,44 +273,8 @@ nsPerformanceSnapshot::GetIsSystem(JSContext*,
   return nsContentUtils::IsSystemPrincipal(nsContentUtils::ObjectPrincipal(global));
 }
 
-/* static */
-void
-nsPerformanceSnapshot::GetName(JSContext* cx,
-                               JS::Handle<JSObject*> global,
-                               nsString& name)
-{
-  nsAutoCString cname;
-  do {
-    // Attempt to use the URL as name.
-    nsCOMPtr<nsIPrincipal> principal = nsContentUtils::ObjectPrincipal(global);
-    if (!principal) {
-      break;
-    }
-
-    nsCOMPtr<nsIURI> uri;
-    nsresult rv = principal->GetURI(getter_AddRefs(uri));
-    if (NS_FAILED(rv) || !uri) {
-      break;
-    }
-
-    rv = uri->GetSpec(cname);
-    if (NS_FAILED(rv)) {
-      break;
-    }
-
-    name.Assign(NS_ConvertUTF8toUTF16(cname));
-    return;
-  } while(false);
-  xpc::GetCurrentCompartmentName(cx, cname);
-  name.Assign(NS_ConvertUTF8toUTF16(cname));
-}
-
 already_AddRefed<nsIPerformanceStats>
-nsPerformanceSnapshot::ImportStats(JSContext* cx, const js::PerformanceData& performance, const uint64_t uid, nsIPerformanceStats* parent) {
-  if (performance.ticks == 0) {
-    // Ignore compartments with no activity.
-    return nullptr;
-  }
+nsPerformanceSnapshot::ImportStats(JSContext* cx, const js::PerformanceData& performance, const uint64_t uid) {
   JS::RootedObject global(cx, JS::CurrentGlobalOrNull(cx));
 
   if (!global) {
@@ -352,34 +293,28 @@ nsPerformanceSnapshot::ImportStats(JSContext* cx, const js::PerformanceData& per
   uint64_t windowId;
   GetWindowData(cx, title, &windowId);
 
-  nsString name;
-  GetName(cx, global, name);
+  nsAutoString name;
+  nsAutoCString cname;
+  xpc::GetCurrentCompartmentName(cx, cname);
+  name.Assign(NS_ConvertUTF8toUTF16(cname));
 
   bool isSystem = GetIsSystem(cx, global);
 
   nsCOMPtr<nsIPerformanceStats> result =
-    new nsPerformanceStats(name, parent, groupId, addonId, title, windowId, isSystem, performance);
+    new nsPerformanceStats(name, groupId, addonId, title, windowId, isSystem, performance);
   return result.forget();
 }
 
 /*static*/ bool
-nsPerformanceSnapshot::IterPerformanceStatsCallback(JSContext* cx,
-                                                    const js::PerformanceData& stats, const uint64_t id,
-                                                    const uint64_t* parentId,
-                                                    void* self) {
-  return reinterpret_cast<nsPerformanceSnapshot*>(self)->IterPerformanceStatsCallbackInternal(cx, stats, id, parentId);
+nsPerformanceSnapshot::IterPerformanceStatsCallback(JSContext* cx, const js::PerformanceData& stats, const uint64_t uid, void* self) {
+  return reinterpret_cast<nsPerformanceSnapshot*>(self)->IterPerformanceStatsCallbackInternal(cx, stats, uid);
 }
 
 bool
-nsPerformanceSnapshot::IterPerformanceStatsCallbackInternal(JSContext* cx,
-                                                            const js::PerformanceData& stats, const uint64_t id,
-                                                            const uint64_t* parentId) {
-
-  nsCOMPtr<nsIPerformanceStats> parent = parentId ? mCachedStats.Get(*parentId) : nullptr;
-  nsCOMPtr<nsIPerformanceStats> result = ImportStats(cx, stats, id, parent);
+nsPerformanceSnapshot::IterPerformanceStatsCallbackInternal(JSContext* cx, const js::PerformanceData& stats, const uint64_t uid) {
+  nsCOMPtr<nsIPerformanceStats> result = ImportStats(cx, stats, uid);
   if (result) {
     mComponentsData.AppendElement(result);
-    mCachedStats.Put(id, result);
   }
 
   return true;
@@ -393,12 +328,8 @@ nsPerformanceSnapshot::Init(JSContext* cx, uint64_t processId) {
     return NS_ERROR_UNEXPECTED;
   }
 
-  nsAutoString processGroupId;
-  processGroupId.AssignLiteral("process: ");
-  processGroupId.AppendInt(processId);
   mProcessData = new nsPerformanceStats(NS_LITERAL_STRING("<process>"), // name
-                                        nullptr,                        // parent
-                                        processGroupId,                 // group id
+                                        NS_LITERAL_STRING("<process:?>"), // group id
                                         NS_LITERAL_STRING(""),          // add-on id
                                         NS_LITERAL_STRING(""),          // title
                                         0,                              // window id
@@ -474,20 +405,6 @@ NS_IMETHODIMP nsPerformanceStatsService::SetIsMonitoringJank(JSContext* cx, bool
   }
   return NS_OK;
 }
-NS_IMETHODIMP nsPerformanceStatsService::GetIsMonitoringPerCompartment(JSContext* cx, bool *aIsStopwatchActive)
-{
-  JSRuntime *runtime = JS_GetRuntime(cx);
-  *aIsStopwatchActive = js::GetStopwatchIsMonitoringPerCompartment(runtime);
-  return NS_OK;
-}
-NS_IMETHODIMP nsPerformanceStatsService::SetIsMonitoringPerCompartment(JSContext* cx, bool aIsStopwatchActive)
-{
-  JSRuntime *runtime = JS_GetRuntime(cx);
-  if (!js::SetStopwatchIsMonitoringPerCompartment(runtime, aIsStopwatchActive)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return NS_OK;
-}
 
 /* readonly attribute nsIPerformanceSnapshot snapshot; */
 NS_IMETHODIMP nsPerformanceStatsService::GetSnapshot(JSContext* cx, nsIPerformanceSnapshot * *aSnapshot)
diff --git a/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js b/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
index 4492a4c55cf..360b6a1f9b6 100644
--- a/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
+++ b/toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
@@ -28,7 +28,7 @@ function frameScript() {
       getService(Ci.nsIPerformanceStatsService);
 
     // Make sure that the stopwatch is now active.
-    let monitor = PerformanceStats.getMonitor(["jank", "cpow", "ticks", "compartments"]);
+    let monitor = PerformanceStats.getMonitor(["jank", "cpow", "ticks"]);
 
     addMessageListener("compartments-test:getStatistics", () => {
       try {
@@ -158,10 +158,8 @@ function monotinicity_tester(source, testName) {
         ["jank", "totalSystemTime"],
         ["cpow", "totalCPOWTime"]
       ]) {
-        // Note that we cannot expect components data to be always smaller
-        // than process data, as `getrusage` & co are not monotonic.
-        SilentAssert.leq(item[probe][k], 2 * snapshot.processData[probe][k],
-          `Sanity check (${testName}): ${k} of component is not impossibly larger than that of process`);
+        SilentAssert.leq(item[probe][k], snapshot.processData[probe][k],
+          `Sanity check (${testName}): component has a lower ${k} than process`);
       }
 
       let key = item.groupId;
@@ -171,24 +169,6 @@ function monotinicity_tester(source, testName) {
       }
       map.set(key, item);
     }
-    for (let item of snapshot.componentsData) {
-      if (!item.parentId) {
-        continue;
-      }
-      let parent = map.get(item.parentId);
-      SilentAssert.ok(parent, `The parent exists ${item.parentId}`);
-
-      for (let [probe, k] of [
-        ["jank", "totalUserTime"],
-        ["jank", "totalSystemTime"],
-        ["cpow", "totalCPOWTime"]
-      ]) {
-        // Note that we cannot expect components data to be always smaller
-        // than parent data, as `getrusage` & co are not monotonic.
-        SilentAssert.leq(item[probe][k], 2 * parent[probe][k],
-          `Sanity check (${testName}): ${k} of component is not impossibly larger than that of parent`);
-      }
-    }
     for (let [key, item] of map) {
       sanityCheck(previous.componentsMap.get(key), item);
       previous.componentsMap.set(key, item);
diff --git a/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js b/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js
index f4c7d562f38..44a10a08ba3 100644
--- a/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js
+++ b/toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js
@@ -19,12 +19,10 @@ let promiseStatistics = Task.async(function*(name) {
   let componentsData = [];
   let componentsEnum = snapshot.getComponentsData().enumerate();
   while (componentsEnum.hasMoreElements()) {
-    let data = componentsEnum.getNext().QueryInterface(Ci.nsIPerformanceStats);
-    let normalized = JSON.parse(JSON.stringify(data));
-    componentsData.push(data);
+    componentsData.push(componentsEnum.getNext().QueryInterface(Ci.nsIPerformanceStats));
   }
   return {
-    processData: JSON.parse(JSON.stringify(snapshot.getProcessData())),
+    processData: snapshot.getProcessData(),
     componentsData
   };
 });
@@ -37,19 +35,11 @@ let promiseSetMonitoring = Task.async(function*(to) {
   yield Promise.resolve();
 });
 
-let promiseSetPerCompartment = Task.async(function*(to) {
-  let service = Cc["@mozilla.org/toolkit/performance-stats-service;1"].
-    getService(Ci.nsIPerformanceStatsService);
-  service.isMonitoringPerCompartment = to;
-  yield Promise.resolve();
-});
-
 function getBuiltinStatistics(name, snapshot) {
   let stats = snapshot.componentsData.find(stats =>
     stats.isSystem && !stats.addonId
   );
   do_print(`Built-in statistics for ${name} were ${stats?"":"not "}found`);
-  do_print(JSON.stringify(snapshot.componentsData, null, "\t"));
   return stats;
 }
 
@@ -67,25 +57,17 @@ function burnCPU(ms) {
 }
 
 function ensureEquals(snap1, snap2, name) {
-  for (let k of Object.keys(snap1.processData)) {
-    if (k == "ticks") {
-      // Ticks monitoring cannot be deactivated
-      continue;
-    }
-    Assert.equal(snap1.processData[k], snap2.processData[k], `Same process data value ${k} (${name})`)
-  }
+  Assert.equal(
+    JSON.stringify(snap1.processData),
+    JSON.stringify(snap2.processData),
+    "Same process data: " + name);
   let stats1 = snap1.componentsData.sort((a, b) => a.name <= b.name);
   let stats2 = snap2.componentsData.sort((a, b) => a.name <= b.name);
-  Assert.equal(stats1.length, stats2.length, `Same number of components (${name})`);
-  for (let i = 0; i < stats1.length; ++i) {
-    for (let k of Object.keys(stats1[i])) {
-      if (k == "ticks") {
-        // Ticks monitoring cannot be deactivated
-        continue;
-      }
-      Assert.equal(stats1[i][k], stats1[i][k], `Same component data value ${i} ${k} (${name})`)
-    }
-  }
+  Assert.equal(
+    JSON.stringify(stats1),
+    JSON.stringify(stats2),
+    "Same components data: " + name
+  );
 }
 
 function hasLowPrecision() {
@@ -106,7 +88,6 @@ function hasLowPrecision() {
 
 add_task(function* test_measure() {
   let skipPrecisionTests = hasLowPrecision();
-  yield promiseSetPerCompartment(false);
 
   do_print("Burn CPU without the stopwatch");
   yield promiseSetMonitoring(false);
@@ -156,14 +137,4 @@ add_task(function* test_measure() {
   Assert.equal(builtin2.totalCPOWTime, builtin1.totalCPOWTime, "No CPOW for built-in statistics");
   Assert.equal(builtin4.totalUserTime, builtin3.totalUserTime, "After deactivating the stopwatch, we didn't count any time for the built-in");
   Assert.equal(builtin4.totalCPOWTime, builtin3.totalCPOWTime, "After deactivating the stopwatch, we didn't count any CPOW time for the built-in");
-
-  // Ideally, we should be able to look for test_compartments.js, but
-  // it doesn't have its own compartment.
-  for (let stats of [stats1, stats2, stats3, stats4]) {
-    Assert.ok(!stats.componentsData.find(x => x.name.includes("Task.jsm")), "At this stage, Task.jsm doesn't show up in the components data");
-  }
-  yield promiseSetPerCompartment(true);
-  burnCPU(300);
-  let stats5 = yield promiseStatistics("With per-compartment monitoring");
-  Assert.ok(stats5.componentsData.find(x => x.name.includes("Task.jsm")), "With per-compartment monitoring, test_compartments.js shows up");
 });