From 0a931bdeff6b3e68a4aca6a3e11d358264814a43 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Tue, 30 Oct 2018 19:04:23 +0000
Subject: [PATCH 01/53] Bug 1502731 - Remove @hudButton@ and
 @hudButtonPressed@. r=dao

Differential Revision: https://phabricator.services.mozilla.com/D10004

--HG--
extra : moz-landing-system : lando
---
 .../controlcenter/content/panel.inc.xul       |   9 ++-
 .../components/places/content/editBookmark.js |   8 +--
 .../places/content/editBookmarkPanel.inc.xul  |   6 +-
 browser/themes/osx/browser.css                |  54 +++++-------------
 browser/themes/osx/controlcenter/panel.css    |   7 ---
 browser/themes/osx/customizableui/panelUI.css |  20 +++++++
 browser/themes/osx/jar.mn                     |   4 --
 browser/themes/osx/pageInfo.css               |   2 +-
 browser/themes/osx/panel-expander-closed.png  | Bin 154 -> 0 bytes
 .../themes/osx/panel-expander-closed@2x.png   | Bin 362 -> 0 bytes
 browser/themes/osx/panel-expander-open.png    | Bin 154 -> 0 bytes
 browser/themes/osx/panel-expander-open@2x.png | Bin 356 -> 0 bytes
 browser/themes/osx/shared.inc                 |   6 --
 .../themes/shared/icons/arrow-dropdown-12.svg |   2 +-
 toolkit/themes/shared/icons/arrow-up-12.svg   |   6 ++
 toolkit/themes/shared/jar.inc.mn              |   1 +
 16 files changed, 56 insertions(+), 69 deletions(-)
 delete mode 100644 browser/themes/osx/panel-expander-closed.png
 delete mode 100644 browser/themes/osx/panel-expander-closed@2x.png
 delete mode 100644 browser/themes/osx/panel-expander-open.png
 delete mode 100644 browser/themes/osx/panel-expander-open@2x.png
 delete mode 100644 browser/themes/osx/shared.inc
 create mode 100644 toolkit/themes/shared/icons/arrow-up-12.svg

diff --git a/browser/components/controlcenter/content/panel.inc.xul b/browser/components/controlcenter/content/panel.inc.xul
index 1fee8fd3aced..35c54a43d460 100644
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -106,17 +106,17 @@
           </vbox>
 
           <button id="tracking-action-unblock"
-                  class="tracking-protection-button"
+                  class="panel-button tracking-protection-button"
                   label="&trackingProtection.unblock4.label;"
                   accesskey="&trackingProtection.unblock4.accesskey;"
                   oncommand="ContentBlocking.disableForCurrentPage(); gIdentityHandler.recordClick('unblock');" />
           <button id="tracking-action-unblock-private"
-                  class="tracking-protection-button"
+                  class="panel-button tracking-protection-button"
                   label="&trackingProtection.unblockPrivate4.label;"
                   accesskey="&trackingProtection.unblockPrivate4.accesskey;"
                   oncommand="ContentBlocking.disableForCurrentPage(); gIdentityHandler.recordClick('unblock_private');" />
           <button id="tracking-action-block"
-                  class="tracking-protection-button"
+                  class="panel-button tracking-protection-button"
                   label="&trackingProtection.block5.label;"
                   accesskey="&trackingProtection.block5.accesskey;"
                   oncommand="ContentBlocking.enableForCurrentPage(); gIdentityHandler.recordClick('block');" />
@@ -188,6 +188,7 @@
         <button when-connection="secure-cert-user-overridden"
                 label="&identity.removeCertException.label;"
                 accesskey="&identity.removeCertException.accesskey;"
+                class="panel-button"
                 oncommand="gIdentityHandler.removeCertException()"/>
 
         <!-- Connection is Not Secure -->
@@ -230,10 +231,12 @@
         <button when-mixedcontent="active-blocked"
                 label="&identity.disableMixedContentBlocking.label;"
                 accesskey="&identity.disableMixedContentBlocking.accesskey;"
+                class="panel-button"
                 oncommand="gIdentityHandler.disableMixedContentProtection()"/>
         <button when-mixedcontent="active-loaded"
                 label="&identity.enableMixedContentBlocking.label;"
                 accesskey="&identity.enableMixedContentBlocking.accesskey;"
+                class="panel-button"
                 oncommand="gIdentityHandler.enableMixedContentProtection()"/>
       </vbox>
 
diff --git a/browser/components/places/content/editBookmark.js b/browser/components/places/content/editBookmark.js
index eca1ae4ac331..ecc6b169922a 100644
--- a/browser/components/places/content/editBookmark.js
+++ b/browser/components/places/content/editBookmark.js
@@ -641,15 +641,15 @@ var gEditItemOverlay = {
   toggleFolderTreeVisibility() {
     var expander = this._element("foldersExpander");
     var folderTreeRow = this._element("folderTreeRow");
+    expander.classList.toggle("expander-up", folderTreeRow.collapsed);
+    expander.classList.toggle("expander-down", !folderTreeRow.collapsed);
     if (!folderTreeRow.collapsed) {
-      expander.className = "expander-down";
       expander.setAttribute("tooltiptext",
                             expander.getAttribute("tooltiptextdown"));
       folderTreeRow.collapsed = true;
       this._element("chooseFolderSeparator").hidden =
         this._element("chooseFolderMenuItem").hidden = false;
     } else {
-      expander.className = "expander-up";
       expander.setAttribute("tooltiptext",
                             expander.getAttribute("tooltiptextup"));
       folderTreeRow.collapsed = false;
@@ -802,8 +802,9 @@ var gEditItemOverlay = {
     var tagsSelector = this._element("tagsSelector");
     var tagsSelectorRow = this._element("tagsSelectorRow");
     var expander = this._element("tagsSelectorExpander");
+    expander.classList.toggle("expander-up", tagsSelectorRow.collapsed);
+    expander.classList.toggle("expander-down", !tagsSelectorRow.collapsed);
     if (tagsSelectorRow.collapsed) {
-      expander.className = "expander-up";
       expander.setAttribute("tooltiptext",
                             expander.getAttribute("tooltiptextup"));
       tagsSelectorRow.collapsed = false;
@@ -813,7 +814,6 @@ var gEditItemOverlay = {
       tagsSelector.addEventListener("mousedown", this);
       tagsSelector.addEventListener("keypress", this);
     } else {
-      expander.className = "expander-down";
       expander.setAttribute("tooltiptext",
                             expander.getAttribute("tooltiptextdown"));
       tagsSelectorRow.collapsed = true;
diff --git a/browser/components/places/content/editBookmarkPanel.inc.xul b/browser/components/places/content/editBookmarkPanel.inc.xul
index a5fb0e3ae274..9f95de7611e3 100644
--- a/browser/components/places/content/editBookmarkPanel.inc.xul
+++ b/browser/components/places/content/editBookmarkPanel.inc.xul
@@ -29,7 +29,7 @@
              control="editBMPanel_folderMenuList"/>
       <hbox flex="1" align="center">
         <menulist id="editBMPanel_folderMenuList"
-                  class="folder-icon"
+                  class="folder-icon panel-button"
                   flex="1"
                   oncommand="gEditItemOverlay.onFolderMenuListCommand(event).catch(Components.utils.reportError);">
           <menupopup>
@@ -48,7 +48,7 @@
           </menupopup>
         </menulist>
         <button id="editBMPanel_foldersExpander"
-                class="expander-down"
+                class="expander-down panel-button"
                 tooltiptext="&editBookmarkOverlay.foldersExpanderDown.tooltip;"
                 tooltiptextdown="&editBookmarkOverlay.foldersExpanderDown.tooltip;"
                 tooltiptextup="&editBookmarkOverlay.expanderUp.tooltip;"
@@ -98,7 +98,7 @@
                  placeholder="&editBookmarkOverlay.tagsEmptyDesc.label;"
                  onchange="gEditItemOverlay.onTagsFieldChange();"/>
         <button id="editBMPanel_tagsSelectorExpander"
-                class="expander-down"
+                class="expander-down panel-button"
                 tooltiptext="&editBookmarkOverlay.tagsExpanderDown.tooltip;"
                 tooltiptextdown="&editBookmarkOverlay.tagsExpanderDown.tooltip;"
                 tooltiptextup="&editBookmarkOverlay.expanderUp.tooltip;"
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index c534ad4cad20..1eb7a3677674 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2,7 +2,7 @@
  * 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 shared.inc
+%include ../../../toolkit/themes/osx/global/shared.inc
 %define toolbarButtonPressed :hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"])
 
 @namespace html url("http://www.w3.org/1999/xhtml");
@@ -461,8 +461,6 @@ html|input.urlbar-input {
 }
 
 #editBMPanel_folderMenuList {
-  @hudButton@
-  background-clip: padding-box;
   margin: 0;
   min-height: 22px;
   padding-top: 2px;
@@ -475,18 +473,16 @@ html|input.urlbar-input {
   box-shadow: var(--focus-ring-box-shadow);
 }
 
-#editBMPanel_folderMenuList[open="true"],
-#editBMPanel_folderMenuList:hover:active {
-  @hudButtonPressed@
-}
-
 #editBMPanel_folderMenuList > .menulist-dropmarker {
   -moz-appearance: none;
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0.8;
+  list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
   display: -moz-box;
   -moz-box-align: center;
   padding-inline-end: 4px;
   width: 7px;
-  list-style-image: url("chrome://global/skin/icons/panel-dropmarker.png");
 }
 
 /**** folder tree and tag selector ****/
@@ -523,31 +519,16 @@ html|input.urlbar-input {
 
 #editBookmarkPanel .expander-up,
 #editBookmarkPanel .expander-down {
-  @hudButton@
+  -moz-appearance: none; /* override button.css */
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0.8;
   margin: 0;
   margin-inline-start: 4px;
   min-width: 27px;
   min-height: 22px;
 }
 
-#editBookmarkPanel .expander-up:-moz-focusring,
-#editBookmarkPanel .expander-down:-moz-focusring {
-  box-shadow: var(--focus-ring-box-shadow);
-}
-
-#editBookmarkPanel .expander-up:hover:active,
-#editBookmarkPanel .expander-down:hover:active {
-  @hudButtonPressed@
-}
-
-#editBookmarkPanel .expander-up {
-  list-style-image: url("chrome://browser/skin/panel-expander-open.png");
-}
-
-#editBookmarkPanel .expander-down {
-  list-style-image: url("chrome://browser/skin/panel-expander-closed.png");
-}
-
 #editBookmarkPanel .expander-up > .button-box > .button-icon,
 #editBookmarkPanel .expander-down > .button-box > .button-icon {
   margin: 1px 0 0;
@@ -558,19 +539,12 @@ html|input.urlbar-input {
   display: none;
 }
 
-@media (min-resolution: 2dppx) {
-  #editBookmarkPanel .expander-up {
-    list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png");
-  }
+#editBookmarkPanel .expander-up {
+  list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg");
+}
 
-  #editBookmarkPanel .expander-down {
-    list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png");
-  }
-
-  #editBookmarkPanel .expander-up > .button-box > .button-icon,
-  #editBookmarkPanel .expander-down > .button-box > .button-icon {
-    width: 9px;
-  }
+#editBookmarkPanel .expander-down {
+  list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
 }
 
 #editBMPanel_tagsField > moz-input-box > html|*.textbox-input::placeholder {
diff --git a/browser/themes/osx/controlcenter/panel.css b/browser/themes/osx/controlcenter/panel.css
index 1c8b1d8e2a4c..5284464385cf 100644
--- a/browser/themes/osx/controlcenter/panel.css
+++ b/browser/themes/osx/controlcenter/panel.css
@@ -2,7 +2,6 @@
  * 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 ../shared.inc
 %include ../../shared/controlcenter/panel.inc.css
 
 .identity-popup-expander:-moz-focusring,
@@ -12,15 +11,9 @@
 
 .tracking-protection-button,
 #identity-popup-securityView-body > button {
-  @hudButton@
   min-height: 30px;
 }
 
-.tracking-protection-button:hover:active,
-#identity-popup-securityView-body > button:hover:active {
-  @hudButtonPressed@
-}
-
 .tracking-protection-button:-moz-focusring,
 #identity-popup-securityView-body > button:-moz-focusring {
   box-shadow: var(--focus-ring-box-shadow);
diff --git a/browser/themes/osx/customizableui/panelUI.css b/browser/themes/osx/customizableui/panelUI.css
index 0a2fa6b7340e..2fdd003ea6aa 100644
--- a/browser/themes/osx/customizableui/panelUI.css
+++ b/browser/themes/osx/customizableui/panelUI.css
@@ -80,3 +80,23 @@ menu.subviewbutton > .menu-right {
 #PanelUI-remotetabs-tabslist {
   padding-bottom: 4px;
 }
+
+.panel-button {
+  -moz-appearance: none;
+  border-radius: 2px;
+  background-color: var(--arrowpanel-dimmed);
+  color: inherit;
+  padding: 2px 6px;
+}
+
+.panel-button@buttonStateHover@ {
+  background-color: var(--arrowpanel-dimmed-further);
+}
+
+.panel-button@buttonStateActive@ {
+  background-color: var(--arrowpanel-dimmed-even-further);
+}
+
+.panel-button:-moz-focusring {
+  box-shadow: var(--focus-ring-box-shadow);
+}
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 71e840323465..f9a2e2d31025 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -9,10 +9,6 @@ browser.jar:
 * skin/classic/browser/syncedtabs/sidebar.css          (syncedtabs/sidebar.css)
 * skin/classic/browser/browser.css
 * skin/classic/browser/compacttheme.css
-  skin/classic/browser/panel-expander-closed.png
-  skin/classic/browser/panel-expander-closed@2x.png
-  skin/classic/browser/panel-expander-open.png
-  skin/classic/browser/panel-expander-open@2x.png
   skin/classic/browser/panel-plus-sign.png
 * skin/classic/browser/pageInfo.css
 * skin/classic/browser/searchbar.css
diff --git a/browser/themes/osx/pageInfo.css b/browser/themes/osx/pageInfo.css
index 648779e48e00..3f28b1677b65 100644
--- a/browser/themes/osx/pageInfo.css
+++ b/browser/themes/osx/pageInfo.css
@@ -4,7 +4,7 @@
 
 @import "chrome://global/skin/";
 
-%include shared.inc
+%include ../../../toolkit/themes/osx/global/shared.inc
 
 #topBar {
   -moz-appearance: toolbar;
diff --git a/browser/themes/osx/panel-expander-closed.png b/browser/themes/osx/panel-expander-closed.png
deleted file mode 100644
index e08c1636bb12768afc74c094437d8ed50ff73fe6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRR!2%?ApR4f$Qi+}}jv*C{$rsjK+_`?{IR>^_
znhs^WhwGmnaJ@Et>t6|pEq~YOvFrU>&oiZZ<?HRI9xka|_1E+NQ~lC|r~VtqZu}7Y
zeDnSMtI3c5`|t>SnE!M__y0?izX>qTQ21Tn{C|yr83T*D;@#WXE58CQWAJqKb6Mw<
G&;$Tg073o$

diff --git a/browser/themes/osx/panel-expander-closed@2x.png b/browser/themes/osx/panel-expander-closed@2x.png
deleted file mode 100644
index 0e7ded50f4143b22ec7ecbd831f33b07f8d3a339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq000sI000aK1ONa4#Tz9z0003oNkl<Z7#VfJ
zJxc-s00!Xq?ou(&Lmf^X1kq|Rlc=UFAqomAGa`iW6O;%EH4wThhiq)n22*TvkQS$Q
z|3O=8bEAv<TTxI_Jr8K5N;g%?l<)&3%2es5N-MlY^wC9c`IL5w_(GBPl>&O`qVFwY
z<n-6jL>--2k_tt<qevx|L<e;={k4%3bPXf3mnc9J+u1$J6ev*6?}%+^C<HHt5xN1;
z^Rn*Ik%KPXl{RRhrMhZpLPvf|dtIXkA1KiGwB@QG1<llGg<E0sEp((^mFG?RDBu$%
z&J3cq65=?Quazt4IC2yRQBG6DHyRjtI5Zt2hBC@HkWU`>8Q=uQ(a2CEA*Hd6T|@Rh
z&LEBWjgwrcW{{LpHwn(ujK5LgQa*E*;38%Gj}C@7M;pex0osjr2JJ-x4*&oF07*qo
IM6N<$g0z^D<NyEw

diff --git a/browser/themes/osx/panel-expander-open.png b/browser/themes/osx/panel-expander-open.png
deleted file mode 100644
index 596f0469cf83f8b9200f8457d7fe8e055d8817f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRR!2%?ApR4f$Qi+}}jv*C{$qfv=oM$Vg4)Jg-
zIGMfa=EJ6sQoejE8pKwgteKvC)YtEL@3PE|O|3oFbNb9g{!Gu;D6mPp!YOj${AP=Z
z_dmqXX?(c9qOSQU=U<z)|6c!P|DAU1`JvCAqRq&lYa-`Z5~jKlXc>d2tDnm{r-UW|
DB}_QM

diff --git a/browser/themes/osx/panel-expander-open@2x.png b/browser/themes/osx/panel-expander-open@2x.png
deleted file mode 100644
index 391337030cd9eef9b0deb9509653bc3d5d8e2c20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq000sI000aK1ONa4#Tz9z0003iNkl<Z7*}=A
zze@rE0LAg=o#&}}bvNWt1`UZ|77Ev3(%2Fjh{74B`Ge4NDnjnEYzZ4ADi9;0S_9XX
zX8(cy0RIgCfY($g<#+xJ?*UU$q=#;bm>mUbF>|{_mBMVYuz!SC;Voxy{$EB1m3&rs
zhJ}{!beyD*j=#ivwktm39ET|2QtG#N=$&G8(0#ilKfpr4-&i(LL~HK;PN#c<Q67Yq
zE^HX;$uKj_sHZr<h0+~_DgO}H=bCl{3u(Fbo@IpVA8DV7EbPVWuT@F_=o|%>u3#f2
zmHK&Z(nS|HUUE_yDcCFRQGia2{h=l-?7`?18KV~f=wY-|gn=aNP;=}@u#6sRs5Gk7
zsr;_=QEyaHK^?td8B`cyf^kNvO&kU_Mj2;<5h~v@1#mNpUWG>h0000<MNUMnLSTYb
CPnNU*

diff --git a/browser/themes/osx/shared.inc b/browser/themes/osx/shared.inc
deleted file mode 100644
index aacad914ca0e..000000000000
--- a/browser/themes/osx/shared.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-%include ../../../toolkit/themes/osx/global/shared.inc
-
-%filter substitution
-
-%define hudButton -moz-appearance: none; color: #434343; border-radius: 4px; border: 1px solid #b5b5b5; background: linear-gradient(#fff, #f2f2f2); box-shadow: inset 0 1px rgba(255,255,255,.8), inset 0 0 1px rgba(255,255, 255,.25), 0 1px rgba(255,255,255,.3); background-clip: padding-box; background-origin: padding-box; padding: 2px 6px;
-%define hudButtonPressed box-shadow: inset 0 1px 4px -3px #000, 0 1px rgba(255,255,255,.3);
diff --git a/toolkit/themes/shared/icons/arrow-dropdown-12.svg b/toolkit/themes/shared/icons/arrow-dropdown-12.svg
index e6da521ef318..1a784357ce94 100644
--- a/toolkit/themes/shared/icons/arrow-dropdown-12.svg
+++ b/toolkit/themes/shared/icons/arrow-dropdown-12.svg
@@ -2,5 +2,5 @@
    - 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/. -->
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
-  <path fill="context-fill" d="M6,9a1,1,0,0,1-.707-.293l-4-4A1,1,0,0,1,2.707,3.293L6,6.586,9.293,3.293a1,1,0,0,1,1.414,1.414l-4,4A1,1,0,0,1,6,9Z" />
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M6 9a1 1 0 0 1-.707-.293l-3-3a1 1 0 0 1 1.414-1.414L6 6.586l2.293-2.293a1 1 0 0 1 1.414 1.414l-3 3A1 1 0 0 1 6 9z"/>
 </svg>
diff --git a/toolkit/themes/shared/icons/arrow-up-12.svg b/toolkit/themes/shared/icons/arrow-up-12.svg
new file mode 100644
index 000000000000..d881044a948a
--- /dev/null
+++ b/toolkit/themes/shared/icons/arrow-up-12.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M6 3a1 1 0 0 0-.707.293l-3 3a1 1 0 0 0 1.414 1.414L6 5.414l2.293 2.293a1 1 0 0 0 1.414-1.414l-3-3A1 1 0 0 0 6 3z"/>
+</svg>
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index 786f8f7f6da1..9086e0129efb 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -49,6 +49,7 @@ toolkit.jar:
   skin/classic/global/icons/twisty-expanded.svg            (../../shared/icons/twisty-expanded.svg)
   skin/classic/global/icons/arrow-dropdown-12.svg          (../../shared/icons/arrow-dropdown-12.svg)
   skin/classic/global/icons/arrow-dropdown-16.svg          (../../shared/icons/arrow-dropdown-16.svg)
+  skin/classic/global/icons/arrow-up-12.svg                (../../shared/icons/arrow-up-12.svg)
   skin/classic/global/icons/warning.svg                    (../../shared/icons/warning.svg)
   skin/classic/global/illustrations/about-rights.svg       (../../shared/illustrations/about-rights.svg)
   skin/classic/global/icons/blocked.svg                    (../../shared/incontent-icons/blocked.svg)

From db400cd64a188887b369d471199cbc5f20b69735 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Tue, 30 Oct 2018 18:59:18 +0000
Subject: [PATCH 02/53] Bug 1502731 - Modernize MacOS bookmarking panel
 component styles. r=dao

Depends on D10004

Differential Revision: https://phabricator.services.mozilla.com/D10249

--HG--
extra : moz-landing-system : lando
---
 browser/themes/osx/browser.css | 51 ++++++++++++++--------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 1eb7a3677674..7dde8dbb55f5 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -25,6 +25,8 @@
   --arrowpanel-dimmed-further: hsla(0,0%,80%,.45);
   --arrowpanel-dimmed-even-further: hsla(0,0%,80%,.8);
 
+  --arrowpanel-field-background: rgba(249,249,250,.3);
+
   --urlbar-separator-color: hsla(0,0%,16%,.2);
 
   --toolbox-border-bottom-color: #e1e1e2;
@@ -43,6 +45,8 @@
   --arrowpanel-dimmed: rgba(249,249,250,.1);
   --arrowpanel-dimmed-further: rgba(249,249,250,.15);
   --arrowpanel-dimmed-even-further: rgba(249,249,250,.2);
+
+  --arrowpanel-field-background: rgba(12,12,13,.3);
 }
 
 #navigator-toolbox {
@@ -398,12 +402,10 @@ html|input.urlbar-input {
 #editBookmarkPanelRows > vbox > textbox,
 #editBookmarkPanelRows > vbox > hbox > textbox {
   -moz-appearance: none;
-  background: linear-gradient(#fafafa, #fff);
-  background-clip: padding-box;
-  border-radius: 3px;
-  border: 1px solid rgba(0,0,0,.3) !important;
-  box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
-              0 1px rgba(255,255,255,.3);
+  background-color: var(--arrowpanel-field-background);
+  color: inherit;
+  border-radius: 2px;
+  border: 1px solid var(--panel-separator-color) !important;
   margin: 0;
   padding: 3px 6px;
 }
@@ -420,46 +422,37 @@ html|input.urlbar-input {
    editBookmark.css. */
 
 #editBMPanel_newFolderBox {
-  background: linear-gradient(#fff, #f2f2f2);
-  background-origin: padding-box;
-  background-clip: padding-box;
-  border-radius: 0 0 3px 3px;
-  border: 1px solid #a5a5a5;
-  box-shadow: inset 0 1px rgba(255,255,255,.8),
-              inset 0 0 1px rgba(255,255, 255,.25),
-              0 1px rgba(255,255,255,.3);
+  background-color: var(--arrowpanel-field-background);
+  color: inherit;
+  border-radius: 0 2px;
+  border: 1px solid var(--panel-separator-color);
   margin: 0;
   padding: 0;
-  height:  20px;
+  height: 20px;
 }
 
 #editBMPanel_newFolderButton {
   -moz-appearance: none;
-  border: 0 solid #a5a5a5;
+  border: 0 solid var(--panel-separator-color);
   border-inline-end-width: 1px;
   padding: 0 9px;
   margin: 0;
   min-width: 21px;
   min-height: 20px;
-  height:  20px;
-  color: #fff;
+  height: 20px;
+  color: inherit;
   list-style-image: url("chrome://browser/skin/panel-plus-sign.png");
   position: relative;
 }
 
 #editBMPanel_newFolderButton:hover:active {
-  background: linear-gradient(rgba(40,40,40,.9), rgba(70,70,70,.9));
-  box-shadow: inset 0 0 3px rgba(0,0,0,.2), inset 0 1px 7px rgba(0,0,0,.4);
+  background-color: var(--arrowpanel-dimmed-further);
 }
 
 #editBMPanel_newFolderButton:-moz-focusring {
   box-shadow: var(--focus-ring-box-shadow);
 }
 
-#editBMPanel_newFolderButton .button-text {
-  display: none;
-}
-
 #editBMPanel_folderMenuList {
   margin: 0;
   min-height: 22px;
@@ -490,12 +483,10 @@ html|input.urlbar-input {
 #editBMPanel_folderTree,
 #editBMPanel_tagsSelector {
   -moz-appearance: none;
-  background: linear-gradient(#fafafa, #fff);
-  background-clip: padding-box;
-  border-radius: 3px;
-  border: 1px solid rgba(0,0,0,.3);
-  box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
-              0 1px rgba(255,255,255,.3);
+  background-color: var(--arrowpanel-field-background);
+  color: inherit;
+  border-radius: 2px;
+  border: 1px solid var(--panel-separator-color);
   margin: 0;
 }
 

From 87c38be65a8fec823777a016c8d0dee18babfa27 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Thu, 11 Oct 2018 16:10:28 +0000
Subject: [PATCH 03/53] bug 1492499: marionette: fix GeckoDriver#setWindowRect
 docs; r=automatedtester

Differential Revision: https://phabricator.services.mozilla.com/D8404

--HG--
extra : moz-landing-system : lando
---
 testing/marionette/driver.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js
index 4d8dfbe8e194..aa2f3d4e3c55 100644
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -1410,8 +1410,8 @@ GeckoDriver.prototype.getWindowRect = async function() {
  * Set the window position and size of the browser on the operating
  * system window manager.
  *
- * The supplied |width| and |height| values refer to the window outerWidth
- * and outerHeight values, which include browser chrome and OS-level
+ * The supplied `width` and `height` values refer to the window `outerWidth`
+ * and `outerHeight` values, which include browser chrome and OS-level
  * window borders.
  *
  * @param {number} x
@@ -1426,7 +1426,7 @@ GeckoDriver.prototype.getWindowRect = async function() {
  *     Height to resize the window to.
  *
  * @return {Object.<string, number>}
- *     Object with |x| and |y| coordinates and |width| and |height|
+ *     Object with `x` and `y` coordinates and `width` and `height`
  *     dimensions.
  *
  * @throws {UnsupportedOperationError}

From b0d96c11783556b5b5c8a9669fc9c37311ae9f62 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Thu, 11 Oct 2018 16:13:02 +0000
Subject: [PATCH 04/53] bug 1492499: webdriver: fix is_fullscreen assertions;
 r=automatedtester

The "is True" and "is False" style is unnecessary as the return
values are boolean, which means "assert is_fullscreen(session)"
and "assert not is_fullscreen(session)" is sufficient.

Depends on D8404

Differential Revision: https://phabricator.services.mozilla.com/D8405

--HG--
extra : moz-landing-system : lando
---
 .../tests/fullscreen_window/fullscreen.py          |  8 ++++----
 .../tests/fullscreen_window/user_prompts.py        | 14 ++++++--------
 .../webdriver/tests/maximize_window/maximize.py    |  4 ++--
 .../tests/webdriver/tests/set_window_rect/set.py   |  4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/testing/web-platform/tests/webdriver/tests/fullscreen_window/fullscreen.py b/testing/web-platform/tests/webdriver/tests/fullscreen_window/fullscreen.py
index 5391114c6767..3834c3eb8df8 100644
--- a/testing/web-platform/tests/webdriver/tests/fullscreen_window/fullscreen.py
+++ b/testing/web-platform/tests/webdriver/tests/fullscreen_window/fullscreen.py
@@ -26,7 +26,7 @@ def test_fullscreen(session):
     response = fullscreen(session)
     assert_success(response)
 
-    assert is_fullscreen(session) is True
+    assert is_fullscreen(session)
 
 
 def test_payload(session):
@@ -47,12 +47,12 @@ def test_payload(session):
 
 
 def test_fullscreen_twice_is_idempotent(session):
-    assert is_fullscreen(session) is False
+    assert not is_fullscreen(session)
 
     first_response = fullscreen(session)
     assert_success(first_response)
-    assert is_fullscreen(session) is True
+    assert is_fullscreen(session)
 
     second_response = fullscreen(session)
     assert_success(second_response)
-    assert is_fullscreen(session) is True
+    assert is_fullscreen(session)
diff --git a/testing/web-platform/tests/webdriver/tests/fullscreen_window/user_prompts.py b/testing/web-platform/tests/webdriver/tests/fullscreen_window/user_prompts.py
index 04b8bc5337db..bbaa84b61446 100644
--- a/testing/web-platform/tests/webdriver/tests/fullscreen_window/user_prompts.py
+++ b/testing/web-platform/tests/webdriver/tests/fullscreen_window/user_prompts.py
@@ -24,7 +24,7 @@ def is_fullscreen(session):
 @pytest.fixture
 def check_user_prompt_closed_without_exception(session, create_dialog):
     def check_user_prompt_closed_without_exception(dialog_type, retval):
-        assert is_fullscreen(session) is False
+        assert not is_fullscreen(session)
 
         create_dialog(dialog_type, text=dialog_type)
 
@@ -32,8 +32,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
         assert_success(response)
 
         assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
-
-        assert is_fullscreen(session) is True
+        assert is_fullscreen(session)
 
     return check_user_prompt_closed_without_exception
 
@@ -41,7 +40,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
 @pytest.fixture
 def check_user_prompt_closed_with_exception(session, create_dialog):
     def check_user_prompt_closed_with_exception(dialog_type, retval):
-        assert is_fullscreen(session) is False
+        assert not is_fullscreen(session)
 
         create_dialog(dialog_type, text=dialog_type)
 
@@ -49,8 +48,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
         assert_error(response, "unexpected alert open")
 
         assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
-
-        assert is_fullscreen(session) is False
+        assert not is_fullscreen(session)
 
     return check_user_prompt_closed_with_exception
 
@@ -58,7 +56,7 @@ def check_user_prompt_closed_with_exception(session, create_dialog):
 @pytest.fixture
 def check_user_prompt_not_closed_but_exception(session, create_dialog):
     def check_user_prompt_not_closed_but_exception(dialog_type):
-        assert is_fullscreen(session) is False
+        assert not is_fullscreen(session)
 
         create_dialog(dialog_type, text=dialog_type)
 
@@ -68,7 +66,7 @@ def check_user_prompt_not_closed_but_exception(session, create_dialog):
         assert session.alert.text == dialog_type
         session.alert.dismiss()
 
-        assert is_fullscreen(session) is False
+        assert not is_fullscreen(session)
 
     return check_user_prompt_not_closed_but_exception
 
diff --git a/testing/web-platform/tests/webdriver/tests/maximize_window/maximize.py b/testing/web-platform/tests/webdriver/tests/maximize_window/maximize.py
index 77af0b99169a..6149a48bf3ba 100644
--- a/testing/web-platform/tests/webdriver/tests/maximize_window/maximize.py
+++ b/testing/web-platform/tests/webdriver/tests/maximize_window/maximize.py
@@ -24,11 +24,11 @@ def test_no_browsing_context(session, closed_window):
 
 def test_fully_exit_fullscreen(session):
     session.window.fullscreen()
-    assert is_fullscreen(session) is True
+    assert is_fullscreen(session)
 
     response = maximize(session)
     assert_success(response)
-    assert is_fullscreen(session) is False
+    assert not is_fullscreen(session)
 
 
 def test_restore_the_window(session):
diff --git a/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py b/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
index 928fd622efc2..5023cac4e1c0 100644
--- a/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
+++ b/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
@@ -142,14 +142,14 @@ def test_no_change(session, rect):
 
 def test_fully_exit_fullscreen(session):
     session.window.fullscreen()
-    assert is_fullscreen(session) is True
+    assert is_fullscreen(session)
 
     response = set_window_rect(session, {"width": 400, "height": 400})
     value = assert_success(response)
     assert value["width"] == 400
     assert value["height"] == 400
 
-    assert is_fullscreen(session) is False
+    assert not is_fullscreen(session)
 
 
 def test_restore_from_minimized(session):

From fdfb04c5daa8b927b04e67e4f92649a93d5e412f Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Thu, 11 Oct 2018 16:40:08 +0000
Subject: [PATCH 05/53] bug 1492499: marionette: trim crlf off produced stack;
 r=automatedtester

The stack is joined with "\n" causing an extra carriage return line
feed to appear at the end of the string.

Depends on D8405

Differential Revision: https://phabricator.services.mozilla.com/D8406

--HG--
extra : moz-landing-system : lando
---
 testing/marionette/error.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/marionette/error.js b/testing/marionette/error.js
index 706e0d5284cb..84fed3cf310d 100644
--- a/testing/marionette/error.js
+++ b/testing/marionette/error.js
@@ -160,7 +160,8 @@ this.stack = function() {
   let trace = new Error().stack;
   let sa = trace.split("\n");
   sa = sa.slice(1);
-  return "stacktrace:\n" + sa.join("\n");
+  let rv = "stacktrace:\n" + sa.join("\n");
+  return rv.trimEnd();
 };
 
 /**

From 48089e16fe60cd7c43208f6309828802a0813637 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Thu, 11 Oct 2018 16:40:36 +0000
Subject: [PATCH 06/53] bug 1492499: marionette: warn on TimedPromise bailing;
 r=automatedtester

We often use TimedPromise to ensure Marionette does not unexpectedly
block on a promise that, for whatever reason, does not resolve.
It can however be useful to be alerted when they don't, as it quite
often means there is an underlying problem.

Depends on D8406

Differential Revision: https://phabricator.services.mozilla.com/D8407

--HG--
extra : moz-landing-system : lando
---
 testing/marionette/sync.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/testing/marionette/sync.js b/testing/marionette/sync.js
index c6e784e847c7..a63155c1b725 100644
--- a/testing/marionette/sync.js
+++ b/testing/marionette/sync.js
@@ -9,11 +9,12 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const {
   error,
+  stack,
   TimeoutError,
 } = ChromeUtils.import("chrome://marionette/content/error.js", {});
 const {Log} = ChromeUtils.import("chrome://marionette/content/log.js", {});
 
-XPCOMUtils.defineLazyGetter(this, "logger", Log.get);
+XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 
 this.EXPORTED_SYMBOLS = [
   "IdlePromise",
@@ -185,6 +186,7 @@ function TimedPromise(fn, {timeout = 1500, throws = TimeoutError} = {}) {
         let err = new throws();
         reject(err);
       } else {
+        log.warn(`TimedPromise timed out after ${timeout} ms`, stack());
         resolve();
       }
     };
@@ -255,7 +257,7 @@ function Sleep(timeout) {
 function MessageManagerDestroyedPromise(messageManager) {
   return new Promise(resolve => {
     function observe(subject, topic) {
-      logger.debug(`Received observer notification ${topic}`);
+      log.debug(`Received observer notification ${topic}`);
 
       if (subject == messageManager) {
         Services.obs.removeObserver(this, "message-manager-disconnect");

From d16e7c5292157eaf291eb23536e131b3ea332737 Mon Sep 17 00:00:00 2001
From: Ted Campbell <tcampbell@mozilla.com>
Date: Tue, 30 Oct 2018 19:24:14 +0000
Subject: [PATCH 07/53] Bug 1447372 - Cleanup LifoAlloc usage for RegExp
 r=jorendorff

Directly construct a LifoAllocScope on cx->tempLifoAlloc inside
RegExpObject::create. The data allocated temporarily does not outlive
this function. Also simplify callers as a result.

Differential Revision: https://phabricator.services.mozilla.com/D9976

--HG--
extra : moz-landing-system : lando
---
 js/src/builtin/RegExp.cpp           |  3 +-
 js/src/builtin/TestingFunctions.cpp | 31 +++++++++---------
 js/src/frontend/BinSource-auto.cpp  |  1 -
 js/src/frontend/BinSource.yaml      |  1 -
 js/src/frontend/Parser.cpp          | 12 ++++---
 js/src/irregexp/RegExpEngine.cpp    |  9 +++---
 js/src/irregexp/RegExpEngine.h      |  2 +-
 js/src/irregexp/RegExpParser.cpp    |  2 --
 js/src/jsapi.cpp                    |  6 ++--
 js/src/vm/RegExpObject.cpp          | 49 +++++++++++++++--------------
 js/src/vm/RegExpObject.h            | 13 ++++----
 js/src/vm/SelfHosting.cpp           |  3 +-
 js/src/vm/StructuredClone.cpp       |  3 +-
 13 files changed, 67 insertions(+), 68 deletions(-)

diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index eb93ef22b348..6c327f5eb7b1 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -185,9 +185,10 @@ js::ExecuteRegExpLegacy(JSContext* cx, RegExpStatics* res, Handle<RegExpObject*>
 static bool
 CheckPatternSyntaxSlow(JSContext* cx, HandleAtom pattern, RegExpFlag flags)
 {
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
     CompileOptions options(cx);
     frontend::TokenStream dummyTokenStream(cx, options, nullptr, 0, nullptr);
-    return irregexp::ParsePatternSyntax(dummyTokenStream, cx->tempLifoAlloc(), pattern,
+    return irregexp::ParsePatternSyntax(dummyTokenStream, allocScope.alloc(), pattern,
                                         flags & UnicodeFlag);
 }
 
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index 9aad1a1e7e2a..93430d35993e 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -4703,7 +4703,7 @@ AssertionTypeToString(irregexp::RegExpAssertion::AssertionType type)
 }
 
 static JSObject*
-ConvertRegExpTreeToObject(JSContext* cx, irregexp::RegExpTree* tree)
+ConvertRegExpTreeToObject(JSContext* cx, LifoAlloc& alloc, irregexp::RegExpTree* tree)
 {
     RootedObject obj(cx, JS_NewPlainObject(cx));
     if (!obj) {
@@ -4750,18 +4750,18 @@ ConvertRegExpTreeToObject(JSContext* cx, irregexp::RegExpTree* tree)
         return JS_SetProperty(cx, obj, name, val);
     };
 
-    auto TreeProp = [&ObjectProp](JSContext* cx, HandleObject obj,
-                                  const char* name, irregexp::RegExpTree* tree) {
-        RootedObject treeObj(cx, ConvertRegExpTreeToObject(cx, tree));
+    auto TreeProp = [&ObjectProp, &alloc](JSContext* cx, HandleObject obj,
+                                          const char* name, irregexp::RegExpTree* tree) {
+        RootedObject treeObj(cx, ConvertRegExpTreeToObject(cx, alloc, tree));
         if (!treeObj) {
             return false;
         }
         return ObjectProp(cx, obj, name, treeObj);
     };
 
-    auto TreeVectorProp = [&ObjectProp](JSContext* cx, HandleObject obj,
-                                        const char* name,
-                                        const irregexp::RegExpTreeVector& nodes) {
+    auto TreeVectorProp = [&ObjectProp, &alloc](JSContext* cx, HandleObject obj,
+                                                const char* name,
+                                                const irregexp::RegExpTreeVector& nodes) {
         size_t len = nodes.length();
         RootedObject array(cx, JS_NewArrayObject(cx, len));
         if (!array) {
@@ -4769,7 +4769,7 @@ ConvertRegExpTreeToObject(JSContext* cx, irregexp::RegExpTree* tree)
         }
 
         for (size_t i = 0; i < len; i++) {
-            RootedObject child(cx, ConvertRegExpTreeToObject(cx, nodes[i]));
+            RootedObject child(cx, ConvertRegExpTreeToObject(cx, alloc, nodes[i]));
             if (!child) {
                 return false;
             }
@@ -4823,8 +4823,8 @@ ConvertRegExpTreeToObject(JSContext* cx, irregexp::RegExpTree* tree)
         return ObjectProp(cx, obj, name, array);
     };
 
-    auto ElemProp = [&ObjectProp](JSContext* cx, HandleObject obj,
-                                  const char* name, const irregexp::TextElementVector& elements) {
+    auto ElemProp = [&ObjectProp, &alloc](JSContext* cx, HandleObject obj, const char* name,
+                                          const irregexp::TextElementVector& elements) {
         size_t len = elements.length();
         RootedObject array(cx, JS_NewArrayObject(cx, len));
         if (!array) {
@@ -4833,7 +4833,7 @@ ConvertRegExpTreeToObject(JSContext* cx, irregexp::RegExpTree* tree)
 
         for (size_t i = 0; i < len; i++) {
             const irregexp::TextElement& element = elements[i];
-            RootedObject elemTree(cx, ConvertRegExpTreeToObject(cx, element.tree()));
+            RootedObject elemTree(cx, ConvertRegExpTreeToObject(cx, alloc, element.tree()));
             if (!elemTree) {
                 return false;
             }
@@ -4884,8 +4884,7 @@ ConvertRegExpTreeToObject(JSContext* cx, irregexp::RegExpTree* tree)
         if (!BooleanProp(cx, obj, "is_negated", t->is_negated())) {
             return nullptr;
         }
-        LifoAlloc* alloc = &cx->tempLifoAlloc();
-        if (!CharRangesProp(cx, obj, "ranges", t->ranges(alloc))) {
+        if (!CharRangesProp(cx, obj, "ranges", t->ranges(&alloc))) {
             return nullptr;
         }
         return obj;
@@ -5022,8 +5021,10 @@ ParseRegExp(JSContext* cx, unsigned argc, Value* vp)
     CompileOptions options(cx);
     frontend::TokenStream dummyTokenStream(cx, options, nullptr, 0, nullptr);
 
+    // Data lifetime is controlled by LifoAllocScope.
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
     irregexp::RegExpCompileData data;
-    if (!irregexp::ParsePattern(dummyTokenStream, cx->tempLifoAlloc(), pattern,
+    if (!irregexp::ParsePattern(dummyTokenStream, allocScope.alloc(), pattern,
                                 flags & MultilineFlag, match_only,
                                 flags & UnicodeFlag, flags & IgnoreCaseFlag,
                                 flags & GlobalFlag, flags & StickyFlag,
@@ -5032,7 +5033,7 @@ ParseRegExp(JSContext* cx, unsigned argc, Value* vp)
         return false;
     }
 
-    RootedObject obj(cx, ConvertRegExpTreeToObject(cx, data.tree));
+    RootedObject obj(cx, ConvertRegExpTreeToObject(cx, allocScope.alloc(), data.tree));
     if (!obj) {
         return false;
     }
diff --git a/js/src/frontend/BinSource-auto.cpp b/js/src/frontend/BinSource-auto.cpp
index 629be8cb6247..2674ec8c539e 100644
--- a/js/src/frontend/BinSource-auto.cpp
+++ b/js/src/frontend/BinSource-auto.cpp
@@ -4357,7 +4357,6 @@ BinASTParser<Tok>::parseInterfaceLiteralRegExpExpression(const size_t start, con
     BINJS_TRY_VAR(reobj, RegExpObject::create(cx_,
         pattern,
         reflags,
-        alloc_,
         TenuredObject));
 
     BINJS_TRY_DECL(result, factory_.newRegExp(reobj, tokenizer_->pos(start), *this));
diff --git a/js/src/frontend/BinSource.yaml b/js/src/frontend/BinSource.yaml
index fd5553d751e2..552349103e27 100644
--- a/js/src/frontend/BinSource.yaml
+++ b/js/src/frontend/BinSource.yaml
@@ -1081,7 +1081,6 @@ LiteralRegExpExpression:
         BINJS_TRY_VAR(reobj, RegExpObject::create(cx_,
             pattern,
             reflags,
-            alloc_,
             TenuredObject));
 
         BINJS_TRY_DECL(result, factory_.newRegExp(reobj, tokenizer_->pos(start), *this));
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index acc5bd675874..3e03aba1cf45 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -10032,8 +10032,7 @@ Parser<FullParseHandler, Unit>::newRegExp()
     RegExpFlag flags = anyChars.currentToken().regExpFlags();
 
     Rooted<RegExpObject*> reobj(context);
-    reobj = RegExpObject::create(context, chars.begin(), chars.length(), flags, anyChars, alloc,
-                                 TenuredObject);
+    reobj = RegExpObject::create(context, chars.begin(), chars.length(), flags, anyChars, TenuredObject);
     if (!reobj) {
         return null();
     }
@@ -10052,8 +10051,13 @@ Parser<SyntaxParseHandler, Unit>::newRegExp()
     RegExpFlag flags = anyChars.currentToken().regExpFlags();
 
     mozilla::Range<const char16_t> source(chars.begin(), chars.length());
-    if (!js::irregexp::ParsePatternSyntax(anyChars, alloc, source, flags & UnicodeFlag)) {
-        return null();
+    {
+        LifoAllocScope scopeAlloc(&alloc);
+        if (!js::irregexp::ParsePatternSyntax(anyChars, scopeAlloc.alloc(),
+                                              source, flags & UnicodeFlag))
+        {
+            return null();
+        }
     }
 
     return handler.newRegExp(SyntaxParseHandler::NodeGeneric, pos(), *this);
diff --git a/js/src/irregexp/RegExpEngine.cpp b/js/src/irregexp/RegExpEngine.cpp
index d381dc1e454e..48a8a32acb35 100644
--- a/js/src/irregexp/RegExpEngine.cpp
+++ b/js/src/irregexp/RegExpEngine.cpp
@@ -1735,17 +1735,16 @@ IsNativeRegExpEnabled(JSContext* cx)
 }
 
 RegExpCode
-irregexp::CompilePattern(JSContext* cx, HandleRegExpShared shared, RegExpCompileData* data,
-                         HandleLinearString sample, bool is_global, bool ignore_case,
-                         bool is_latin1, bool match_only, bool force_bytecode, bool sticky,
-                         bool unicode, RegExpShared::JitCodeTables& tables)
+irregexp::CompilePattern(JSContext* cx, LifoAlloc& alloc, HandleRegExpShared shared,
+                         RegExpCompileData* data, HandleLinearString sample, bool is_global,
+                         bool ignore_case, bool is_latin1, bool match_only, bool force_bytecode,
+                         bool sticky, bool unicode, RegExpShared::JitCodeTables& tables)
 {
     if ((data->capture_count + 1) * 2 - 1 > RegExpMacroAssembler::kMaxRegister) {
         JS_ReportErrorASCII(cx, "regexp too big");
         return RegExpCode();
     }
 
-    LifoAlloc& alloc = cx->tempLifoAlloc();
     RegExpCompiler compiler(cx, &alloc, data->capture_count, ignore_case, is_latin1, match_only,
                             unicode);
 
diff --git a/js/src/irregexp/RegExpEngine.h b/js/src/irregexp/RegExpEngine.h
index ff14131c1aba..22e9be72e1c8 100644
--- a/js/src/irregexp/RegExpEngine.h
+++ b/js/src/irregexp/RegExpEngine.h
@@ -85,7 +85,7 @@ struct RegExpCode
 };
 
 RegExpCode
-CompilePattern(JSContext* cx, HandleRegExpShared shared, RegExpCompileData* data,
+CompilePattern(JSContext* cx, LifoAlloc& alloc, HandleRegExpShared shared, RegExpCompileData* data,
                HandleLinearString sample,  bool is_global, bool ignore_case,
                bool is_latin1, bool match_only, bool force_bytecode, bool sticky,
                bool unicode, RegExpShared::JitCodeTables& tables);
diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index 2fd3b80fd6e0..853ec7f86338 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -1958,8 +1958,6 @@ static bool
 ParsePatternSyntax(frontend::TokenStreamAnyChars& ts, LifoAlloc& alloc,
                    const CharT* chars, size_t length, bool unicode)
 {
-    LifoAllocScope scope(&alloc);
-
     RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, false, unicode, false);
     return parser.ParsePattern() != nullptr;
 }
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 68d38638788f..54476b904426 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -6005,8 +6005,7 @@ JS_NewRegExpObject(JSContext* cx, const char* bytes, size_t length, unsigned fla
         return nullptr;
     }
 
-    return RegExpObject::create(cx, chars.get(), length, RegExpFlag(flags), cx->tempLifoAlloc(),
-                                GenericObject);
+    return RegExpObject::create(cx, chars.get(), length, RegExpFlag(flags), GenericObject);
 }
 
 JS_PUBLIC_API(JSObject*)
@@ -6015,8 +6014,7 @@ JS_NewUCRegExpObject(JSContext* cx, const char16_t* chars, size_t length, unsign
     AssertHeapIsIdle();
     CHECK_THREAD(cx);
 
-    return RegExpObject::create(cx, chars, length, RegExpFlag(flags), cx->tempLifoAlloc(),
-                                GenericObject);
+    return RegExpObject::create(cx, chars, length, RegExpFlag(flags), GenericObject);
 }
 
 JS_PUBLIC_API(bool)
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index 08af8c7d818e..6ca5bbc4e401 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -209,8 +209,7 @@ const Class RegExpObject::protoClass_ = {
 template<typename CharT>
 RegExpObject*
 RegExpObject::create(JSContext* cx, const CharT* chars, size_t length, RegExpFlag flags,
-                     frontend::TokenStreamAnyChars& tokenStream, LifoAlloc& alloc,
-                     NewObjectKind newKind)
+                     frontend::TokenStreamAnyChars& tokenStream, NewObjectKind newKind)
 {
     static_assert(mozilla::IsSame<CharT, char16_t>::value,
                   "this code may need updating if/when CharT encodes UTF-8");
@@ -220,18 +219,17 @@ RegExpObject::create(JSContext* cx, const CharT* chars, size_t length, RegExpFla
         return nullptr;
     }
 
-    return create(cx, source, flags, tokenStream, alloc, newKind);
+    return create(cx, source, flags, tokenStream, newKind);
 }
 
 template RegExpObject*
 RegExpObject::create(JSContext* cx, const char16_t* chars, size_t length, RegExpFlag flags,
-                     frontend::TokenStreamAnyChars& tokenStream, LifoAlloc& alloc,
-                     NewObjectKind newKind);
+                     frontend::TokenStreamAnyChars& tokenStream, NewObjectKind newKind);
 
 template<typename CharT>
 RegExpObject*
-RegExpObject::create(JSContext* cx, const CharT* chars, size_t length, RegExpFlag flags,
-                     LifoAlloc& alloc, NewObjectKind newKind)
+RegExpObject::create(JSContext* cx, const CharT* chars, size_t length,
+                     RegExpFlag flags, NewObjectKind newKind)
 {
     static_assert(mozilla::IsSame<CharT, char16_t>::value,
                   "this code may need updating if/when CharT encodes UTF-8");
@@ -241,19 +239,21 @@ RegExpObject::create(JSContext* cx, const CharT* chars, size_t length, RegExpFla
         return nullptr;
     }
 
-    return create(cx, source, flags, alloc, newKind);
+    return create(cx, source, flags, newKind);
 }
 
 template RegExpObject*
-RegExpObject::create(JSContext* cx, const char16_t* chars, size_t length, RegExpFlag flags,
-                     LifoAlloc& alloc, NewObjectKind newKind);
+RegExpObject::create(JSContext* cx, const char16_t* chars, size_t length,
+                     RegExpFlag flags, NewObjectKind newKind);
 
 RegExpObject*
 RegExpObject::create(JSContext* cx, HandleAtom source, RegExpFlag flags,
-                     frontend::TokenStreamAnyChars& tokenStream,
-                     LifoAlloc& alloc, NewObjectKind newKind)
+                     frontend::TokenStreamAnyChars& tokenStream, NewObjectKind newKind)
 {
-    if (!irregexp::ParsePatternSyntax(tokenStream, alloc, source, flags & UnicodeFlag)) {
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
+    if (!irregexp::ParsePatternSyntax(tokenStream, allocScope.alloc(),
+                                      source, flags & UnicodeFlag))
+    {
         return nullptr;
     }
 
@@ -268,13 +268,15 @@ RegExpObject::create(JSContext* cx, HandleAtom source, RegExpFlag flags,
 }
 
 RegExpObject*
-RegExpObject::create(JSContext* cx, HandleAtom source, RegExpFlag flags, LifoAlloc& alloc,
-                     NewObjectKind newKind)
+RegExpObject::create(JSContext* cx, HandleAtom source, RegExpFlag flags, NewObjectKind newKind)
 {
     CompileOptions dummyOptions(cx);
     TokenStream dummyTokenStream(cx, dummyOptions, (const char16_t*) nullptr, 0, nullptr);
 
-    if (!irregexp::ParsePatternSyntax(dummyTokenStream, alloc, source, flags & UnicodeFlag)) {
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
+    if (!irregexp::ParsePatternSyntax(dummyTokenStream, allocScope.alloc(),
+                                      source, flags & UnicodeFlag))
+    {
         return nullptr;
     }
 
@@ -1050,11 +1052,11 @@ RegExpShared::compile(JSContext* cx, MutableHandleRegExpShared re, HandleAtom pa
     CompileOptions options(cx);
     frontend::TokenStream dummyTokenStream(cx, options, nullptr, 0, nullptr);
 
-    LifoAllocScope scope(&cx->tempLifoAlloc());
-
-    /* Parse the pattern. */
+    /* Parse the pattern. The RegExpCompileData is allocated in LifoAlloc and
+     * will only be live while LifoAllocScope is on stack. */
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
     irregexp::RegExpCompileData data;
-    if (!irregexp::ParsePattern(dummyTokenStream, cx->tempLifoAlloc(), pattern,
+    if (!irregexp::ParsePattern(dummyTokenStream, allocScope.alloc(), pattern,
                                 re->multiline(), mode == MatchOnly, re->unicode(),
                                 re->ignoreCase(), re->global(), re->sticky(), &data))
     {
@@ -1064,7 +1066,8 @@ RegExpShared::compile(JSContext* cx, MutableHandleRegExpShared re, HandleAtom pa
     re->parenCount = data.capture_count;
 
     JitCodeTables tables;
-    irregexp::RegExpCode code = irregexp::CompilePattern(cx, re, &data, input,
+    irregexp::RegExpCode code = irregexp::CompilePattern(cx, allocScope.alloc(),
+                                                         re, &data, input,
                                                          false /* global() */,
                                                          re->ignoreCase(),
                                                          input->hasLatin1Chars(),
@@ -1515,7 +1518,7 @@ js::XDRScriptRegExpObject(XDRState<mode>* xdr, MutableHandle<RegExpObject*> objp
     MOZ_TRY(xdr->codeUint32(&flagsword));
     if (mode == XDR_DECODE) {
         RegExpObject* reobj = RegExpObject::create(xdr->cx(), source, RegExpFlag(flagsword),
-                                                   xdr->lifoAlloc(), TenuredObject);
+                                                   TenuredObject);
         if (!reobj) {
             return xdr->fail(JS::TranscodeResult_Throw);
         }
@@ -1539,7 +1542,7 @@ js::CloneScriptRegExpObject(JSContext* cx, RegExpObject& reobj)
     RootedAtom source(cx, reobj.getSource());
     cx->markAtom(source);
 
-    return RegExpObject::create(cx, source, reobj.getFlags(), cx->tempLifoAlloc(), TenuredObject);
+    return RegExpObject::create(cx, source, reobj.getFlags(), TenuredObject);
 }
 
 JS_FRIEND_API(RegExpShared*)
diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h
index a7e8bd8c6d2f..c4099cfd30b8 100644
--- a/js/src/vm/RegExpObject.h
+++ b/js/src/vm/RegExpObject.h
@@ -70,21 +70,20 @@ class RegExpObject : public NativeObject
 
     template<typename CharT>
     static RegExpObject*
-    create(JSContext* cx, const CharT* chars, size_t length, RegExpFlag flags, LifoAlloc& alloc,
-           NewObjectKind newKind);
+    create(JSContext* cx, const CharT* chars, size_t length,
+           RegExpFlag flags, NewObjectKind newKind);
 
     template<typename CharT>
     static RegExpObject*
     create(JSContext* cx, const CharT* chars, size_t length, RegExpFlag flags,
-           frontend::TokenStreamAnyChars& ts, LifoAlloc& alloc, NewObjectKind kind);
+           frontend::TokenStreamAnyChars& ts, NewObjectKind kind);
 
     static RegExpObject*
-    create(JSContext* cx, HandleAtom atom, RegExpFlag flags, LifoAlloc& alloc,
-           NewObjectKind newKind);
+    create(JSContext* cx, HandleAtom source, RegExpFlag flags, NewObjectKind newKind);
 
     static RegExpObject*
-    create(JSContext* cx, HandleAtom atom, RegExpFlag flags, frontend::TokenStreamAnyChars& ts,
-           LifoAlloc& alloc, NewObjectKind newKind);
+    create(JSContext* cx, HandleAtom source, RegExpFlag flags,
+           frontend::TokenStreamAnyChars& ts, NewObjectKind newKind);
 
     /*
      * Compute the initial shape to associate with fresh RegExp objects,
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index ab03282ac94f..1f98dc49e6c9 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -3184,8 +3184,7 @@ CloneObject(JSContext* cx, HandleNativeObject selfHostedObject)
         RegExpObject& reobj = selfHostedObject->as<RegExpObject>();
         RootedAtom source(cx, reobj.getSource());
         MOZ_ASSERT(source->isPermanentAtom());
-        clone = RegExpObject::create(cx, source, reobj.getFlags(), cx->tempLifoAlloc(),
-                                     TenuredObject);
+        clone = RegExpObject::create(cx, source, reobj.getFlags(), TenuredObject);
     } else if (selfHostedObject->is<DateObject>()) {
         clone = JS::NewDateObject(cx, selfHostedObject->as<DateObject>().clippedTime());
     } else if (selfHostedObject->is<BooleanObject>()) {
diff --git a/js/src/vm/StructuredClone.cpp b/js/src/vm/StructuredClone.cpp
index dc358e798c4b..ab1cef1be546 100644
--- a/js/src/vm/StructuredClone.cpp
+++ b/js/src/vm/StructuredClone.cpp
@@ -2595,8 +2595,7 @@ JSStructuredCloneReader::startRead(MutableHandleValue vp)
             return false;
         }
 
-        RegExpObject* reobj = RegExpObject::create(context(), atom, flags,
-                                                   context()->tempLifoAlloc(), GenericObject);
+        RegExpObject* reobj = RegExpObject::create(context(), atom, flags, GenericObject);
         if (!reobj) {
             return false;
         }

From 6b5003a03f0353f67bd402beb7863d6b0fab31d3 Mon Sep 17 00:00:00 2001
From: Ted Campbell <tcampbell@mozilla.com>
Date: Tue, 30 Oct 2018 19:24:37 +0000
Subject: [PATCH 08/53] Bug 1447372 - Cleanup LifoAlloc usage for
 BytecodeParser r=jorendorff

Move LifoAllocScope out of BytecodeParser to avoid ordering issues that
may arise when LifoAllocScope is wrapped.

Differential Revision: https://phabricator.services.mozilla.com/D9977

--HG--
extra : moz-landing-system : lando
---
 js/src/vm/BytecodeUtil.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/js/src/vm/BytecodeUtil.cpp b/js/src/vm/BytecodeUtil.cpp
index f5bc1b6abc37..9da254a7b425 100644
--- a/js/src/vm/BytecodeUtil.cpp
+++ b/js/src/vm/BytecodeUtil.cpp
@@ -441,7 +441,7 @@ class BytecodeParser
     };
 
     JSContext* cx_;
-    LifoAllocScope allocScope_;
+    LifoAlloc& alloc_;
     RootedScript script_;
 
     Bytecode** codeArray_;
@@ -454,9 +454,9 @@ class BytecodeParser
 #endif
 
   public:
-    BytecodeParser(JSContext* cx, JSScript* script)
+    BytecodeParser(JSContext* cx, LifoAlloc& alloc, JSScript* script)
       : cx_(cx),
-        allocScope_(&cx->tempLifoAlloc()),
+        alloc_(alloc),
         script_(cx, script),
         codeArray_(nullptr)
 #ifdef DEBUG
@@ -540,11 +540,10 @@ class BytecodeParser
 
   private:
     LifoAlloc& alloc() {
-        return allocScope_.alloc();
+        return alloc_;
     }
 
     void reportOOM() {
-        allocScope_.releaseEarly();
         ReportOutOfMemory(cx_);
     }
 
@@ -1003,7 +1002,8 @@ BytecodeParser::parse()
 bool
 js::ReconstructStackDepth(JSContext* cx, JSScript* script, jsbytecode* pc, uint32_t* depth, bool* reachablePC)
 {
-    BytecodeParser parser(cx, script);
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
+    BytecodeParser parser(cx, allocScope.alloc(), script);
     if (!parser.parse()) {
         return false;
     }
@@ -1030,8 +1030,9 @@ static MOZ_MUST_USE bool
 DisassembleAtPC(JSContext* cx, JSScript* scriptArg, bool lines,
                 jsbytecode* pc, bool showAll, Sprinter* sp)
 {
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
     RootedScript script(cx, scriptArg);
-    BytecodeParser parser(cx, script);
+    BytecodeParser parser(cx, allocScope.alloc(), script);
     parser.setStackDump();
     if (!parser.parse()) {
         return false;
@@ -2262,7 +2263,8 @@ static bool
 DecompileAtPCForStackDump(JSContext* cx, HandleScript script,
                           const OffsetAndDefIndex& offsetAndDefIndex, Sprinter* sp)
 {
-    BytecodeParser parser(cx, script);
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
+    BytecodeParser parser(cx, allocScope.alloc(), script);
     parser.setStackDump();
     if (!parser.parse()) {
         return false;
@@ -2385,7 +2387,8 @@ DecompileExpressionFromStack(JSContext* cx, int spindex, int skipStackHits, Hand
         return true;
     }
 
-    BytecodeParser parser(cx, frameIter.script());
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
+    BytecodeParser parser(cx, allocScope.alloc(), frameIter.script());
     if (!parser.parse()) {
         return false;
     }
@@ -2489,7 +2492,8 @@ DecompileArgumentFromStack(JSContext* cx, int formalIndex, UniqueChars* res)
         return true;
     }
 
-    BytecodeParser parser(cx, script);
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
+    BytecodeParser parser(cx, allocScope.alloc(), script);
     if (!parser.parse()) {
         return false;
     }
@@ -2749,7 +2753,8 @@ GetPCCountJSON(JSContext* cx, const ScriptAndCounts& sac, Sprinter& sp)
 
     RootedScript script(cx, sac.script);
 
-    BytecodeParser parser(cx, script);
+    LifoAllocScope allocScope(&cx->tempLifoAlloc());
+    BytecodeParser parser(cx, allocScope.alloc(), script);
     if (!parser.parse()) {
         return false;
     }

From 7deaf7bc043e6f968632b5193661f8db50f775f4 Mon Sep 17 00:00:00 2001
From: Ted Campbell <tcampbell@mozilla.com>
Date: Tue, 30 Oct 2018 19:23:25 +0000
Subject: [PATCH 09/53] Bug 1447372 - Cleanup LifoAlloc usage for
 BytecodeCompiler r=jorendorff

Make off-thread and main-thread parsing more consistent by using the
JSContext tempLifoAlloc always. This also makes BytecodeCompiler APIs
more consistent.

Remove BytecodeCompiler::alloc which was obscuring lifetimes and
conflicts of allocator.

Differential Revision: https://phabricator.services.mozilla.com/D9978

--HG--
extra : moz-landing-system : lando
---
 js/src/builtin/Eval.cpp                |  8 ++----
 js/src/frontend/BytecodeCompiler.cpp   | 37 +++++++++++---------------
 js/src/frontend/BytecodeCompiler.h     | 11 ++++----
 js/src/vm/CompilationAndEvaluation.cpp |  5 ++--
 js/src/vm/Debugger.cpp                 |  6 ++---
 js/src/vm/HelperThreads.cpp            | 12 ++++-----
 js/src/vm/Xdr.cpp                      |  6 -----
 js/src/vm/Xdr.h                        | 11 ++------
 8 files changed, 35 insertions(+), 61 deletions(-)

diff --git a/js/src/builtin/Eval.cpp b/js/src/builtin/Eval.cpp
index d1e510e11343..15f595a1add5 100644
--- a/js/src/builtin/Eval.cpp
+++ b/js/src/builtin/Eval.cpp
@@ -322,9 +322,7 @@ EvalKernel(JSContext* cx, HandleValue v, EvalType evalType, AbstractFramePtr cal
                                                   ? SourceBufferHolder::GiveOwnership
                                                   : SourceBufferHolder::NoOwnership;
         SourceBufferHolder srcBuf(chars, linearStr->length(), ownership);
-        JSScript* compiled = frontend::CompileEvalScript(cx, cx->tempLifoAlloc(),
-                                                         env, enclosing,
-                                                         options, srcBuf);
+        JSScript* compiled = frontend::CompileEvalScript(cx, env, enclosing, options, srcBuf);
         if (!compiled) {
             return false;
         }
@@ -408,9 +406,7 @@ js::DirectEvalStringFromIon(JSContext* cx,
                                                   ? SourceBufferHolder::GiveOwnership
                                                   : SourceBufferHolder::NoOwnership;
         SourceBufferHolder srcBuf(chars, linearStr->length(), ownership);
-        JSScript* compiled = frontend::CompileEvalScript(cx, cx->tempLifoAlloc(),
-                                                         env, enclosing,
-                                                         options, srcBuf);
+        JSScript* compiled = frontend::CompileEvalScript(cx, env, enclosing, options, srcBuf);
         if (!compiled) {
             return false;
         }
diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index a919f6970a96..fc056eec7d57 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -45,7 +45,6 @@ class MOZ_STACK_CLASS BytecodeCompiler
   public:
     // Construct an object passing mandatory arguments.
     BytecodeCompiler(JSContext* cx,
-                     LifoAlloc& alloc,
                      const ReadOnlyCompileOptions& options,
                      SourceBufferHolder& sourceBuffer,
                      HandleScope enclosingScope);
@@ -83,7 +82,6 @@ class MOZ_STACK_CLASS BytecodeCompiler
     AutoKeepAtoms keepAtoms;
 
     JSContext* cx;
-    LifoAlloc& alloc;
     const ReadOnlyCompileOptions& options;
     SourceBufferHolder& sourceBuffer;
 
@@ -154,13 +152,11 @@ AutoFrontendTraceLog::AutoFrontendTraceLog(JSContext* cx, const TraceLoggerTextI
 #endif
 
 BytecodeCompiler::BytecodeCompiler(JSContext* cx,
-                                   LifoAlloc& alloc,
                                    const ReadOnlyCompileOptions& options,
                                    SourceBufferHolder& sourceBuffer,
                                    HandleScope enclosingScope)
   : keepAtoms(cx),
     cx(cx),
-    alloc(alloc),
     options(options),
     sourceBuffer(sourceBuffer),
     enclosingScope(cx, enclosingScope),
@@ -233,15 +229,15 @@ BytecodeCompiler::createParser(ParseGoal goal)
     usedNames.emplace(cx);
 
     if (canLazilyParse()) {
-        syntaxParser.emplace(cx, alloc, options, sourceBuffer.get(), sourceBuffer.length(),
-                             /* foldConstants = */ false, *usedNames, nullptr, nullptr,
-                             sourceObject, goal);
+        syntaxParser.emplace(cx, cx->tempLifoAlloc(), options, sourceBuffer.get(),
+                             sourceBuffer.length(), /* foldConstants = */ false,
+                             *usedNames, nullptr, nullptr, sourceObject, goal);
         if (!syntaxParser->checkOptions()) {
             return false;
         }
     }
 
-    parser.emplace(cx, alloc, options, sourceBuffer.get(), sourceBuffer.length(),
+    parser.emplace(cx, cx->tempLifoAlloc(), options, sourceBuffer.get(), sourceBuffer.length(),
                    /* foldConstants = */ true, *usedNames, syntaxParser.ptrOr(nullptr), nullptr,
                    sourceObject, goal);
     parser->ss = scriptSource;
@@ -643,14 +639,14 @@ class MOZ_RAII AutoAssertReportedException
 };
 
 JSScript*
-frontend::CompileGlobalScript(JSContext* cx, LifoAlloc& alloc, ScopeKind scopeKind,
+frontend::CompileGlobalScript(JSContext* cx, ScopeKind scopeKind,
                               const ReadOnlyCompileOptions& options,
                               SourceBufferHolder& srcBuf,
                               ScriptSourceObject** sourceObjectOut)
 {
     MOZ_ASSERT(scopeKind == ScopeKind::Global || scopeKind == ScopeKind::NonSyntactic);
     AutoAssertReportedException assertException(cx);
-    BytecodeCompiler compiler(cx, alloc, options, srcBuf, /* enclosingScope = */ nullptr);
+    BytecodeCompiler compiler(cx, options, srcBuf, /* enclosingScope = */ nullptr);
     AutoInitializeSourceObject autoSSO(compiler, sourceObjectOut);
     JSScript* script = compiler.compileGlobalScript(scopeKind);
     if (!script) {
@@ -724,14 +720,14 @@ frontend::CompileGlobalBinASTScript(JSContext* cx, LifoAlloc& alloc, const ReadO
 #endif // JS_BUILD_BINAST
 
 JSScript*
-frontend::CompileEvalScript(JSContext* cx, LifoAlloc& alloc,
-                            HandleObject environment, HandleScope enclosingScope,
+frontend::CompileEvalScript(JSContext* cx, HandleObject environment,
+                            HandleScope enclosingScope,
                             const ReadOnlyCompileOptions& options,
                             SourceBufferHolder& srcBuf,
                             ScriptSourceObject** sourceObjectOut)
 {
     AutoAssertReportedException assertException(cx);
-    BytecodeCompiler compiler(cx, alloc, options, srcBuf, enclosingScope);
+    BytecodeCompiler compiler(cx, options, srcBuf, enclosingScope);
     AutoInitializeSourceObject autoSSO(compiler, sourceObjectOut);
     JSScript* script = compiler.compileEvalScript(environment, enclosingScope);
     if (!script) {
@@ -744,7 +740,7 @@ frontend::CompileEvalScript(JSContext* cx, LifoAlloc& alloc,
 
 ModuleObject*
 frontend::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& optionsInput,
-                        SourceBufferHolder& srcBuf, LifoAlloc& alloc,
+                        SourceBufferHolder& srcBuf,
                         ScriptSourceObject** sourceObjectOut)
 {
     MOZ_ASSERT(srcBuf.get());
@@ -758,7 +754,7 @@ frontend::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& optionsInpu
     options.allowHTMLComments = false;
 
     RootedScope emptyGlobalScope(cx, &cx->global()->emptyGlobalScope());
-    BytecodeCompiler compiler(cx, alloc, options, srcBuf, emptyGlobalScope);
+    BytecodeCompiler compiler(cx, options, srcBuf, emptyGlobalScope);
     AutoInitializeSourceObject autoSSO(compiler, sourceObjectOut);
     ModuleObject* module = compiler.compileModule();
     if (!module) {
@@ -779,8 +775,7 @@ frontend::CompileModule(JSContext* cx, const JS::ReadOnlyCompileOptions& options
         return nullptr;
     }
 
-    LifoAlloc& alloc = cx->tempLifoAlloc();
-    RootedModuleObject module(cx, CompileModule(cx, options, srcBuf, alloc));
+    RootedModuleObject module(cx, CompileModule(cx, options, srcBuf, nullptr));
     if (!module) {
         return nullptr;
     }
@@ -1011,7 +1006,7 @@ frontend::CompileStandaloneFunction(JSContext* cx, MutableHandleFunction fun,
         scope = &cx->global()->emptyGlobalScope();
     }
 
-    BytecodeCompiler compiler(cx, cx->tempLifoAlloc(), options, srcBuf, scope);
+    BytecodeCompiler compiler(cx, options, srcBuf, scope);
     if (!compiler.compileStandaloneFunction(fun, GeneratorKind::NotGenerator,
                                             FunctionAsyncKind::SyncFunction,
                                             parameterListEnd))
@@ -1033,7 +1028,7 @@ frontend::CompileStandaloneGenerator(JSContext* cx, MutableHandleFunction fun,
 
     RootedScope emptyGlobalScope(cx, &cx->global()->emptyGlobalScope());
 
-    BytecodeCompiler compiler(cx, cx->tempLifoAlloc(), options, srcBuf, emptyGlobalScope);
+    BytecodeCompiler compiler(cx, options, srcBuf, emptyGlobalScope);
     if (!compiler.compileStandaloneFunction(fun, GeneratorKind::Generator,
                                             FunctionAsyncKind::SyncFunction,
                                             parameterListEnd))
@@ -1055,7 +1050,7 @@ frontend::CompileStandaloneAsyncFunction(JSContext* cx, MutableHandleFunction fu
 
     RootedScope emptyGlobalScope(cx, &cx->global()->emptyGlobalScope());
 
-    BytecodeCompiler compiler(cx, cx->tempLifoAlloc(), options, srcBuf, emptyGlobalScope);
+    BytecodeCompiler compiler(cx, options, srcBuf, emptyGlobalScope);
     if (!compiler.compileStandaloneFunction(fun, GeneratorKind::NotGenerator,
                                             FunctionAsyncKind::AsyncFunction,
                                             parameterListEnd))
@@ -1077,7 +1072,7 @@ frontend::CompileStandaloneAsyncGenerator(JSContext* cx, MutableHandleFunction f
 
     RootedScope emptyGlobalScope(cx, &cx->global()->emptyGlobalScope());
 
-    BytecodeCompiler compiler(cx, cx->tempLifoAlloc(), options, srcBuf, emptyGlobalScope);
+    BytecodeCompiler compiler(cx, options, srcBuf, emptyGlobalScope);
     if (!compiler.compileStandaloneFunction(fun, GeneratorKind::Generator,
                                             FunctionAsyncKind::AsyncFunction,
                                             parameterListEnd))
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index c461c257d151..8ce3cb6f5275 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -20,7 +20,6 @@ class JSLinearString;
 namespace js {
 
 class LazyScript;
-class LifoAlloc;
 class ModuleObject;
 class ScriptSourceObject;
 
@@ -31,7 +30,7 @@ class FunctionBox;
 class ParseNode;
 
 JSScript*
-CompileGlobalScript(JSContext* cx, LifoAlloc& alloc, ScopeKind scopeKind,
+CompileGlobalScript(JSContext* cx, ScopeKind scopeKind,
                     const JS::ReadOnlyCompileOptions& options,
                     JS::SourceBufferHolder& srcBuf,
                     ScriptSourceObject** sourceObjectOut = nullptr);
@@ -50,8 +49,8 @@ CompileLazyBinASTFunction(JSContext* cx, Handle<LazyScript*> lazy, const uint8_t
 #endif // JS_BUILD_BINAST
 
 JSScript*
-CompileEvalScript(JSContext* cx, LifoAlloc& alloc,
-                  HandleObject scopeChain, HandleScope enclosingScope,
+CompileEvalScript(JSContext* cx, HandleObject environment,
+                  HandleScope enclosingScope,
                   const JS::ReadOnlyCompileOptions& options,
                   JS::SourceBufferHolder& srcBuf,
                   ScriptSourceObject** sourceObjectOut = nullptr);
@@ -62,8 +61,8 @@ CompileModule(JSContext* cx, const JS::ReadOnlyCompileOptions& options,
 
 ModuleObject*
 CompileModule(JSContext* cx, const JS::ReadOnlyCompileOptions& options,
-              JS::SourceBufferHolder& srcBuf, LifoAlloc& alloc,
-              ScriptSourceObject** sourceObjectOut = nullptr);
+              JS::SourceBufferHolder& srcBuf,
+              ScriptSourceObject** sourceObjectOut);
 
 MOZ_MUST_USE bool
 CompileLazyFunction(JSContext* cx, Handle<LazyScript*> lazy, const char16_t* chars, size_t length);
diff --git a/js/src/vm/CompilationAndEvaluation.cpp b/js/src/vm/CompilationAndEvaluation.cpp
index 1cc2efe2abb1..690b32a7911c 100644
--- a/js/src/vm/CompilationAndEvaluation.cpp
+++ b/js/src/vm/CompilationAndEvaluation.cpp
@@ -51,7 +51,7 @@ CompileSourceBuffer(JSContext* cx, const ReadOnlyCompileOptions& options,
     AssertHeapIsIdle();
     CHECK_THREAD(cx);
 
-    script.set(frontend::CompileGlobalScript(cx, cx->tempLifoAlloc(), scopeKind, options, srcBuf));
+    script.set(frontend::CompileGlobalScript(cx, scopeKind, options, srcBuf));
     return !!script;
 }
 
@@ -491,8 +491,7 @@ Evaluate(JSContext* cx, ScopeKind scopeKind, HandleObject env,
     MOZ_ASSERT_IF(!IsGlobalLexicalEnvironment(env), scopeKind == ScopeKind::NonSyntactic);
 
     options.setIsRunOnce(true);
-    RootedScript script(cx, frontend::CompileGlobalScript(cx, cx->tempLifoAlloc(),
-                                                          scopeKind, options, srcBuf));
+    RootedScript script(cx, frontend::CompileGlobalScript(cx, scopeKind, options, srcBuf));
     if (!script) {
         return false;
     }
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index e4f7bcbfc524..a53d6f41280e 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -8903,8 +8903,7 @@ EvaluateInEnv(JSContext* cx, Handle<Env*> env, AbstractFramePtr frame,
         if (!scope) {
             return false;
         }
-        script = frontend::CompileEvalScript(cx, cx->tempLifoAlloc(), env, scope,
-                                             options, srcBuf);
+        script = frontend::CompileEvalScript(cx, env, scope, options, srcBuf);
         if (script) {
             script->setActiveEval();
         }
@@ -8914,8 +8913,7 @@ EvaluateInEnv(JSContext* cx, Handle<Env*> env, AbstractFramePtr frame,
         // circumvent the fresh lexical scope that all eval have, so that the
         // users of executeInGlobal, like the web console, may add new bindings to
         // the global scope.
-        script = frontend::CompileGlobalScript(cx, cx->tempLifoAlloc(), scopeKind, options,
-                                               srcBuf);
+        script = frontend::CompileGlobalScript(cx, scopeKind, options, srcBuf);
     }
 
     if (!script) {
diff --git a/js/src/vm/HelperThreads.cpp b/js/src/vm/HelperThreads.cpp
index 6ca5206ea188..14189a180a97 100644
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -568,8 +568,7 @@ ScriptParseTask::parse(JSContext* cx)
 
     ScopeKind scopeKind = options.nonSyntacticScope ? ScopeKind::NonSyntactic : ScopeKind::Global;
 
-    JSScript* script = frontend::CompileGlobalScript(cx, cx->tempLifoAlloc(), scopeKind,
-                                                     options, data,
+    JSScript* script = frontend::CompileGlobalScript(cx, scopeKind, options, data,
                                                      /* sourceObjectOut = */ &sourceObject.get());
     if (script) {
         scripts.infallibleAppend(script);
@@ -592,7 +591,7 @@ ModuleParseTask::parse(JSContext* cx)
 
     Rooted<ScriptSourceObject*> sourceObject(cx);
 
-    ModuleObject* module = frontend::CompileModule(cx, options, data, cx->tempLifoAlloc(), &sourceObject.get());
+    ModuleObject* module = frontend::CompileModule(cx, options, data, &sourceObject.get());
     if (module) {
         scripts.infallibleAppend(module->script());
         if (sourceObject) {
@@ -615,8 +614,7 @@ ScriptDecodeTask::parse(JSContext* cx)
     RootedScript resultScript(cx);
     Rooted<ScriptSourceObject*> sourceObject(cx);
 
-    XDROffThreadDecoder decoder(cx, cx->tempLifoAlloc(), &options,
-                                /* sourceObjectOut = */ &sourceObject.get(), range);
+    XDROffThreadDecoder decoder(cx, &options, /* sourceObjectOut = */ &sourceObject.get(), range);
     XDRResult res = decoder.codeScript(&resultScript);
     MOZ_ASSERT(bool(resultScript) == res.isOk());
     if (res.isOk()) {
@@ -681,7 +679,7 @@ MultiScriptsDecodeTask::parse(JSContext* cx)
         RootedScript resultScript(cx);
         Rooted<ScriptSourceObject*> sourceObject(cx);
 
-        XDROffThreadDecoder decoder(cx, cx->tempLifoAlloc(), &opts, &sourceObject.get(),
+        XDROffThreadDecoder decoder(cx, &opts, &sourceObject.get(),
                                     source.range);
         XDRResult res = decoder.codeScript(&resultScript);
         MOZ_ASSERT(bool(resultScript) == res.isOk());
@@ -2310,6 +2308,8 @@ HelperThread::handleParseWorkload(AutoLockHelperThreadState& locked)
 
         task->parse(cx);
 
+        MOZ_ASSERT(cx->tempLifoAlloc().isEmpty());
+        cx->tempLifoAlloc().freeAll();
         cx->frontendCollectionPool().purge();
         cx->atomsZoneFreeLists().clear();
     }
diff --git a/js/src/vm/Xdr.cpp b/js/src/vm/Xdr.cpp
index 28db4df5fec0..d67470c387fc 100644
--- a/js/src/vm/Xdr.cpp
+++ b/js/src/vm/Xdr.cpp
@@ -30,12 +30,6 @@ using namespace js;
 using mozilla::ArrayEqual;
 using mozilla::Utf8Unit;
 
-template<XDRMode mode>
-LifoAlloc&
-XDRState<mode>::lifoAlloc() const {
-    return buf.cx()->tempLifoAlloc();
-}
-
 #ifdef DEBUG
 bool
 XDRCoderBase::validateResultCode(JSContext* cx, JS::TranscodeResult code) const
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index 30d06e859fcc..da3d6efee3a0 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -254,7 +254,6 @@ class XDRState : public XDRCoderBase
     JSContext* cx() const {
         return buf.cx();
     }
-    virtual LifoAlloc& lifoAlloc() const;
 
     virtual bool hasOptions() const { return false; }
     virtual const JS::ReadOnlyCompileOptions& options() {
@@ -508,7 +507,6 @@ class XDROffThreadDecoder : public XDRDecoder
 {
     const JS::ReadOnlyCompileOptions* options_;
     ScriptSourceObject** sourceObjectOut_;
-    LifoAlloc& alloc_;
 
   public:
     // Note, when providing an JSContext, where isJSContext is false,
@@ -519,24 +517,19 @@ class XDROffThreadDecoder : public XDRDecoder
     //
     // When providing a sourceObjectOut pointer, you have to ensure that it is
     // marked by the GC to avoid dangling pointers.
-    XDROffThreadDecoder(JSContext* cx, LifoAlloc& alloc,
+    XDROffThreadDecoder(JSContext* cx,
                         const JS::ReadOnlyCompileOptions* options,
                         ScriptSourceObject** sourceObjectOut,
                         const JS::TranscodeRange& range)
       : XDRDecoder(cx, range),
         options_(options),
-        sourceObjectOut_(sourceObjectOut),
-        alloc_(alloc)
+        sourceObjectOut_(sourceObjectOut)
     {
         MOZ_ASSERT(options);
         MOZ_ASSERT(sourceObjectOut);
         MOZ_ASSERT(*sourceObjectOut == nullptr);
     }
 
-    LifoAlloc& lifoAlloc() const override {
-        return alloc_;
-    }
-
     bool hasOptions() const override { return true; }
     const JS::ReadOnlyCompileOptions& options() override {
         return *options_;

From 325c068d48a9c4cc047cb6792af345d7c2c09852 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Tue, 30 Oct 2018 18:12:30 +0000
Subject: [PATCH 10/53] Bug 1501178 - Prioritize directories containing rust
 compilation in the make backend. r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D10268

--HG--
extra : moz-landing-system : lando
---
 python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index e3e7d4013f37..560a933cb317 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -811,7 +811,11 @@ class RecursiveMakeBackend(CommonBackend):
 
         def add_category_rules(category, roots, graph):
             rule = root_deps_mk.create_rule(['recurse_%s' % category])
-            rule.add_dependencies(roots)
+            # Directories containing rust compilations don't generally depend
+            # on other directories in the tree, so putting them first here will
+            # start them earlier in the build.
+            rule.add_dependencies(chain((r for r in roots if 'rust' in r),
+                                        (r for r in roots if 'rust' not in r)))
             for target, deps in sorted(graph.items()):
                 if deps:
                     rule = root_deps_mk.create_rule([target])

From b0c1c38fa828e4d709cf5e4084231bd470bfd54e Mon Sep 17 00:00:00 2001
From: Ursula Sarracini <ursulasarracini@gmail.com>
Date: Tue, 30 Oct 2018 19:36:22 +0000
Subject: [PATCH 11/53] Bug 1503288 - Use 'args' in button_action params to fix
 busted simplified onboarding actions r=k88hudson

Differential Revision: https://phabricator.services.mozilla.com/D10232

--HG--
extra : moz-landing-system : lando
---
 .../OnboardingMessage.schema.json             | 93 +++++++++++++++++++
 .../newtab/lib/OnboardingMessageProvider.jsm  | 10 +-
 .../templates/OnboardingMessage.test.jsx      | 35 +++++++
 3 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.schema.json
 create mode 100644 browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx

diff --git a/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.schema.json b/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.schema.json
new file mode 100644
index 000000000000..478d482a796d
--- /dev/null
+++ b/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.schema.json
@@ -0,0 +1,93 @@
+{
+  "title": "OnboardingMessage",
+  "description": "A template with a title, icon, button and description. No markup allowed.",
+  "version": "1.0.0",
+  "type": "object",
+  "properties": {
+    "title": {
+      "oneOf": [
+        {
+          "type": "string",
+          "description": "The message displayed in the title of the onboarding card"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "string_id": {
+              "type": "string"
+            }
+          },
+          "required": ["string_id"],
+          "description": "Id of localized string for onboarding card title"
+        }
+      ],
+      "description": "Id of localized string or message override."
+    },
+    "text": {
+      "oneOf": [
+        {
+          "type": "string",
+          "description": "The message displayed in the description of the onboarding card"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "string_id": {
+              "type": "string"
+            }
+          },
+          "required": ["string_id"],
+          "description": "Id of localized string for onboarding card description"
+        }
+      ],
+      "description": "Id of localized string or message override."
+    },
+    "icon": {
+      "allOf": [
+        {
+          "type": "string",
+          "description": "Image associated with the onboarding card"
+        }
+      ]
+    },
+    "button_label": {
+      "oneOf": [
+        {
+          "type": "string",
+          "description": "The label of the onboarding card's action button"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "string_id": {
+              "type": "string"
+            }
+          },
+          "required": ["string_id"],
+          "description": "Id of localized string for onboarding card button"
+        }
+      ],
+      "description": "Id of localized string or message override."
+    },
+    "button_action": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Action dispatched by the button."
+        },
+        "data": {
+          "properties": {
+            "args": {
+              "type": "string",
+              "description": "Additional parameters for button action, for example which link the button should open."
+            }
+          }
+        }
+      }
+    }
+  },
+  "additionalProperties": false,
+  "required": ["title", "text", "icon", "button_label", "button_action"]
+}
+
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
index b101c70a5dc4..aef5ede3031b 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -35,7 +35,7 @@ const ONBOARDING_MESSAGES = () => ([
       button_label: {string_id: "onboarding-button-label-try-now"},
       button_action: {
         type: "OPEN_URL",
-        data: {url: "https://screenshots.firefox.com/#tour"},
+        data: {args: "https://screenshots.firefox.com/#tour"},
       },
     },
     trigger: {id: "firstRun"},
@@ -52,7 +52,7 @@ const ONBOARDING_MESSAGES = () => ([
       button_label: {string_id: "onboarding-button-label-try-now"},
       button_action: {
         type: "OPEN_ABOUT_PAGE",
-        data: {page: "addons"},
+        data: {args: "addons"},
       },
     },
     trigger: {id: "firstRun"},
@@ -69,7 +69,7 @@ const ONBOARDING_MESSAGES = () => ([
       button_label: {string_id: "onboarding-button-label-try-now"},
       button_action: {
         type: "OPEN_URL",
-        data: {url: "https://addons.mozilla.org/en-US/firefox/addon/ghostery/"},
+        data: {args: "https://addons.mozilla.org/en-US/firefox/addon/ghostery/"},
       },
     },
     targeting: "providerCohorts.onboarding == 'ghostery'",
@@ -89,6 +89,10 @@ const OnboardingMessageProvider = {
     const messages = await this.translateMessages(ONBOARDING_MESSAGES());
     return messages;
   },
+  getUntranslatedMessages() {
+    // This is helpful for jsonSchema testing - since we are localizing in the provider
+    return ONBOARDING_MESSAGES();
+  },
   async translateMessages(messages) {
     let translatedMessages = [];
     for (const msg of messages) {
diff --git a/browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx b/browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx
new file mode 100644
index 000000000000..d3956bea1194
--- /dev/null
+++ b/browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx
@@ -0,0 +1,35 @@
+import {OnboardingMessageProvider} from "lib/OnboardingMessageProvider.jsm";
+import schema from "content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.schema.json";
+
+const DEFAULT_CONTENT = {
+  "title": "A title",
+  "text": "A description",
+  "icon": "icon",
+  "button_label": "some_button_label",
+  "button_action": {
+    "type": "SOME_TYPE",
+    "data": {"args": "example.com"},
+  },
+};
+
+const L10N_CONTENT = {
+  "title": {string_id: "onboarding-private-browsing-title"},
+  "text": {string_id: "onboarding-private-browsing-text"},
+  "icon": "icon",
+  "button_label": {string_id: "onboarding-button-label-try-now"},
+  "button_action": {type: "SOME_TYPE"},
+};
+
+describe("OnboardingMessage", () => {
+  it("should validate DEFAULT_CONTENT", () => {
+    assert.jsonSchema(DEFAULT_CONTENT, schema);
+  });
+  it("should validate L10N_CONTENT", () => {
+    assert.jsonSchema(L10N_CONTENT, schema);
+  });
+  it("should validate all messages from OnboardingMessageProvider", () => {
+    const messages = OnboardingMessageProvider.getUntranslatedMessages();
+    messages.forEach(msg => assert.jsonSchema(msg.content, schema));
+  });
+});
+

From b3f95a8c0ea4e4dde6c86062e1f9a46850c07fe0 Mon Sep 17 00:00:00 2001
From: Rob Wu <rob@robwu.nl>
Date: Tue, 30 Oct 2018 18:53:22 +0000
Subject: [PATCH 12/53] Bug 1501375 - Interrupt extension start-up if
 background page crashes r=mixedpuppy

Extension start-up is blocked on receiving an initialization message
from the extension child process. If the extension browser goes away
before a response is received (e.g. if the extension is crashed), stop
waiting to avoid blocking the startup (and shutdown) forever.

This is not the cause of bug 1501375, but still worth fixing
( for bug 1355239 ).

Differential Revision: https://phabricator.services.mozilla.com/D9959

--HG--
extra : moz-landing-system : lando
---
 .../components/extensions/ExtensionParent.jsm | 44 ++++++++++++++++---
 .../extensions/parent/ext-backgroundPage.js   |  3 +-
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm
index a6b1dfbd4e4c..486df963a65e 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -1370,15 +1370,47 @@ const DebugUtils = {
 };
 
 
-function promiseExtensionViewLoaded(browser) {
-  return new Promise(resolve => {
-    browser.messageManager.addMessageListener("Extension:ExtensionViewLoaded", function onLoad({data}) {
-      browser.messageManager.removeMessageListener("Extension:ExtensionViewLoaded", onLoad);
-      resolve(data.childId && ParentAPIManager.getContextById(data.childId));
-    });
+/**
+ * Returns a Promise which resolves with the message data when the given message
+ * was received by the message manager. The promise is rejected if the message
+ * manager was closed before a message was received.
+ *
+ * @param {MessageListenerManager} messageManager
+ *        The message manager on which to listen for messages.
+ * @param {string} messageName
+ *        The message to listen for.
+ * @returns {Promise<*>}
+ */
+function promiseMessageFromChild(messageManager, messageName) {
+  return new Promise((resolve, reject) => {
+    let unregister;
+    function listener(message) {
+      unregister();
+      resolve(message.data);
+    }
+    function observer(subject, topic, data) {
+      if (subject === messageManager) {
+        unregister();
+        reject(new Error(`Message manager was disconnected before receiving ${messageName}`));
+      }
+    }
+    unregister = () => {
+      Services.obs.removeObserver(observer, "message-manager-close");
+      messageManager.removeMessageListener(messageName, listener);
+    };
+    messageManager.addMessageListener(messageName, listener);
+    Services.obs.addObserver(observer, "message-manager-close");
   });
 }
 
+// This should be called before browser.loadURI is invoked.
+async function promiseExtensionViewLoaded(browser) {
+  let {childId} = await promiseMessageFromChild(browser.messageManager, "Extension:ExtensionViewLoaded");
+  if (childId) {
+    return ParentAPIManager.getContextById(childId);
+  }
+}
+
 /**
  * This helper is used to subscribe a listener (e.g. in the ext-devtools API implementation)
  * to be called for every ExtensionProxyContext created for an extension page given
diff --git a/toolkit/components/extensions/parent/ext-backgroundPage.js b/toolkit/components/extensions/parent/ext-backgroundPage.js
index 578dc2cccc81..a404b0c89a8f 100644
--- a/toolkit/components/extensions/parent/ext-backgroundPage.js
+++ b/toolkit/components/extensions/parent/ext-backgroundPage.js
@@ -38,9 +38,10 @@ class BackgroundPage extends HiddenExtensionPage {
 
     extensions.emit("extension-browser-inserted", this.browser);
 
+    let contextPromise = promiseExtensionViewLoaded(this.browser);
     this.browser.loadURI(this.url, {triggeringPrincipal: extension.principal});
 
-    let context = await promiseExtensionViewLoaded(this.browser);
+    let context = await contextPromise;
 
     ExtensionTelemetry.backgroundPageLoad.stopwatchFinish(extension, this);
 

From a129af5f135ffa0235bc2cde19973cb769cfe426 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 30 Oct 2018 19:55:03 +0000
Subject: [PATCH 13/53] Bug 1499896 - Clean up listeners to an empty array
 instead of null. r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D9047

--HG--
extra : moz-landing-system : lando
---
 toolkit/modules/ActorManagerChild.jsm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/modules/ActorManagerChild.jsm b/toolkit/modules/ActorManagerChild.jsm
index 34f12c1c699c..70afe47619bc 100644
--- a/toolkit/modules/ActorManagerChild.jsm
+++ b/toolkit/modules/ActorManagerChild.jsm
@@ -171,7 +171,7 @@ class SingletonDispatcher extends Dispatcher {
       }
     }
 
-    this.listeners = null;
+    this.listeners = [];
   }
 
   handleEvent(event) {

From ce32511d99783baf266fb624a563dfd84910830e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 30 Oct 2018 20:28:51 +0000
Subject: [PATCH 14/53] Bug 1502609 - Assert that we don't mess up
 pseudo-element / anon-box restyling. r=TYLin

Differential Revision: https://phabricator.services.mozilla.com/D9990

--HG--
extra : moz-landing-system : lando
---
 layout/generic/nsFrame.cpp | 19 +++++++++++++++++++
 layout/generic/nsIFrame.h  | 10 +++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 4557c1baf75a..42e20455f845 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1192,6 +1192,25 @@ nsFrame::DidSetComputedStyle(ComputedStyle* aOldComputedStyle)
   mMayHaveRoundedCorners = true;
 }
 
+void
+nsIFrame::AssertNewStyleIsSane(ComputedStyle& aNewStyle)
+{
+  MOZ_DIAGNOSTIC_ASSERT(PresShell() == aNewStyle.PresContextForFrame()->PresShell());
+  MOZ_DIAGNOSTIC_ASSERT(
+    aNewStyle.GetPseudo() == mComputedStyle->GetPseudo() ||
+    // ::first-line continuations are weird, this should probably be fixed via
+    // bug 1465474.
+    (mComputedStyle->GetPseudo() == nsCSSPseudoElements::firstLine() &&
+     aNewStyle.GetPseudo() == nsCSSAnonBoxes::mozLineFrame()) ||
+    // ::first-letter continuations are broken, in particular floating ones, see
+    // bug 1490281. The construction code tries to fix this up after the fact,
+    // then restyling undoes it...
+    (mComputedStyle->GetPseudo() == nsCSSAnonBoxes::mozText() &&
+     aNewStyle.GetPseudo() == nsCSSAnonBoxes::firstLetterContinuation()) ||
+    (mComputedStyle->GetPseudo() == nsCSSAnonBoxes::firstLetterContinuation() &&
+     aNewStyle.GetPseudo() == nsCSSAnonBoxes::mozText()));
+}
+
 void
 nsIFrame::ReparentFrameViewTo(nsViewManager* aViewManager,
                               nsView*        aNewParentView,
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 1ffb6e3d6dc1..b2998844d1e9 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -772,10 +772,18 @@ public:
    * Get the style associated with this frame.
    */
   ComputedStyle* Style() const { return mComputedStyle; }
+
+  void AssertNewStyleIsSane(ComputedStyle&)
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+    ;
+#else
+    { }
+#endif
+
   void SetComputedStyle(ComputedStyle* aStyle)
   {
     if (aStyle != mComputedStyle) {
-      MOZ_DIAGNOSTIC_ASSERT(PresShell() == aStyle->PresContextForFrame()->PresShell());
+      AssertNewStyleIsSane(*aStyle);
       RefPtr<ComputedStyle> oldComputedStyle = mComputedStyle.forget();
       mComputedStyle = aStyle;
       DidSetComputedStyle(oldComputedStyle);

From 2db06847e92b1110d57f58e37a0eaf36fe1c2ca6 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Fri, 26 Oct 2018 18:17:48 +0000
Subject: [PATCH 15/53] Bug 1501329 - Set valid client ID on Fennec if canary
 is detected r=chutten

Differential Revision: https://phabricator.services.mozilla.com/D9544

--HG--
extra : moz-landing-system : lando
---
 .../telemetry/app/TelemetryController.jsm     | 20 +++--
 .../unit/test_TelemetryClientID_reset.js      | 75 +++++++++++++++++++
 2 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/toolkit/components/telemetry/app/TelemetryController.jsm b/toolkit/components/telemetry/app/TelemetryController.jsm
index cd56b60f31e9..08a4bf5c4e30 100644
--- a/toolkit/components/telemetry/app/TelemetryController.jsm
+++ b/toolkit/components/telemetry/app/TelemetryController.jsm
@@ -662,13 +662,21 @@ var Impl = {
         this._clientID = await ClientID.getClientID();
 
         // Fix-up a canary client ID if detected.
-        const uploadEnabled = Services.prefs.getBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, false);
-        if (uploadEnabled && this._clientID == Utils.knownClientID) {
-          this._log.trace("Upload enabled, but got canary client ID. Resetting.");
+        if (IS_UNIFIED_TELEMETRY) {
+          // On desktop respect the upload preference.
+          const uploadEnabled = Services.prefs.getBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, false);
+          if (uploadEnabled && this._clientID == Utils.knownClientID) {
+            this._log.trace("Upload enabled, but got canary client ID. Resetting.");
+            this._clientID = await ClientID.resetClientID();
+          } else if (!uploadEnabled && this._clientID != Utils.knownClientID) {
+            this._log.trace("Upload disabled, but got a valid client ID. Setting canary client ID.");
+            this._clientID = await ClientID.setClientID(TelemetryUtils.knownClientID);
+          }
+        } else if (this._clientID == Utils.knownClientID) {
+          // On Fennec (non-unified Telemetry) we might have set a canary client ID in the past by mistake.
+          // We now always reset to a valid random client ID if this is detected (Bug 1501329).
+          this._log.trace("Not unified, but got canary client ID. Resetting.");
           this._clientID = await ClientID.resetClientID();
-        } else if (!uploadEnabled && this._clientID != Utils.knownClientID) {
-          this._log.trace("Upload disabled, but got a valid client ID. Setting canary client ID.");
-          this._clientID = await ClientID.setClientID(TelemetryUtils.knownClientID);
         }
 
         await TelemetrySend.setup(this._testMode);
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js b/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
index 5f126fe1f2a0..8263f59f8c37 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
@@ -152,6 +152,81 @@ add_task(async function test_clientid_canary_after_disabling() {
   Assert.equal(TelemetryUtils.knownClientID, newClientId, "Client ID should be a canary when upload disabled");
 });
 
+/**
+ * On Android Telemetry is not unified.
+ * This tests that we reset the client ID if it was previously reset to a canary client ID by accident.
+ */
+add_task(async function test_clientid_canary_reset_canary_on_nonunified() {
+  const isUnified = Preferences.get(TelemetryUtils.Preferences.Unified, false);
+  if (isUnified) {
+    // Skipping the test if unified telemetry is on.
+    return;
+  }
+
+  await sendPing();
+  let ping = await PingServer.promiseNextPing();
+  Assert.equal(ping.type, TEST_PING_TYPE, "The ping must be a test ping");
+  Assert.ok("clientId" in ping);
+
+  let firstClientId = ping.clientId;
+  Assert.notEqual(TelemetryUtils.knownClientID, firstClientId, "Client ID should be valid and random");
+
+  // Force a canary client ID
+  let clientId = await ClientID.setClientID(TelemetryUtils.knownClientID);
+  Assert.equal(TelemetryUtils.knownClientID, clientId);
+
+  // Now shutdown the instance
+  await TelemetryController.testShutdown();
+  await TelemetryStorage.testClearPendingPings();
+
+  // Start the instance
+  await TelemetryController.testReset();
+
+  let newClientId = await ClientID.getClientID();
+  Assert.notEqual(TelemetryUtils.knownClientID, newClientId, "Client ID should be valid and random");
+  Assert.notEqual(firstClientId, newClientId, "Client ID should be valid and random");
+});
+
+/**
+ * On Android Telemetry is not unified.
+ * This tests that we don't touch the client ID if the pref is toggled for some reason.
+ */
+add_task(async function test_clientid_canary_nonunified_no_pref_trigger() {
+  const isUnified = Preferences.get(TelemetryUtils.Preferences.Unified, false);
+  if (isUnified) {
+    // Skipping the test if unified telemetry is on.
+    return;
+  }
+
+  await sendPing();
+  let ping = await PingServer.promiseNextPing();
+  Assert.equal(ping.type, TEST_PING_TYPE, "The ping must be a test ping");
+  Assert.ok("clientId" in ping);
+
+  let firstClientId = ping.clientId;
+  Assert.notEqual(TelemetryUtils.knownClientID, firstClientId, "Client ID should be valid and random");
+
+  // Flip the pref again
+  Preferences.set(TelemetryUtils.Preferences.FhrUploadEnabled, true);
+
+  // Restart the instance
+  await TelemetryController.testShutdown();
+  await TelemetryController.testReset();
+
+  let newClientId = await ClientID.getClientID();
+  Assert.equal(firstClientId, newClientId, "Client ID should be unmodified");
+
+  // Flip the pref again
+  Preferences.set(TelemetryUtils.Preferences.FhrUploadEnabled, false);
+
+  // Restart the instance
+  await TelemetryController.testShutdown();
+  await TelemetryController.testReset();
+
+  newClientId = await ClientID.getClientID();
+  Assert.equal(firstClientId, newClientId, "Client ID should be unmodified");
+});
+
 add_task(async function stopServer() {
   await PingServer.stop();
 });

From 30189001cda30fac05edef2ab370c5e01d384968 Mon Sep 17 00:00:00 2001
From: Petru Lingurar <petru.lingurar@softvision.ro>
Date: Tue, 30 Oct 2018 16:28:02 +0000
Subject: [PATCH 16/53] Bug 1502435 - 1 - Set valid clientId and save if
 previous was canary clientId; r=jchen

Differential Revision: https://phabricator.services.mozilla.com/D10202

--HG--
extra : moz-landing-system : lando
---
 .../java/org/mozilla/gecko/GeckoProfile.java  | 74 ++++++++++++-------
 1 file changed, 47 insertions(+), 27 deletions(-)

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java
index b30c303b03e5..8a8da4cb47d1 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java
@@ -5,9 +5,9 @@
 
 package org.mozilla.gecko;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.SharedPreferences;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
 import android.util.Log;
@@ -22,7 +22,6 @@ import org.mozilla.gecko.util.FileUtils;
 import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.INIParser;
 import org.mozilla.gecko.util.INISection;
-import org.mozilla.gecko.util.IntentUtils;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -46,6 +45,9 @@ public final class GeckoProfile {
     private static final String CLIENT_ID_FILE_PATH = "datareporting/state.json";
     // In the client ID file, the attribute title in the JSON object containing the client ID value.
     private static final String CLIENT_ID_JSON_ATTR = "clientID";
+    private static final String HAD_CANARY_CLIENT_ID_JSON_ATTR = "wasCanary";
+    // Must match the one from TelemetryUtils.jsm
+    private static final String CANARY_CLIENT_ID = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
 
     private static final String TIMES_PATH = "times.json";
     private static final String PROFILE_CREATION_DATE_JSON_ATTR = "created";
@@ -449,26 +451,37 @@ public final class GeckoProfile {
     // Mimics ClientID.jsm - _doLoadClientID.
     @WorkerThread
     public String getClientId() throws IOException {
+        String clientId = "";
         try {
-            return getValidClientIdFromDisk(CLIENT_ID_FILE_PATH);
+            clientId = getClientIdFromDisk(CLIENT_ID_FILE_PATH);
         } catch (final IOException e) {
             // Avoid log spam: don't log the full Exception w/ the stack trace.
             Log.d(LOGTAG, "Could not get client ID - creating a new one: " + e.getLocalizedMessage());
         }
 
-        String clientIdToWrite = generateNewClientId();
+        if (isClientIdValid(clientId)) {
+            return clientId;
+        } else {
+            String newClientId = generateNewClientId();
+            // There is a possibility Gecko is running and the Gecko telemetry implementation decided it's time to generate
+            // the client ID, writing client ID underneath us. Since it's highly unlikely (e.g. we run in onStart before
+            // Gecko is started), we don't handle that possibility besides writing the ID and then reading from the file
+            // again (rather than just returning the value we generated before writing).
+            //
+            // In the event it does happen, any discrepancy will be resolved after a restart. In the mean time, both this
+            // implementation and the Gecko implementation could upload documents with inconsistent IDs.
+            //
+            // In any case, if we get an exception, intentionally throw - there's nothing more to do here.
+            persistNewClientId(clientId, newClientId);
+        }
 
-        // There is a possibility Gecko is running and the Gecko telemetry implementation decided it's time to generate
-        // the client ID, writing client ID underneath us. Since it's highly unlikely (e.g. we run in onStart before
-        // Gecko is started), we don't handle that possibility besides writing the ID and then reading from the file
-        // again (rather than just returning the value we generated before writing).
-        //
-        // In the event it does happen, any discrepancy will be resolved after a restart. In the mean time, both this
-        // implementation and the Gecko implementation could upload documents with inconsistent IDs.
-        //
-        // In any case, if we get an exception, intentionally throw - there's nothing more to do here.
-        persistClientId(clientIdToWrite);
-        return getValidClientIdFromDisk(CLIENT_ID_FILE_PATH);
+        return getClientIdFromDisk(CLIENT_ID_FILE_PATH);
+    }
+
+    @WorkerThread
+    public boolean getIfHadCanaryClientId() throws IOException {
+        final JSONObject obj = readJSONObjectFromFile(CLIENT_ID_FILE_PATH);
+        return obj.optBoolean(HAD_CANARY_CLIENT_ID_JSON_ATTR);
     }
 
     protected static String generateNewClientId() {
@@ -480,45 +493,52 @@ public final class GeckoProfile {
      * @throws IOException if a valid client ID could not be retrieved
      */
     @WorkerThread
-    private String getValidClientIdFromDisk(final String filePath) throws IOException {
+    private String getClientIdFromDisk(final String filePath) throws IOException {
         final JSONObject obj = readJSONObjectFromFile(filePath);
-        final String clientId = obj.optString(CLIENT_ID_JSON_ATTR);
-        if (isClientIdValid(clientId)) {
-            return clientId;
-        }
-        throw new IOException("Received client ID is invalid: " + clientId);
+        return obj.optString(CLIENT_ID_JSON_ATTR);
     }
 
     /**
      * Persists the given client ID to disk. This will overwrite any existing files.
      */
     @WorkerThread
-    private void persistClientId(final String clientId) throws IOException {
+    private void persistNewClientId(@Nullable final String oldClientId,
+                                    @NonNull final String newClientId) throws IOException {
         if (!ensureParentDirs(CLIENT_ID_FILE_PATH)) {
             throw new IOException("Could not create client ID parent directories");
         }
 
         final JSONObject obj = new JSONObject();
         try {
-            obj.put(CLIENT_ID_JSON_ATTR, clientId);
+            obj.put(CLIENT_ID_JSON_ATTR, newClientId);
+            obj.put(HAD_CANARY_CLIENT_ID_JSON_ATTR, isCanaryClientId(oldClientId));
         } catch (final JSONException e) {
             throw new IOException("Could not create client ID JSON object", e);
         }
 
         // ClientID.jsm overwrites the file to store the client ID so it's okay if we do it too.
-        Log.d(LOGTAG, "Attempting to write new client ID");
+        Log.d(LOGTAG, "Attempting to write new client ID properties");
         writeFile(CLIENT_ID_FILE_PATH, obj.toString()); // Logs errors within function: ideally we'd throw.
     }
 
     // From ClientID.jsm - isValidClientID.
-    public static boolean isClientIdValid(final String clientId) {
+    public static boolean isClientIdValid(@Nullable final String clientId) {
         // We could use UUID.fromString but, for consistency, we take the implementation from ClientID.jsm.
         if (TextUtils.isEmpty(clientId)) {
             return false;
         }
+
+        if (CANARY_CLIENT_ID.equals(clientId)) {
+            return false;
+        }
+
         return clientId.matches("(?i:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})");
     }
 
+    private static boolean isCanaryClientId(@Nullable final String clientId) {
+        return CANARY_CLIENT_ID.equals(clientId);
+    }
+
     /**
      * Gets the profile creation date and persists it if it had to be generated.
      *
@@ -958,7 +978,7 @@ public final class GeckoProfile {
         // Create the client ID file before Gecko starts (we assume this method
         // is called before Gecko starts). If we let Gecko start, the JS telemetry
         // code may try to write to the file at the same time Java does.
-        persistClientId(generateNewClientId());
+        persistNewClientId(null, generateNewClientId());
 
         return profileDir;
     }

From 83fc24bb27a313789911c8db2c3c52336a7543dc Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Tue, 30 Oct 2018 21:48:30 +0100
Subject: [PATCH 17/53] Bug 1502731 - Fix browser_all_files_referenced.js
 failures. r=me

---
 .../themes/osx/global/icons/panel-dropmarker.png  | Bin 138 -> 0 bytes
 toolkit/themes/osx/global/jar.mn                  |   2 +-
 toolkit/themes/shared/jar.inc.mn                  |   1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 toolkit/themes/osx/global/icons/panel-dropmarker.png

diff --git a/toolkit/themes/osx/global/icons/panel-dropmarker.png b/toolkit/themes/osx/global/icons/panel-dropmarker.png
deleted file mode 100644
index 97f7e273e8ac0949095fe8559e3d197add12949d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)Q!2%?eC)))BsX$K`$B+uf<O^Abdy*^fzMA#4
z^ssf5F3)?@=4q`mU3aC6G%{{h`?me>>E}Hh=JK8=`s0lc_R5Fr+y48gzipm2XUqTd
mU*<EOV0F6o|Ca+#3L}HAyK?QP!nq*Z7(8A5T-G@yGywqHx-&8W

diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn
index e34b522580d5..2a23bf7079cb 100644
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -54,7 +54,6 @@ toolkit.jar:
   skin/classic/global/icons/blocklist_favicon.png                    (icons/blocklist_favicon.png)
   skin/classic/global/icons/glyph-dropdown.png                       (icons/glyph-dropdown.png)
   skin/classic/global/icons/glyph-dropdown@2x.png                    (icons/glyph-dropdown@2x.png)
-  skin/classic/global/icons/panel-dropmarker.png                     (icons/panel-dropmarker.png)
   skin/classic/global/icons/search-textbox.svg                       (icons/search-textbox.svg)
   skin/classic/global/icons/searchfield-cancel.svg                   (icons/searchfield-cancel.svg)
   skin/classic/global/icons/warning-64.png                           (icons/warning-64.png)
@@ -64,6 +63,7 @@ toolkit.jar:
   skin/classic/global/icons/question-16.png                          (icons/question-16.png)
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
+  skin/classic/global/icons/arrow-up-12.svg                          (../../shared/icons/arrow-up-12.svg)
 * skin/classic/global/in-content/common.css                          (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css                      (in-content/info-pages.css)
   skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn
index 9086e0129efb..786f8f7f6da1 100644
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -49,7 +49,6 @@ toolkit.jar:
   skin/classic/global/icons/twisty-expanded.svg            (../../shared/icons/twisty-expanded.svg)
   skin/classic/global/icons/arrow-dropdown-12.svg          (../../shared/icons/arrow-dropdown-12.svg)
   skin/classic/global/icons/arrow-dropdown-16.svg          (../../shared/icons/arrow-dropdown-16.svg)
-  skin/classic/global/icons/arrow-up-12.svg                (../../shared/icons/arrow-up-12.svg)
   skin/classic/global/icons/warning.svg                    (../../shared/icons/warning.svg)
   skin/classic/global/illustrations/about-rights.svg       (../../shared/illustrations/about-rights.svg)
   skin/classic/global/icons/blocked.svg                    (../../shared/incontent-icons/blocked.svg)

From 77c9e65708a8991035895330a4965d5c83aa9596 Mon Sep 17 00:00:00 2001
From: Jan Henning <jh+bugzilla@buttercookie.de>
Date: Tue, 30 Oct 2018 20:36:10 +0000
Subject: [PATCH 18/53] Bug 1502646 - Enable using ChromeUtils in Robocop JS
 tests. r=gbrown

We finally updated our host utils at some point after bug 1431533, so this
works now.

robocop_head.js is being included as a normal page <script> as well, though, and
as such is left to bug 1502674.

Differential Revision: https://phabricator.services.mozilla.com/D10278

--HG--
extra : moz-landing-system : lando
---
 mobile/android/tests/browser/robocop/.eslintrc.js |  8 --------
 .../android/tests/browser/robocop/robocop_head.js |  1 +
 .../tests/browser/robocop/robocop_testharness.js  |  4 +++-
 .../tests/browser/robocop/testAccessibleCarets.js | 14 +++++---------
 .../robocop/testActivityStreamPocketReferrer.js   |  6 ++----
 .../robocop/testAndroidCastDeviceProvider.js      |  7 +------
 .../tests/browser/robocop/testBrowserDiscovery.js |  4 +---
 .../tests/browser/robocop/testEventDispatcher.js  |  6 ++----
 .../tests/browser/robocop/testFilePicker.js       |  4 +---
 .../tests/browser/robocop/testFindInPage.js       |  6 ++----
 .../tests/browser/robocop/testHistoryService.js   |  6 ++----
 .../browser/robocop/testReaderCacheMigration.js   |  4 +---
 .../tests/browser/robocop/testReadingListCache.js |  8 +++-----
 .../browser/robocop/testRuntimePermissionsAPI.js  |  6 ++----
 .../tests/browser/robocop/testSnackbarAPI.js      |  8 ++------
 .../browser/robocop/testTrackingProtection.js     | 15 ++++-----------
 .../tests/browser/robocop/testUITelemetry.js      |  4 +---
 .../robocop/testUnifiedTelemetryClientId.js       |  4 +---
 .../tests/browser/robocop/testVideoControls.js    |  6 ++----
 19 files changed, 36 insertions(+), 85 deletions(-)
 delete mode 100644 mobile/android/tests/browser/robocop/.eslintrc.js

diff --git a/mobile/android/tests/browser/robocop/.eslintrc.js b/mobile/android/tests/browser/robocop/.eslintrc.js
deleted file mode 100644
index 5fc03eb67776..000000000000
--- a/mobile/android/tests/browser/robocop/.eslintrc.js
+++ /dev/null
@@ -1,8 +0,0 @@
-"use strict";
-
-module.exports = {
-  "rules": {
-    "mozilla/use-chromeutils-generateqi": 0,
-  },
-};
-
diff --git a/mobile/android/tests/browser/robocop/robocop_head.js b/mobile/android/tests/browser/robocop/robocop_head.js
index cfb60895dd30..6c46f3ad9986 100644
--- a/mobile/android/tests/browser/robocop/robocop_head.js
+++ b/mobile/android/tests/browser/robocop/robocop_head.js
@@ -27,6 +27,7 @@
 
 /* eslint-disable mozilla/use-cc-etc */
 /* eslint-disable mozilla/use-chromeutils-import */
+/* eslint-disable mozilla/use-chromeutils-generateqi */
 /* eslint-disable mozilla/use-services */
 
 var _quit = false;
diff --git a/mobile/android/tests/browser/robocop/robocop_testharness.js b/mobile/android/tests/browser/robocop/robocop_testharness.js
index 8a9f29c1d8e5..85343c59cb60 100644
--- a/mobile/android/tests/browser/robocop/robocop_testharness.js
+++ b/mobile/android/tests/browser/robocop/robocop_testharness.js
@@ -56,7 +56,9 @@ function testOneFile(uri) {
   let principal = SpecialPowers.Cc["@mozilla.org/systemprincipal;1"]
                                .createInstance(SpecialPowers.Ci.nsIPrincipal);
 
-  let testScope = SpecialPowers.Cu.Sandbox(principal);
+  let testScope =
+    SpecialPowers.Cu.Sandbox(principal, { sandboxName: uri,
+                                          wantGlobalProperties: ["ChromeUtils"] });
 
   // Populate test environment with test harness prerequisites.
   testScope.Components = SpecialPowers.Components;
diff --git a/mobile/android/tests/browser/robocop/testAccessibleCarets.js b/mobile/android/tests/browser/robocop/testAccessibleCarets.js
index 90eeb6fc0c8b..58c431ee7f48 100644
--- a/mobile/android/tests/browser/robocop/testAccessibleCarets.js
+++ b/mobile/android/tests/browser/robocop/testAccessibleCarets.js
@@ -4,11 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Messaging.jsm");
-Cu.import("resource://gre/modules/Geometry.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Messaging.jsm");
+ChromeUtils.import("resource://gre/modules/Geometry.jsm");
 
 const ACCESSIBLECARET_PREF = "layout.accessiblecaret.enabled";
 const BASE_TEST_URL = "http://mochi.test:8888/tests/robocop/testAccessibleCarets.html";
@@ -46,10 +44,8 @@ function do_promiseTabChangeEvent(tabId, eventType) {
  * or if we have basic content.
  */
 function isInputOrTextarea(element) {
-  // ChromeUtils isn't included in robocop tests, so we have to use a different
-  // way to test elements.
-  return (element.namespaceURI === "http://www.w3.org/1999/xhtml" &&
-         (element.localName === "input" || element.localName === "textarea"));
+  return (ChromeUtils.getClassName(element) === "HTMLInputElement" ||
+          ChromeUtils.getClassName(element) === "HTMLTextAreaElement");
 }
 
 /**
diff --git a/mobile/android/tests/browser/robocop/testActivityStreamPocketReferrer.js b/mobile/android/tests/browser/robocop/testActivityStreamPocketReferrer.js
index cac57902218d..b79331a6881f 100644
--- a/mobile/android/tests/browser/robocop/testActivityStreamPocketReferrer.js
+++ b/mobile/android/tests/browser/robocop/testActivityStreamPocketReferrer.js
@@ -2,10 +2,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/. */
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Messaging.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Messaging.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 let java = new JavaBridge(this);
 do_register_cleanup(() => {
diff --git a/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js b/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
index 82d92e0c34c4..039061649b75 100644
--- a/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
+++ b/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
@@ -8,12 +8,7 @@
 
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Messaging.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const {ChromeUtils} = Cu.getGlobalForObject(XPCOMUtils);
+ChromeUtils.import("resource://gre/modules/Messaging.jsm");
 
 // event name
 const TOPIC_ANDROID_CAST_DEVICE_ADDED   = "AndroidCastDevice:Added";
diff --git a/mobile/android/tests/browser/robocop/testBrowserDiscovery.js b/mobile/android/tests/browser/robocop/testBrowserDiscovery.js
index f2f460bc46e2..3af3ebc3f0c1 100644
--- a/mobile/android/tests/browser/robocop/testBrowserDiscovery.js
+++ b/mobile/android/tests/browser/robocop/testBrowserDiscovery.js
@@ -5,9 +5,7 @@
 
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // We use a global variable to track the <browser> where the tests are happening
 var browser;
diff --git a/mobile/android/tests/browser/robocop/testEventDispatcher.js b/mobile/android/tests/browser/robocop/testEventDispatcher.js
index 0240e38213c2..4b5caff934e4 100644
--- a/mobile/android/tests/browser/robocop/testEventDispatcher.js
+++ b/mobile/android/tests/browser/robocop/testEventDispatcher.js
@@ -1,7 +1,5 @@
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Messaging.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Messaging.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var java = new JavaBridge(this);
 
diff --git a/mobile/android/tests/browser/robocop/testFilePicker.js b/mobile/android/tests/browser/robocop/testFilePicker.js
index 222c3d07f518..e75e064b3cfb 100644
--- a/mobile/android/tests/browser/robocop/testFilePicker.js
+++ b/mobile/android/tests/browser/robocop/testFilePicker.js
@@ -5,9 +5,7 @@
 
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 add_test(function filepicker_open() {
   let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
diff --git a/mobile/android/tests/browser/robocop/testFindInPage.js b/mobile/android/tests/browser/robocop/testFindInPage.js
index 503d859fa388..d44096760456 100644
--- a/mobile/android/tests/browser/robocop/testFindInPage.js
+++ b/mobile/android/tests/browser/robocop/testFindInPage.js
@@ -5,10 +5,8 @@
 
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Messaging.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Messaging.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const TEST_URL = "http://mochi.test:8888/tests/robocop/robocop_text_page.html";
 
diff --git a/mobile/android/tests/browser/robocop/testHistoryService.js b/mobile/android/tests/browser/robocop/testHistoryService.js
index 4140ccfc51fc..18f13ef698bb 100644
--- a/mobile/android/tests/browser/robocop/testHistoryService.js
+++ b/mobile/android/tests/browser/robocop/testHistoryService.js
@@ -5,10 +5,8 @@
 
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // Make the timer global so it doesn't get GC'd
 var gTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
diff --git a/mobile/android/tests/browser/robocop/testReaderCacheMigration.js b/mobile/android/tests/browser/robocop/testReaderCacheMigration.js
index b7367fdd7a83..2600e35736c0 100644
--- a/mobile/android/tests/browser/robocop/testReaderCacheMigration.js
+++ b/mobile/android/tests/browser/robocop/testReaderCacheMigration.js
@@ -4,9 +4,7 @@
  * 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/. */
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/ReaderMode.jsm");
+ChromeUtils.import("resource://gre/modules/ReaderMode.jsm");
 
 var java = new JavaBridge(this);
 
diff --git a/mobile/android/tests/browser/robocop/testReadingListCache.js b/mobile/android/tests/browser/robocop/testReadingListCache.js
index 530d7bec91fb..072a406b7789 100644
--- a/mobile/android/tests/browser/robocop/testReadingListCache.js
+++ b/mobile/android/tests/browser/robocop/testReadingListCache.js
@@ -5,11 +5,9 @@
 
 /* globals ReaderMode */
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/ReaderMode.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
+ChromeUtils.import("resource://gre/modules/ReaderMode.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Task.jsm");
 
 var Reader = Services.wm.getMostRecentWindow("navigator:browser").Reader;
 
diff --git a/mobile/android/tests/browser/robocop/testRuntimePermissionsAPI.js b/mobile/android/tests/browser/robocop/testRuntimePermissionsAPI.js
index 9aba49aee04d..b81cef3947b4 100644
--- a/mobile/android/tests/browser/robocop/testRuntimePermissionsAPI.js
+++ b/mobile/android/tests/browser/robocop/testRuntimePermissionsAPI.js
@@ -3,11 +3,9 @@
  * 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/. */
 
-/* eslint-disable mozilla/use-chromeutils-import */
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "RuntimePermissions", "resource://gre/modules/RuntimePermissions.jsm");
+ChromeUtils.defineModuleGetter(this, "RuntimePermissions", "resource://gre/modules/RuntimePermissions.jsm");
 
 add_task(async function test_snackbar_api() {
   RuntimePermissions.waitForPermissions([
diff --git a/mobile/android/tests/browser/robocop/testSnackbarAPI.js b/mobile/android/tests/browser/robocop/testSnackbarAPI.js
index 66d76c85b7d4..d939d4f4e9e7 100644
--- a/mobile/android/tests/browser/robocop/testSnackbarAPI.js
+++ b/mobile/android/tests/browser/robocop/testSnackbarAPI.js
@@ -3,12 +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/. */
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Snackbars", "resource://gre/modules/Snackbars.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "EventDispatcher", "resource://gre/modules/Messaging.jsm");
+ChromeUtils.defineModuleGetter(this, "Snackbars", "resource://gre/modules/Snackbars.jsm");
+ChromeUtils.defineModuleGetter(this, "EventDispatcher", "resource://gre/modules/Messaging.jsm");
 
 add_task(async function test_snackbar_api() {
   Snackbars.show("This is a Snackbar", Snackbars.LENGTH_INDEFINITE, {
diff --git a/mobile/android/tests/browser/robocop/testTrackingProtection.js b/mobile/android/tests/browser/robocop/testTrackingProtection.js
index aafa9d890536..7b9c6341e1a9 100644
--- a/mobile/android/tests/browser/robocop/testTrackingProtection.js
+++ b/mobile/android/tests/browser/robocop/testTrackingProtection.js
@@ -5,11 +5,9 @@
 
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Messaging.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Messaging.jsm");
 
 function promiseLoadEvent(browser, url, eventType = "load", runBeforeLoad) {
   return new Promise((resolve, reject) => {
@@ -58,12 +56,7 @@ function doUpdate() {
 
   return new Promise((resolve, reject) => {
     let listener = {
-      QueryInterface: function(iid) {
-        if (iid.equals(Ci.nsISupports) || iid.equals(Ci.nsIUrlClassifierUpdateObserver))
-          return this;
-
-        throw Cr.NS_ERROR_NO_INTERFACE;
-      },
+      QueryInterface: ChromeUtils.generateQI([Ci.nsIUrlClassifierUpdateObserver]),
       updateUrlRequested: function(url) { },
       streamFinished: function(status) { },
       updateError: function(errorCode) {
diff --git a/mobile/android/tests/browser/robocop/testUITelemetry.js b/mobile/android/tests/browser/robocop/testUITelemetry.js
index 3a34b10bcc93..fb4263dac06e 100644
--- a/mobile/android/tests/browser/robocop/testUITelemetry.js
+++ b/mobile/android/tests/browser/robocop/testUITelemetry.js
@@ -3,9 +3,7 @@
  * 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/. */
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const EVENT_TEST1 = "_test_event_1.1";
 const EVENT_TEST2 = "_test_event_2.1";
diff --git a/mobile/android/tests/browser/robocop/testUnifiedTelemetryClientId.js b/mobile/android/tests/browser/robocop/testUnifiedTelemetryClientId.js
index bb900b7a9d1b..393b40c017f4 100644
--- a/mobile/android/tests/browser/robocop/testUnifiedTelemetryClientId.js
+++ b/mobile/android/tests/browser/robocop/testUnifiedTelemetryClientId.js
@@ -1,6 +1,4 @@
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/ClientID.jsm");
+ChromeUtils.import("resource://gre/modules/ClientID.jsm");
 
 var java = new JavaBridge(this);
 do_register_cleanup(() => {
diff --git a/mobile/android/tests/browser/robocop/testVideoControls.js b/mobile/android/tests/browser/robocop/testVideoControls.js
index 5096711f3aee..6a0d446a9638 100644
--- a/mobile/android/tests/browser/robocop/testVideoControls.js
+++ b/mobile/android/tests/browser/robocop/testVideoControls.js
@@ -5,10 +5,8 @@
 
 "use strict";
 
-/* eslint-disable mozilla/use-chromeutils-import */
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/SimpleServiceDiscovery.jsm");
 
 Cu.importGlobalProperties(["InspectorUtils"]);
 

From 000eca920e9e800e98b6c32f6820b972b1b0146d Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Tue, 30 Oct 2018 19:34:22 +0000
Subject: [PATCH 19/53] Bug 1498697 - stop polling when there's nothing to
 poll, restart when processes are re-added, r=kmag

Differential Revision: https://phabricator.services.mozilla.com/D8962

--HG--
extra : moz-landing-system : lando
---
 .../modules/subprocess/subprocess_worker_unix.js   | 14 +++++++++++++-
 .../modules/subprocess/subprocess_worker_win.js    | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/toolkit/modules/subprocess/subprocess_worker_unix.js b/toolkit/modules/subprocess/subprocess_worker_unix.js
index 10a7e7635928..24d403e62533 100644
--- a/toolkit/modules/subprocess/subprocess_worker_unix.js
+++ b/toolkit/modules/subprocess/subprocess_worker_unix.js
@@ -499,6 +499,8 @@ io = {
 
   running: true,
 
+  polling: false,
+
   init(details) {
     this.signal = new Signal(details.signalFd);
     this.updatePollFds();
@@ -545,6 +547,16 @@ io = {
 
     handlers = handlers.filter(handler => handler.pollEvents);
 
+    // Our poll loop is only useful if we've got at least 1 thing to poll other than our own
+    // signal.
+    if (handlers.length == 1) {
+      this.polling = false;
+    } else if (!this.polling && this.running) {
+      // Restart the poll loop if necessary:
+      setTimeout(this.loop.bind(this), 0);
+      this.polling = true;
+    }
+
     let pollfds = unix.pollfd.array(handlers.length)();
 
     for (let [i, handler] of handlers.entries()) {
@@ -561,7 +573,7 @@ io = {
 
   loop() {
     this.poll();
-    if (this.running) {
+    if (this.running && this.polling) {
       setTimeout(this.loop.bind(this), 0);
     }
   },
diff --git a/toolkit/modules/subprocess/subprocess_worker_win.js b/toolkit/modules/subprocess/subprocess_worker_win.js
index f888b31ca4b1..40e6a1a6870d 100644
--- a/toolkit/modules/subprocess/subprocess_worker_win.js
+++ b/toolkit/modules/subprocess/subprocess_worker_win.js
@@ -616,6 +616,8 @@ io = {
 
   running: true,
 
+  polling: false,
+
   init(details) {
     this.comspec = details.comspec;
 
@@ -668,6 +670,16 @@ io = {
 
     handlers = handlers.filter(handler => handler.event);
 
+    // Our poll loop is only useful if we've got at least 1 thing to poll other than our own
+    // signal.
+    if (handlers.length == 1) {
+      this.polling = false;
+    } else if (!this.polling && this.running) {
+      // Restart the poll loop if necessary:
+      setTimeout(this.loop.bind(this), 0);
+      this.polling = true;
+    }
+
     this.eventHandlers = handlers;
 
     let handles = handlers.map(handler => handler.event);
@@ -676,7 +688,7 @@ io = {
 
   loop() {
     this.poll();
-    if (this.running) {
+    if (this.running && this.polling) {
       setTimeout(this.loop.bind(this), 0);
     }
   },

From 8d7b51d9435b94f60f9ae3e4edd6f95aaf2ad48b Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 30 Oct 2018 21:24:04 +0000
Subject: [PATCH 20/53] Bug 1486960 - Pretend there is only a touch screen
 device if touch similation is enabled on RDM. #firefox-style-system-reviewers
 r=emilio

When the touch similation is enabled on RDM, TOUCHEVENTS_OVERRIDE_ENABLED is
propagated to all descendants docShells, so that we can just query it and return
PointerCapabilities::Coarse for the case.

Differential Revision: https://phabricator.services.mozilla.com/D10203

--HG--
extra : moz-landing-system : lando
---
 layout/style/nsMediaFeatures.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index 75cfd8aebda5..40b74cc6caf2 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -268,6 +268,17 @@ GetPointerCapabilities(nsIDocument* aDocument, LookAndFeel::IntID aID)
 {
   MOZ_ASSERT(aID == LookAndFeel::eIntID_PrimaryPointerCapabilities ||
              aID == LookAndFeel::eIntID_AllPointerCapabilities);
+  MOZ_ASSERT(aDocument);
+
+  if (nsIDocShell* docShell = aDocument->GetDocShell()) {
+    // The touch-events-override happens only for the Responsive Design Mode so
+    // that we don't need to care about ResistFingerprinting.
+    uint32_t touchEventsOverride = nsIDocShell::TOUCHEVENTS_OVERRIDE_NONE;
+    docShell->GetTouchEventsOverride(&touchEventsOverride);
+    if (touchEventsOverride == nsIDocShell::TOUCHEVENTS_OVERRIDE_ENABLED) {
+      return PointerCapabilities::Coarse;
+    }
+  }
 
   // The default value is mouse-type pointer.
   const PointerCapabilities kDefaultCapabilities =

From ecabb3873c4639fc31c5d5d1bd85daedab4d9541 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 30 Oct 2018 21:24:06 +0000
Subject: [PATCH 21/53] Bug 1486960 - Test that checks the interaction media
 features when touch similation is enabled on RDM. r=gl

Depends on D10203

Differential Revision: https://phabricator.services.mozilla.com/D10204

--HG--
extra : moz-landing-system : lando
---
 .../test/browser/browser_touch_simulation.js  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/devtools/client/responsive.html/test/browser/browser_touch_simulation.js b/devtools/client/responsive.html/test/browser/browser_touch_simulation.js
index e3c289851fc7..0fc102496039 100644
--- a/devtools/client/responsive.html/test/browser/browser_touch_simulation.js
+++ b/devtools/client/responsive.html/test/browser/browser_touch_simulation.js
@@ -61,6 +61,16 @@ async function testWithNoTouch(ui) {
     await EventUtils.synthesizeClick(div);
     is(div.dataset.isDelay, "false",
       "300ms delay between touch events and mouse events should not work");
+
+    // Assuming that this test runs on devices having no touch screen device.
+    ok(!content.document.defaultView.matchMedia("(pointer: coarse)").matches,
+       "pointer: coarse shouldn't be matched");
+    ok(!content.document.defaultView.matchMedia("(hover: none)").matches,
+       "hover: none shouldn't be matched");
+    ok(!content.document.defaultView.matchMedia("(any-pointer: coarse)").matches,
+       "any-pointer: coarse shouldn't be matched");
+    ok(!content.document.defaultView.matchMedia("(any-hover: none)").matches,
+       "any-hover: none shouldn't be matched");
   });
 }
 
@@ -98,6 +108,15 @@ async function testWithTouch(ui) {
           { type: "mousemove", isSynthesized: false }, content);
     isnot(div.style.backgroundColor, "blue",
       "mouseout or mouseleave should not work");
+
+    ok(content.document.defaultView.matchMedia("(pointer: coarse)").matches,
+       "pointer: coarse should be matched");
+    ok(content.document.defaultView.matchMedia("(hover: none)").matches,
+       "hover: none should be matched");
+    ok(content.document.defaultView.matchMedia("(any-pointer: coarse)").matches,
+       "any-pointer: coarse should be matched");
+    ok(content.document.defaultView.matchMedia("(any-hover: none)").matches,
+       "any-hover: none should be matched");
   });
 }
 

From b85791110fe6983de56608b0329d62636144f876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 30 Oct 2018 21:25:17 +0000
Subject: [PATCH 22/53] Bug 1503401 - Update cbindgen due to breaking change.
 r=boris

https://github.com/eqrion/cbindgen/pull/233 changed the way one of the options
we use work.

I think the new behavior is better, but we should do this sooner rather than
later, and fix broken builds.

Differential Revision: https://phabricator.services.mozilla.com/D10301

--HG--
extra : moz-landing-system : lando
---
 build/moz.configure/rust.configure         |  2 +-
 python/mozboot/mozboot/osx.py              |  2 +-
 servo/components/style/cbindgen.toml       | 28 +++++++++++-----------
 taskcluster/scripts/misc/build-cbindgen.sh |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index d8a0081d7944..42402fccc087 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -294,7 +294,7 @@ cbindgen = check_prog('CBINDGEN', add_rustup_path('cbindgen'), paths=toolchain_s
 @checking('cbindgen version')
 @imports(_from='textwrap', _import='dedent')
 def cbindgen_version(cbindgen):
-    cbindgen_min_version = Version('0.6.6')
+    cbindgen_min_version = Version('0.6.7')
 
     # cbindgen x.y.z
     version = Version(check_cmd_output(cbindgen, '--version').strip().split(" ")[1])
diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py
index 91f8a0fd7ce3..f3e6dfc15a7b 100644
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -503,7 +503,7 @@ class OSXBootstrapper(BaseBootstrapper):
         return active_name.lower()
 
     def ensure_stylo_packages(self, state_dir, checkout_root):
-        cbindgen_min_version = '0.6.6'
+        cbindgen_min_version = '0.6.7'
         # We installed clang via homebrew earlier.
         self.ensure_rust_package('cbindgen', cbindgen_min_version)
 
diff --git a/servo/components/style/cbindgen.toml b/servo/components/style/cbindgen.toml
index 1c8d14e16e8c..50252690054a 100644
--- a/servo/components/style/cbindgen.toml
+++ b/servo/components/style/cbindgen.toml
@@ -38,19 +38,19 @@ derive_helper_methods = true
 [export]
 prefix = "Style"
 include = [
-  "StyleAppearance",
-  "StyleComputedFontStretchRange",
-  "StyleComputedFontStyleDescriptor",
-  "StyleComputedFontWeightRange",
-  "StyleComputedTimingFunction",
-  "StyleDisplay",
-  "StyleDisplayMode",
-  "StyleFillRule",
-  "StyleFontDisplay",
-  "StyleFontFaceSourceListComponent",
-  "StyleFontLanguageOverride",
-  "StyleTimingFunction",
-  "StylePathCommand",
-  "StyleUnicodeRange",
+  "Appearance",
+  "ComputedFontStretchRange",
+  "ComputedFontStyleDescriptor",
+  "ComputedFontWeightRange",
+  "ComputedTimingFunction",
+  "Display",
+  "DisplayMode",
+  "FillRule",
+  "FontDisplay",
+  "FontFaceSourceListComponent",
+  "FontLanguageOverride",
+  "TimingFunction",
+  "PathCommand",
+  "UnicodeRange",
 ]
 item_types = ["enums", "structs", "typedefs"]
diff --git a/taskcluster/scripts/misc/build-cbindgen.sh b/taskcluster/scripts/misc/build-cbindgen.sh
index 2359a1bfc290..f550a29a4440 100755
--- a/taskcluster/scripts/misc/build-cbindgen.sh
+++ b/taskcluster/scripts/misc/build-cbindgen.sh
@@ -3,7 +3,7 @@ set -x -e -v
 
 # If you update this, make sure to update the minimum version in
 # build/moz.configure/rust.configure and python/mozboot/mozboot/osx.py as well.
-CBINDGEN_VERSION=v0.6.6
+CBINDGEN_VERSION=v0.6.7
 TARGET="$1"
 
 case "$(uname -s)" in

From 249491eb67c291135a4eea070927368282b164ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 30 Oct 2018 22:40:57 +0100
Subject: [PATCH 23/53] Bug 1502609 - followup: Add a missing ifdef.

---
 layout/generic/nsFrame.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 42e20455f845..0eb5406b50d0 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1192,6 +1192,7 @@ nsFrame::DidSetComputedStyle(ComputedStyle* aOldComputedStyle)
   mMayHaveRoundedCorners = true;
 }
 
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
 void
 nsIFrame::AssertNewStyleIsSane(ComputedStyle& aNewStyle)
 {
@@ -1210,6 +1211,7 @@ nsIFrame::AssertNewStyleIsSane(ComputedStyle& aNewStyle)
     (mComputedStyle->GetPseudo() == nsCSSAnonBoxes::firstLetterContinuation() &&
      aNewStyle.GetPseudo() == nsCSSAnonBoxes::mozText()));
 }
+#endif
 
 void
 nsIFrame::ReparentFrameViewTo(nsViewManager* aViewManager,

From 5fcc1832bd7150f32fe64f29c15b40ec68965cf7 Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Tue, 30 Oct 2018 21:47:29 +0000
Subject: [PATCH 24/53] Bug 1416747 - [marionette] Hardening
 test_cli_arguments.py TestCommandLineArguments.test_startup_timeout. r=ato

Using a startup timeout of 0s should always cause an IOError,
even for builds which startup within 100ms (pgo, Nightly opt).

Further the test should not modify the internal startup timeout
property, but pass the timeout as parameter to "start_session()".

Differential Revision: https://phabricator.services.mozilla.com/D10224

--HG--
extra : moz-landing-system : lando
---
 .../tests/unit/test_cli_arguments.py                 | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_cli_arguments.py b/testing/marionette/harness/marionette_harness/tests/unit/test_cli_arguments.py
index 58e82a5afba3..75708c498d14 100644
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_cli_arguments.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_cli_arguments.py
@@ -37,16 +37,10 @@ class TestCommandLineArguments(MarionetteTestCase):
             self.assertTrue(safe_mode, "Safe Mode has not been enabled")
 
     def test_startup_timeout(self):
-        startup_timeout = self.marionette.startup_timeout
-
-        # Use a timeout which always cause an IOError
-        self.marionette.startup_timeout = .1
-        msg = "Process killed after {}s".format(self.marionette.startup_timeout)
-
         try:
             self.marionette.quit()
-            with self.assertRaisesRegexp(IOError, msg):
-                self.marionette.start_session()
+            with self.assertRaisesRegexp(IOError, "Process killed after 0s"):
+                # Use a small enough timeout which should always cause an IOError
+                self.marionette.start_session(timeout=0)
         finally:
-            self.marionette.startup_timeout = startup_timeout
             self.marionette.start_session()

From 51817cd36dc9fff9ef4a86cec7744ae8e1696284 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 30 Oct 2018 21:46:55 +0000
Subject: [PATCH 25/53] Bug 1493984 - Part 0. Fix ActorChild.addEventListener.
 r=mconley

This fixes the addEventListener in ActorChild that I got wrong on bug 1490810, as it was still directly adding the events to the message manager, instead of going through the dispatcher (which can simulate the Fission process boundaries). ActorChild.addEventListener is meant for actors to add more events after they are constructed (that were not declared in nsBrowserGlue or ActorManagerParent)

Differential Revision: https://phabricator.services.mozilla.com/D7932

--HG--
extra : moz-landing-system : lando
---
 toolkit/modules/ActorChild.jsm        | 4 ++--
 toolkit/modules/ActorManagerChild.jsm | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/toolkit/modules/ActorChild.jsm b/toolkit/modules/ActorChild.jsm
index 600897d5901e..629bbdde5a85 100644
--- a/toolkit/modules/ActorChild.jsm
+++ b/toolkit/modules/ActorChild.jsm
@@ -30,8 +30,8 @@ class ActorChild {
     return this.mm.docShell;
   }
 
-  addEventListener(event, listener, options) {
-    this._dispatcher.addEventListener(event, listener, options);
+  addEventListener(event, options) {
+    this._dispatcher.addEventListener(event, this.constructor.name, options);
   }
 
   cleanup() {
diff --git a/toolkit/modules/ActorManagerChild.jsm b/toolkit/modules/ActorManagerChild.jsm
index 70afe47619bc..30560c75619c 100644
--- a/toolkit/modules/ActorManagerChild.jsm
+++ b/toolkit/modules/ActorManagerChild.jsm
@@ -47,7 +47,7 @@ class Dispatcher {
       Services.obs.addObserver(this, topic, true);
     }
     for (let {event, options, actor} of this.events) {
-      this.addEventListener(event, this.handleActorEvent.bind(this, actor), options);
+      this.addEventListener(event, actor, options);
     }
 
     this.mm.addEventListener("unload", this);
@@ -59,7 +59,8 @@ class Dispatcher {
     }
   }
 
-  addEventListener(event, listener, options) {
+  addEventListener(event, actor, options) {
+    let listener = this.handleActorEvent.bind(this, actor);
     this.mm.addEventListener(event, listener, options);
   }
 
@@ -186,7 +187,8 @@ class SingletonDispatcher extends Dispatcher {
     }
   }
 
-  addEventListener(event, listener, options) {
+  addEventListener(event, actor, options) {
+    let listener = this.handleActorEvent.bind(this, actor);
     this.listeners.push([event, listener, options]);
     this.window.addEventListener(event, listener, options);
   }

From 3b972f7f7ab28f239b6166bec0977d8c9812fe17 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 30 Oct 2018 21:47:04 +0000
Subject: [PATCH 26/53] Bug 1493984 - Implement Fission-aware message handling
 to actors. r=mconley

This patch adds a messaging mechanism to actors that work like this:

If browser.fission.simulate is true, messages handled by ActorManagerChild will only be dispatched to an actor tied to a specific frame, specified either by its frameId (outerWindowId) or by its browsingContextId. Messages that lack the information about the destination frame will be considered meant for the top-level frame.

In addition, a sendMessage API is added to ActorChild that automatically adds the id information to the outbound message, making it easier for it to be handled in the parent.

The frameId support is to ease the transition of some code that is already using outerWindowIds. For new code, it is preferred to use the browsing context ids, together with bug 1496840

Differential Revision: https://phabricator.services.mozilla.com/D7933

--HG--
extra : moz-landing-system : lando
---
 toolkit/modules/ActorChild.jsm        | 12 ++++-
 toolkit/modules/ActorManagerChild.jsm | 69 ++++++++++++++++++++++++---
 2 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/toolkit/modules/ActorChild.jsm b/toolkit/modules/ActorChild.jsm
index 629bbdde5a85..27576747aea1 100644
--- a/toolkit/modules/ActorChild.jsm
+++ b/toolkit/modules/ActorChild.jsm
@@ -23,7 +23,7 @@ class ActorChild {
   }
 
   get content() {
-    return this._dispatcher.window || this.mm.content;
+    return this._dispatcher.window;
   }
 
   get docShell() {
@@ -34,6 +34,16 @@ class ActorChild {
     this._dispatcher.addEventListener(event, this.constructor.name, options);
   }
 
+  addMessageListener(msg) {
+    this._dispatcher.addMessageListener(msg, this.constructor.name);
+  }
+
+  sendAsyncMessage(msg, data = {}) {
+    data.frameId = this._dispatcher.frameId;
+    data.browsingContextId = this._dispatcher.browsingContextId;
+    this.mm.sendAsyncMessage(msg, data);
+  }
+
   cleanup() {
     this._dispatcher = null;
   }
diff --git a/toolkit/modules/ActorManagerChild.jsm b/toolkit/modules/ActorManagerChild.jsm
index 30560c75619c..fdfd58435ec9 100644
--- a/toolkit/modules/ActorManagerChild.jsm
+++ b/toolkit/modules/ActorManagerChild.jsm
@@ -16,6 +16,9 @@ ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
+ChromeUtils.defineModuleGetter(this, "WebNavigationFrames",
+                               "resource://gre/modules/WebNavigationFrames.jsm");
+
 const {DefaultMap} = ExtensionUtils;
 
 const {sharedData} = Services.cpmm;
@@ -41,6 +44,9 @@ class Dispatcher {
 
   init() {
     for (let msg of this.messages.keys()) {
+      // This is directly called on the message manager
+      // because this.addMessageListener is meant to handle
+      // additions after initialization.
       this.mm.addMessageListener(msg, this);
     }
     for (let topic of this.observers.keys()) {
@@ -59,11 +65,41 @@ class Dispatcher {
     }
   }
 
+  get window() {
+    return this.mm.content;
+  }
+
+  get frameId() {
+    // 0 for top-level windows, outerWindowId otherwise
+    return WebNavigationFrames.getFrameId(this.window);
+  }
+
+  get browsingContextId() {
+    return this.window.docShell.browsingContext.id;
+  }
+
   addEventListener(event, actor, options) {
     let listener = this.handleActorEvent.bind(this, actor);
     this.mm.addEventListener(event, listener, options);
   }
 
+  addMessageListener(msg, actor) {
+    let actors = this.messages.get(msg);
+
+    if (!actors) {
+      actors = [];
+      this.messages.set(msg, actors);
+    }
+
+    if (actors.length == 0) {
+      this.mm.addMessageListener(msg, this);
+    }
+
+    if (!actors.includes(actor)) {
+      actors.push(actor);
+    }
+  }
+
   getActor(actorName) {
     let inst = this.instances.get(actorName);
     if (!inst) {
@@ -89,9 +125,7 @@ class Dispatcher {
 
     if (simulateFission) {
       targetWindow = event.target.ownerGlobal;
-      let dispatcherWindow = this.window || this.mm.content;
-
-      if (targetWindow != dispatcherWindow) {
+      if (targetWindow != this.window) {
         // events can't propagate across frame boundaries because the
         // frames will be hosted on separated processes.
         return;
@@ -102,15 +136,32 @@ class Dispatcher {
 
   receiveMessage(message) {
     let actors = this.messages.get(message.name);
-    let result;
+
+    if (simulateFission) {
+      let match = false;
+      let data = message.data || {};
+      if (data.hasOwnProperty("frameId")) {
+        match = (data.frameId == this.frameId);
+      } else if (data.hasOwnProperty("browsingContextId")) {
+        match = (data.browsingContextId == this.browsingContextId);
+      } else {
+        // if no specific target was given, just dispatch it to
+        // top-level actors.
+        match = (this.frameId == 0);
+      }
+
+      if (!match) {
+        return;
+      }
+    }
+
     for (let actor of actors) {
       try {
-        result = this.getActor(actor).receiveMessage(message);
+        this.getActor(actor).receiveMessage(message);
       } catch (e) {
         Cu.reportError(e);
       }
     }
-    return result;
   }
 
   observe(subject, topic, data) {
@@ -136,7 +187,7 @@ class SingletonDispatcher extends Dispatcher {
     window.addEventListener("pageshow", this, {mozSystemGroup: true});
     window.addEventListener("pagehide", this, {mozSystemGroup: true});
 
-    this.window = window;
+    this._window = window;
     this.listeners = [];
   }
 
@@ -175,6 +226,10 @@ class SingletonDispatcher extends Dispatcher {
     this.listeners = [];
   }
 
+  get window() {
+    return this._window;
+  }
+
   handleEvent(event) {
     if (event.type == "pageshow") {
       if (this.hidden) {

From e13fd1f1fc0f6e5d62a300562a7d113e92d4ce63 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 30 Oct 2018 21:47:05 +0000
Subject: [PATCH 27/53] Bug 1493984 - Change event listener to the mm to be
 able to receive chrome events. r=mconley

Some events that actors need to listen to are chrome events which are not received by the listener in the window (even with mozSystemGroup = true).

Differential Revision: https://phabricator.services.mozilla.com/D8014

--HG--
extra : moz-landing-system : lando
---
 toolkit/modules/ActorManagerChild.jsm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/toolkit/modules/ActorManagerChild.jsm b/toolkit/modules/ActorManagerChild.jsm
index fdfd58435ec9..16c663bab401 100644
--- a/toolkit/modules/ActorManagerChild.jsm
+++ b/toolkit/modules/ActorManagerChild.jsm
@@ -212,7 +212,7 @@ class SingletonDispatcher extends Dispatcher {
       this.mm.removeMessageListener(msg, this);
     }
     for (let [event, listener, options] of this.listeners) {
-      this.window.removeEventListener(event, listener, options);
+      this.mm.removeEventListener(event, listener, options);
     }
 
     for (let actor of this.instances.values()) {
@@ -242,10 +242,16 @@ class SingletonDispatcher extends Dispatcher {
     }
   }
 
+  handleActorEvent(actor, event) {
+    if (event.target.ownerGlobal == this.window) {
+      this.getActor(actor).handleEvent(event);
+    }
+  }
+
   addEventListener(event, actor, options) {
     let listener = this.handleActorEvent.bind(this, actor);
     this.listeners.push([event, listener, options]);
-    this.window.addEventListener(event, listener, options);
+    this.mm.addEventListener(event, listener, options);
   }
 }
 

From 6a9ea162e6dac29bedb8319967f8803a92d0e183 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Tue, 30 Oct 2018 21:49:29 +0000
Subject: [PATCH 28/53] Bug 1502963 - Quote jit_test.py --show-failed-cmd
 output. r=sfink

Differential Revision: https://phabricator.services.mozilla.com/D10091

--HG--
extra : moz-landing-system : lando
---
 js/src/tests/lib/jittests.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/src/tests/lib/jittests.py b/js/src/tests/lib/jittests.py
index 36ab4997f305..44b4b7f5993b 100755
--- a/js/src/tests/lib/jittests.py
+++ b/js/src/tests/lib/jittests.py
@@ -11,7 +11,6 @@ import os
 import posixpath
 import sys
 import traceback
-import subprocess
 from collections import namedtuple
 from datetime import datetime
 
@@ -21,7 +20,7 @@ else:
     from tasks_win import run_all_tests
 
 from progressbar import ProgressBar, NullProgressBar
-from results import TestOutput
+from results import TestOutput, escape_cmdline
 from structuredlog import TestLogger
 
 TESTS_LIB_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -429,7 +428,7 @@ def run_test_remote(test, device, prefix, options):
                        posixpath.join(options.remote_test_root, 'modules/'),
                        posixpath.join(options.remote_test_root, 'tests'))
     if options.show_cmd:
-        print(subprocess.list2cmdline(cmd))
+        print(escape_cmdline(cmd))
 
     env = {}
     if test.tz_pacific:
@@ -615,7 +614,7 @@ def print_test_summary(num_tests, failures, complete, doing, options):
 
         def show_test(res):
             if options.show_failed:
-                print('    ' + subprocess.list2cmdline(res.cmd))
+                print('    ' + escape_cmdline(res.cmd))
             else:
                 print('    ' + ' '.join(res.test.jitflags + [res.test.relpath_tests]))
 

From b74fab43a789260af6ce9b5f7c95e337a9079ffb Mon Sep 17 00:00:00 2001
From: Andreea Pavel <apavel@mozilla.com>
Date: Tue, 30 Oct 2018 23:59:24 +0200
Subject: [PATCH 29/53] Backed out changeset b374a5789689 (bug 1501375) for
 failing xpcshell at
 toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup.js on
 a CLOSED TREE

---
 .../components/extensions/ExtensionParent.jsm | 44 +++----------------
 .../extensions/parent/ext-backgroundPage.js   |  3 +-
 2 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm
index 486df963a65e..a6b1dfbd4e4c 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -1370,47 +1370,15 @@ const DebugUtils = {
 };
 
 
-/**
- * Returns a Promise which resolves with the message data when the given message
- * was received by the message manager. The promise is rejected if the message
- * manager was closed before a message was received.
- *
- * @param {MessageListenerManager} messageManager
- *        The message manager on which to listen for messages.
- * @param {string} messageName
- *        The message to listen for.
- * @returns {Promise<*>}
- */
-function promiseMessageFromChild(messageManager, messageName) {
-  return new Promise((resolve, reject) => {
-    let unregister;
-    function listener(message) {
-      unregister();
-      resolve(message.data);
-    }
-    function observer(subject, topic, data) {
-      if (subject === messageManager) {
-        unregister();
-        reject(new Error(`Message manager was disconnected before receiving ${messageName}`));
-      }
-    }
-    unregister = () => {
-      Services.obs.removeObserver(observer, "message-manager-close");
-      messageManager.removeMessageListener(messageName, listener);
-    };
-    messageManager.addMessageListener(messageName, listener);
-    Services.obs.addObserver(observer, "message-manager-close");
+function promiseExtensionViewLoaded(browser) {
+  return new Promise(resolve => {
+    browser.messageManager.addMessageListener("Extension:ExtensionViewLoaded", function onLoad({data}) {
+      browser.messageManager.removeMessageListener("Extension:ExtensionViewLoaded", onLoad);
+      resolve(data.childId && ParentAPIManager.getContextById(data.childId));
+    });
   });
 }
 
-// This should be called before browser.loadURI is invoked.
-async function promiseExtensionViewLoaded(browser) {
-  let {childId} = await promiseMessageFromChild(browser.messageManager, "Extension:ExtensionViewLoaded");
-  if (childId) {
-    return ParentAPIManager.getContextById(childId);
-  }
-}
-
 /**
  * This helper is used to subscribe a listener (e.g. in the ext-devtools API implementation)
  * to be called for every ExtensionProxyContext created for an extension page given
diff --git a/toolkit/components/extensions/parent/ext-backgroundPage.js b/toolkit/components/extensions/parent/ext-backgroundPage.js
index a404b0c89a8f..578dc2cccc81 100644
--- a/toolkit/components/extensions/parent/ext-backgroundPage.js
+++ b/toolkit/components/extensions/parent/ext-backgroundPage.js
@@ -38,10 +38,9 @@ class BackgroundPage extends HiddenExtensionPage {
 
     extensions.emit("extension-browser-inserted", this.browser);
 
-    let contextPromise = promiseExtensionViewLoaded(this.browser);
     this.browser.loadURI(this.url, {triggeringPrincipal: extension.principal});
 
-    let context = await contextPromise;
+    let context = await promiseExtensionViewLoaded(this.browser);
 
     ExtensionTelemetry.backgroundPageLoad.stopwatchFinish(extension, this);
 

From 03534668740338edbed3327a970a37d1f733edcb Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Tue, 30 Oct 2018 22:01:52 +0000
Subject: [PATCH 30/53] Bug 1502889 - Revert TypedArray [[Set]] to previous
 behavior if not receiver. r=jorendorff

Differential Revision: https://phabricator.services.mozilla.com/D10116

--HG--
extra : moz-landing-system : lando
---
 .../jit-test/tests/cacheir/typedarray-set.js  | 29 ----------
 .../tests/proxy/testDirectProxySetArray4.js   |  1 +
 js/src/jit/CacheIR.cpp                        |  5 --
 .../non262/TypedArray/set-with-receiver.js    | 19 +++---
 js/src/vm/NativeObject.cpp                    | 58 ++++++++++++-------
 5 files changed, 45 insertions(+), 67 deletions(-)
 delete mode 100644 js/src/jit-test/tests/cacheir/typedarray-set.js

diff --git a/js/src/jit-test/tests/cacheir/typedarray-set.js b/js/src/jit-test/tests/cacheir/typedarray-set.js
deleted file mode 100644
index 128dd2b0802f..000000000000
--- a/js/src/jit-test/tests/cacheir/typedarray-set.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Based on work by André Bargull
-
-function f() {
-    var x = [1,2,3];
-    x[3] = 0xff;
-
-    // Should have been defined on typed array.
-    assertEq(x.length, 3);
-    assertEq(x[3], -1);
-
-    x[3] = 0;
-}
-
-Object.setPrototypeOf(Array.prototype, new Int8Array(4));
-f();
-f();
-
-function g() {
-    var x = [1,2,3,4];
-    x[4] = 0xff;
-
-    // OOB [[Set]] should have been ignored
-    assertEq(x.length, 4);
-    assertEq(x[4], undefined);
-}
-
-Object.setPrototypeOf(Array.prototype, new Int8Array(4));
-g();
-g();
diff --git a/js/src/jit-test/tests/proxy/testDirectProxySetArray4.js b/js/src/jit-test/tests/proxy/testDirectProxySetArray4.js
index 2c40df1e2654..524ddca456ce 100644
--- a/js/src/jit-test/tests/proxy/testDirectProxySetArray4.js
+++ b/js/src/jit-test/tests/proxy/testDirectProxySetArray4.js
@@ -21,3 +21,4 @@ function test(arr) {
 }
 
 test([123]);
+test(new Int32Array([123]));
diff --git a/js/src/jit/CacheIR.cpp b/js/src/jit/CacheIR.cpp
index 03994ef254a0..3ff092c6f077 100644
--- a/js/src/jit/CacheIR.cpp
+++ b/js/src/jit/CacheIR.cpp
@@ -4016,11 +4016,6 @@ CanAttachAddElement(NativeObject* obj, bool isInit)
             return false;
         }
 
-        // TypedArrayObjects [[Set]] has special behavior.
-        if (proto->is<TypedArrayObject>()) {
-            return false;
-        }
-
         // We have to make sure the proto has no non-writable (frozen) elements
         // because we're not allowed to shadow them. There are a few cases to
         // consider:
diff --git a/js/src/tests/non262/TypedArray/set-with-receiver.js b/js/src/tests/non262/TypedArray/set-with-receiver.js
index 6e75f544b033..dc01c0766f39 100644
--- a/js/src/tests/non262/TypedArray/set-with-receiver.js
+++ b/js/src/tests/non262/TypedArray/set-with-receiver.js
@@ -1,21 +1,15 @@
 for (var constructor of anyTypedArrayConstructors) {
-    var receiver = new Proxy({}, {
-        getOwnPropertyDescriptor(p) {
-            throw "fail";
-        },
-
-        defineProperty() {
-            throw "fail";
-        }
-    });
+    var receiver = {};
 
     var ta = new constructor(1);
     assertEq(Reflect.set(ta, 0, 47, receiver), true);
-    assertEq(ta[0], 47);
+    assertEq(ta[0], 0);
+    assertEq(receiver[0], 47);
 
     // Out-of-bounds
-    assertEq(Reflect.set(ta, 10, 47, receiver), false);
+    assertEq(Reflect.set(ta, 10, 47, receiver), true);
     assertEq(ta[10], undefined);
+    assertEq(receiver[10], 47);
 
     // Detached
     if (typeof detachArrayBuffer === "function" &&
@@ -24,8 +18,9 @@ for (var constructor of anyTypedArrayConstructors) {
         detachArrayBuffer(ta.buffer)
 
         assertEq(ta[0], undefined);
-        assertEq(Reflect.set(ta, 0, 47, receiver), false);
+        assertEq(Reflect.set(ta, 0, 42, receiver), true);
         assertEq(ta[0], undefined);
+        assertEq(receiver[0], 42);
     }
 }
 
diff --git a/js/src/vm/NativeObject.cpp b/js/src/vm/NativeObject.cpp
index c941e89193df..158be44283c5 100644
--- a/js/src/vm/NativeObject.cpp
+++ b/js/src/vm/NativeObject.cpp
@@ -2040,12 +2040,6 @@ DefineNonexistentProperty(JSContext* cx, HandleNativeObject obj, HandleId id,
 {
     // Optimized NativeDefineProperty() version for known absent properties.
 
-#ifdef DEBUG
-    // Indexed properties of typed arrays should have been handled by SetTypedArrayElement.
-    uint64_t index;
-    MOZ_ASSERT_IF(obj->is<TypedArrayObject>(), !IsTypedArrayIndex(id, &index));
-#endif
-
     // Dispense with custom behavior of exotic native objects first.
     if (obj->is<ArrayObject>()) {
         // Array's length property is non-configurable, so we shouldn't
@@ -2059,7 +2053,35 @@ DefineNonexistentProperty(JSContext* cx, HandleNativeObject obj, HandleId id,
                 return result.fail(JSMSG_CANT_DEFINE_PAST_ARRAY_LENGTH);
             }
         }
-    }  else if (obj->is<ArgumentsObject>()) {
+    } else if (obj->is<TypedArrayObject>()) {
+        // 9.4.5.5 step 2. Indexed properties of typed arrays are special.
+        uint64_t index;
+        if (IsTypedArrayIndex(id, &index)) {
+            // This method is only called for non-existent properties, which
+            // means any absent indexed property must be out of range.
+            MOZ_ASSERT(index >= obj->as<TypedArrayObject>().length());
+
+            // Steps 1-2 are enforced by the caller.
+
+            // Step 3.
+            // We still need to call ToNumber, because of its possible side
+            // effects.
+            double d;
+            if (!ToNumber(cx, v, &d)) {
+                return false;
+            }
+
+            // Steps 4-5.
+            // ToNumber may have detached the array buffer.
+            if (obj->as<TypedArrayObject>().hasDetachedBuffer()) {
+                return result.failSoft(JSMSG_TYPED_ARRAY_DETACHED);
+            }
+
+            // Steps 6-9.
+            // We (wrongly) ignore out of range defines.
+            return result.failSoft(JSMSG_BAD_INDEX);
+        }
+    } else if (obj->is<ArgumentsObject>()) {
         // If this method is called with either |length| or |@@iterator|, the
         // property was previously deleted and hence should already be marked
         // as overridden.
@@ -2939,8 +2961,6 @@ SetExistingProperty(JSContext* cx, HandleId id, HandleValue v, HandleValue recei
 {
     // Step 5 for dense elements.
     if (prop.isDenseOrTypedArrayElement()) {
-        MOZ_ASSERT(!pobj->is<TypedArrayObject>());
-
         // Step 5.a.
         if (pobj->denseElementsAreFrozen()) {
             return result.fail(JSMSG_READ_ONLY);
@@ -2948,7 +2968,14 @@ SetExistingProperty(JSContext* cx, HandleId id, HandleValue v, HandleValue recei
 
         // Pure optimization for the common case:
         if (receiver.isObject() && pobj == &receiver.toObject()) {
-            return SetDenseElement(cx, pobj, JSID_TO_INT(id), v, result);
+            uint32_t index = JSID_TO_INT(id);
+
+            if (pobj->is<TypedArrayObject>()) {
+                Rooted<TypedArrayObject*> tobj(cx, &pobj->as<TypedArrayObject>());
+                return SetTypedArrayElement(cx, tobj, index, v, result);
+            }
+
+            return SetDenseElement(cx, pobj, index, v, result);
         }
 
         // Steps 5.b-f.
@@ -3014,17 +3041,6 @@ js::NativeSetProperty(JSContext* cx, HandleNativeObject obj, HandleId id, Handle
             return false;
         }
 
-        if (pobj->is<TypedArrayObject>()) {
-            uint64_t index;
-            if (IsTypedArrayIndex(id, &index)) {
-                Rooted<TypedArrayObject*> tobj(cx, &pobj->as<TypedArrayObject>());
-                return SetTypedArrayElement(cx, tobj, index, v, result);
-            }
-
-            // This case should have been handled.
-            MOZ_ASSERT(!prop.isDenseOrTypedArrayElement());
-        }
-
         if (prop) {
             // Steps 5-6.
             return SetExistingProperty(cx, id, v, receiver, pobj, prop, result);

From 3e3d914c394c2d957d69e485b16f66dc6b4145a9 Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Tue, 30 Oct 2018 21:53:03 +0000
Subject: [PATCH 31/53] Bug 1502966 - Print column number in FormatStackDump.
 r=jwalden

Differential Revision: https://phabricator.services.mozilla.com/D10092

--HG--
extra : moz-landing-system : lando
---
 js/src/jsfriendapi.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 9461992315f2..2fd77506c8a3 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -881,7 +881,8 @@ FormatFrame(JSContext* cx, const FrameIter& iter, Sprinter& sp, int num,
     JSAutoRealm ar(cx, envChain);
 
     const char* filename = script->filename();
-    unsigned lineno = PCToLineNumber(script, pc);
+    unsigned column = 0;
+    unsigned lineno = PCToLineNumber(script, pc, &column);
     RootedFunction fun(cx, iter.maybeCallee(cx));
     RootedString funname(cx);
     if (fun) {
@@ -990,11 +991,12 @@ FormatFrame(JSContext* cx, const FrameIter& iter, Sprinter& sp, int num,
         }
     }
 
-    // print filename and line number
-    if (!sp.printf("%s [\"%s\":%d]\n",
+    // print filename, line number and column
+    if (!sp.printf("%s [\"%s\":%d:%d]\n",
                    fun ? ")" : "",
                    filename ? filename : "<unknown>",
-                   lineno))
+                   lineno,
+                   column))
     {
         return false;
     }

From 81bcc04ac0faff9e3ee8d3058e96a41c0c784ae3 Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Tue, 30 Oct 2018 22:08:24 +0000
Subject: [PATCH 32/53] Bug 1503015 - [marionette] Added unhandled prompt check
 to "WebDriver:FindElements". r=ato

Differential Revision: https://phabricator.services.mozilla.com/D10181

--HG--
extra : moz-landing-system : lando
---
 testing/marionette/driver.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js
index aa2f3d4e3c55..6e031320be69 100644
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -2054,6 +2054,7 @@ GeckoDriver.prototype.findElement = async function(cmd) {
  */
 GeckoDriver.prototype.findElements = async function(cmd) {
   const win = assert.open(this.getCurrentWindow());
+  await this._handleUserPrompts();
 
   let {using, value} = cmd.parameters;
   let startNode;

From b604174729a3fc102b2555050470f6fffcb12f65 Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Tue, 30 Oct 2018 22:08:51 +0000
Subject: [PATCH 33/53] Bug 1503015 - [wdspec] Add user prompt tests for
 element retrieval commands. r=ato

Depends on D10181

Differential Revision: https://phabricator.services.mozilla.com/D10182

--HG--
extra : moz-landing-system : lando
---
 .../tests/find_element/user_prompts.py        | 121 +++++++++++++++++
 .../find_element_from_element/user_prompts.py | 126 +++++++++++++++++
 .../tests/find_elements/user_prompts.py       | 123 +++++++++++++++++
 .../user_prompts.py                           | 128 ++++++++++++++++++
 4 files changed, 498 insertions(+)
 create mode 100644 testing/web-platform/tests/webdriver/tests/find_element/user_prompts.py
 create mode 100644 testing/web-platform/tests/webdriver/tests/find_element_from_element/user_prompts.py
 create mode 100644 testing/web-platform/tests/webdriver/tests/find_elements/user_prompts.py
 create mode 100644 testing/web-platform/tests/webdriver/tests/find_elements_from_element/user_prompts.py

diff --git a/testing/web-platform/tests/webdriver/tests/find_element/user_prompts.py b/testing/web-platform/tests/webdriver/tests/find_element/user_prompts.py
new file mode 100644
index 000000000000..613466b62b51
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/tests/find_element/user_prompts.py
@@ -0,0 +1,121 @@
+# META: timeout=long
+
+import pytest
+
+from tests.support.asserts import (
+    assert_error,
+    assert_same_element,
+    assert_success,
+    assert_dialog_handled,
+)
+from tests.support.inline import inline
+
+
+def find_element(session, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/element".format(**vars(session)),
+        {"using": using, "value": value})
+
+
+@pytest.fixture
+def check_user_prompt_closed_without_exception(session, create_dialog):
+    def check_user_prompt_closed_without_exception(dialog_type, retval):
+        session.url = inline("<p>bar</p>")
+        element = session.find.css("p", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, "css selector", "p")
+        value = assert_success(response)
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+        assert_same_element(session, value, element)
+
+    return check_user_prompt_closed_without_exception
+
+
+@pytest.fixture
+def check_user_prompt_closed_with_exception(session, create_dialog):
+    def check_user_prompt_closed_with_exception(dialog_type, retval):
+        session.url = inline("<p>bar</p>")
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_with_exception
+
+
+@pytest.fixture
+def check_user_prompt_not_closed_but_exception(session, create_dialog):
+    def check_user_prompt_not_closed_but_exception(dialog_type):
+        session.url = inline("<p>bar</p>")
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert session.alert.text == dialog_type
+        session.alert.dismiss()
+
+    return check_user_prompt_not_closed_but_exception
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "ignore"})
+@pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
+def test_ignore(check_user_prompt_not_closed_but_exception, dialog_type):
+    check_user_prompt_not_closed_but_exception(dialog_type)
+
+
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
diff --git a/testing/web-platform/tests/webdriver/tests/find_element_from_element/user_prompts.py b/testing/web-platform/tests/webdriver/tests/find_element_from_element/user_prompts.py
new file mode 100644
index 000000000000..3fdaf4e47ed7
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/tests/find_element_from_element/user_prompts.py
@@ -0,0 +1,126 @@
+# META: timeout=long
+
+import pytest
+
+from tests.support.asserts import (
+    assert_error,
+    assert_same_element,
+    assert_success,
+    assert_dialog_handled,
+)
+from tests.support.inline import inline
+
+
+def find_element(session, element_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/element/{element_id}/element".format(
+            session_id=session.session_id,
+            element_id=element_id),
+        {"using": using, "value": value})
+
+
+@pytest.fixture
+def check_user_prompt_closed_without_exception(session, create_dialog):
+    def check_user_prompt_closed_without_exception(dialog_type, retval):
+        session.url = inline("<div><p>bar</p><div>")
+        outer_element = session.find.css("div", all=False)
+        inner_element = session.find.css("p", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, outer_element.id, "css selector", "p")
+        value = assert_success(response)
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+        assert_same_element(session, value, inner_element)
+
+    return check_user_prompt_closed_without_exception
+
+
+@pytest.fixture
+def check_user_prompt_closed_with_exception(session, create_dialog):
+    def check_user_prompt_closed_with_exception(dialog_type, retval):
+        session.url = inline("<div><p>bar</p><div>")
+        outer_element = session.find.css("div", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, outer_element.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_with_exception
+
+
+@pytest.fixture
+def check_user_prompt_not_closed_but_exception(session, create_dialog):
+    def check_user_prompt_not_closed_but_exception(dialog_type):
+        session.url = inline("<div><p>bar</p><div>")
+        outer_element = session.find.css("div", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_element(session, outer_element.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert session.alert.text == dialog_type
+        session.alert.dismiss()
+
+    return check_user_prompt_not_closed_but_exception
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "ignore"})
+@pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
+def test_ignore(check_user_prompt_not_closed_but_exception, dialog_type):
+    check_user_prompt_not_closed_but_exception(dialog_type)
+
+
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
diff --git a/testing/web-platform/tests/webdriver/tests/find_elements/user_prompts.py b/testing/web-platform/tests/webdriver/tests/find_elements/user_prompts.py
new file mode 100644
index 000000000000..01eb8ff3c863
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/tests/find_elements/user_prompts.py
@@ -0,0 +1,123 @@
+# META: timeout=long
+
+import pytest
+
+from tests.support.asserts import (
+    assert_error,
+    assert_same_element,
+    assert_success,
+    assert_dialog_handled,
+)
+from tests.support.inline import inline
+
+
+def find_elements(session, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/elements".format(**vars(session)),
+        {"using": using, "value": value})
+
+
+@pytest.fixture
+def check_user_prompt_closed_without_exception(session, create_dialog):
+    def check_user_prompt_closed_without_exception(dialog_type, retval):
+        session.url = inline("<p>bar</p>")
+        element = session.find.css("p", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, "css selector", "p")
+        value = assert_success(response)
+        assert isinstance(value, list)
+        assert len(value) == 1
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+        assert_same_element(session, value[0], element)
+
+    return check_user_prompt_closed_without_exception
+
+
+@pytest.fixture
+def check_user_prompt_closed_with_exception(session, create_dialog):
+    def check_user_prompt_closed_with_exception(dialog_type, retval):
+        session.url = inline("<p>bar</p>")
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_with_exception
+
+
+@pytest.fixture
+def check_user_prompt_not_closed_but_exception(session, create_dialog):
+    def check_user_prompt_not_closed_but_exception(dialog_type):
+        session.url = inline("<p>bar</p>")
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert session.alert.text == dialog_type
+        session.alert.dismiss()
+
+    return check_user_prompt_not_closed_but_exception
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "ignore"})
+@pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
+def test_ignore(check_user_prompt_not_closed_but_exception, dialog_type):
+    check_user_prompt_not_closed_but_exception(dialog_type)
+
+
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
diff --git a/testing/web-platform/tests/webdriver/tests/find_elements_from_element/user_prompts.py b/testing/web-platform/tests/webdriver/tests/find_elements_from_element/user_prompts.py
new file mode 100644
index 000000000000..ca7bc7735d08
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/tests/find_elements_from_element/user_prompts.py
@@ -0,0 +1,128 @@
+# META: timeout=long
+
+import pytest
+
+from tests.support.asserts import (
+    assert_error,
+    assert_same_element,
+    assert_success,
+    assert_dialog_handled,
+)
+from tests.support.inline import inline
+
+
+def find_elements(session, element_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/element/{element_id}/elements".format(
+            session_id=session.session_id,
+            element_id=element_id),
+        {"using": using, "value": value})
+
+
+@pytest.fixture
+def check_user_prompt_closed_without_exception(session, create_dialog):
+    def check_user_prompt_closed_without_exception(dialog_type, retval):
+        session.url = inline("<div><p>bar</p><div>")
+        outer_element = session.find.css("div", all=False)
+        inner_element = session.find.css("p", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, outer_element.id, "css selector", "p")
+        value = assert_success(response)
+        assert isinstance(value, list)
+        assert len(value) == 1
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+        assert_same_element(session, value[0], inner_element)
+
+    return check_user_prompt_closed_without_exception
+
+
+@pytest.fixture
+def check_user_prompt_closed_with_exception(session, create_dialog):
+    def check_user_prompt_closed_with_exception(dialog_type, retval):
+        session.url = inline("<div><p>bar</p><div>")
+        outer_element = session.find.css("div", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, outer_element.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
+
+    return check_user_prompt_closed_with_exception
+
+
+@pytest.fixture
+def check_user_prompt_not_closed_but_exception(session, create_dialog):
+    def check_user_prompt_not_closed_but_exception(dialog_type):
+        session.url = inline("<div><p>bar</p><div>")
+        outer_element = session.find.css("div", all=False)
+
+        create_dialog(dialog_type, text=dialog_type)
+
+        response = find_elements(session, outer_element.id, "css selector", "p")
+        assert_error(response, "unexpected alert open")
+
+        assert session.alert.text == dialog_type
+        session.alert.dismiss()
+
+    return check_user_prompt_not_closed_but_exception
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "accept and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", True),
+    ("prompt", ""),
+])
+def test_accept_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss(check_user_prompt_closed_without_exception, dialog_type, retval):
+    check_user_prompt_closed_without_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "dismiss and notify"})
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_dismiss_and_notify(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)
+
+
+@pytest.mark.capabilities({"unhandledPromptBehavior": "ignore"})
+@pytest.mark.parametrize("dialog_type", ["alert", "confirm", "prompt"])
+def test_ignore(check_user_prompt_not_closed_but_exception, dialog_type):
+    check_user_prompt_not_closed_but_exception(dialog_type)
+
+
+@pytest.mark.parametrize("dialog_type, retval", [
+    ("alert", None),
+    ("confirm", False),
+    ("prompt", None),
+])
+def test_default(check_user_prompt_closed_with_exception, dialog_type, retval):
+    check_user_prompt_closed_with_exception(dialog_type, retval)

From b463e797335d6f94eb6a59e54e1918d7f1740550 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Fri, 26 Oct 2018 18:01:13 +0000
Subject: [PATCH 34/53] Bug 1501329 - Persist information about canary after
 resetting client ID r=chutten

We erroneously reset client IDs on Fennec to a canary client ID.
This is now detected and a new valid and random client ID is set.

This adds a new boolean attribute "wasCanary" to the `state.json` file
generated by ClientID.jsm.

Depends on D9544

Differential Revision: https://phabricator.services.mozilla.com/D9903

--HG--
extra : moz-landing-system : lando
---
 .../unit/test_TelemetryClientID_reset.js      |  6 ++-
 toolkit/modules/ClientID.jsm                  | 38 +++++++++++++++++++
 .../modules/tests/xpcshell/test_client_id.js  | 25 ++++++++++++
 toolkit/modules/tests/xpcshell/xpcshell.ini   |  1 -
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js b/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
index 8263f59f8c37..fd105eeda78d 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
@@ -15,10 +15,10 @@ const PING_FORMAT_VERSION = 4;
 const OPTOUT_PING_TYPE = "optout";
 const TEST_PING_TYPE = "test-ping-type";
 
-function sendPing() {
+function sendPing(addEnvironment = false) {
   let options = {
     addClientId: true,
-    addEnvironment: false,
+    addEnvironment,
   };
   return TelemetryController.submitExternalPing(TEST_PING_TYPE, {}, options);
 }
@@ -211,6 +211,7 @@ add_task(async function test_clientid_canary_nonunified_no_pref_trigger() {
 
   // Restart the instance
   await TelemetryController.testShutdown();
+  await TelemetryStorage.testClearPendingPings();
   await TelemetryController.testReset();
 
   let newClientId = await ClientID.getClientID();
@@ -221,6 +222,7 @@ add_task(async function test_clientid_canary_nonunified_no_pref_trigger() {
 
   // Restart the instance
   await TelemetryController.testShutdown();
+  await TelemetryStorage.testClearPendingPings();
   await TelemetryController.testReset();
 
   newClientId = await ClientID.getClientID();
diff --git a/toolkit/modules/ClientID.jsm b/toolkit/modules/ClientID.jsm
index e81abb581f52..18eb0a3b221e 100644
--- a/toolkit/modules/ClientID.jsm
+++ b/toolkit/modules/ClientID.jsm
@@ -9,9 +9,12 @@ var EXPORTED_SYMBOLS = ["ClientID"];
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/Log.jsm");
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 const LOGGER_NAME = "Toolkit.Telemetry";
 const LOGGER_PREFIX = "ClientID::";
+// Must match ID in TelemetryUtils
+const CANARY_CLIENT_ID = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
 
 ChromeUtils.defineModuleGetter(this, "CommonUtils",
                                "resource://services-common/utils.js");
@@ -56,6 +59,18 @@ var ClientID = Object.freeze({
     return ClientIDImpl.getClientID();
   },
 
+  /**
+   * This returns true if the client ID prior to the last client ID reset was a canary client ID.
+   * Android only. Always returns null on Desktop.
+   */
+  wasCanaryClientID() {
+    if (AppConstants.platform == "android") {
+      return ClientIDImpl.wasCanaryClientID();
+    }
+
+    return null;
+  },
+
   /**
    * Get the client id synchronously without hitting the disk.
    * This returns:
@@ -107,6 +122,7 @@ var ClientIDImpl = {
   _saveClientIdTask: null,
   _removeClientIdTask: null,
   _logger: null,
+  _wasCanary: null,
 
   _loadClientID() {
     if (this._loadClientIdTask) {
@@ -130,6 +146,9 @@ var ClientIDImpl = {
     // Try to load the client id from the DRS state file.
     try {
       let state = await CommonUtils.readJSON(gStateFilePath);
+      if (AppConstants.platform == "android" && state && "wasCanary" in state) {
+        this._wasCanary = state.wasCanary;
+      }
       if (state && this.updateClientID(state.clientID)) {
         return this._clientID;
       }
@@ -157,6 +176,10 @@ var ClientIDImpl = {
    */
   async _saveClientID() {
     let obj = { clientID: this._clientID };
+    // We detected a canary client ID when resetting, storing this as a flag
+    if (AppConstants.platform == "android" && this._wasCanary) {
+      obj.wasCanary = true;
+    }
     await OS.File.makeDir(gDatareportingPath);
     await CommonUtils.writeJSON(obj, gStateFilePath);
     this._saveClientIdTask = null;
@@ -176,6 +199,14 @@ var ClientIDImpl = {
     return Promise.resolve(this._clientID);
   },
 
+  /**
+   * This returns true if the client ID prior to the last client ID reset was a canary client ID.
+   * Android only. Always returns null on Desktop.
+   */
+  wasCanaryClientID() {
+    return this._wasCanary;
+  },
+
   /**
    * Get the client id synchronously without hitting the disk.
    * This returns:
@@ -243,6 +274,8 @@ var ClientIDImpl = {
   },
 
   async resetClientID() {
+    let oldClientId = this._clientID;
+
     // Wait for the removal.
     // Asynchronous calls to getClientID will also be blocked on this.
     this._removeClientIdTask = this._doRemoveClientID();
@@ -251,6 +284,11 @@ var ClientIDImpl = {
 
     await this._removeClientIdTask;
 
+    // On Android we detect resets after a canary client ID.
+    if (AppConstants.platform == "android" ) {
+      this._wasCanary = oldClientId == CANARY_CLIENT_ID;
+    }
+
     // Generate a new id.
     return this.getClientID();
   },
diff --git a/toolkit/modules/tests/xpcshell/test_client_id.js b/toolkit/modules/tests/xpcshell/test_client_id.js
index af3fbc7a3e98..f7de7a0e8666 100644
--- a/toolkit/modules/tests/xpcshell/test_client_id.js
+++ b/toolkit/modules/tests/xpcshell/test_client_id.js
@@ -7,6 +7,7 @@ ChromeUtils.import("resource://gre/modules/ClientID.jsm");
 ChromeUtils.import("resource://services-common/utils.js");
 ChromeUtils.import("resource://gre/modules/osfile.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 const PREF_CACHED_CLIENTID = "toolkit.telemetry.cachedClientID";
 
@@ -130,3 +131,27 @@ add_task(async function test_resetParallelGet() {
   Assert.notEqual(firstClientID, newClientID, "After reset client ID should be different.");
   Assert.equal(newClientID, otherClientID, "Getting the client ID in parallel to a reset should give the same id.");
 });
+
+add_task({
+  skip_if: () => AppConstants.platform != "android",
+}, async function test_FennecCanaryDetect() {
+  const KNOWN_UUID = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
+
+  // We should get a valid UUID after reset
+  let firstClientID = await ClientID.resetClientID();
+  Assert.notEqual(KNOWN_UUID, firstClientID, "Client ID should be random.");
+
+  // Set the canary client ID.
+  await ClientID.setClientID(KNOWN_UUID);
+  Assert.equal(KNOWN_UUID, await ClientID.getClientID(), "Client ID should be known canary.");
+
+  let newClientID = await ClientID.resetClientID();
+  Assert.notEqual(KNOWN_UUID, newClientID, "After reset Client ID should be random.");
+  Assert.notEqual(firstClientID, newClientID, "After reset Client ID should be new.");
+  Assert.ok(ClientID.wasCanaryClientID(), "After reset we should have detected a canary client ID");
+
+  let clientID = await ClientID.resetClientID();
+  Assert.notEqual(KNOWN_UUID, clientID, "After reset Client ID should be random.");
+  Assert.notEqual(newClientID, clientID, "After reset Client ID should be new.");
+  Assert.ok(!ClientID.wasCanaryClientID(), "After reset we should not have detected a canary client ID");
+});
diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini
index 3741384d9028..d03667d9f102 100644
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -12,7 +12,6 @@ support-files =
 skip-if = toolkit == 'android'
 [test_CanonicalJSON.js]
 [test_client_id.js]
-skip-if = toolkit == 'android'
 [test_Color.js]
 [test_CreditCard.js]
 [test_DeferredTask.js]

From 71e618635775185cdfa24e877128e7bc591e2c7c Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Fri, 26 Oct 2018 20:05:53 +0000
Subject: [PATCH 35/53] Bug 1501329 - Expose "wasCanary" flag in saved-session
 pings for Fennec r=chutten

Depends on D9903

Depends on D9903

Differential Revision: https://phabricator.services.mozilla.com/D9904

--HG--
extra : moz-landing-system : lando
---
 .../telemetry/app/TelemetryController.jsm     |  5 +++
 .../telemetry/docs/data/environment.rst       |  7 ++++
 .../unit/test_TelemetryClientID_reset.js      | 41 +++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/toolkit/components/telemetry/app/TelemetryController.jsm b/toolkit/components/telemetry/app/TelemetryController.jsm
index 08a4bf5c4e30..464b10e5f412 100644
--- a/toolkit/components/telemetry/app/TelemetryController.jsm
+++ b/toolkit/components/telemetry/app/TelemetryController.jsm
@@ -375,6 +375,11 @@ var Impl = {
 
     if (aOptions.addEnvironment) {
       pingData.environment = aOptions.overrideEnvironment || TelemetryEnvironment.currentEnvironment;
+
+      // On Android store a flag if the client ID was reset from a canary ID.
+      if (AppConstants.platform == "android" && ClientID.wasCanaryClientID()) {
+        pingData.environment.profile.wasCanary = true;
+      }
     }
 
     return pingData;
diff --git a/toolkit/components/telemetry/docs/data/environment.rst b/toolkit/components/telemetry/docs/data/environment.rst
index 446757d1924e..7145dad37873 100644
--- a/toolkit/components/telemetry/docs/data/environment.rst
+++ b/toolkit/components/telemetry/docs/data/environment.rst
@@ -74,6 +74,7 @@ Structure:
         creationDate: <integer>, // integer days since UNIX epoch, e.g. 16446
         resetDate: <integer>, // integer days since UNIX epoch, e.g. 16446 - optional
         firstUseDate: <integer>, // integer days since UNIX epoch, e.g. 16446 - optional
+        wasCanary: <bool>, // Android only: true if this profile previously had a canary client ID
       },
       partner: { // This section may not be immediately available on startup
         distributionId: <string>, // pref "distribution.id", null on failure
@@ -391,6 +392,12 @@ The time of the first use of profile. If this is an old profile where we can't
 determine this this field will not be present.
 It's read from a file-stored timestamp from the client's profile directory.
 
+wasCanary
+~~~~~~~~~
+
+Android-only. This attribute is set to ``true`` if the client ID was erroneously set to a canary client ID before
+and later reset to a new random client ID. The attribute is not included if the client ID was not changed.
+
 partner
 -------
 
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js b/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
index fd105eeda78d..31e84d0b8f6b 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryClientID_reset.js
@@ -229,6 +229,47 @@ add_task(async function test_clientid_canary_nonunified_no_pref_trigger() {
   Assert.equal(firstClientId, newClientId, "Client ID should be unmodified");
 });
 
+/**
+ * On Android Telemetry is not unified.
+ * Test that we record the canary flag after detecting a canary client ID and resetting to a new ID.
+ */
+add_task(async function test_clientid_canary_nonunified_canary_detected() {
+  const isUnified = Preferences.get(TelemetryUtils.Preferences.Unified, false);
+  if (isUnified) {
+    // Skipping the test if unified telemetry is on.
+    return;
+  }
+
+  let firstClientId = await ClientID.resetClientID();
+  await TelemetryController.testReset();
+  await sendPing(/* environment */ true);
+  let ping = await PingServer.promiseNextPing();
+  Assert.equal(ping.type, TEST_PING_TYPE, "The ping must be a test ping");
+  Assert.equal(firstClientId, ping.clientId, "Client ID should be from the reset");
+  Assert.ok(!("wasCanary" in ping.environment.profile));
+
+  // Setting canary
+  await ClientID.setClientID(TelemetryUtils.knownClientID);
+
+  // Reset the controller to reset the client ID.
+  await TelemetryController.testReset();
+  await sendPing(/* environment */ true);
+  ping = await PingServer.promiseNextPing();
+  Assert.equal(ping.type, TEST_PING_TYPE, "The ping must be a test ping");
+  let clientId = ping.clientId;
+  Assert.notEqual(TelemetryUtils.knownClientID, clientId, "Client ID should have been reset to a valid one.");
+  Assert.notEqual(firstClientId, clientId, "Client ID should be a new one after reset.");
+  Assert.ok(ping.environment.profile.wasCanary, "Previous canary client ID should have been detected after reset.");
+
+  // Reset the controller again.
+  await TelemetryController.testReset();
+  await sendPing(/* environment */ true);
+  ping = await PingServer.promiseNextPing();
+  Assert.equal(ping.type, TEST_PING_TYPE, "The ping must be a test ping");
+  Assert.equal(clientId, ping.clientId, "Client ID should be unmodified now.");
+  Assert.ok(ping.environment.profile.wasCanary, "Canary client ID flag should be persisted.");
+});
+
 add_task(async function stopServer() {
   await PingServer.stop();
 });

From 35496b0e2c253a491d36134d9d4c5107068b0a5b Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 30 Oct 2018 22:28:34 +0000
Subject: [PATCH 36/53] Bug 1464632 - Add the option to explicitly cache the
 internal results of nsContentUtils::ComparePoints since
 nsRange::IsNodeSelected calls it repeatedly with the same value and we don't
 want to pollute the internal caching of nsINode... r=mats

...::ComputeIndexOf. r?mats

MozReview-Commit-ID: HKFmy1QeCs6

Differential Revision: https://phabricator.services.mozilla.com/D10138

--HG--
extra : moz-landing-system : lando
---
 dom/base/nsContentUtils.cpp | 11 ++++++++---
 dom/base/nsContentUtils.h   | 27 ++++++++++++++++++++++++++-
 dom/base/nsRange.cpp        | 12 +++++++-----
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index fa5af6e719dd..1d39bc8215d1 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -2674,7 +2674,8 @@ nsContentUtils::PositionIsBefore(nsINode* aNode1, nsINode* aNode2,
 int32_t
 nsContentUtils::ComparePoints(nsINode* aParent1, int32_t aOffset1,
                               nsINode* aParent2, int32_t aOffset2,
-                              bool* aDisconnected)
+                              bool* aDisconnected,
+                              ComparePointsCache* aParent1Cache)
 {
   if (aParent1 == aParent2) {
     // XXX This is odd.  aOffset1 and/or aOffset2 may be -1, e.g., it's result
@@ -2716,7 +2717,9 @@ nsContentUtils::ComparePoints(nsINode* aParent1, int32_t aOffset1,
     nsINode* child1 = parents1.ElementAt(--pos1);
     nsINode* child2 = parents2.ElementAt(--pos2);
     if (child1 != child2) {
-      return parent->ComputeIndexOf(child1) < parent->ComputeIndexOf(child2) ? -1 : 1;
+      int32_t child1index = aParent1Cache ? aParent1Cache->ComputeIndexOf(parent, child1) :
+                                            parent->ComputeIndexOf(child1);
+      return child1index < parent->ComputeIndexOf(child2) ? -1 : 1;
     }
     parent = child1;
   }
@@ -2738,7 +2741,9 @@ nsContentUtils::ComparePoints(nsINode* aParent1, int32_t aOffset1,
   nsINode* child1 = parents1.ElementAt(--pos1);
   // XXX aOffset2 may be -1 as mentioned above.  So, why does this return it's
   //     *after* of the valid DOM point?
-  return parent->ComputeIndexOf(child1) < aOffset2 ? -1 : 1;
+  int32_t child1index = aParent1Cache ? aParent1Cache->ComputeIndexOf(parent, child1) :
+                                        parent->ComputeIndexOf(child1);
+  return child1index < aOffset2 ? -1 : 1;
 }
 
 /* static */
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index 1c758a5585de..e4487045f421 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -458,6 +458,27 @@ public:
                                int32_t* aNode1Index = nullptr,
                                int32_t* aNode2Index = nullptr);
 
+
+  struct ComparePointsCache {
+    int32_t ComputeIndexOf(nsINode* aParent, nsINode* aChild) {
+      if (aParent == mParent &&
+          aChild == mChild) {
+        return mIndex;
+      }
+
+      mIndex = aParent->ComputeIndexOf(aChild);
+      mParent = aParent;
+      mChild = aChild;
+      return mIndex;
+    }
+
+
+  private:
+    nsINode* mParent = nullptr;
+    nsINode* mChild = nullptr;
+    int32_t mIndex = 0;
+  };
+
   /**
    *  Utility routine to compare two "points", where a point is a
    *  node/offset pair
@@ -467,6 +488,9 @@ public:
    *  the result is 1, and the optional aDisconnected parameter
    *  is set to true.
    *
+   *  Pass a cache object as aParent1Cache if you expect to repeatedly
+   *  call this function with the same value as aParent1.
+   *
    *  XXX aOffset1 and aOffset2 should be uint32_t since valid offset value is
    *      between 0 - UINT32_MAX.  However, these methods work even with
    *      negative offset values!  E.g., when aOffset1 is -1 and aOffset is 0,
@@ -476,7 +500,8 @@ public:
    */
   static int32_t ComparePoints(nsINode* aParent1, int32_t aOffset1,
                                nsINode* aParent2, int32_t aOffset2,
-                               bool* aDisconnected = nullptr);
+                               bool* aDisconnected = nullptr,
+                               ComparePointsCache* aParent1Cache = nullptr);
   static int32_t ComparePoints(const mozilla::RawRangeBoundary& aFirst,
                                const mozilla::RawRangeBoundary& aSecond,
                                bool* aDisconnected = nullptr);
diff --git a/dom/base/nsRange.cpp b/dom/base/nsRange.cpp
index c48fb9856f24..1a11fd02ad0b 100644
--- a/dom/base/nsRange.cpp
+++ b/dom/base/nsRange.cpp
@@ -171,6 +171,7 @@ struct IsItemInRangeComparator
   nsINode* mNode;
   uint32_t mStartOffset;
   uint32_t mEndOffset;
+  nsContentUtils::ComparePointsCache* mCache;
 
   int operator()(const nsRange* const aRange) const
   {
@@ -178,13 +179,13 @@ struct IsItemInRangeComparator
       nsContentUtils::ComparePoints(
         mNode, static_cast<int32_t>(mEndOffset),
         aRange->GetStartContainer(),
-        static_cast<int32_t>(aRange->StartOffset()));
+        static_cast<int32_t>(aRange->StartOffset()), nullptr, mCache);
     if (cmp == 1) {
       cmp =
         nsContentUtils::ComparePoints(
           mNode, static_cast<int32_t>(mStartOffset),
           aRange->GetEndContainer(),
-          static_cast<int32_t>(aRange->EndOffset()));
+          static_cast<int32_t>(aRange->EndOffset()), nullptr, mCache);
       if (cmp == -1) {
         return 0;
       }
@@ -228,7 +229,8 @@ nsRange::IsNodeSelected(nsINode* aNode, uint32_t aStartOffset,
     }
   }
 
-  IsItemInRangeComparator comparator = { aNode, aStartOffset, aEndOffset };
+  nsContentUtils::ComparePointsCache cache;
+  IsItemInRangeComparator comparator = { aNode, aStartOffset, aEndOffset, &cache };
   if (!ancestorSelections.IsEmpty()) {
     for (auto iter = ancestorSelections.ConstIter(); !iter.Done(); iter.Next()) {
       Selection* selection = iter.Get()->GetKey();
@@ -254,7 +256,7 @@ nsRange::IsNodeSelected(nsINode* aNode, uint32_t aStartOffset,
               nsContentUtils::ComparePoints(
                 aNode, static_cast<int32_t>(aEndOffset),
                 middlePlus1->GetStartContainer(),
-                static_cast<int32_t>(middlePlus1->StartOffset())) > 0) {
+                static_cast<int32_t>(middlePlus1->StartOffset()), nullptr, &cache) > 0) {
               result = 1;
           // if node start < end of middle - 1, result = -1
           } else if (middle >= 1 &&
@@ -262,7 +264,7 @@ nsRange::IsNodeSelected(nsINode* aNode, uint32_t aStartOffset,
               nsContentUtils::ComparePoints(
                 aNode, static_cast<int32_t>(aStartOffset),
                 middleMinus1->GetEndContainer(),
-                static_cast<int32_t>(middleMinus1->EndOffset())) < 0) {
+                static_cast<int32_t>(middleMinus1->EndOffset()), nullptr, &cache) < 0) {
             result = -1;
           } else {
             break;

From ee3fe34d8e9491a616532c86c6b6568dbc86212e Mon Sep 17 00:00:00 2001
From: Petru Lingurar <petru.lingurar@softvision.ro>
Date: Wed, 31 Oct 2018 01:13:57 +0200
Subject: [PATCH 37/53] Bug 1502435 - 2 - Include new `bug_1501329_affected`
 property in the core ping; r=jchen

Summary: Depends on D10202

Reviewers: jchen

Reviewed By: jchen

Subscribers: jchen, janerik

Bug #: 1502435

Differential Revision: https://phabricator.services.mozilla.com/D10205

--HG--
extra : amend_source : aaf5168ccd5932465f7cf9eff0b1fdc1111ca77e
---
 .../gecko/telemetry/TelemetryCorePingDelegate.java       | 5 ++++-
 .../telemetry/pingbuilders/TelemetryCorePingBuilder.java | 9 ++++++++-
 toolkit/components/telemetry/docs/data/core-ping.rst     | 4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java
index 0ee2dce57ed4..e0ed965a1c79 100644
--- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java
+++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingDelegate.java
@@ -155,10 +155,12 @@ public class TelemetryCorePingDelegate extends BrowserAppDelegateWithReference
                 }
 
                 final String clientID;
+                final boolean hadCanaryClientId;
                 try {
                     clientID = profile.getClientId();
+                    hadCanaryClientId = profile.getIfHadCanaryClientId();
                 } catch (final IOException e) {
-                    Log.w(LOGTAG, "Unable to get client ID to generate core ping: " + e);
+                    Log.w(LOGTAG, "Unable to get client ID properties to generate core ping: " + e);
                     return;
                 }
 
@@ -168,6 +170,7 @@ public class TelemetryCorePingDelegate extends BrowserAppDelegateWithReference
                         sessionMeasurements.getAndResetSessionMeasurements(activity);
                 final TelemetryCorePingBuilder pingBuilder = new TelemetryCorePingBuilder(activity)
                         .setClientID(clientID)
+                        .setHadCanaryClientId(hadCanaryClientId)
                         .setDefaultSearchEngine(TelemetryCorePingBuilder.getEngineIdentifier(engine))
                         .setProfileCreationDate(TelemetryCorePingBuilder.getProfileCreationDate(activity, profile))
                         .setSequenceNumber(TelemetryCorePingBuilder.getAndIncrementSequenceNumber(sharedPrefs))
diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryCorePingBuilder.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryCorePingBuilder.java
index 0ae89445f183..bbac8316b10f 100644
--- a/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryCorePingBuilder.java
+++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryCorePingBuilder.java
@@ -54,7 +54,7 @@ public class TelemetryCorePingBuilder extends TelemetryPingBuilder {
     private static final String PREF_SEQ_COUNT = "telemetry-seqCount";
 
     private static final String NAME = "core";
-    private static final int VERSION_VALUE = 9; // For version history, see toolkit/components/telemetry/docs/core-ping.rst
+    private static final int VERSION_VALUE = 10; // For version history, see toolkit/components/telemetry/docs/core-ping.rst
 
     private static final String DEFAULT_BROWSER = "defaultBrowser";
     private static final String ARCHITECTURE = "arch";
@@ -78,6 +78,7 @@ public class TelemetryCorePingBuilder extends TelemetryPingBuilder {
     private static final String VERSION_ATTR = "v";
     private static final String FLASH_USAGE = "flashUsage";
     private static final String ACCESSIBILITY_SERVICES = "accessibilityServices";
+    private static final String HAD_CANARY_CLIENT_ID = "bug_1501329_affected";
 
     public TelemetryCorePingBuilder(final Context context) {
         initPayloadConstants(context);
@@ -133,6 +134,7 @@ public class TelemetryCorePingBuilder extends TelemetryPingBuilder {
                 SEQ,
                 TIMEZONE_OFFSET,
                 VERSION_ATTR,
+                HAD_CANARY_CLIENT_ID,
         };
     }
 
@@ -144,6 +146,11 @@ public class TelemetryCorePingBuilder extends TelemetryPingBuilder {
         return this;
     }
 
+    public TelemetryCorePingBuilder setHadCanaryClientId(final boolean hadCanaryClientId) {
+        payload.put(HAD_CANARY_CLIENT_ID, hadCanaryClientId);
+        return this;
+    }
+
     /**
      * @param engine the default search engine identifier, or null if there is an error.
      */
diff --git a/toolkit/components/telemetry/docs/data/core-ping.rst b/toolkit/components/telemetry/docs/data/core-ping.rst
index f0175f2774cd..304fa577da7a 100644
--- a/toolkit/components/telemetry/docs/data/core-ping.rst
+++ b/toolkit/components/telemetry/docs/data/core-ping.rst
@@ -27,7 +27,7 @@ Structure:
 .. code-block:: js
 
     {
-      "v": 9, // ping format version
+      "v": 10, // ping format version
       "clientId": <string>, // client id, e.g.
                             // "c641eacf-c30c-4171-b403-f077724e848a"
       "seq": <positive integer>, // running ping counter, e.g. 3
@@ -62,6 +62,8 @@ Structure:
                                                     // interact with our android products.
       "flashUsage": <integer>, // number of times flash plugin is played since last upload
       "defaultBrowser": <boolean> // true if the user has set Firefox as default browser
+      "bug_1501329_affected": <boolean>  // true if Firefox previously used canary clientId
+                                         // when submitting telemetry
 
     }
 

From aef56d36ffaae7464174465ecddedf501fa1886e Mon Sep 17 00:00:00 2001
From: Petru Lingurar <petru.lingurar@softvision.ro>
Date: Wed, 31 Oct 2018 01:14:57 +0200
Subject: [PATCH 38/53] Bug 1502435 - 3 - Update tests to include checks for
 canary clientId; r=jchen

--HG--
extra : amend_source : f097e053f75f32efc7ef1875f894a29179a4b81e
---
 .../org/mozilla/gecko/TestGeckoProfile.java   | 61 ++++++++++++++++++-
 .../tests/testUnifiedTelemetryClientId.java   |  2 +
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/TestGeckoProfile.java b/mobile/android/app/src/test/java/org/mozilla/gecko/TestGeckoProfile.java
index e00c61e270fd..5f95d15d9b50 100644
--- a/mobile/android/app/src/test/java/org/mozilla/gecko/TestGeckoProfile.java
+++ b/mobile/android/app/src/test/java/org/mozilla/gecko/TestGeckoProfile.java
@@ -31,6 +31,7 @@ public class TestGeckoProfile {
     private static final String PROFILE_NAME = "profileName";
 
     private static final String CLIENT_ID_JSON_ATTR = "clientID";
+    private static final String CLIENT_ID_CANARY = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
     private static final String PROFILE_CREATION_DATE_JSON_ATTR = "created";
 
     @Rule
@@ -52,9 +53,12 @@ public class TestGeckoProfile {
         timesFile = new File(profileDir, "times.json");
     }
 
-    public void assertValidClientId(final String clientId) {
+    private void assertValidClientId(final String clientId) throws IllegalStateException {
         // This isn't the method we use in the main GeckoProfile code, but it should be equivalent.
         UUID.fromString(clientId); // assert: will throw if null or invalid UUID.
+        if (CLIENT_ID_CANARY.equals(clientId)) {
+            throw new IllegalArgumentException("Canary client id: " + clientId);
+        }
     }
 
     @Test
@@ -76,6 +80,15 @@ public class TestGeckoProfile {
         assertEquals("clientID file format matches expectations", clientId, readClientIdFromFile(clientIdFile));
     }
 
+    @Test
+    public void testIfHadCanaryClientIdForFreshProfile() throws Exception {
+         assertFalse("client ID file does not exist", clientIdFile.exists());
+
+        // Asking for getClientId() will create a new one if none existed
+        profile.getClientId();
+        assertEquals(false, profile.getIfHadCanaryClientId());
+    }
+
     @Test
     public void testGetClientIdFileAlreadyExists() throws Exception {
         final String validClientId = "905de1c0-0ea6-4a43-95f9-6170035f5a82";
@@ -125,6 +138,47 @@ public class TestGeckoProfile {
         assertNotEquals("Created new ID when file format was invalid", validClientId, clientIdForInvalidFormat);
     }
 
+    @Test
+    public void testGetClientIdForCanaryId() throws Exception {
+        assertTrue("Created the parent dirs of the client ID file", clientIdFile.getParentFile().mkdirs());
+        writeClientIdToFile(clientIdFile, CLIENT_ID_CANARY);
+
+        final String clientIdForCanaryId = profile.getClientId();
+        assertValidClientId(clientIdForCanaryId);
+        assertNotEquals(CLIENT_ID_CANARY, clientIdForCanaryId);
+    }
+
+    @Test
+    public void testCanaryFlagForValidId() throws Exception {
+        assertTrue("Created the parent dirs of the client ID file", clientIdFile.getParentFile().mkdirs());
+        final String generatedValidClientId = UUID.randomUUID().toString();
+        writeClientIdToFile(clientIdFile, generatedValidClientId);
+        createCanaryIdFlag();
+
+        final boolean hasCanaryFlagForValidId = profile.getIfHadCanaryClientId();
+        assertEquals(false, hasCanaryFlagForValidId);
+    }
+
+    @Test
+    public void testCanaryIdFlagForInvalidId() throws Exception {
+        assertTrue("Created the parent dirs of the client ID file", clientIdFile.getParentFile().mkdirs());
+        writeClientIdToFile(clientIdFile, "invalid");
+        createCanaryIdFlag();
+
+        final boolean hasCanaryFlagForInvalidId = profile.getIfHadCanaryClientId();
+        assertEquals(false, hasCanaryFlagForInvalidId);
+    }
+
+    @Test
+    public void testCanaryIdFlagForCanaryId() throws Exception {
+        assertTrue("Created the parent dirs of the client ID file", clientIdFile.getParentFile().mkdirs());
+        writeClientIdToFile(clientIdFile, CLIENT_ID_CANARY);
+        createCanaryIdFlag();
+
+        final boolean hasCanaryFlagForCanaryId = profile.getIfHadCanaryClientId();
+        assertEquals(true, hasCanaryFlagForCanaryId);
+    }
+
     @Test
     public void testEnsureParentDirs() {
         final File grandParentDir = new File(profileDir, "grandParent");
@@ -171,6 +225,7 @@ public class TestGeckoProfile {
                 "905de1c0-0ea6-4a43-95f9-6170035f5a8", // too short (last section)
                 "05de1c0-0ea6-4a43-95f9-6170035f5a82", // too short (first section)
                 "905de1c0-0ea6-4a43-95f9-6170035f5a8!", // contains a symbol
+                CLIENT_ID_CANARY,
         };
         for (final String invalidClientId : invalidClientIds) {
             assertFalse("Client ID, " + invalidClientId + ", is invalid", GeckoProfile.isClientIdValid(invalidClientId));
@@ -231,4 +286,8 @@ public class TestGeckoProfile {
         obj.put(CLIENT_ID_JSON_ATTR, clientId);
         FileUtils.writeJSONObjectToFile(file, obj);
     }
+
+    private void createCanaryIdFlag() throws Exception{
+        profile.getClientId();
+    }
 }
diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testUnifiedTelemetryClientId.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testUnifiedTelemetryClientId.java
index 4d9926cacfef..b7aebbf0c544 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testUnifiedTelemetryClientId.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testUnifiedTelemetryClientId.java
@@ -15,6 +15,7 @@ import java.io.IOException;
 public class testUnifiedTelemetryClientId extends JavascriptBridgeTest {
     private static final String TEST_JS = "testUnifiedTelemetryClientId.js";
     private static final String CLIENT_ID_PATH = "datareporting/state.json";
+    private static final String CLIENT_ID_CANARY = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
 
     private GeckoProfile profile;
     private File profileDir;
@@ -138,6 +139,7 @@ public class testUnifiedTelemetryClientId extends JavascriptBridgeTest {
         // file is created when Java attempts to retrieve it if it does not exist.
         final String clientId = profile.getClientId();
         fAssertNotNull("Returned client ID is not null", clientId);
+        fAssertNotEquals("Client ID is not the canary id", clientId, CLIENT_ID_CANARY);
         fAssertTrue("Client ID file exists after getClientId call", getClientIdFile().exists());
         return clientId;
     }

From 018ea81588ac82b877238a8714c046d2f773b75c Mon Sep 17 00:00:00 2001
From: Gavin Lazar Suntop <gavin@gsuntop.com>
Date: Tue, 30 Oct 2018 17:43:58 +0000
Subject: [PATCH 39/53] Bug 1501459 - removing unused CTA layouts r=thecount

Removing unused CTA layouts from multivariant testing for Pocket users without the mobile app installed.

Differential Revision: https://phabricator.services.mozilla.com/D9858

--HG--
rename : browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton.handlebars
extra : moz-landing-system : lando
---
 .../content/panels/css/sendtomobile.css       | 11 ----
 .../pocket/content/panels/js/sendtomobile.js  | 62 ++-----------------
 .../pocket/content/panels/js/tmpl.js          |  8 +--
 ....handlebars => ho2_sharebutton.handlebars} |  0
 .../tmpl/ho2/ho2_sharebutton_v1.handlebars    | 18 ------
 .../tmpl/ho2/ho2_sharebutton_v3.handlebars    |  7 ---
 6 files changed, 6 insertions(+), 100 deletions(-)
 rename browser/components/pocket/content/panels/tmpl/ho2/{ho2_sharebutton_v2.handlebars => ho2_sharebutton.handlebars} (100%)
 delete mode 100644 browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars
 delete mode 100644 browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars

diff --git a/browser/components/pocket/content/panels/css/sendtomobile.css b/browser/components/pocket/content/panels/css/sendtomobile.css
index 6eed91f61e2a..3d4e92cee934 100644
--- a/browser/components/pocket/content/panels/css/sendtomobile.css
+++ b/browser/components/pocket/content/panels/css/sendtomobile.css
@@ -2,10 +2,6 @@
     top: -5px;
 }
 
-.pkt_ext_saved_sendtomobile.pkt_ext_ho2_v1 .pkt_ext_loadingspinner {
-    top: 110px;
-}
-
 .pkt_ext_save_title_wrapper {
     position: relative;
     display: inline-flex;
@@ -95,13 +91,6 @@
     cursor: pointer;
 }
 
-.pkt_ext_ho2_v1 {
-    background-color: #EBEBEB;
-    border-top: 1px solid #C3C3C3;
-    padding: 17px;
-    height: 144px;
-}
-
 .pkt_ext_experiment_saved_tile {
     position: relative;
     margin: 0 auto 17px;
diff --git a/browser/components/pocket/content/panels/js/sendtomobile.js b/browser/components/pocket/content/panels/js/sendtomobile.js
index ba96f43f5a83..037823949201 100644
--- a/browser/components/pocket/content/panels/js/sendtomobile.js
+++ b/browser/components/pocket/content/panels/js/sendtomobile.js
@@ -3,31 +3,11 @@
 var PKT_SENDTOMOBILE = (function() {
 
     var width = 350;
-    var variant1Height = 312;
-    var variant2Height = 200;
+    var ctaHeight = 200;
     var confirmHeight = 275;
     var premDetailsHeight = 110;
     var email = null;
 
-    function _swapPlaceholder(data) {
-        var info = {};
-
-        if (!data.item_preview) {
-            info.domain = data.fallback_domain;
-            info.title = data.fallback_title;
-        } else {
-            info.domain = data.item_preview.resolved_domain;
-            info.title = data.item_preview.title;
-            info.has_image = (data.item_preview.top_image_url) ? 1 : 0;
-
-            if (data.item_preview.top_image_url) {
-                info.image_src = getImageCacheUrl(data.item_preview.top_image_url, "w225");
-            }
-        }
-
-        $("#pkt_ext_swap").replaceWith(Handlebars.templates.ho2_articleinfo(info));
-    }
-
     function _initPanelOneClicks() {
         $("#pkt_ext_sendtomobile_button").click(function() {
             $("#pkt_ext_sendtomobile_button").replaceWith("<div class=\"pkt_ext_loadingspinner\"><div></div></div>");
@@ -49,22 +29,10 @@ var PKT_SENDTOMOBILE = (function() {
         $("body").addClass("pkt_ext_ho2_experiment");
         var height = (adjustHeight) ? premDetailsHeight : 0;
 
-        if (ho2 == "show_prompt_preview") {
-            height += variant1Height;
-            $("body").append(Handlebars.templates.ho2_sharebutton_v1());
-            thePKT_SAVED.sendMessage("resizePanel", { width, height });
-            thePKT_SAVED.sendMessage("getArticleInfo", {}, function(data) {
-                _swapPlaceholder(data);
-            });
-        } else if (ho2 == "show_prompt_no_preview") {
-            height += variant2Height;
-            $("body").append(Handlebars.templates.ho2_sharebutton_v2());
-            thePKT_SAVED.sendMessage("resizePanel", { width, height });
-        } else if (ho2 == "show_prompt_get_app") {
-            height += variant2Height;
-            $("body").append(Handlebars.templates.ho2_sharebutton_v3());
-            thePKT_SAVED.sendMessage("resizePanel", { width, height });
-        }
+        // Show "Send to your phone" CTA
+        height += ctaHeight;
+        $("body").append(Handlebars.templates.ho2_sharebutton());
+        thePKT_SAVED.sendMessage("resizePanel", { width, height });
 
         _initPanelOneClicks();
     }
@@ -76,23 +44,3 @@ var PKT_SENDTOMOBILE = (function() {
         create,
     };
 }());
-
-
-/**
- * This function is based on getImageCacheUrl in:
- * https://github.com/Pocket/Web/blob/master/public_html/a/j/shared.js
- */
-function getImageCacheUrl(url, resize, fallback) {
-    if (!url)
-        return false;
-    // The full URL should be included in the get parameters such that the image cache can request it.
-    var query = {
-        "url": url,
-    };
-    if (resize)
-        query.resize = resize;
-    if (fallback)
-        query.f = fallback;
-
-    return "https://d33ypg4xwx0n86.cloudfront.net/direct?" + $.param(query);
-}
diff --git a/browser/components/pocket/content/panels/js/tmpl.js b/browser/components/pocket/content/panels/js/tmpl.js
index adf89d9ca43c..45de96fc673d 100644
--- a/browser/components/pocket/content/panels/js/tmpl.js
+++ b/browser/components/pocket/content/panels/js/tmpl.js
@@ -33,15 +33,9 @@ templates['ho2_download'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":fu
 templates['ho2_download_error'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
     return "<div class=\"pkt_ext_detail pkt_ext_saved_sendcollectemail\">\n    <h3 class=\"pkt_ext_heading\">There was a problem</h3>\n    <p class=\"pkt_ext_description\">Email failed to send, please try again later</p>\n\n    <div class=\"pkt_ext_download_section\">\n        <p class=\"pkt_ext_description\">You can also get the Pocket app on the App Store here:</p>\n\n        <div class=\"pkt_ext_download_button_wrapper\">\n            <a href=\"https://getpocket.com/apps/link/pocket-iphone/?s=fx_save_hanger\" target=\"_blank\" ><div class=\"pkt_ext_apple_download\"></div></a>\n            <a href=\"https://getpocket.com/apps/link/pocket-android/?s=fx_save_hanger\" target=\"_blank\" ><img class=\"pkt_ext_google_download\" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>\n        </div>\n    </div>\n</div>\n";
 },"useData":true});
-templates['ho2_sharebutton_v1'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-    return "<div class=\"pkt_ext_detail pkt_ext_saved_sendtomobile pkt_ext_ho2_v1\">\n    <div id=\"pkt_ext_articleinfo\">\n        <div id=\"pkt_ext_swap\" class=\"pkt_ext_experiment_saved_tile pkt_ext_has_image pkt_ext_cf\">\n            <div class=\"pkt_ext_save_image pkt_ext_save_image_placeholder\"></div>\n\n            <div class=\"pkt_ext_save_title pkt_ext_title_image_placeholder\">\n                <div class=\"pkt_ext_save_open\"> </div>\n                <div class=\"pkt_ext_save_source\"> </div>\n            </div>\n        </div>\n    </div>\n\n    <button id=\"pkt_ext_sendtomobile_button\" class=\"pkt_ext_button\">\n        <span class=\"pkt_ext_save_title_wrapper pkt_ext_mobile_icon\">\n            <span class=\"pkt_ext_logo_action_copy\">Send to your phone</span>\n        </span>\n    </button>\n</div>\n";
-},"useData":true});
-templates['ho2_sharebutton_v2'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+templates['ho2_sharebutton'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
     return "<div class=\"pkt_ext_detail pkt_ext_saved_sendtomobile\">\n    <button id=\"pkt_ext_sendtomobile_button\" class=\"pkt_ext_button\">\n        <span class=\"pkt_ext_save_title_wrapper pkt_ext_mobile_icon\">\n            <span class=\"pkt_ext_logo_action_copy\">Send to your phone</span>\n        </span>\n    </button>\n</div>\n";
 },"useData":true});
-templates['ho2_sharebutton_v3'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-    return "<div class=\"pkt_ext_detail pkt_ext_saved_sendtomobile\">\n    <button id=\"pkt_ext_sendtomobile_button\" class=\"pkt_ext_button\">\n        <span class=\"pkt_ext_save_title_wrapper pkt_ext_mobile_icon\">\n            <span class=\"pkt_ext_logo_action_copy\">Get the Pocket Mobile App</span>\n        </span>\n    </button>\n</div>\n";
-},"useData":true});
 templates['saved_premiumextras'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
     return "<div class=\"pkt_ext_suggestedtag_detailshown\">\r\n</div> ";
 },"useData":true});
diff --git a/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton.handlebars
similarity index 100%
rename from browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars
rename to browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton.handlebars
diff --git a/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars
deleted file mode 100644
index 89429659b4ac..000000000000
--- a/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="pkt_ext_detail pkt_ext_saved_sendtomobile pkt_ext_ho2_v1">
-    <div id="pkt_ext_articleinfo">
-        <div id="pkt_ext_swap" class="pkt_ext_experiment_saved_tile pkt_ext_has_image pkt_ext_cf">
-            <div class="pkt_ext_save_image pkt_ext_save_image_placeholder"></div>
-
-            <div class="pkt_ext_save_title pkt_ext_title_image_placeholder">
-                <div class="pkt_ext_save_open"> </div>
-                <div class="pkt_ext_save_source"> </div>
-            </div>
-        </div>
-    </div>
-
-    <button id="pkt_ext_sendtomobile_button" class="pkt_ext_button">
-        <span class="pkt_ext_save_title_wrapper pkt_ext_mobile_icon">
-            <span class="pkt_ext_logo_action_copy">Send to your phone</span>
-        </span>
-    </button>
-</div>
diff --git a/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars b/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars
deleted file mode 100644
index 306628b63d48..000000000000
--- a/browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="pkt_ext_detail pkt_ext_saved_sendtomobile">
-    <button id="pkt_ext_sendtomobile_button" class="pkt_ext_button">
-        <span class="pkt_ext_save_title_wrapper pkt_ext_mobile_icon">
-            <span class="pkt_ext_logo_action_copy">Get the Pocket Mobile App</span>
-        </span>
-    </button>
-</div>

From 343e0160ee83d5b498db0376d2e14db7a5f24be5 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 19:41:18 +0000
Subject: [PATCH 40/53] Bug 1493073 Remove obsolete comment about webidl
 callback parameter being nulled before use r=kmag

CustomElementRegistryBinding uses RootedCallback and so the constructor cannot
be nulled.

The comment was added to warn about an unrooted callback argument
from nsDocument::RegisterElement(), a caller that no longer exists.

https://bugzilla.mozilla.org/show_bug.cgi?id=1369533#c25
https://hg.mozilla.org/mozilla-central/rev/16d0cd656b05#l6.298

Differential Revision: https://phabricator.services.mozilla.com/D6465

--HG--
extra : moz-landing-system : lando
---
 dom/base/CustomElementRegistry.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry.cpp
index 3f698f0cdb90..e578e44d1107 100644
--- a/dom/base/CustomElementRegistry.cpp
+++ b/dom/base/CustomElementRegistry.cpp
@@ -773,9 +773,6 @@ CustomElementRegistry::Define(JSContext* aCx,
                               const ElementDefinitionOptions& aOptions,
                               ErrorResult& aRv)
 {
-  // Note: No calls that might run JS or trigger CC before this point, or
-  // there's a (vanishingly small) chance of our constructor being nulled
-  // before we access it.
   JS::Rooted<JSObject*> constructor(aCx, aFunctionConstructor.CallableOrNull());
 
   JS::Rooted<JSObject*> constructorUnwrapped(aCx, js::CheckedUnwrap(constructor));

From 07c0fa4fe62c180427382f27e6636e4b6682a7e7 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Wed, 31 Oct 2018 00:37:15 +0000
Subject: [PATCH 41/53] bug 1502268: marionette: provide informative messages
 for unexpected alert open error; r=whimboo

Provides specific error messages informing the user what action
was taken with the user prompt, based on the configuration of the
unhandled prompt handler.

Differential Revision: https://phabricator.services.mozilla.com/D10089

--HG--
extra : moz-landing-system : lando
---
 testing/marionette/driver.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js
index 6e031320be69..8d96c0dc53a0 100644
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -3229,6 +3229,8 @@ GeckoDriver.prototype._handleUserPrompts = async function() {
     return;
   }
 
+  let {textContent} = this.dialog.ui.infoBody;
+
   let behavior = this.capabilities.get("unhandledPromptBehavior");
   switch (behavior) {
     case UnhandledPromptBehavior.Accept:
@@ -3237,7 +3239,8 @@ GeckoDriver.prototype._handleUserPrompts = async function() {
 
     case UnhandledPromptBehavior.AcceptAndNotify:
       await this.acceptDialog();
-      throw new UnexpectedAlertOpenError();
+      throw new UnexpectedAlertOpenError(
+          `Accepted user prompt dialog: ${textContent}`);
 
     case UnhandledPromptBehavior.Dismiss:
       await this.dismissDialog();
@@ -3245,10 +3248,12 @@ GeckoDriver.prototype._handleUserPrompts = async function() {
 
     case UnhandledPromptBehavior.DismissAndNotify:
       await this.dismissDialog();
-      throw new UnexpectedAlertOpenError();
+      throw new UnexpectedAlertOpenError(
+          `Dismissed user prompt dialog: ${textContent}`);
 
     case UnhandledPromptBehavior.Ignore:
-      throw new UnexpectedAlertOpenError();
+      throw new UnexpectedAlertOpenError(
+          "Encountered unhandled user prompt dialog");
 
     default:
       throw new TypeError(`Unknown unhandledPromptBehavior "${behavior}"`);

From dbcebc32f490a52607c9bea0051178158ac558fc Mon Sep 17 00:00:00 2001
From: WR Updater Bot <graphics-team@mozilla.staktrace.com>
Date: Wed, 31 Oct 2018 00:42:58 +0000
Subject: [PATCH 42/53] Bug 1503263 - Update webrender to commit
 a2997bc78ce6e161fd379e04e2e4479525d12782 (WR PR 3245). r=kats

Differential Revision: https://phabricator.services.mozilla.com/D10318

--HG--
extra : moz-landing-system : lando
---
 gfx/webrender_api/src/display_list.rs | 4 ++--
 gfx/webrender_bindings/revision.txt   | 2 +-
 gfx/wrench/src/yaml_frame_reader.rs   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfx/webrender_api/src/display_list.rs b/gfx/webrender_api/src/display_list.rs
index c1546f525078..7f7859d21fa2 100644
--- a/gfx/webrender_api/src/display_list.rs
+++ b/gfx/webrender_api/src/display_list.rs
@@ -1276,7 +1276,7 @@ impl DisplayListBuilder {
         clip_node_id: Option<ClipId>,
         transform_style: TransformStyle,
         mix_blend_mode: MixBlendMode,
-        filters: Vec<FilterOp>,
+        filters: &[FilterOp],
         raster_space: RasterSpace,
     ) {
         let item = SpecificDisplayItem::PushStackingContext(PushStackingContextDisplayItem {
@@ -1289,7 +1289,7 @@ impl DisplayListBuilder {
         });
 
         self.push_item(item, info);
-        self.push_iter(&filters);
+        self.push_iter(filters);
     }
 
     pub fn pop_stacking_context(&mut self) {
diff --git a/gfx/webrender_bindings/revision.txt b/gfx/webrender_bindings/revision.txt
index 081357f03b16..6d392b2073f1 100644
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1 +1 @@
-f3d6f138c9d15f498384f13aeaa5f5dd6ee76dd6
+a2997bc78ce6e161fd379e04e2e4479525d12782
diff --git a/gfx/wrench/src/yaml_frame_reader.rs b/gfx/wrench/src/yaml_frame_reader.rs
index fd8ca15b949f..a4c0166ef693 100644
--- a/gfx/wrench/src/yaml_frame_reader.rs
+++ b/gfx/wrench/src/yaml_frame_reader.rs
@@ -1654,7 +1654,7 @@ impl YamlFrameReader {
             clip_node_id,
             transform_style,
             mix_blend_mode,
-            filters,
+            &filters,
             raster_space,
         );
 

From d9cf2958ea5b5ce3482901a61b5a634a1cdbc36d Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 31 Oct 2018 00:43:31 +0000
Subject: [PATCH 43/53] Bug 1503263 - Update for API change in WR PR 3245.
 r=kats

Depends on D10318

Differential Revision: https://phabricator.services.mozilla.com/D10319

--HG--
extra : moz-landing-system : lando
---
 gfx/webrender_bindings/src/bindings.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src/bindings.rs
index f9cba705fd16..41ceb4a52c39 100644
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -1903,7 +1903,7 @@ pub extern "C" fn wr_dp_push_stacking_context(state: &mut WrState,
                                 clip_node_id,
                                 transform_style,
                                 mix_blend_mode,
-                                filters,
+                                &filters,
                                 glyph_raster_space);
 }
 

From cd96c8e6314ea56bc4bda2345ca9d6d64e98ec73 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 23:49:55 +0000
Subject: [PATCH 44/53] Bug 1503132 remove unused MediaStream::ConsumerCount()
 r=padenot

Differential Revision: https://phabricator.services.mozilla.com/D10159

--HG--
extra : moz-landing-system : lando
---
 dom/media/MediaStreamGraph.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dom/media/MediaStreamGraph.h b/dom/media/MediaStreamGraph.h
index b2423b29ed06..6c436f6280d4 100644
--- a/dom/media/MediaStreamGraph.h
+++ b/dom/media/MediaStreamGraph.h
@@ -471,10 +471,6 @@ public:
   {
     mConsumers.RemoveElement(aPort);
   }
-  uint32_t ConsumerCount() const
-  {
-    return mConsumers.Length();
-  }
   StreamTracks& GetStreamTracks() { return mTracks; }
   GraphTime GetStreamTracksStartTime() const { return mTracksStartTime; }
 

From 056ba195bdc59ee4d9f8c48c23ef44b4ce051928 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 23:50:27 +0000
Subject: [PATCH 45/53] Bug 1503132 remove unused
 MediaStreamGraphImpl::Running() r=padenot

Differential Revision: https://phabricator.services.mozilla.com/D10160

--HG--
extra : moz-landing-system : lando
---
 dom/media/MediaStreamGraphImpl.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dom/media/MediaStreamGraphImpl.h b/dom/media/MediaStreamGraphImpl.h
index 8b3a37b8d37d..27de05030538 100644
--- a/dom/media/MediaStreamGraphImpl.h
+++ b/dom/media/MediaStreamGraphImpl.h
@@ -203,11 +203,6 @@ public:
    */
   void SignalMainThreadCleanup();
 
-  bool Running() const
-  {
-    return LifecycleStateRef() == LIFECYCLE_RUNNING;
-  }
-
   /* This is the end of the current iteration, that is, the current time of the
    * graph. */
   GraphTime IterationEnd() const;

From a2cc4c64769ea96e17454e2cc116c21383a21368 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 23:51:49 +0000
Subject: [PATCH 46/53] Bug 1503132 remove unnecessary monitor notify for
 AudioCallbackDriver r=padenot

Differential Revision: https://phabricator.services.mozilla.com/D10161

--HG--
extra : moz-landing-system : lando
---
 dom/media/GraphDriver.cpp | 3 +--
 dom/media/GraphDriver.h   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index 05c5cd76ec43..8aec0fe8d0c3 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -850,13 +850,12 @@ AudioCallbackDriver::AddMixerCallback()
 void
 AudioCallbackDriver::WaitForNextIteration()
 {
+  // Do not block.
 }
 
 void
 AudioCallbackDriver::WakeUp()
 {
-  mGraphImpl->GetMonitor().AssertCurrentThreadOwns();
-  mGraphImpl->GetMonitor().Notify();
 }
 
 void
diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 74096019433b..210072a13ac6 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -116,8 +116,8 @@ public:
   explicit GraphDriver(MediaStreamGraphImpl* aGraphImpl);
 
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GraphDriver);
-  /* For real-time graphs, this waits until it's time to process more data. For
-   * offline graphs, this is a no-op. */
+  /* For SystemClockDriver, this waits until it's time to process more data.
+   * For other drivers, this is a no-op. */
   virtual void WaitForNextIteration() = 0;
   /* Wakes up the graph if it is waiting. */
   virtual void WakeUp() = 0;

From 40589e930476ef21d3cb15a09d5a10ca664fd2bd Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 31 Oct 2018 00:54:14 +0000
Subject: [PATCH 47/53] Bug 1503132 remove unnecessary
 SystemClockDriver::mWaitState r=padenot

mWaitState is only ever tested against WAITSTATE_WAITING_INDEFINITELY and so
the other values are equivalent.  It is never WAITSTATE_WAITING_INDEFINITELY
on leaving (or entering) WaitForNextIteration and so there is no need to set
it in WakeUp().

Differential Revision: https://phabricator.services.mozilla.com/D10162

--HG--
extra : moz-landing-system : lando
---
 dom/media/GraphDriver.cpp | 16 +++-------------
 dom/media/GraphDriver.h   | 16 ----------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index 8aec0fe8d0c3..fc66159e3167 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -293,7 +293,6 @@ SystemClockDriver::SystemClockDriver(MediaStreamGraphImpl* aGraphImpl)
   : ThreadedDriver(aGraphImpl),
     mInitialTimeStamp(TimeStamp::Now()),
     mLastTimeStamp(TimeStamp::Now()),
-    mWaitState(WAITSTATE_RUNNING),
     mIsFallback(false)
 {}
 
@@ -412,7 +411,6 @@ SystemClockDriver::WaitForNextIteration()
   bool another = GraphImpl()->mNeedAnotherIteration; // atomic
   if (!another) {
     GraphImpl()->mGraphDriverAsleep = true; // atomic
-    mWaitState = WAITSTATE_WAITING_INDEFINITELY;
   }
   // NOTE: mNeedAnotherIteration while also atomic may have changed before
   // we could set mGraphDriverAsleep, so we must re-test it.
@@ -430,10 +428,10 @@ SystemClockDriver::WaitForNextIteration()
          GraphImpl(),
          (now - mInitialTimeStamp).ToSeconds(),
          timeoutMS / 1000.0));
-    if (mWaitState == WAITSTATE_WAITING_INDEFINITELY) {
+    if (!another) {
       GraphImpl()->mGraphDriverAsleep = false; // atomic
+      another = true;
     }
-    mWaitState = WAITSTATE_WAITING_FOR_NEXT_ITERATION;
   }
   if (!timeout.IsZero()) {
     GraphImpl()->GetMonitor().Wait(timeout);
@@ -444,23 +442,15 @@ SystemClockDriver::WaitForNextIteration()
          (TimeStamp::Now() - now).ToSeconds()));
   }
 
-  if (mWaitState == WAITSTATE_WAITING_INDEFINITELY) {
+  if (!another) {
     GraphImpl()->mGraphDriverAsleep = false; // atomic
   }
-  // Note: this can race against the EnsureNextIteration setting
-  // WAITSTATE_RUNNING and setting mGraphDriverAsleep to false, so you can
-  // have an iteration with WAITSTATE_WAKING_UP instead of RUNNING.
-  mWaitState = WAITSTATE_RUNNING;
   GraphImpl()->mNeedAnotherIteration = false; // atomic
 }
 
 void SystemClockDriver::WakeUp()
 {
   GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
-  // Note: this can race against the thread setting WAITSTATE_RUNNING and
-  // setting mGraphDriverAsleep to false, so you can have an iteration
-  // with WAITSTATE_WAKING_UP instead of RUNNING.
-  mWaitState = WAITSTATE_WAKING_UP;
   GraphImpl()->mGraphDriverAsleep = false; // atomic
   GraphImpl()->GetMonitor().Notify();
 }
diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 210072a13ac6..dddfbf005015 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -314,22 +314,6 @@ private:
   TimeStamp mInitialTimeStamp;
   TimeStamp mLastTimeStamp;
 
-  // This enum specifies the wait state of the driver.
-  enum WaitState {
-    // RunThread() is running normally
-    WAITSTATE_RUNNING,
-    // RunThread() is paused waiting for its next iteration, which will
-    // happen soon
-    WAITSTATE_WAITING_FOR_NEXT_ITERATION,
-    // RunThread() is paused indefinitely waiting for something to change
-    WAITSTATE_WAITING_INDEFINITELY,
-    // Something has signaled RunThread() to wake up immediately,
-    // but it hasn't done so yet
-    WAITSTATE_WAKING_UP
-  };
-  // This must be access with the monitor.
-  WaitState mWaitState;
-
   // This is true if this SystemClockDriver runs the graph because we could not
   // open an audio stream.
   bool mIsFallback;

From f85e9dfabcf86a8e3935e6bdffa189d0f93f9b38 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 09:48:08 +0000
Subject: [PATCH 48/53] Bug 1503132 add wait/wake-up support to
 OfflineAudioContext r=padenot

Depends on D10162

Differential Revision: https://phabricator.services.mozilla.com/D10163

--HG--
extra : moz-landing-system : lando
---
 dom/media/GraphDriver.cpp | 56 ++++++++++++++++++++-------------------
 dom/media/GraphDriver.h   | 17 +++++++-----
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index fc66159e3167..03ce85828bbc 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -400,12 +400,11 @@ OfflineClockDriver::GetCurrentTimeStamp()
 }
 
 void
-SystemClockDriver::WaitForNextIteration()
+ThreadedDriver::WaitForNextIteration()
 {
   GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
 
   TimeDuration timeout = TimeDuration::Forever();
-  TimeStamp now = TimeStamp::Now();
 
   // This lets us avoid hitting the Atomic twice when we know we won't sleep
   bool another = GraphImpl()->mNeedAnotherIteration; // atomic
@@ -417,29 +416,18 @@ SystemClockDriver::WaitForNextIteration()
   // (EnsureNextIteration sets mNeedAnotherIteration, then tests
   // mGraphDriverAsleep
   if (another || GraphImpl()->mNeedAnotherIteration) { // atomic
-    int64_t timeoutMS = MEDIA_GRAPH_TARGET_PERIOD_MS -
-      int64_t((now - mCurrentTimeStamp).ToMilliseconds());
-    // Make sure timeoutMS doesn't overflow 32 bits by waking up at
-    // least once a minute, if we need to wake up at all
-    timeoutMS = std::max<int64_t>(0, std::min<int64_t>(timeoutMS, 60*1000));
-    timeout = TimeDuration::FromMilliseconds(timeoutMS);
-    LOG(LogLevel::Verbose,
-        ("%p: Waiting for next iteration; at %f, timeout=%f",
-         GraphImpl(),
-         (now - mInitialTimeStamp).ToSeconds(),
-         timeoutMS / 1000.0));
+    timeout = WaitInterval();
     if (!another) {
       GraphImpl()->mGraphDriverAsleep = false; // atomic
       another = true;
     }
   }
   if (!timeout.IsZero()) {
-    GraphImpl()->GetMonitor().Wait(timeout);
+    CVStatus status = GraphImpl()->GetMonitor().Wait(timeout);
     LOG(LogLevel::Verbose,
-        ("%p: Resuming after timeout; at %f, elapsed=%f",
+        ("%p: Resuming after %s",
          GraphImpl(),
-         (TimeStamp::Now() - mInitialTimeStamp).ToSeconds(),
-         (TimeStamp::Now() - now).ToSeconds()));
+         status == CVStatus::Timeout ? "timeout" : "wake-up"));
   }
 
   if (!another) {
@@ -448,13 +436,32 @@ SystemClockDriver::WaitForNextIteration()
   GraphImpl()->mNeedAnotherIteration = false; // atomic
 }
 
-void SystemClockDriver::WakeUp()
+void
+ThreadedDriver::WakeUp()
 {
   GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
   GraphImpl()->mGraphDriverAsleep = false; // atomic
   GraphImpl()->GetMonitor().Notify();
 }
 
+TimeDuration
+SystemClockDriver::WaitInterval()
+{
+  TimeStamp now = TimeStamp::Now();
+  int64_t timeoutMS = MEDIA_GRAPH_TARGET_PERIOD_MS -
+    int64_t((now - mCurrentTimeStamp).ToMilliseconds());
+  // Make sure timeoutMS doesn't overflow 32 bits by waking up at
+  // least once a minute, if we need to wake up at all
+  timeoutMS = std::max<int64_t>(0, std::min<int64_t>(timeoutMS, 60*1000));
+  LOG(LogLevel::Verbose,
+      ("%p: Waiting for next iteration; at %f, timeout=%f",
+       GraphImpl(),
+       (now - mInitialTimeStamp).ToSeconds(),
+       timeoutMS / 1000.0));
+
+  return TimeDuration::FromMilliseconds(timeoutMS);
+}
+
 OfflineClockDriver::OfflineClockDriver(MediaStreamGraphImpl* aGraphImpl, GraphTime aSlice)
   : ThreadedDriver(aGraphImpl),
     mSlice(aSlice)
@@ -472,16 +479,11 @@ OfflineClockDriver::GetIntervalForIteration()
   return GraphImpl()->MillisecondsToMediaTime(mSlice);
 }
 
-void
-OfflineClockDriver::WaitForNextIteration()
+TimeDuration
+OfflineClockDriver::WaitInterval()
 {
-  // No op: we want to go as fast as possible when we are offline
-}
-
-void
-OfflineClockDriver::WakeUp()
-{
-  MOZ_ASSERT(false, "An offline graph should not have to wake up.");
+  // We want to go as fast as possible when we are offline
+  return 0;
 }
 
 AsyncCubebTask::AsyncCubebTask(AudioCallbackDriver* aDriver,
diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index dddfbf005015..2e13e983eb84 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -116,8 +116,8 @@ public:
   explicit GraphDriver(MediaStreamGraphImpl* aGraphImpl);
 
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GraphDriver);
-  /* For SystemClockDriver, this waits until it's time to process more data.
-   * For other drivers, this is a no-op. */
+  /* For {System,Offline}ClockDriver, this waits until it's time to process
+   * more data.  For AudioCallbackDriver, this is a no-op. */
   virtual void WaitForNextIteration() = 0;
   /* Wakes up the graph if it is waiting. */
   virtual void WakeUp() = 0;
@@ -254,6 +254,8 @@ class ThreadedDriver : public GraphDriver
 public:
   explicit ThreadedDriver(MediaStreamGraphImpl* aGraphImpl);
   virtual ~ThreadedDriver();
+  void WaitForNextIteration() override;
+  void WakeUp() override;
   void Start() override;
   void Revive() override;
   void Shutdown() override;
@@ -276,7 +278,10 @@ public:
   {
     return mThreadRunning;
   }
-
+  /*
+   * Return the TimeDuration to wait before the next rendering iteration.
+   */
+  virtual TimeDuration WaitInterval() = 0;
   /* When the graph wakes up to do an iteration, implementations return the
    * range of time that will be processed.  This is called only once per
    * iteration; it may determine the interval from state in a previous
@@ -299,9 +304,8 @@ class SystemClockDriver : public ThreadedDriver
 public:
   explicit SystemClockDriver(MediaStreamGraphImpl* aGraphImpl);
   virtual ~SystemClockDriver();
+  TimeDuration WaitInterval() override;
   MediaTime GetIntervalForIteration() override;
-  void WaitForNextIteration() override;
-  void WakeUp() override;
   void MarkAsFallback();
   bool IsFallback();
   SystemClockDriver* AsSystemClockDriver() override {
@@ -328,9 +332,8 @@ class OfflineClockDriver : public ThreadedDriver
 public:
   OfflineClockDriver(MediaStreamGraphImpl* aGraphImpl, GraphTime aSlice);
   virtual ~OfflineClockDriver();
+  TimeDuration WaitInterval() override;
   MediaTime GetIntervalForIteration() override;
-  void WaitForNextIteration() override;
-  void WakeUp() override;
   TimeStamp GetCurrentTimeStamp() override;
   OfflineClockDriver* AsOfflineClockDriver() override {
     return this;

From a39a70682795bcfc1538d9cea01b4563a02daef0 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 15:14:33 +0000
Subject: [PATCH 49/53] Bug 1503132 update offline main thread state when there
 is no pending iteration r=padenot

Depends on D10163

Differential Revision: https://phabricator.services.mozilla.com/D10164

--HG--
extra : moz-landing-system : lando
---
 dom/media/MediaStreamGraph.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 7ed032276b6a..8684de3a5b13 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -1113,7 +1113,11 @@ MediaStreamGraphImpl::ShouldUpdateMainThread()
   }
 
   TimeStamp now = TimeStamp::Now();
-  if ((now - mLastMainThreadUpdate).ToMilliseconds() > CurrentDriver()->IterationDuration()) {
+  // For offline graphs, update now if there is no pending iteration or if it
+  // has been long enough since the last update.
+  if (!mNeedAnotherIteration ||
+      ((now - mLastMainThreadUpdate).ToMilliseconds() >
+       CurrentDriver()->IterationDuration())) {
     mLastMainThreadUpdate = now;
     return true;
   }

From 8de2b7d0e5a8763b9994e7fc0c832437b2a41359 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 15:14:35 +0000
Subject: [PATCH 50/53] Bug 1503132 when graph time has not advanced, only
 ensure another iteration if rendering r=padenot

Depends on D10164

Differential Revision: https://phabricator.services.mozilla.com/D10165

--HG--
extra : moz-landing-system : lando
---
 dom/media/MediaStreamGraph.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 8684de3a5b13..49e78f643e5b 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -1348,14 +1348,16 @@ MediaStreamGraphImpl::UpdateGraph(GraphTime aEndBlockingDecisions)
     stream->mStartBlocking = mStateComputedTime;
   }
 
-  // The loop is woken up so soon that IterationEnd() barely advances and we
-  // end up having aEndBlockingDecision == mStateComputedTime.
-  // Since stream blocking is computed in the interval of
-  // [mStateComputedTime, aEndBlockingDecision), it won't be computed at all.
-  // We should ensure next iteration so that pending blocking changes will be
-  // computed in next loop.
+  // If the loop is woken up so soon that IterationEnd() barely advances or
+  // if an offline graph is not currently rendering, we end up having
+  // aEndBlockingDecisions == mStateComputedTime.
+  // Since the process interval [mStateComputedTime, aEndBlockingDecision) is
+  // empty, Process() will not find any unblocked stream and so will not
+  // ensure another iteration.  If the graph should be rendering, then ensure
+  // another iteration to render.
   if (ensureNextIteration ||
-      aEndBlockingDecisions == mStateComputedTime) {
+      (aEndBlockingDecisions == mStateComputedTime &&
+       mStateComputedTime < mEndTime)) {
     EnsureNextIteration();
   }
 }

From 583e8af90ceba5e57326cbae3d665503410def30 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 14:59:52 +0000
Subject: [PATCH 51/53] Bug 1503132 do not shut down graph thread on completion
 of offline rendering r=padenot

AudioWorket will need to keep processing events on the graph thread.
The graph thread is instead shut down when the AudioContext is destroyed.

Depends on D10165

Differential Revision: https://phabricator.services.mozilla.com/D10166

--HG--
extra : moz-landing-system : lando
---
 dom/media/MediaStreamGraph.cpp   | 13 -------------
 dom/media/MediaStreamGraphImpl.h |  5 -----
 2 files changed, 18 deletions(-)

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 49e78f643e5b..576346bb817a 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -1230,18 +1230,6 @@ MediaStreamGraphImpl::ProduceDataForStreamsBlockByBlock(uint32_t aStreamIndex,
                "Something went wrong with rounding to block boundaries");
 }
 
-bool
-MediaStreamGraphImpl::AllFinishedStreamsNotified()
-{
-  MOZ_ASSERT(OnGraphThread());
-  for (MediaStream* stream : AllStreams()) {
-    if (stream->mFinished && !stream->mNotifiedFinished) {
-      return false;
-    }
-  }
-  return true;
-}
-
 void
 MediaStreamGraphImpl::RunMessageAfterProcessing(UniquePtr<ControlMessage> aMessage)
 {
@@ -1451,7 +1439,6 @@ MediaStreamGraphImpl::UpdateMainThreadState()
   MOZ_ASSERT(OnGraphThread());
   MonitorAutoLock lock(mMonitor);
   bool finalUpdate = mForceShutDown ||
-    (mProcessedTime >= mEndTime && AllFinishedStreamsNotified()) ||
     (IsEmpty() && mBackMessageQueue.IsEmpty());
   PrepareUpdatesToMainThreadState(finalUpdate);
   if (finalUpdate) {
diff --git a/dom/media/MediaStreamGraphImpl.h b/dom/media/MediaStreamGraphImpl.h
index 27de05030538..868ca370fd07 100644
--- a/dom/media/MediaStreamGraphImpl.h
+++ b/dom/media/MediaStreamGraphImpl.h
@@ -218,11 +218,6 @@ public:
    * mMonitor must be held.
    */
   void PrepareUpdatesToMainThreadState(bool aFinalUpdate);
-  /**
-   * Returns false if there is any stream that has finished but not yet finished
-   * playing out.
-   */
-  bool AllFinishedStreamsNotified();
   /**
    * If we are rendering in non-realtime mode, we don't want to send messages to
    * the main thread at each iteration for performance reasons. We instead

From 95a0d00031cb99a8ca6bd2692e2911d1da3a48f6 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Tue, 30 Oct 2018 09:51:07 +0000
Subject: [PATCH 52/53] Bug 1503132 remove unused
 ProcessedMediaStream::QueueFinish() r=padenot

Depends on D10166

Differential Revision: https://phabricator.services.mozilla.com/D10167

--HG--
extra : moz-landing-system : lando
---
 dom/media/MediaStreamGraph.cpp | 15 ---------------
 dom/media/MediaStreamGraph.h   |  4 ----
 2 files changed, 19 deletions(-)

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 576346bb817a..a18f7371f38c 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -3634,21 +3634,6 @@ ProcessedMediaStream::AllocateInputPort(MediaStream* aStream, TrackID aTrackID,
   return port.forget();
 }
 
-void
-ProcessedMediaStream::QueueFinish()
-{
-  class Message : public ControlMessage {
-  public:
-    explicit Message(ProcessedMediaStream* aStream)
-      : ControlMessage(aStream) {}
-    void Run() override
-    {
-      mStream->FinishOnGraphThread();
-    }
-  };
-  GraphImpl()->AppendMessage(MakeUnique<Message>(this));
-}
-
 void
 ProcessedMediaStream::QueueSetAutofinish(bool aAutofinish)
 {
diff --git a/dom/media/MediaStreamGraph.h b/dom/media/MediaStreamGraph.h
index 6c436f6280d4..4be3f99ef17c 100644
--- a/dom/media/MediaStreamGraph.h
+++ b/dom/media/MediaStreamGraph.h
@@ -1186,10 +1186,6 @@ public:
                     uint16_t aInputNumber = 0,
                     uint16_t aOutputNumber = 0,
                     nsTArray<TrackID>* aBlockedTracks = nullptr);
-  /**
-   * Queue a message to force this stream into the finished state.
-   */
-  void QueueFinish();
   /**
    * Queue a message to set the autofinish flag on this stream (defaults to
    * false). When this flag is set, and all input streams are in the finished

From 7abb408ffd13d3db895315f2c64df093b288deb9 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Wed, 31 Oct 2018 02:10:04 +0000
Subject: [PATCH 53/53] Bug 1503458 - Remove unused GetParameterIndexed.
 r=kvark

GetIndexedParameter is the real function.

Differential Revision: https://phabricator.services.mozilla.com/D10324

--HG--
extra : moz-landing-system : lando
---
 dom/canvas/WebGLContext.h        |  2 --
 dom/canvas/WebGLContextState.cpp | 30 ------------------------------
 2 files changed, 32 deletions(-)

diff --git a/dom/canvas/WebGLContext.h b/dom/canvas/WebGLContext.h
index 73ad84c8234b..23fbeb819d8c 100644
--- a/dom/canvas/WebGLContext.h
+++ b/dom/canvas/WebGLContext.h
@@ -1050,8 +1050,6 @@ public:
         retval.set(GetParameter(cx, pname, rv));
     }
 
-    void GetParameterIndexed(JSContext* cx, GLenum pname, GLuint index,
-                             JS::MutableHandle<JS::Value> retval);
     bool IsEnabled(GLenum cap);
 
 private:
diff --git a/dom/canvas/WebGLContextState.cpp b/dom/canvas/WebGLContextState.cpp
index 8d550802bfe2..20ec2bd6c5e9 100644
--- a/dom/canvas/WebGLContextState.cpp
+++ b/dom/canvas/WebGLContextState.cpp
@@ -602,36 +602,6 @@ WebGLContext::GetParameter(JSContext* cx, GLenum pname, ErrorResult& rv)
     return JS::NullValue();
 }
 
-void
-WebGLContext::GetParameterIndexed(JSContext* cx, GLenum pname, GLuint index,
-                                  JS::MutableHandle<JS::Value> retval)
-{
-    const FuncScope funcScope(*this, "getParameterIndexed");
-    if (IsContextLost()) {
-        retval.setNull();
-        return;
-    }
-
-    switch (pname) {
-        case LOCAL_GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
-        {
-            if (index >= mGLMaxTransformFeedbackSeparateAttribs) {
-                ErrorInvalidValue("`index` should be less than MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS");
-                retval.setNull();
-                return;
-            }
-            retval.setNull(); // See bug 903594
-            return;
-        }
-
-        default:
-            break;
-    }
-
-    ErrorInvalidEnumInfo("pname", pname);
-    retval.setNull();
-}
-
 bool
 WebGLContext::IsEnabled(GLenum cap)
 {