From fd702be66b640f3be08ac738f02f45c89242841a Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jrmuizel@gmail.com>
Date: Tue, 13 Nov 2018 02:23:41 +0000
Subject: [PATCH 01/33] Bug 1506676. blob-inval: handle the parent item being
 removed. r=mattwoodrow

If the parent item is removed our assertions will be wrong because
the parent item's bounds will not be added to the invalid rect until
after we've traversed all of the items. Further, the new unbounded rect
for the child item won't be added to the invalid rect unless we do it
ourselves. This makes sure we add the old and new rects to the invalid
rect.

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

--HG--
extra : moz-landing-system : lando
---
 gfx/layers/wr/WebRenderCommandBuilder.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gfx/layers/wr/WebRenderCommandBuilder.cpp b/gfx/layers/wr/WebRenderCommandBuilder.cpp
index 3a29ef4c62f7..6fe60b5a7831 100644
--- a/gfx/layers/wr/WebRenderCommandBuilder.cpp
+++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp
@@ -554,10 +554,10 @@ struct DIGroup
             combined = clip.ApplyNonRoundedIntersection(geometry->ComputeInvalidationRegion());
             IntRect transformedRect = ToDeviceSpace(combined.GetBounds(), aMatrix, appUnitsPerDevPixel, mLayerBounds.TopLeft());
             // The invalid rect should contain the old rect and the new rect
-            // because the parent should have invalidated this area
-            MOZ_RELEASE_ASSERT(mInvalidRect.Contains(aData->mRect));
+            // but may not because the parent may have been removed.
+            InvalidateRect(aData->mRect);
             aData->mRect = transformedRect.Intersect(mImageBounds);
-            MOZ_RELEASE_ASSERT(mInvalidRect.Contains(aData->mRect));
+            InvalidateRect(aData->mRect);
             GP("ContainerLayer image rect bounds change\n");
           } else {
             // XXX: this code can eventually be deleted/made debug only
@@ -574,10 +574,10 @@ struct DIGroup
           combined = clip.ApplyNonRoundedIntersection(geometry->ComputeInvalidationRegion());
           IntRect transformedRect = ToDeviceSpace(combined.GetBounds(), aMatrix, appUnitsPerDevPixel, mLayerBounds.TopLeft());
           // The invalid rect should contain the old rect and the new rect
-          // because the parent should have invalidated this area
-          MOZ_RELEASE_ASSERT(mInvalidRect.Contains(aData->mRect));
+          // but may not because the parent may have been removed.
+          InvalidateRect(aData->mRect);
           aData->mRect = transformedRect.Intersect(mImageBounds);
-          MOZ_RELEASE_ASSERT(mInvalidRect.Contains(aData->mRect));
+          InvalidateRect(aData->mRect);
           GP("image rect bounds change\n");
         } else {
           // XXX: this code can eventually be deleted/made debug only

From 478074e691f222a3756df0dbf00d02386c514c3c Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 13 Nov 2018 03:15:51 +0000
Subject: [PATCH 02/33] Bug 1506492 - Report WebRender swap-chain memory usage.
 r=bholley

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

--HG--
extra : moz-landing-system : lando
---
 gfx/thebes/gfxPlatform.cpp              |  1 +
 gfx/webrender_bindings/RenderThread.cpp |  7 ++++---
 gfx/webrender_bindings/RendererOGL.cpp  | 17 +++++++++++++++++
 gfx/webrender_bindings/RendererOGL.h    |  2 ++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index 575e653c6aae..7caf63ccd788 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -747,6 +747,7 @@ WebRenderMemoryReporter::CollectReports(nsIHandleReportCallback* aHandleReport,
       helper.ReportTexture(aReport.render_target_textures, "render-targets");
       helper.ReportTexture(aReport.texture_cache_textures, "texture-cache");
       helper.ReportTexture(aReport.depth_target_textures, "depth-targets");
+      helper.ReportTexture(aReport.swap_chain, "swap-chains");
 
       // Total GPU bytes, for sanity-checking the above.
       helper.ReportTotalGPUBytes(aReport.total_gpu_bytes_allocated);
diff --git a/gfx/webrender_bindings/RenderThread.cpp b/gfx/webrender_bindings/RenderThread.cpp
index 9269387eca66..f1d22eaea36a 100644
--- a/gfx/webrender_bindings/RenderThread.cpp
+++ b/gfx/webrender_bindings/RenderThread.cpp
@@ -147,13 +147,14 @@ void
 RenderThread::DoAccumulateMemoryReport(MemoryReport aReport, const RefPtr<MemoryReportPromise::Private>& aPromise)
 {
   MOZ_ASSERT(IsInRenderThread());
+  MOZ_ASSERT(aReport.total_gpu_bytes_allocated == 0);
+
   for (auto& r: mRenderers) {
-    wr_renderer_accumulate_memory_report(r.second->GetRenderer(), &aReport);
+    r.second->AccumulateMemoryReport(&aReport);
   }
 
   // Note total gpu bytes allocated across all WR instances.
-  MOZ_ASSERT(aReport.total_gpu_bytes_allocated == 0);
-  aReport.total_gpu_bytes_allocated = wr_total_gpu_bytes_allocated();
+  aReport.total_gpu_bytes_allocated += wr_total_gpu_bytes_allocated();
 
   aPromise->Resolve(aReport, __func__);
 }
diff --git a/gfx/webrender_bindings/RendererOGL.cpp b/gfx/webrender_bindings/RendererOGL.cpp
index 1a15d68ac1c3..043486fd75d4 100644
--- a/gfx/webrender_bindings/RendererOGL.cpp
+++ b/gfx/webrender_bindings/RendererOGL.cpp
@@ -8,6 +8,7 @@
 #include "GLContext.h"
 #include "mozilla/gfx/Logging.h"
 #include "mozilla/gfx/gfxVars.h"
+#include "mozilla/gfx/Types.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/LayersTypes.h"
@@ -248,6 +249,22 @@ RendererOGL::GetRenderTexture(wr::WrExternalImageId aExternalImageId)
   return mThread->GetRenderTexture(aExternalImageId);
 }
 
+void
+RendererOGL::AccumulateMemoryReport(MemoryReport* aReport)
+{
+  wr_renderer_accumulate_memory_report(GetRenderer(), aReport);
+
+  LayoutDeviceIntSize size = mCompositor->GetBufferSize();
+
+  // Assume BGRA8 for the format since it's not exposed anywhere,
+  // and all compositor backends should be using that.
+  uintptr_t swapChainSize = size.width * size.height * 
+                            BytesPerPixel(SurfaceFormat::B8G8R8A8) *
+                            (mCompositor->UseTripleBuffering() ? 3 : 2);
+  aReport->swap_chain += swapChainSize;
+  aReport->total_gpu_bytes_allocated += swapChainSize;
+}
+
 static void
 DoNotifyWebRenderError(layers::CompositorBridgeParent* aBridge, WebRenderError aError)
 {
diff --git a/gfx/webrender_bindings/RendererOGL.h b/gfx/webrender_bindings/RendererOGL.h
index ea2c94d541da..0bcf98acb7b3 100644
--- a/gfx/webrender_bindings/RendererOGL.h
+++ b/gfx/webrender_bindings/RendererOGL.h
@@ -95,6 +95,8 @@ public:
 
   RenderTextureHost* GetRenderTexture(wr::WrExternalImageId aExternalImageId);
 
+  void AccumulateMemoryReport(MemoryReport* aReport);
+
   wr::Renderer* GetRenderer() { return mRenderer; }
 
   gl::GLContext* gl() const;

From b6884c792045694f99c4469b85a685490f7320f3 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Mon, 12 Nov 2018 15:45:39 +0000
Subject: [PATCH 03/33] Bug 1504854 - Autofilled search shortcuts should show a
 single "Search with Engine" heuristic result in the popup r=mak

All we need to do is set `_searchEngineAliasMatch` with an empty query so that we don't try to add any more results. That hits the existing case where the user types out a full @ alias and we show only the "search with engine" heuristic result.

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

--HG--
extra : moz-landing-system : lando
---
 toolkit/components/places/UnifiedComplete.js     | 15 +++++++++++++--
 .../test_autofill_search_engine_aliases.js       | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/places/UnifiedComplete.js b/toolkit/components/places/UnifiedComplete.js
index 8bdd63858515..e7f74f0b8228 100644
--- a/toolkit/components/places/UnifiedComplete.js
+++ b/toolkit/components/places/UnifiedComplete.js
@@ -1114,7 +1114,7 @@ Search.prototype = {
     return true;
   },
 
-  async _matchSearchEngineTokenAlias() {
+  async _matchSearchEngineTokenAliasForAutofill() {
     // We need a single "@engine" search token.
     if (this._searchTokens.length != 1) {
       return false;
@@ -1152,6 +1152,17 @@ Search.prototype = {
             icon: engine.iconURI ? engine.iconURI.spec : null,
           });
           this._result.setDefaultIndex(0);
+
+          // Set _searchEngineAliasMatch with an empty query so that we don't
+          // attempt to add any more matches.  When a token alias is autofilled,
+          // the only match should be the one we just added.
+          this._searchEngineAliasMatch = {
+            engine,
+            alias: aliasPreservingUserCase,
+            query: "",
+            isTokenAlias: true,
+          };
+
           return true;
         }
       }
@@ -1224,7 +1235,7 @@ Search.prototype = {
     }
 
     if (this.pending && shouldAutofill) {
-      let matched = await this._matchSearchEngineTokenAlias();
+      let matched = await this._matchSearchEngineTokenAliasForAutofill();
       if (matched) {
         return true;
       }
diff --git a/toolkit/components/places/tests/unifiedcomplete/test_autofill_search_engine_aliases.js b/toolkit/components/places/tests/unifiedcomplete/test_autofill_search_engine_aliases.js
index d67326f3a686..883d0ed8a7ff 100644
--- a/toolkit/components/places/tests/unifiedcomplete/test_autofill_search_engine_aliases.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_autofill_search_engine_aliases.js
@@ -24,6 +24,14 @@ add_task(async function init() {
 
 // Searching for @autofi should autofill to @autofilltest.
 add_task(async function basic() {
+  // Add a history visit that should normally match but for the fact that the
+  // search uses an @ alias.  When an @ alias is autofilled, there should be no
+  // other matches except the autofill heuristic match.
+  await PlacesTestUtils.addVisits({
+    uri: "http://example.com/",
+    title: TEST_ENGINE_ALIAS,
+  });
+
   let autofilledValue = TEST_ENGINE_ALIAS + " ";
   let completedURL = PlacesUtils.mozActionURI("searchengine", {
     engineName: TEST_ENGINE_NAME,
@@ -49,6 +57,14 @@ add_task(async function basic() {
 // Searching for @AUTOFI should autofill to @AUTOFIlltest, preserving the case
 // in the search string.
 add_task(async function preserveCase() {
+  // Add a history visit that should normally match but for the fact that the
+  // search uses an @ alias.  When an @ alias is autofilled, there should be no
+  // other matches except the autofill heuristic match.
+  await PlacesTestUtils.addVisits({
+    uri: "http://example.com/",
+    title: TEST_ENGINE_ALIAS,
+  });
+
   let search =
     TEST_ENGINE_ALIAS.toUpperCase()
     .substr(0, Math.round(TEST_ENGINE_ALIAS.length / 2));

From 5902f4631a6e7c0c278ff92fc0b1c30262c820dd Mon Sep 17 00:00:00 2001
From: Jan Henning <jh+bugzilla@buttercookie.de>
Date: Tue, 13 Nov 2018 06:55:01 +0000
Subject: [PATCH 04/33] Bug 1506689 - Wait for JNI_READY before getting
 profiler time stamp from Gecko. r=snorp

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

--HG--
extra : moz-landing-system : lando
---
 .../android/base/java/org/mozilla/gecko/GeckoJavaSampler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java b/mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java
index fc8860899b00..3c13457d1851 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java
@@ -32,7 +32,7 @@ public class GeckoJavaSampler {
         public long mJavaTime; // non-zero if Android system time is used
         public Sample(StackTraceElement[] aStack) {
             mFrames = new Frame[aStack.length];
-            if (GeckoThread.isStateAtLeast(GeckoThread.State.LIBS_READY)) {
+            if (GeckoThread.isStateAtLeast(GeckoThread.State.JNI_READY)) {
                 mTime = getProfilerTime();
             }
             if (mTime == 0.0d) {

From 0b3117868137d8cc3aba149b2294b8aa6dbb0e05 Mon Sep 17 00:00:00 2001
From: Jan Henning <jh+bugzilla@buttercookie.de>
Date: Tue, 13 Nov 2018 06:55:03 +0000
Subject: [PATCH 05/33] Bug 1506699 - Make dumping a profile to disk easier
 when using MOZ_PROFILER_SHUTDOWN. r=snorp

We're already have some special handling in the Android UI when detecting
MOZ_PROFILER_STARTUP, so we might as well handle MOZ_PROFILER_SHUTDOWN, too.

This means two things:
1. In order to actually quit the app, the "Quit" button needs to be enabled.
2. We need to wait until we're sure that the profile has been dumped to disk
   before finishing the activity (and thereby possibly killing our process).

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

--HG--
extra : moz-landing-system : lando
---
 .../base/java/org/mozilla/gecko/BrowserApp.java  | 16 ++++++++++++----
 .../base/java/org/mozilla/gecko/GeckoApp.java    | 12 +++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index b4417d85138e..5c4fd5989f97 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1867,9 +1867,16 @@ public class BrowserApp extends GeckoApp
 
             case "Sanitize:Finished":
                 if (message.getBoolean("shutdown", false)) {
-                    // Gecko is shutting down and has called our sanitize handlers,
-                    // so we can start exiting, too.
-                    finishAndShutdown(/* restart */ false);
+                    // Gecko is shutting down and has called our sanitize handlers, so to make us
+                    // appear more responsive, we can start shutting down the UI as well, even if
+                    // that means that Android might kill our process before Gecko has fully exited.
+
+                    // There is at least one exception, though: If we want to dump a captured
+                    // profile to disk, Gecko must be able to fully shutdown, so we only kill the UI
+                    // later on, in response to the Gecko thread exiting.
+                    if (!mDumpProfileOnShutdown) {
+                        finishAndShutdown(/* restart */ false);
+                    }
                 }
                 break;
 
@@ -3144,12 +3151,13 @@ public class BrowserApp extends GeckoApp
         final MenuItem enterGuestMode = aMenu.findItem(R.id.new_guest_session);
         final MenuItem exitGuestMode = aMenu.findItem(R.id.exit_guest_session);
 
-        // Only show the "Quit" menu item on pre-ICS, television devices,
+        // Only show the "Quit" menu when capturing a profile, on television devices,
         // or if the user has explicitly enabled the clear on shutdown pref.
         // (We check the pref last to save the pref read.)
         // In ICS+, it's easy to kill an app through the task switcher.
         final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this);
         final boolean visible = HardwareUtils.isTelevision() ||
+                                mDumpProfileOnShutdown ||
                                 prefs.getBoolean(GeckoPreferences.PREFS_SHOW_QUIT_MENU, false) ||
                                 !PrefUtils.getStringSet(prefs,
                                                         ClearOnShutdownPref.PREF,
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index ae08a9a88745..76b0e1fcb786 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -178,6 +178,8 @@ public abstract class GeckoApp extends GeckoActivity
     /** Tells if we're aborting app launch, e.g. if this is an unsupported device configuration. */
     protected boolean mIsAbortingAppLaunch;
 
+    protected boolean mDumpProfileOnShutdown;
+
     private PromptService mPromptService;
     protected TextSelection mTextSelection;
 
@@ -923,8 +925,9 @@ public abstract class GeckoApp extends GeckoActivity
 
     /**
      * Check and start the Java profiler if MOZ_PROFILER_STARTUP env var is specified.
+     * Also check whether we want to dump the captured profile on shutdown.
      **/
-    protected static void earlyStartJavaSampler(SafeIntent intent) {
+    protected void handleGeckoProfilerOptions(SafeIntent intent) {
         String env = intent.getStringExtra("env0");
         for (int i = 1; env != null; i++) {
             if (env.startsWith("MOZ_PROFILER_STARTUP=")) {
@@ -932,7 +935,10 @@ public abstract class GeckoApp extends GeckoActivity
                     GeckoJavaSampler.start(10, 1000);
                     Log.d(LOGTAG, "Profiling Java on startup");
                 }
-                break;
+            } else if (env.startsWith("MOZ_PROFILER_SHUTDOWN=")) {
+                if (!env.endsWith("=")) {
+                    mDumpProfileOnShutdown = true;
+                }
             }
             env = intent.getStringExtra("env" + i);
         }
@@ -977,7 +983,7 @@ public abstract class GeckoApp extends GeckoActivity
 
         final SafeIntent intent = new SafeIntent(getIntent());
 
-        earlyStartJavaSampler(intent);
+        handleGeckoProfilerOptions(intent);
 
         // Workaround for <http://code.google.com/p/android/issues/detail?id=20915>.
         try {

From cb4aa814b8d46253c33c3dee27b857691ea0ea60 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 13 Nov 2018 08:22:25 +0000
Subject: [PATCH 06/33] Bug 1506756 - Remove the use of real_path added in bug
 1501903. r=andi

In the first part of bug 1501903, paths were canonicalized in
inThirdPartyPath. For some reason, this seems to add a non-negligible
overhead on Windows. OTOH, most include paths handed by the build system
are absolute, and most paths that contains .. are for system headers,
which don't matter for the inThirdPartyPath test.

Considering the inThirdPartyPath has been using non-canonicalized paths
for the longest, we'll assume it's fine to come back to that mode.

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

--HG--
extra : moz-landing-system : lando
---
 build/clang-plugin/Utils.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/build/clang-plugin/Utils.h b/build/clang-plugin/Utils.h
index 24af9248e209..65196b9e6319 100644
--- a/build/clang-plugin/Utils.h
+++ b/build/clang-plugin/Utils.h
@@ -356,10 +356,8 @@ inline bool inThirdPartyPath(SourceLocation Loc, const SourceManager &SM) {
     return pair->second;
   }
 
-  SmallString<1024> RawFileName = SM.getFilename(Loc);
-  llvm::sys::fs::make_absolute(RawFileName);
-  SmallString<1024> FileName;
-  llvm::sys::fs::real_path(RawFileName, FileName);
+  SmallString<1024> FileName = SM.getFilename(Loc);
+  llvm::sys::fs::make_absolute(FileName);
 
   for (uint32_t i = 0; i < MOZ_THIRD_PARTY_PATHS_COUNT; ++i) {
     auto PathB = sys::path::begin(FileName);

From 8d34d6b733e0bf35c399065d4a77187c3dc706f3 Mon Sep 17 00:00:00 2001
From: Qinghao_Jack_Song <songqing@msu.edu>
Date: Mon, 12 Nov 2018 19:34:21 +0000
Subject: [PATCH 07/33] Bug 1498451 - Migrate Device Manager Dialog of
 Preferences Section to use Fluent for localization r=Gijs,flod,zbraniecki

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

--HG--
extra : moz-landing-system : lando
---
 .../preferences/in-content/preferences.xul    |   3 +-
 .../preferences/in-content/privacy.xul        |  20 +-
 .../bug_1498451_deviceManager.py              | 182 ++++++++++++++++++
 .../en-US/chrome/pipnss/pipnss.properties     |   3 -
 .../en-US/chrome/pippki/deviceManager.dtd     |  36 ----
 .../en-US/chrome/pippki/pippki.properties     |  24 ---
 .../security/certificates/deviceManager.ftl   | 130 +++++++++++++
 security/manager/locales/jar.mn               |   3 +-
 .../pki/resources/content/device_manager.js   | 113 ++++-------
 .../pki/resources/content/device_manager.xul  |  44 ++---
 .../pki/resources/content/load_device.js      |  20 +-
 .../pki/resources/content/load_device.xul     |  28 ++-
 12 files changed, 408 insertions(+), 198 deletions(-)
 create mode 100644 python/l10n/fluent_migrations/bug_1498451_deviceManager.py
 delete mode 100644 security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
 create mode 100644 security/manager/locales/en-US/security/certificates/deviceManager.ftl

diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul
index ff2ced7d0984..dd8c8a0258eb 100644
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -19,11 +19,9 @@
 <!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % certManagerDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
-<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
 <!ENTITY % sanitizeDTD SYSTEM "chrome://browser/locale/sanitize.dtd">
 %brandDTD;
 %certManagerDTD;
-%deviceManangerDTD;
 %sanitizeDTD;
 ]>
 
@@ -50,6 +48,7 @@
     <link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
     <link rel="localization" href="browser/aboutDialog.ftl"/>
     <link rel="localization" href="toolkit/updates/history.ftl"/>
+    <link rel="localization" href="security/certificates/deviceManager.ftl"/>
   </linkset>
 
   <html:link rel="shortcut icon"
diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index b3357ba6e1bf..c6fcad76158f 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -788,15 +788,17 @@
                 class="accessory-button"
                 data-l10n-id="certs-devices"
                 preference="security.disable_button.openDeviceManager"
-                searchkeywords="&devmgr.title;
-                                &devmgr.devlist.label;
-                                &devmgr.details.title;
-                                &devmgr.details.title2;
-                                &devmgr.button.login.label;
-                                &devmgr.button.logout.label;
-                                &devmgr.button.changepw.label;
-                                &devmgr.button.load.label;
-                                &devmgr.button.unload.label;"/>
+                search-l10n-ids="
+                  devmgr.title,
+                  devmgr-devlist.label,
+                  devmgr-header-details.label,
+                  devmgr-header-value.label,
+                  devmgr-button-login.label,
+                  devmgr-button-logout.label,
+                  devmgr-button-changepw.label,
+                  devmgr-button-load.label,
+                  devmgr-button-unload.label
+                "/>
       </hbox>
     </vbox>
   </hbox>
diff --git a/python/l10n/fluent_migrations/bug_1498451_deviceManager.py b/python/l10n/fluent_migrations/bug_1498451_deviceManager.py
new file mode 100644
index 000000000000..6ee3d4f55740
--- /dev/null
+++ b/python/l10n/fluent_migrations/bug_1498451_deviceManager.py
@@ -0,0 +1,182 @@
+# coding=utf8
+
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from __future__ import absolute_import
+import fluent.syntax.ast as FTL
+from fluent.migrate.helpers import transforms_from
+from fluent.migrate import COPY
+from fluent.migrate import REPLACE
+from fluent.migrate import CONCAT
+from fluent.migrate.helpers import VARIABLE_REFERENCE
+
+def migrate(ctx):
+    """Bug 1498451 - Migrate Device Manager Dialog of Preferences Section to use Fluent for localization, part {index}."""
+
+    ctx.add_transforms(
+        "security/manager/security/certificates/deviceManager.ftl",
+        "security/manager/security/certificates/deviceManager.ftl",
+        transforms_from(
+"""
+devmgr =
+  .title = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.title") }
+  .style = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.style2") }
+
+devmgr-devlist =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.devlist.label") }
+
+devmgr-header-details =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.details.title") }
+
+devmgr-header-value =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.details.title2") }
+
+devmgr-button-login =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.login.label") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.login.accesskey") }
+
+devmgr-button-logout =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.logout.label") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.logout.accesskey") }
+
+devmgr-button-changepw =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.changepw.label") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.changepw.accesskey") }
+
+devmgr-button-load =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.load.label") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.load.accesskey") }
+
+devmgr-button-unload =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.unload.label") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "devmgr.button.unload.accesskey") }
+
+load-device =
+  .title = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.title2") }
+
+load-device-info = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.info") }
+
+load-device-modname =
+  .value = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.modname2") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.modname2.accesskey") }
+
+load-device-modname-default =
+  .value = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.modname.default") }
+
+load-device-filename =
+  .value = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.filename2") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.filename2.accesskey") }
+
+load-device-browse =
+  .label = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.browse") }
+  .accesskey = { COPY("security/manager/chrome/pippki/deviceManager.dtd", "loaddevice.browse.accesskey") }
+
+devinfo-status =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_status") }
+
+devinfo-status-disabled =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_stat_disabled") }
+
+devinfo-status-not-present =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_stat_notpresent") }
+
+devinfo-status-uninitialized =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_stat_uninitialized") }
+
+devinfo-status-not-logged-in =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_stat_notloggedin") }
+
+devinfo-status-logged-in
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_stat_loggedin") }
+
+devinfo-status-ready =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_stat_ready") }
+
+devinfo-desc =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_desc") }
+
+devinfo-man-id =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_manID") }
+
+devinfo-hwversion =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_hwversion") }
+
+devinfo-fwversion =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_fwversion") }
+
+devinfo-modname =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_modname") }
+
+devinfo-modpath =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_modpath") }
+
+login-failed = { COPY("security/manager/chrome/pippki/pippki.properties", "login_failed") }
+
+devinfo-label =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_label") }
+
+devinfo-serialnum =
+  .label = { COPY("security/manager/chrome/pippki/pippki.properties", "devinfo_serialnum") }
+
+fips-nonempty-password-required = { COPY("security/manager/chrome/pippki/pippki.properties", "fips_nonempty_password_required") }
+unable-to-toggle-fips = { COPY("security/manager/chrome/pippki/pippki.properties", "unable_to_toggle_fips") }
+load-pk11-module-file-picker-title = { COPY("security/manager/chrome/pippki/pippki.properties", "loadPK11ModuleFilePickerTitle") }
+
+load-module-help-empty-module-name =
+  .value = { COPY("security/manager/chrome/pippki/pippki.properties", "loadModuleHelp_emptyModuleName") }
+
+load-module-help-root-certs-module-name =
+  .value = { COPY("security/manager/chrome/pippki/pippki.properties", "loadModuleHelp_rootCertsModuleName") }
+
+add-module-failure = { COPY("security/manager/chrome/pipnss/pipnss.properties", "AddModuleFailure") }
+del-module-warning = { COPY("security/manager/chrome/pipnss/pipnss.properties", "DelModuleWarning") }
+del-module-error = { COPY("security/manager/chrome/pipnss/pipnss.properties", "DelModuleError") }
+""")
+)
+
+    ctx.add_transforms(
+        "security/manager/security/certificates/deviceManager.ftl",
+        "security/manager/security/certificates/deviceManager.ftl",
+        [
+            FTL.Message(
+            id=FTL.Identifier("devmgr-button-enable-fips"),
+            attributes=[
+                FTL.Attribute(
+                    id=FTL.Identifier("label"),
+                    value=COPY(
+                            "security/manager/chrome/pippki/pippki.properties",
+                            "enable_fips",
+                        )
+                    ),
+                FTL.Attribute(
+                    id=FTL.Identifier("accesskey"),
+                    value=COPY(
+                            "security/manager/chrome/pippki/deviceManager.dtd",
+                            "devmgr.button.fips.accesskey",
+                            )
+                        )
+                    ]
+                ),
+            FTL.Message(
+            id=FTL.Identifier("devmgr-button-disable-fips"),
+            attributes=[
+                FTL.Attribute(
+                    id=FTL.Identifier("label"),
+                    value=COPY(
+                            "security/manager/chrome/pippki/pippki.properties",
+                            "disable_fips",
+                            )
+                        ),
+                    FTL.Attribute(
+                        id=FTL.Identifier("accesskey"),
+                        value=COPY(
+                            "security/manager/chrome/pippki/deviceManager.dtd",
+                            "devmgr.button.fips.accesskey",
+                            )
+                        )
+                    ]
+                ),
+            ]
+        )
+
diff --git a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties b/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
index 277842cf6756..b051688c5e42 100755
--- a/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
+++ b/security/manager/locales/en-US/chrome/pipnss/pipnss.properties
@@ -260,9 +260,6 @@ PKCS12UnknownErrBackup=Failed to create the PKCS #12 backup file for unknown rea
 PKCS12UnknownErr=The PKCS #12 operation failed for unknown reasons.
 PKCS12InfoNoSmartcardBackup=It is not possible to back up certificates from a hardware security device such as a smart card.
 PKCS12DupData=The certificate and private key already exist on the security device.
-AddModuleFailure=Unable to add module
-DelModuleWarning=Are you sure you want to delete this security module?
-DelModuleError=Unable to delete module
 AVATemplate=%S = %S
 
 PSMERR_SSL_Disabled=Can’t connect securely because the SSL protocol has been disabled.
diff --git a/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd b/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
deleted file mode 100644
index 82bf74bac284..000000000000
--- a/security/manager/locales/en-US/chrome/pippki/deviceManager.dtd
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY devmgr.title                           "Device Manager">
-<!-- LOCALIZATION NOTE (devmgr.style2): This is CSS style for Device Manager
-     window size. Don't translate "width" nor "height". Adjust the numbers
-     to make window contents fit. -->
-<!ENTITY devmgr.style2                          "width: 67em; height: 32em;">
-
-<!ENTITY devmgr.devlist.label                   "Security Modules and Devices">
-<!ENTITY devmgr.details.title                   "Details">
-<!ENTITY devmgr.details.title2                  "Value">
-
-<!ENTITY devmgr.button.login.label              "Log In">
-<!ENTITY devmgr.button.login.accesskey          "n">
-<!ENTITY devmgr.button.logout.label             "Log Out">
-<!ENTITY devmgr.button.logout.accesskey         "O">
-<!ENTITY devmgr.button.changepw.label           "Change Password">
-<!ENTITY devmgr.button.changepw.accesskey       "P">
-<!ENTITY devmgr.button.load.label               "Load">
-<!ENTITY devmgr.button.load.accesskey           "L">
-<!ENTITY devmgr.button.unload.label             "Unload">
-<!ENTITY devmgr.button.unload.accesskey         "U">
-<!ENTITY devmgr.button.fips.accesskey           "F">
-
-<!ENTITY loaddevice.info                        "Enter the information for the module you want to add.">
-<!ENTITY loaddevice.modname2                    "Module Name">
-<!ENTITY loaddevice.modname2.accesskey          "M">
-<!ENTITY loaddevice.modname.default             "New PKCS#11 Module">
-<!ENTITY loaddevice.filename2                   "Module filename">
-<!ENTITY loaddevice.filename2.accesskey         "f">
-<!ENTITY loaddevice.browse                      "Browse…">
-<!ENTITY loaddevice.browse.accesskey            "B">
-
-<!ENTITY loaddevice.title2                      "Load PKCS#11 Device Driver">
diff --git a/security/manager/locales/en-US/chrome/pippki/pippki.properties b/security/manager/locales/en-US/chrome/pippki/pippki.properties
index ed3b867ed260..abac0e8b5695 100644
--- a/security/manager/locales/en-US/chrome/pippki/pippki.properties
+++ b/security/manager/locales/en-US/chrome/pippki/pippki.properties
@@ -123,27 +123,8 @@ pw_erased_ok=Warning! You have deleted your Master Password.
 pw_not_wanted=Warning! You have decided not to use a Master Password.
 pw_empty_warning=Your stored web and email passwords, form data, and private keys will not be protected.
 pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
-login_failed=Failed to Login
-loadPK11ModuleFilePickerTitle=Choose a PKCS#11 device driver to load
-devinfo_modname=Module
-devinfo_modpath=Path
-devinfo_label=Label
-devinfo_manID=Manufacturer
-devinfo_serialnum=Serial Number
-devinfo_hwversion=HW Version
-devinfo_fwversion=FW Version
-devinfo_status=Status
-devinfo_desc=Description
-devinfo_stat_disabled=Disabled
-devinfo_stat_notpresent=Not Present
-devinfo_stat_uninitialized=Uninitialized
-devinfo_stat_notloggedin=Not Logged In
-devinfo_stat_loggedin=Logged In
-devinfo_stat_ready=Ready
 enable_fips=Enable FIPS
 disable_fips=Disable FIPS
-fips_nonempty_password_required=FIPS mode requires that you have a Master Password set for each security device. Please set the password before trying to enable FIPS mode.
-unable_to_toggle_fips=Unable to change the FIPS mode for the security device. It is recommended that you exit and restart this application.
 
 resetPasswordConfirmationTitle=Reset Master Password
 resetPasswordConfirmationMessage=Your password has been reset.
@@ -182,8 +163,3 @@ addExceptionCheckingShort=Checking Information
 addExceptionCheckingLong2=Attempting to identify this site…
 addExceptionNoCertShort=No Information Available
 addExceptionNoCertLong2=Unable to obtain identification status for this site.
-
-# Load Module Dialog
-loadModuleHelp_emptyModuleName=The module name cannot be empty.
-# LOCALIZATION NOTE(loadModuleHelp_rootCertsModuleName): Do not translate 'Root Certs'
-loadModuleHelp_rootCertsModuleName=‘Root Certs‘ is reserved and cannot be used as the module name.
diff --git a/security/manager/locales/en-US/security/certificates/deviceManager.ftl b/security/manager/locales/en-US/security/certificates/deviceManager.ftl
new file mode 100644
index 000000000000..f82a13f05b24
--- /dev/null
+++ b/security/manager/locales/en-US/security/certificates/deviceManager.ftl
@@ -0,0 +1,130 @@
+# 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/.
+
+## Strings used for device manager
+devmgr =
+    .title = Device Manager
+    .style = width: 67em; height: 32em;
+
+devmgr-devlist =
+    .label = Security Modules and Devices
+
+devmgr-header-details =
+    .label = Details
+
+devmgr-header-value =
+    .label = Value
+
+devmgr-button-login =
+    .label = Log In
+    .accesskey = n
+
+devmgr-button-logout =
+    .label = Log Out
+    .accesskey = O
+
+devmgr-button-changepw =
+    .label = Change Password
+    .accesskey = P
+
+devmgr-button-load =
+    .label = Load
+    .accesskey = L
+
+devmgr-button-unload =
+    .label = Unload
+    .accesskey = U
+
+devmgr-button-enable-fips =
+    .label = Enable FIPS
+    .accesskey = F
+
+devmgr-button-disable-fips =
+    .label = Disable FIPS
+    .accesskey = F
+
+## Strings used for load device
+load-device =
+    .title = Load PKCS#11 Device Driver
+
+load-device-info = Enter the information for the module you want to add.
+
+load-device-modname =
+    .value = Module Name
+    .accesskey = M
+
+load-device-modname-default =
+    .value = New PKCS#11 Module
+
+load-device-filename =
+    .value = Module filename
+    .accesskey = f
+
+load-device-browse =
+    .label = Browse…
+    .accesskey = B
+
+## Token Manager
+
+devinfo-status =
+    .label = Status
+
+devinfo-status-disabled =
+    .label = Disabled
+
+devinfo-status-not-present =
+    .label = Not Present
+
+devinfo-status-uninitialized =
+    .label = Uninitialized
+
+devinfo-status-not-logged-in =
+    .label = Not Logged In
+
+devinfo-status-logged-in =
+    .label = Logged In
+
+devinfo-status-ready =
+    .label = Ready
+
+devinfo-desc =
+    .label = Description
+
+devinfo-man-id =
+    .label = Manufacturer
+
+devinfo-hwversion =
+    .label = HW Version
+devinfo-fwversion =
+    .label = FW Version
+
+devinfo-modname =
+    .label = Module
+
+devinfo-modpath =
+    .label = Path
+
+login-failed = Failed to Login
+
+devinfo-label =
+    .label = Label
+
+devinfo-serialnum =
+    .label = Serial Number
+
+fips-nonempty-password-required = FIPS mode requires that you have a Master Password set for each security device. Please set the password before trying to enable FIPS mode.
+unable-to-toggle-fips = Unable to change the FIPS mode for the security device. It is recommended that you exit and restart this application.
+load-pk11-module-file-picker-title = Choose a PKCS#11 device driver to load
+
+# Load Module Dialog
+load-module-help-empty-module-name =
+    .value = The module name cannot be empty.
+
+# Do not translate 'Root Certs'
+load-module-help-root-certs-module-name =
+    .value = ‘Root Certs‘ is reserved and cannot be used as the module name.
+
+add-module-failure = Unable to add module
+del-module-warning = Are you sure you want to delete this security module?
+del-module-error = Unable to delete module
diff --git a/security/manager/locales/jar.mn b/security/manager/locales/jar.mn
index 9b5c2da4461d..e86f5ed6ae8f 100644
--- a/security/manager/locales/jar.mn
+++ b/security/manager/locales/jar.mn
@@ -3,6 +3,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+[localization] @AB_CD@.jar:
+  security                                     (%security/**/*.ftl)
 
 @AB_CD@.jar:
 % locale pipnss @AB_CD@ %locale/@AB_CD@/pipnss/
@@ -12,4 +14,3 @@
   locale/@AB_CD@/pippki/pippki.dtd            (%chrome/pippki/pippki.dtd)
   locale/@AB_CD@/pippki/pippki.properties     (%chrome/pippki/pippki.properties)
   locale/@AB_CD@/pippki/certManager.dtd       (%chrome/pippki/certManager.dtd)
-  locale/@AB_CD@/pippki/deviceManager.dtd     (%chrome/pippki/deviceManager.dtd)
diff --git a/security/manager/pki/resources/content/device_manager.js b/security/manager/pki/resources/content/device_manager.js
index 6784b6436fb4..83a6e5e9145e 100644
--- a/security/manager/pki/resources/content/device_manager.js
+++ b/security/manager/pki/resources/content/device_manager.js
@@ -16,26 +16,22 @@ const nsIPK11TokenDB = Ci.nsIPK11TokenDB;
 const nsIDialogParamBlock = Ci.nsIDialogParamBlock;
 const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1";
 
-var bundle;
 var secmoddb;
 var skip_enable_buttons = false;
 
 /* Do the initial load of all PKCS# modules and list them. */
 function LoadModules() {
-  bundle = document.getElementById("pippki_bundle");
   secmoddb = Cc[nsPKCS11ModuleDB].getService(nsIPKCS11ModuleDB);
   RefreshDeviceList();
 }
 
-function getNSSString(name) {
-  return document.getElementById("pipnss_bundle").getString(name);
-}
-
-function doPrompt(msg) {
+async function doPrompt(l10n_id) {
+  let [msg] = await document.l10n.formatValues([{id: l10n_id}]);
   Services.prompt.alert(window, null, msg);
 }
 
-function doConfirm(msg) {
+async function doConfirm(l10n_id) {
+  let [msg] = await document.l10n.formatValues([{id: l10n_id}]);
   return Services.prompt.confirm(window, null, msg);
 }
 
@@ -51,13 +47,11 @@ function RefreshDeviceList() {
 
 function SetFIPSButton() {
   var fipsButton = document.getElementById("fipsbutton");
-  var label;
   if (secmoddb.isFIPSEnabled) {
-   label = bundle.getString("disable_fips");
+    document.l10n.setAttributes(fipsButton, "devmgr-button-disable-fips");
   } else {
-   label = bundle.getString("enable_fips");
+    document.l10n.setAttributes(fipsButton, "devmgr-button-enable-fips");
   }
-  fipsButton.setAttribute("label", label);
 
   var can_toggle = secmoddb.canToggleFIPS;
   if (can_toggle) {
@@ -199,48 +193,32 @@ function showSlotInfo() {
   ClearInfoList();
   switch (selected_slot.status) {
    case nsIPKCS11Slot.SLOT_DISABLED:
-     AddInfoRow(bundle.getString("devinfo_status"),
-                bundle.getString("devinfo_stat_disabled"),
-                "tok_status");
+     AddInfoRow("devinfo-status", {l10nID: "devinfo-status-disabled"}, "tok_status");
      present = false;
      break;
    case nsIPKCS11Slot.SLOT_NOT_PRESENT:
-     AddInfoRow(bundle.getString("devinfo_status"),
-                bundle.getString("devinfo_stat_notpresent"),
-                "tok_status");
+     AddInfoRow("devinfo-status", {l10nID: "devinfo-status-not-present"}, "tok_status");
      present = false;
      break;
    case nsIPKCS11Slot.SLOT_UNINITIALIZED:
-     AddInfoRow(bundle.getString("devinfo_status"),
-                bundle.getString("devinfo_stat_uninitialized"),
-                "tok_status");
+     AddInfoRow("devinfo-status", {l10nID: "devinfo-status-uninitialized"}, "tok_status");
      break;
    case nsIPKCS11Slot.SLOT_NOT_LOGGED_IN:
-     AddInfoRow(bundle.getString("devinfo_status"),
-                bundle.getString("devinfo_stat_notloggedin"),
-                "tok_status");
+     AddInfoRow("devinfo-status", {l10nID: "devinfo-status-not-logged-in"}, "tok_status");
      break;
    case nsIPKCS11Slot.SLOT_LOGGED_IN:
-     AddInfoRow(bundle.getString("devinfo_status"),
-                bundle.getString("devinfo_stat_loggedin"),
-                "tok_status");
+     AddInfoRow("devinfo-status", {l10nID: "devinfo-status-logged-in"}, "tok_status");
      break;
    case nsIPKCS11Slot.SLOT_READY:
-     AddInfoRow(bundle.getString("devinfo_status"),
-                bundle.getString("devinfo_stat_ready"),
-                "tok_status");
+     AddInfoRow("devinfo-status", {l10nID: "devinfo-status-ready"}, "tok_status");
      break;
    default:
      return;
   }
-  AddInfoRow(bundle.getString("devinfo_desc"),
-             selected_slot.desc, "slot_desc");
-  AddInfoRow(bundle.getString("devinfo_manID"),
-             selected_slot.manID, "slot_manID");
-  AddInfoRow(bundle.getString("devinfo_hwversion"),
-             selected_slot.HWVersion, "slot_hwv");
-  AddInfoRow(bundle.getString("devinfo_fwversion"),
-             selected_slot.FWVersion, "slot_fwv");
+  AddInfoRow("devinfo-desc", {label: selected_slot.desc}, "slot_desc");
+  AddInfoRow("devinfo-man-id", {label: selected_slot.manID}, "slot_manID");
+  AddInfoRow("devinfo-hwversion", {label: selected_slot.HWVersion}, "slot_hwv");
+  AddInfoRow("devinfo-fwversion", {label: selected_slot.FWVersion}, "slot_fwv");
   if (present) {
      showTokenInfo();
   }
@@ -248,23 +226,25 @@ function showSlotInfo() {
 
 function showModuleInfo() {
   ClearInfoList();
-  AddInfoRow(bundle.getString("devinfo_modname"),
-             selected_module.name, "module_name");
-  AddInfoRow(bundle.getString("devinfo_modpath"),
-             selected_module.libName, "module_path");
+  AddInfoRow("devinfo-modname", {label: selected_module.name}, "module_name");
+  AddInfoRow("devinfo-modpath", {label: selected_module.libName}, "module_path");
 }
 
 // add a row to the info list, as [col1 col2] (ex.: ["status" "logged in"])
-function AddInfoRow(col1, col2, cell_id) {
+function AddInfoRow(l10nID, col2, cell_id) {
   var tree = document.getElementById("info_list");
   var item  = document.createXULElement("treeitem");
   var row  = document.createXULElement("treerow");
   var cell1 = document.createXULElement("treecell");
-  cell1.setAttribute("label", col1);
+  document.l10n.setAttributes(cell1, l10nID);
   cell1.setAttribute("crop", "never");
   row.appendChild(cell1);
   var cell2 = document.createXULElement("treecell");
-  cell2.setAttribute("label", col2);
+  if (col2.l10nID) {
+    document.l10n.setAttributes(cell2, col2.l10nID);
+  } else {
+    cell2.setAttribute("label", col2.label);
+  }
   cell2.setAttribute("crop", "never");
   cell2.setAttribute("id", cell_id);
   row.appendChild(cell2);
@@ -281,14 +261,12 @@ function doLogin() {
     selected_token.login(false);
     var tok_status = document.getElementById("tok_status");
     if (selected_token.isLoggedIn()) {
-      tok_status.setAttribute("label",
-                              bundle.getString("devinfo_stat_loggedin"));
+      document.l10n.setAttributes(tok_status, "devinfo-status-logged-in");
     } else {
-      tok_status.setAttribute("label",
-                              bundle.getString("devinfo_stat_notloggedin"));
+      document.l10n.setAttributes(tok_status, "devinfo-status-not-logged-in");
     }
   } catch (e) {
-    doPrompt(bundle.getString("login_failed"));
+    doPrompt("login-failed");
   }
   enableButtons();
 }
@@ -302,11 +280,9 @@ function doLogout() {
     selected_token.logoutAndDropAuthenticatedResources();
     var tok_status = document.getElementById("tok_status");
     if (selected_token.isLoggedIn()) {
-      tok_status.setAttribute("label",
-                              bundle.getString("devinfo_stat_loggedin"));
+      document.l10n.setAttributes(tok_status, "devinfo-status-logged-in");
     } else {
-      tok_status.setAttribute("label",
-                              bundle.getString("devinfo_stat_notloggedin"));
+      document.l10n.setAttributes(tok_status, "devinfo-status-not-logged-in");
     }
   } catch (e) {
   }
@@ -320,14 +296,14 @@ function doLoad() {
   RefreshDeviceList();
 }
 
-function deleteSelected() {
+async function deleteSelected() {
   getSelectedItem();
   if (selected_module &&
-      doConfirm(getNSSString("DelModuleWarning"))) {
+      (await doConfirm("del-module-warning"))) {
     try {
       secmoddb.deleteModule(selected_module.name);
     } catch (e) {
-      doPrompt(getNSSString("DelModuleError"));
+      doPrompt("del-module-error");
       return false;
     }
     selected_module = null;
@@ -336,8 +312,8 @@ function deleteSelected() {
   return false;
 }
 
-function doUnload() {
-  if (deleteSelected()) {
+async function doUnload() {
+  if (await deleteSelected()) {
     ClearDeviceList();
     RefreshDeviceList();
   }
@@ -360,16 +336,11 @@ function changePassword() {
 
 function showTokenInfo() {
   var selected_token = selected_slot.getToken();
-  AddInfoRow(bundle.getString("devinfo_label"),
-             selected_token.tokenName, "tok_label");
-  AddInfoRow(bundle.getString("devinfo_manID"),
-             selected_token.tokenManID, "tok_manID");
-  AddInfoRow(bundle.getString("devinfo_serialnum"),
-             selected_token.tokenSerialNumber, "tok_sNum");
-  AddInfoRow(bundle.getString("devinfo_hwversion"),
-             selected_token.tokenHWVersion, "tok_hwv");
-  AddInfoRow(bundle.getString("devinfo_fwversion"),
-             selected_token.tokenFWVersion, "tok_fwv");
+  AddInfoRow("devinfo-label", {label: selected_token.tokenName}, "tok_label");
+  AddInfoRow("devinfo-man-id", {label: selected_token.tokenManID}, "tok_manID");
+  AddInfoRow("devinfo-serialnum", {label: selected_token.tokenSerialNumber}, "tok_sNum");
+  AddInfoRow("devinfo-hwversion", {label: selected_token.tokenHWVersion}, "tok_hwv");
+  AddInfoRow("devinfo-fwversion", {label: selected_token.tokenFWVersion}, "tok_fwv");
 }
 
 function toggleFIPS() {
@@ -382,7 +353,7 @@ function toggleFIPS() {
     var internal_token = tokendb.getInternalKeyToken(); // nsIPK11Token
     if (!internal_token.hasPassword) {
       // Token has either no or an empty password.
-      doPrompt(bundle.getString("fips_nonempty_password_required"));
+      doPrompt("fips-nonempty-password-required");
       return;
     }
   }
@@ -390,7 +361,7 @@ function toggleFIPS() {
   try {
     secmoddb.toggleFIPSMode();
   } catch (e) {
-    doPrompt(bundle.getString("unable_to_toggle_fips"));
+    doPrompt("unable-to-toggle-fips");
     return;
   }
 
diff --git a/security/manager/pki/resources/content/device_manager.xul b/security/manager/pki/resources/content/device_manager.xul
index 2e59b08db99a..f0f97ecaf289 100644
--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/security/manager/pki/resources/content/device_manager.xul
@@ -5,26 +5,20 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<!DOCTYPE dialog [
-<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
-%deviceManangerDTD;
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
+<!DOCTYPE dialog>
 
 <dialog id="devicemanager"
-	windowtype="mozilla:devicemanager"
+        windowtype="mozilla:devicemanager"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&devmgr.title;"
-        style="&devmgr.style2;"
+        data-l10n-id="devmgr"
+        data-l10n-attrs="style"
         persist="screenX screenY width height"
         onload="LoadModules();"
         buttons="accept">
 
-<stringbundleset id="stringbundleset">
-  <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
-  <stringbundle id="pipnss_bundle" src="chrome://pipnss/locale/pipnss.properties"/>
-</stringbundleset>
+<linkset>
+  <link rel="localization" href="security/certificates/deviceManager.ftl"/>
+</linkset>
 
 <script type="application/javascript" src="chrome://pippki/content/device_manager.js"/>
 
@@ -41,7 +35,7 @@
               onselect="enableButtons();" hidecolumnpicker="true"
               flex="1" style="min-width: 15em">
           <treecols>
-            <treecol id="deviceCol" flex="1" primary="true" label="&devmgr.devlist.label;"/>
+            <treecol id="deviceCol" flex="1" primary="true" data-l10n-id="devmgr-devlist"/>
           </treecols>
           <treechildren id="device_list"/>
         </tree>
@@ -50,36 +44,30 @@
         <tree id="info_tree" seltype="single" hidecolumnpicker="true"
               flex="1" style="min-width: 10em">
           <treecols>
-            <treecol id="title1Col" flex="5" primary="true" label="&devmgr.details.title;"/>
-            <treecol id="title2Col" flex="7" label="&devmgr.details.title2;"/>
+            <treecol id="title1Col" flex="5" primary="true" data-l10n-id="devmgr-header-details"/>
+            <treecol id="title2Col" flex="7" data-l10n-id="devmgr-header-value"/>
           </treecols>
           <treechildren id="info_list"/>
         </tree>
       </vbox> <!-- / Device status -->
       <vbox> <!-- Buttons for manipulating devices -->
         <button id="login_button"
-                label="&devmgr.button.login.label;"
-                accesskey="&devmgr.button.login.accesskey;"
+                data-l10n-id="devmgr-button-login"
                 oncommand="doLogin();" disabled="true"/>
         <button id="logout_button"
-                label="&devmgr.button.logout.label;"
-                accesskey="&devmgr.button.logout.accesskey;"
+                data-l10n-id="devmgr-button-logout"
                 oncommand="doLogout();" disabled="true"/>
         <button id="change_pw_button"
-                label="&devmgr.button.changepw.label;"
-                accesskey="&devmgr.button.changepw.accesskey;"
+                data-l10n-id="devmgr-button-changepw"
                 oncommand="changePassword();" disabled="true"/>
         <button id="load_button"
-                label="&devmgr.button.load.label;"
-                accesskey="&devmgr.button.load.accesskey;"
+                data-l10n-id="devmgr-button-load"
                 oncommand="doLoad();"/>
         <button id="unload_button"
-                label="&devmgr.button.unload.label;"
-                accesskey="&devmgr.button.unload.accesskey;"
+                data-l10n-id="devmgr-button-unload"
                 oncommand="doUnload();" disabled="true"/>
         <button id="fipsbutton"
-                label=""
-                accesskey="&devmgr.button.fips.accesskey;"
+                data-l10n-id="devmgr-button-enable-fips"
                 oncommand="toggleFIPS();"/>
       </vbox> <!-- / Buttons for manipulating devices -->
     </row>
diff --git a/security/manager/pki/resources/content/load_device.js b/security/manager/pki/resources/content/load_device.js
index 4ab8e0a98452..95190e663679 100644
--- a/security/manager/pki/resources/content/load_device.js
+++ b/security/manager/pki/resources/content/load_device.js
@@ -9,11 +9,10 @@
  *       a PKCS #11 module to be loaded into Firefox.
  */
 
-function onBrowseBtnPress() {
-  let bundle = document.getElementById("pippki_bundle");
+async function onBrowseBtnPress() {
   let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-  fp.init(window, bundle.getString("loadPK11ModuleFilePickerTitle"),
-          Ci.nsIFilePicker.modeOpen);
+  let [loadPK11ModuleFilePickerTitle] = await document.l10n.formatValues([{id: "load-pk11-module-file-picker-title"}]);
+  fp.init(window, loadPK11ModuleFilePickerTitle, Ci.nsIFilePicker.modeOpen);
   fp.appendFilters(Ci.nsIFilePicker.filterAll);
   fp.open(rv => {
     if (rv == Ci.nsIFilePicker.returnOK) {
@@ -32,7 +31,6 @@ function onBrowseBtnPress() {
  * @returns {Boolean} true to make the dialog close, false otherwise.
  */
 function onDialogAccept() {
-  let bundle = document.getElementById("pipnss_bundle");
   let nameBox = document.getElementById("device_name");
   let pathBox = document.getElementById("device_path");
   let pkcs11ModuleDB = Cc["@mozilla.org/security/pkcs11moduledb;1"]
@@ -41,26 +39,30 @@ function onDialogAccept() {
   try {
     pkcs11ModuleDB.addModule(nameBox.value, pathBox.value, 0, 0);
   } catch (e) {
-    alertPromptService(null, bundle.getString("AddModuleFailure"));
+    addModuleFailure("add-module-failure");
     return false;
   }
 
   return true;
 }
 
+async function addModuleFailure(l10nID) {
+  let [AddModuleFailure] = await document.l10n.formatValues([{id: l10nID}]);
+  alertPromptService(null, AddModuleFailure);
+}
+
 function validateModuleName() {
-  let bundle = document.getElementById("pippki_bundle");
   let name = document.getElementById("device_name").value;
   let helpText = document.getElementById("helpText");
   helpText.value = "";
   let dialogNode = document.querySelector("dialog");
   dialogNode.removeAttribute("buttondisabledaccept");
   if (name == "") {
-    helpText.value = bundle.getString("loadModuleHelp_emptyModuleName");
+    document.l10n.setAttributes(helpText, "load-module-help-empty-module-name");
     dialogNode.setAttribute("buttondisabledaccept", true);
   }
   if (name == "Root Certs") {
-    helpText.value = bundle.getString("loadModuleHelp_rootCertsModuleName");
+    document.l10n.setAttributes(helpText, "load-module-help-root-certs-module-name");
     dialogNode.setAttribute("buttondisabledaccept", true);
   }
 }
diff --git a/security/manager/pki/resources/content/load_device.xul b/security/manager/pki/resources/content/load_device.xul
index f7cfca3cacf7..829d42268658 100644
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/security/manager/pki/resources/content/load_device.xul
@@ -5,39 +5,37 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<!DOCTYPE dialog [
-<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
-%deviceManangerDTD;
-]>
+<!DOCTYPE dialog>
 
 <dialog id="loaddevice"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&loaddevice.title2;"
+        data-l10n-id="load-device"
         buttons="accept,cancel"
         ondialogaccept="return onDialogAccept();">
 
-<stringbundleset id="stringbundleset">
-  <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
-  <stringbundle id="pipnss_bundle" src="chrome://pipnss/locale/pipnss.properties"/>
-</stringbundleset>
+  <linkset>
+    <link rel="localization" href="security/certificates/deviceManager.ftl"/>
+  </linkset>
 
   <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/javascript"
           src="chrome://pippki/content/load_device.js"/>
 
-  <description>&loaddevice.info;</description>
+  <description data-l10n-id="load-device-info"></description>
   <hbox align="center">
-    <label value="&loaddevice.modname2;" accesskey="&loaddevice.modname2.accesskey;"
+    <label data-l10n-id="load-device-modname"
            control="device_name"/>
-    <textbox id="device_name" flex="1" value="&loaddevice.modname.default;"
+    <textbox id="device_name" flex="1"
+             data-l10n-id="load-device-modname-default"
+             data-l10n-attrs="value"
              onchange="validateModuleName();"/>
   </hbox>
   <hbox align="center">
-    <label value="&loaddevice.filename2;" accesskey="&loaddevice.filename2.accesskey;"
+    <label data-l10n-id="load-device-filename"
            control="device_path"/>
     <textbox id="device_path" flex="1"/>
-    <button id="browse" label="&loaddevice.browse;" flex="1"
-            accesskey="&loaddevice.browse.accesskey;"
+    <button id="browse" flex="1"
+            data-l10n-id="load-device-browse"
             oncommand="onBrowseBtnPress();"/>
   </hbox>
   <label id="helpText" value=""/>

From 50fbf54ef3109a5738a3331e8fa014e7f2f928c9 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Tue, 13 Nov 2018 09:07:38 +0000
Subject: [PATCH 08/33] Bug 1506559 - Enable ESLint for
 memory/replace/dmd/test/. r=njn

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

--HG--
extra : moz-landing-system : lando
---
 .eslintignore                        |  1 -
 memory/replace/dmd/test/.eslintrc.js |  7 +++++++
 memory/replace/dmd/test/test_dmd.js  | 17 +++++++----------
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 memory/replace/dmd/test/.eslintrc.js

diff --git a/.eslintignore b/.eslintignore
index 0b994b32dbee..3666cb7fa3ae 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -26,7 +26,6 @@ gfx/tests/chrome/**
 gfx/tests/mochitest/**
 image/**
 layout/**
-memory/replace/dmd/test/**
 modules/**
 netwerk/cookie/test/browser/**
 netwerk/test/browser/**
diff --git a/memory/replace/dmd/test/.eslintrc.js b/memory/replace/dmd/test/.eslintrc.js
new file mode 100644
index 000000000000..70fe35407782
--- /dev/null
+++ b/memory/replace/dmd/test/.eslintrc.js
@@ -0,0 +1,7 @@
+"use strict";
+
+module.exports = {
+  "extends": [
+    "plugin:mozilla/xpcshell-test"
+  ]
+};
diff --git a/memory/replace/dmd/test/test_dmd.js b/memory/replace/dmd/test/test_dmd.js
index 0efeaac8dc57..158b4e79a31b 100644
--- a/memory/replace/dmd/test/test_dmd.js
+++ b/memory/replace/dmd/test/test_dmd.js
@@ -6,9 +6,8 @@
 
 "use strict";
 
-var {classes: Cc, interfaces: Ci, utils: Cu} = Components
-
 ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // The xpcshell test harness sets PYTHON so we can read it here.
 var gEnv = Cc["@mozilla.org/process/environment;1"]
@@ -30,8 +29,7 @@ function getExecutable(aFilename) {
   return file;
 }
 
-var gIsWindows = Cc["@mozilla.org/xre/app-info;1"]
-                 .getService(Ci.nsIXULRuntime).OS === "WINNT";
+var gIsWindows = Services.appinfo.OS === "WINNT";
 var gDmdTestFile = getExecutable("SmokeDMD" + (gIsWindows ? ".exe" : ""));
 
 var gDmdScriptFile = getExecutable("dmd.py");
@@ -55,7 +53,7 @@ function readFile(aFile) {
     data += str.value;
   } while (read != 0);
 
-  cstream.close();                // this closes fstream
+  cstream.close(); // this closes fstream
   return data.replace(/\r/g, ""); // normalize line endings
 }
 
@@ -78,7 +76,7 @@ function test(aPrefix, aArgs) {
   let args = [
     gDmdScriptFile.path,
     "--filter-stacks-for-testing",
-    "-o", actualFile.path
+    "-o", actualFile.path,
   ].concat(aArgs);
 
   runProcess(new FileUtils.File(gPythonName), args);
@@ -136,7 +134,7 @@ function run_test() {
   // in-place (to fix stacks) when it runs dmd.py, and that's not safe to do
   // asynchronously.
 
-  gEnv.set('DMD', '1');
+  gEnv.set("DMD", "1");
 
   runProcess(gDmdTestFile, []);
 
@@ -165,8 +163,7 @@ function run_test() {
   jsonFile = FileUtils.getFile("CurWorkD", ["basic-scan.json"]);
   ok(scanTest(jsonFile.path), "Basic scan test");
 
-  let is64Bit = Cc["@mozilla.org/xre/app-info;1"]
-                  .getService(Ci.nsIXULRuntime).is64Bit;
+  let is64Bit = Services.appinfo.is64Bit;
   let basicScanFileName = "basic-scan-" + (is64Bit ? "64" : "32");
   test(basicScanFileName, ["--clamp-contents", jsonFile.path]);
   ok(scanTest(jsonFile.path, ["--clamp-contents"]), "Scan with address clamping");
@@ -187,7 +184,7 @@ function run_test() {
   // of the tested values.
   jsonFile = FileUtils.getFile("CurWorkD", ["script-max-frames.json"]);
   test("script-max-frames-8",
-       [jsonFile.path]);  // --max-frames=8 is the default
+       [jsonFile.path]); // --max-frames=8 is the default
   test("script-max-frames-3",
        ["--max-frames=3", "--no-fix-stacks", jsonFile.path]);
   test("script-max-frames-1",

From 582b645d9bd0b30bd92527cd405e62e78073b74d Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 12 Nov 2018 15:25:38 +0000
Subject: [PATCH 09/33] Bug 1504904 - Don't use GDK_IS_WAYLAND_DISPLAY() as
 it's missing on Gtk+ X11 only builds, r=jhorak

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

--HG--
extra : moz-landing-system : lando
---
 gfx/gl/GLContextProviderEGL.cpp    | 6 +++---
 gfx/gl/GLLibraryEGL.cpp            | 2 +-
 gfx/thebes/gfxPlatformGtk.cpp      | 2 +-
 toolkit/xre/nsAppRunner.cpp        | 2 +-
 widget/gtk/ScreenHelperGTK.cpp     | 2 +-
 widget/gtk/mozcontainer.cpp        | 2 +-
 widget/gtk/mozwayland/mozwayland.c | 9 ---------
 widget/gtk/nsWindow.cpp            | 4 ++--
 8 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index dd3f4220be6f..fc984c02a5e3 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -100,7 +100,7 @@ DeleteWaylandGLSurface(EGLSurface surface)
 {
     // We're running on Wayland which means our EGLSurface may
     // have attached Wayland backend data which must be released.
-    if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {
+    if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
         auto entry = sWaylandGLSurface.Lookup(surface);
         if (entry) {
             delete entry.Data();
@@ -970,7 +970,7 @@ FillContextAttribs(bool alpha, bool depth, bool stencil, bool bpp16,
 {
     out->AppendElement(LOCAL_EGL_SURFACE_TYPE);
 #if defined(MOZ_WAYLAND)
-    if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {
+    if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
         // Wayland on desktop does not support PBuffer or FBO.
         // We create a dummy wl_egl_window instead.
         out->AppendElement(LOCAL_EGL_WINDOW_BIT);
@@ -1101,7 +1101,7 @@ GLContextEGL::CreateEGLPBufferOffscreenContext(CreateContextFlags flags,
     mozilla::gfx::IntSize pbSize(size);
     EGLSurface surface = nullptr;
 #if defined(MOZ_WAYLAND)
-    if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {
+    if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
         surface = GLContextEGL::CreateWaylandBufferSurface(config, pbSize);
     } else
 #endif
diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
index f7f826c7baed..c6660c8afeec 100644
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -774,7 +774,7 @@ GLLibraryEGL::CreateDisplay(bool forceAccel, const nsCOMPtr<nsIGfxInfo>& gfxInfo
 #ifdef MOZ_WAYLAND
         // Some drivers doesn't support EGL_DEFAULT_DISPLAY
         GdkDisplay *gdkDisplay = gdk_display_get_default();
-        if (GDK_IS_WAYLAND_DISPLAY(gdkDisplay)) {
+        if (!GDK_IS_X11_DISPLAY(gdkDisplay)) {
             static auto sGdkWaylandDisplayGetWlDisplay =
                 (wl_display *(*)(GdkDisplay *))
                 dlsym(RTLD_DEFAULT, "gdk_wayland_display_get_wl_display");
diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index 2c5bba90ddd2..7ae12c83f19a 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -799,7 +799,7 @@ already_AddRefed<gfx::VsyncSource>
 gfxPlatformGtk::CreateHardwareVsyncSource()
 {
 #ifdef MOZ_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {
+  if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
     RefPtr<VsyncSource> vsyncSource = new GtkVsyncSource();
     VsyncSource::Display& display = vsyncSource->GetGlobalDisplay();
     static_cast<GtkVsyncSource::GLXDisplay&>(display).SetupWayland();
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index b601b65fce8c..fae9cfb02eba 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4034,7 +4034,7 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
             SaveWordToEnv("DISPLAY", nsDependentCString(display_name));
         }
 #ifdef MOZ_WAYLAND
-        else if (GDK_IS_WAYLAND_DISPLAY(mGdkDisplay)) {
+        else if (!GDK_IS_X11_DISPLAY(mGdkDisplay)) {
             SaveWordToEnv("WAYLAND_DISPLAY", nsDependentCString(display_name));
         }
 #endif
diff --git a/widget/gtk/ScreenHelperGTK.cpp b/widget/gtk/ScreenHelperGTK.cpp
index b13d228f712b..ada86e9d48e3 100644
--- a/widget/gtk/ScreenHelperGTK.cpp
+++ b/widget/gtk/ScreenHelperGTK.cpp
@@ -155,7 +155,7 @@ MakeScreen(GdkScreen* aScreen, gint aMonitorNum)
   DesktopToLayoutDeviceScale contentsScale(1.0);
 #ifdef MOZ_WAYLAND
     GdkDisplay* gdkDisplay = gdk_display_get_default();
-    if (GDK_IS_WAYLAND_DISPLAY(gdkDisplay)) {
+    if (!GDK_IS_X11_DISPLAY(gdkDisplay)) {
       contentsScale.scale = gdkScaleFactor;
     }
 #endif
diff --git a/widget/gtk/mozcontainer.cpp b/widget/gtk/mozcontainer.cpp
index 4834f3acdba3..2c9c599b7918 100644
--- a/widget/gtk/mozcontainer.cpp
+++ b/widget/gtk/mozcontainer.cpp
@@ -215,7 +215,7 @@ moz_container_init (MozContainer *container)
       container->parent_surface_committed = false;
 
       GdkDisplay *gdk_display = gtk_widget_get_display(GTK_WIDGET(container));
-      if (GDK_IS_WAYLAND_DISPLAY (gdk_display)) {
+      if (!GDK_IS_X11_DISPLAY(gdk_display)) {
           // Available as of GTK 3.8+
           static auto sGdkWaylandDisplayGetWlDisplay =
               (wl_display *(*)(GdkDisplay *))
diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
index 4e5fca15483e..b2f6f88ea7ca 100644
--- a/widget/gtk/mozwayland/mozwayland.c
+++ b/widget/gtk/mozwayland/mozwayland.c
@@ -303,12 +303,3 @@ wl_egl_window_resize(struct wl_egl_window *egl_window,
 {
 }
 
-MOZ_EXPORT GType
-gdk_wayland_display_get_type(void)
-{
-   // This shouldn't be ever called.
-   abort();
-
-   return GDK_TYPE_X11_DISPLAY;
-}
-
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
index ebc9d768f5bc..7d2ebfa80a48 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -833,7 +833,7 @@ nsWindow::GetDesktopToDeviceScale()
 {
 #ifdef MOZ_WAYLAND
     GdkDisplay* gdkDisplay = gdk_display_get_default();
-    if (GDK_IS_WAYLAND_DISPLAY(gdkDisplay)) {
+    if (!GDK_IS_X11_DISPLAY(gdkDisplay)) {
         return DesktopToLayoutDeviceScale(GdkScaleFactor());
     }
 #endif
@@ -853,7 +853,7 @@ nsWindow::GetDesktopToDeviceScaleByScreen()
     // so the GdkScaleFactor can return wrong value which can lead to wrong popup
     // placement.
     // We need to use parent's window scale factor for the new one.
-    if (GDK_IS_WAYLAND_DISPLAY(gdkDisplay)) {
+    if (!GDK_IS_X11_DISPLAY(gdkDisplay)) {
         nsView* view = nsView::GetViewFor(this);
         if (view) {
             nsView* parentView = view->GetParent();

From 1471c70fb747ea847392784bceb9276ff1f6a4be Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Tue, 13 Nov 2018 09:11:06 +0000
Subject: [PATCH 10/33] Bug 1506542 - Add run-time flag to enable bigint
 support r=jandem

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

--HG--
extra : moz-landing-system : lando
---
 js/src/fuzz-tests/tests.cpp           |  3 +++
 js/src/jsapi-tests/tests.cpp          |  3 +++
 js/src/jsapi.h                        | 14 ++++++++++++++
 js/src/shell/js.cpp                   | 12 ++++++++++++
 js/src/vm/GlobalObject.cpp            |  5 +++++
 js/xpconnect/src/XPCJSContext.cpp     | 10 ++++++++++
 modules/libpref/init/StaticPrefList.h |  9 +++++++++
 modules/libpref/init/all.js           |  3 +++
 8 files changed, 59 insertions(+)

diff --git a/js/src/fuzz-tests/tests.cpp b/js/src/fuzz-tests/tests.cpp
index 74d608dfa369..c605904a4125 100644
--- a/js/src/fuzz-tests/tests.cpp
+++ b/js/src/fuzz-tests/tests.cpp
@@ -45,6 +45,9 @@ jsfuzz_createGlobal(JSContext* cx, JSPrincipals* principals)
     JS::RootedObject newGlobal(cx);
     JS::RealmOptions options;
     options.creationOptions().setStreamsEnabled(true);
+#ifdef ENABLE_BIGINT
+    options.creationOptions().setBigIntEnabled(true);
+#endif
     newGlobal = JS_NewGlobalObject(cx, getGlobalClass(), principals, JS::FireOnNewGlobalHook,
                                    options);
     if (!newGlobal) {
diff --git a/js/src/jsapi-tests/tests.cpp b/js/src/jsapi-tests/tests.cpp
index e95248450857..93bfd384cd3a 100644
--- a/js/src/jsapi-tests/tests.cpp
+++ b/js/src/jsapi-tests/tests.cpp
@@ -86,6 +86,9 @@ JSObject* JSAPITest::createGlobal(JSPrincipals* principals)
     JS::RootedObject newGlobal(cx);
     JS::RealmOptions options;
     options.creationOptions().setStreamsEnabled(true);
+#ifdef ENABLE_BIGINT
+    options.creationOptions().setBigIntEnabled(true);
+#endif
     newGlobal = JS_NewGlobalObject(cx, getGlobalClass(), principals, JS::FireOnNewGlobalHook,
                                    options);
     if (!newGlobal) {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index ce0dfc5747b6..91e4426783d7 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1501,6 +1501,9 @@ class JS_PUBLIC_API(RealmCreationOptions)
         cloneSingletons_(false),
         sharedMemoryAndAtomics_(false),
         streams_(false),
+#ifdef ENABLE_BIGINT
+        bigint_(false),
+#endif
         secureContext_(false),
         clampAndJitterTime_(true)
     {}
@@ -1572,6 +1575,14 @@ class JS_PUBLIC_API(RealmCreationOptions)
         return *this;
     }
 
+#ifdef ENABLE_BIGINT
+    bool getBigIntEnabled() const { return bigint_; }
+    RealmCreationOptions& setBigIntEnabled(bool flag) {
+        bigint_ = flag;
+        return *this;
+    }
+#endif
+
     // This flag doesn't affect JS engine behavior.  It is used by Gecko to
     // mark whether content windows and workers are "Secure Context"s. See
     // https://w3c.github.io/webappsec-secure-contexts/
@@ -1601,6 +1612,9 @@ class JS_PUBLIC_API(RealmCreationOptions)
     bool cloneSingletons_;
     bool sharedMemoryAndAtomics_;
     bool streams_;
+#ifdef ENABLE_BIGINT
+    bool bigint_;
+#endif
     bool secureContext_;
     bool clampAndJitterTime_;
 };
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 1f54c99719a6..1a0b3a21e870 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -522,6 +522,9 @@ static bool enableWasmGc = false;
 static bool enableTestWasmAwaitTier2 = false;
 static bool enableAsyncStacks = false;
 static bool enableStreams = false;
+#ifdef ENABLE_BIGINT
+static bool enableBigInt = false;
+#endif
 #ifdef JS_GC_ZEAL
 static uint32_t gZealBits = 0;
 static uint32_t gZealFrequency = 0;
@@ -3749,6 +3752,9 @@ static void
 SetStandardRealmOptions(JS::RealmOptions& options)
 {
     options.creationOptions().setSharedMemoryAndAtomicsEnabled(enableSharedMemory)
+#ifdef ENABLE_BIGINT
+                             .setBigIntEnabled(enableBigInt)
+#endif
                              .setStreamsEnabled(enableStreams);
 
 }
@@ -10366,6 +10372,9 @@ SetContextOptions(JSContext* cx, const OptionParser& op)
     enableTestWasmAwaitTier2 = op.getBoolOption("test-wasm-await-tier2");
     enableAsyncStacks = !op.getBoolOption("no-async-stacks");
     enableStreams = !op.getBoolOption("no-streams");
+#ifdef ENABLE_BIGINT
+    enableBigInt = !op.getBoolOption("no-bigint");
+#endif
 
 #if defined ENABLE_WASM_GC && defined ENABLE_WASM_CRANELIFT
     // Note, once we remove --wasm-gc this test will no longer make any sense
@@ -11001,6 +11010,9 @@ main(int argc, char** argv, char** envp)
         || !op.addBoolOption('\0', "no-unboxed-objects", "Disable creating unboxed plain objects")
         || !op.addBoolOption('\0', "enable-streams", "Enable WHATWG Streams (default)")
         || !op.addBoolOption('\0', "no-streams", "Disable WHATWG Streams")
+#ifdef ENABLE_BIGINT
+        || !op.addBoolOption('\0', "no-bigint", "Disable experimental BigInt support")
+#endif
 #ifdef ENABLE_SHARED_ARRAY_BUFFER
         || !op.addStringOption('\0', "shared-memory", "on/off",
                                "SharedArrayBuffer and Atomics "
diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index b43a72458948..293d61dc6370 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -110,6 +110,11 @@ GlobalObject::skipDeselectedConstructor(JSContext* cx, JSProtoKey key)
       case JSProto_CountQueuingStrategy:
         return !cx->realm()->creationOptions().getStreamsEnabled();
 
+#ifdef ENABLE_BIGINT
+      case JSProto_BigInt:
+        return !cx->realm()->creationOptions().getBigIntEnabled();
+#endif
+
       // Return true if the given constructor has been disabled at run-time.
       case JSProto_Atomics:
       case JSProto_SharedArrayBuffer:
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
index cf56baa14d5e..ad9358b161c4 100644
--- a/js/xpconnect/src/XPCJSContext.cpp
+++ b/js/xpconnect/src/XPCJSContext.cpp
@@ -784,11 +784,17 @@ bool xpc::ExtraWarningsForSystemJS() { return false; }
 
 static mozilla::Atomic<bool> sSharedMemoryEnabled(false);
 static mozilla::Atomic<bool> sStreamsEnabled(false);
+#ifdef ENABLE_BIGINT
+static mozilla::Atomic<bool> sBigIntEnabled(false);
+#endif
 
 void
 xpc::SetPrefableRealmOptions(JS::RealmOptions &options)
 {
     options.creationOptions().setSharedMemoryAndAtomicsEnabled(sSharedMemoryEnabled)
+#ifdef ENABLE_BIGINT
+                             .setBigIntEnabled(sBigIntEnabled)
+#endif
                              .setStreamsEnabled(sStreamsEnabled);
 }
 
@@ -831,6 +837,10 @@ ReloadPrefsCallback(const char* pref, XPCJSContext* xpccx)
 
     bool useAsyncStack = Preferences::GetBool(JS_OPTIONS_DOT_STR "asyncstack");
 
+#ifdef ENABLE_BIGINT
+    sBigIntEnabled = Preferences::GetBool(JS_OPTIONS_DOT_STR "bigint");
+#endif
+
     bool throwOnDebuggeeWouldRun = Preferences::GetBool(JS_OPTIONS_DOT_STR
                                                         "throw_on_debuggee_would_run");
 
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
index bd41c88dbe00..c0555a29e9fb 100644
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -894,6 +894,15 @@ VARCACHE_PREF(
   RelaxedAtomicBool, false
 )
 
+#ifdef ENABLE_BIGINT
+// BigInt API
+VARCACHE_PREF(
+  "javascript.options.bigint",
+   javascript_options_bigint,
+  RelaxedAtomicBool, false
+)
+#endif
+
 
 //---------------------------------------------------------------------------
 // Media prefs
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 9d9b030ca70b..75cc31de0820 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1569,6 +1569,9 @@ pref("javascript.options.streams", true);
 pref("javascript.options.streams", false);
 #endif
 
+// BigInt API
+pref("javascript.options.bigint", false);
+
 // advanced prefs
 pref("advanced.mailftp",                    false);
 pref("image.animation_mode",                "normal");

From 6218cd4d20c7d83837b1889ced46c9aecc69f2ed Mon Sep 17 00:00:00 2001
From: Siddhant085 <dpsrkp.sid@gmail.com>
Date: Tue, 13 Nov 2018 09:34:00 +0000
Subject: [PATCH 11/33] Bug 1503851 - Replace Services.search.currentEngine by
 defaultEngine in test code r=Standard8

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

--HG--
extra : moz-landing-system : lando
---
 .../browser_aboutHome_search_composing.js     |  8 +-
 .../browser_aboutHome_search_suggestion.js    |  6 +-
 .../browser_aboutHome_search_telemetry.js     |  8 +-
 .../test/general/browser_contentSearchUI.js   |  6 +-
 .../test/general/browser_newTabDrop.js        |  6 +-
 .../test/general/browser_newWindowDrop.js     |  6 +-
 .../content/test/general/browser_tabDrop.js   |  6 +-
 .../content/test/general/contentSearchUI.js   |  2 +-
 .../urlbar/browser_action_searchengine.js     |  6 +-
 .../browser_action_searchengine_alias.js      |  6 +-
 .../urlbar/browser_autocomplete_a11y_label.js |  6 +-
 .../urlbar/browser_autocomplete_enter_race.js |  6 +-
 .../test/urlbar/browser_canonizeURL.js        |  6 +-
 .../test/urlbar/browser_dragdropURL.js        |  6 +-
 .../test/urlbar/browser_search_favicon.js     |  6 +-
 ...browser_urlbarOneOffs_searchSuggestions.js |  6 +-
 .../test/urlbar/browser_urlbarPlaceholder.js  |  8 +-
 .../urlbar/browser_urlbarSearchSuggestions.js | 10 +--
 ...browser_urlbarSearchSuggestions_opt-out.js |  6 +-
 .../urlbar/browser_urlbarSearchTelemetry.js   |  8 +-
 .../browser_urlbarStopSearchOnSelection.js    |  6 +-
 ...rlbar_search_speculative_connect_engine.js |  6 +-
 ...r_ext_settings_overrides_default_search.js | 76 +++++++++----------
 ...er_ext_webNavigation_urlbar_transitions.js |  6 +-
 .../test_ext_settings_overrides_search.js     |  4 +-
 .../components/search/test/browser_426329.js  |  4 +-
 .../search/test/browser_aboutSearchReset.js   |  8 +-
 .../search/test/browser_addEngine.js          |  6 +-
 .../search/test/browser_contextmenu.js        |  6 +-
 .../search/test/browser_google_behavior.js    |  6 +-
 .../search/test/browser_healthreport.js       |  4 +-
 .../test/browser_hiddenOneOffs_diacritics.js  |  4 +-
 .../browser_oneOffContextMenu_setDefault.js   |  8 +-
 .../test/browser_searchEngine_behaviors.js    |  6 +-
 browser/components/search/test/head.js        |  6 +-
 .../test/browser/browser_ContentSearch.js     | 16 ++--
 .../browser/browser_UsageTelemetry_content.js |  6 +-
 ...rowser_UsageTelemetry_content_aboutHome.js |  6 +-
 .../browser_UsageTelemetry_searchbar.js       | 24 +++---
 .../browser/browser_UsageTelemetry_urlbar.js  | 12 +--
 .../unifiedcomplete/head_autocomplete.js      |  2 +-
 .../test_search_engine_current.js             |  4 +-
 .../test_search_suggestions.js                |  6 +-
 .../xpcshell/test_addEngineWithDetails.js     |  4 +-
 .../test_addEngineWithDetailsObject.js        |  6 +-
 .../tests/xpcshell/test_notifications.js      |  2 +-
 .../search/tests/xpcshell/test_searchReset.js | 12 +--
 .../tests/xpcshell/test_selectedEngine.js     | 44 +++++------
 .../tests/xpcshell/test_sendSubmissionURL.js  |  2 +-
 49 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/browser/base/content/test/about/browser_aboutHome_search_composing.js b/browser/base/content/test/about/browser_aboutHome_search_composing.js
index 23a94d8914b9..15ee4ec0ba14 100644
--- a/browser/base/content/test/about/browser_aboutHome_search_composing.js
+++ b/browser/base/content/test/about/browser_aboutHome_search_composing.js
@@ -9,10 +9,10 @@ add_task(async function() {
 
   await BrowserTestUtils.withNewTab({ gBrowser, url: "about:home" }, async function(browser) {
     // Add a test engine that provides suggestions and switch to it.
-    let currEngine = Services.search.currentEngine;
+    let currEngine = Services.search.defaultEngine;
     let engine = await promiseNewEngine("searchSuggestionEngine.xml");
     let p = promiseContentSearchChange(browser, engine.name);
-    Services.search.currentEngine = engine;
+    Services.search.defaultEngine = engine;
     await p;
 
     await ContentTask.spawn(browser, null, async function() {
@@ -68,7 +68,7 @@ add_task(async function() {
     await mutationPromise;
 
     // Click the second suggestion.
-    let expectedURL = Services.search.currentEngine
+    let expectedURL = Services.search.defaultEngine
       .getSubmission("xbar", null, "homepage").uri.spec;
     let loadPromise = waitForDocLoadAndStopIt(expectedURL);
     await BrowserTestUtils.synthesizeMouseAtCenter("#TEMPID", {
@@ -76,7 +76,7 @@ add_task(async function() {
     }, browser);
     await loadPromise;
 
-    Services.search.currentEngine = currEngine;
+    Services.search.defaultEngine = currEngine;
     try {
       Services.search.removeEngine(engine);
     } catch (ex) { }
diff --git a/browser/base/content/test/about/browser_aboutHome_search_suggestion.js b/browser/base/content/test/about/browser_aboutHome_search_suggestion.js
index 908ab45c46e9..6623f32c3746 100644
--- a/browser/base/content/test/about/browser_aboutHome_search_suggestion.js
+++ b/browser/base/content/test/about/browser_aboutHome_search_suggestion.js
@@ -10,10 +10,10 @@ add_task(async function() {
 
   await BrowserTestUtils.withNewTab({ gBrowser, url: "about:home" }, async function(browser) {
     // Add a test engine that provides suggestions and switch to it.
-    let currEngine = Services.search.currentEngine;
+    let currEngine = Services.search.defaultEngine;
     let engine = await promiseNewEngine("searchSuggestionEngine.xml");
     let p = promiseContentSearchChange(browser, engine.name);
-    Services.search.currentEngine = engine;
+    Services.search.defaultEngine = engine;
     await p;
 
     await ContentTask.spawn(browser, null, async function() {
@@ -54,7 +54,7 @@ add_task(async function() {
         "Search suggestion table hidden");
     });
 
-    Services.search.currentEngine = currEngine;
+    Services.search.defaultEngine = currEngine;
     try {
       Services.search.removeEngine(engine);
     } catch (ex) { }
diff --git a/browser/base/content/test/about/browser_aboutHome_search_telemetry.js b/browser/base/content/test/about/browser_aboutHome_search_telemetry.js
index 023b8a05fefe..ee824135aea4 100644
--- a/browser/base/content/test/about/browser_aboutHome_search_telemetry.js
+++ b/browser/base/content/test/about/browser_aboutHome_search_telemetry.js
@@ -8,14 +8,14 @@ add_task(async function() {
   info("Check that performing a search fires a search event and records to Telemetry.");
 
   await BrowserTestUtils.withNewTab({ gBrowser, url: "about:home" }, async function(browser) {
-    let currEngine = Services.search.currentEngine;
+    let currEngine = Services.search.defaultEngine;
     let engine = await promiseNewEngine("searchSuggestionEngine.xml");
     // Make this actually work in healthreport by giving it an ID:
     Object.defineProperty(engine.wrappedJSObject, "identifier",
                           { value: "org.mozilla.testsearchsuggestions" });
 
     let p = promiseContentSearchChange(browser, engine.name);
-    Services.search.currentEngine = engine;
+    Services.search.defaultEngine = engine;
     await p;
 
     await ContentTask.spawn(browser, { expectedName: engine.name }, async function(args) {
@@ -37,7 +37,7 @@ add_task(async function() {
 
     let searchStr = "a search";
 
-    let expectedURL = Services.search.currentEngine
+    let expectedURL = Services.search.defaultEngine
       .getSubmission(searchStr, null, "homepage").uri.spec;
     let promise = waitForDocLoadAndStopIt(expectedURL, browser);
 
@@ -58,7 +58,7 @@ add_task(async function() {
     Assert.equal(hs[histogramKey].sum, numSearchesBefore + 1,
                  "histogram sum should be incremented");
 
-    Services.search.currentEngine = currEngine;
+    Services.search.defaultEngine = currEngine;
     try {
       Services.search.removeEngine(engine);
     } catch (ex) {}
diff --git a/browser/base/content/test/general/browser_contentSearchUI.js b/browser/base/content/test/general/browser_contentSearchUI.js
index 91f071e00ed3..8f612e314c2a 100644
--- a/browser/base/content/test/general/browser_contentSearchUI.js
+++ b/browser/base/content/test/general/browser_contentSearchUI.js
@@ -737,7 +737,7 @@ function promiseMsg(name, type, msgMan) {
 function setUpEngines() {
   return (async function() {
     info("Removing default search engines");
-    let currentEngineName = Services.search.currentEngine.name;
+    let currentEngineName = Services.search.defaultEngine.name;
     let currentEngines = Services.search.getVisibleEngines();
     info("Adding test search engines");
     let rootDir = getRootDirectory(gTestPath);
@@ -745,13 +745,13 @@ function setUpEngines() {
       rootDir + TEST_ENGINE_BASENAME);
     await SearchTestUtils.promiseNewSearchEngine(
       rootDir + TEST_ENGINE_2_BASENAME);
-    Services.search.currentEngine = engine1;
+    Services.search.defaultEngine = engine1;
     for (let engine of currentEngines) {
       Services.search.removeEngine(engine);
     }
     registerCleanupFunction(() => {
       Services.search.restoreDefaultEngines();
-      Services.search.currentEngine = Services.search.getEngineByName(currentEngineName);
+      Services.search.defaultEngine = Services.search.getEngineByName(currentEngineName);
     });
   })();
 }
diff --git a/browser/base/content/test/general/browser_newTabDrop.js b/browser/base/content/test/general/browser_newTabDrop.js
index 8ddbe0d69ce5..2565ac716b97 100644
--- a/browser/base/content/test/general/browser_newTabDrop.js
+++ b/browser/base/content/test/general/browser_newTabDrop.js
@@ -4,7 +4,7 @@ registerCleanupFunction(async function cleanup() {
   while (gBrowser.tabs.length > 1) {
     BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
   }
-  Services.search.currentEngine = originalEngine;
+  Services.search.defaultEngine = originalEngine;
   let engine = Services.search.getEngineByName("MozSearch");
   Services.search.removeEngine(engine);
 });
@@ -18,8 +18,8 @@ add_task(async function test_setup() {
   Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
                                        "http://example.com/?q={searchTerms}");
   let engine = Services.search.getEngineByName("MozSearch");
-  originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 });
 
 // New Tab Button opens any link.
diff --git a/browser/base/content/test/general/browser_newWindowDrop.js b/browser/base/content/test/general/browser_newWindowDrop.js
index b78135cf9035..1f9a7bd4cd85 100644
--- a/browser/base/content/test/general/browser_newWindowDrop.js
+++ b/browser/base/content/test/general/browser_newWindowDrop.js
@@ -1,5 +1,5 @@
 registerCleanupFunction(function cleanup() {
-  Services.search.currentEngine = originalEngine;
+  Services.search.defaultEngine = originalEngine;
   let engine = Services.search.getEngineByName("MozSearch");
   Services.search.removeEngine(engine);
 });
@@ -13,8 +13,8 @@ add_task(async function test_setup() {
   Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
                                        "http://example.com/?q={searchTerms}");
   let engine = Services.search.getEngineByName("MozSearch");
-  originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 
   // Move New Window button to nav bar, to make it possible to drag and drop.
   let {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm", {});
diff --git a/browser/base/content/test/general/browser_tabDrop.js b/browser/base/content/test/general/browser_tabDrop.js
index ba514aad902c..9345db2ef5f6 100644
--- a/browser/base/content/test/general/browser_tabDrop.js
+++ b/browser/base/content/test/general/browser_tabDrop.js
@@ -4,7 +4,7 @@ registerCleanupFunction(async function cleanup() {
   while (gBrowser.tabs.length > 1) {
     BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
   }
-  Services.search.currentEngine = originalEngine;
+  Services.search.defaultEngine = originalEngine;
   let engine = Services.search.getEngineByName("MozSearch");
   Services.search.removeEngine(engine);
 });
@@ -15,8 +15,8 @@ add_task(async function test_setup() {
   Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
                                        "http://example.com/?q={searchTerms}");
   let engine = Services.search.getEngineByName("MozSearch");
-  originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 });
 
 add_task(async function single_url() {
diff --git a/browser/base/content/test/general/contentSearchUI.js b/browser/base/content/test/general/contentSearchUI.js
index c6c8a8021583..2bcd615807cc 100644
--- a/browser/base/content/test/general/contentSearchUI.js
+++ b/browser/base/content/test/general/contentSearchUI.js
@@ -18,7 +18,7 @@ addMessageListener(TEST_MSG, msg => {
 var messageHandlers = {
 
   init() {
-    Services.search.currentEngine = Services.search.getEngineByName(ENGINE_NAME);
+    Services.search.defaultEngine = Services.search.getEngineByName(ENGINE_NAME);
     let input = content.document.querySelector("input");
     gController =
       new content.ContentSearchUIController(input, input.parentNode, "test", "test");
diff --git a/browser/base/content/test/urlbar/browser_action_searchengine.js b/browser/base/content/test/urlbar/browser_action_searchengine.js
index 0f8026b120aa..cd98c2152c17 100644
--- a/browser/base/content/test/urlbar/browser_action_searchengine.js
+++ b/browser/base/content/test/urlbar/browser_action_searchengine.js
@@ -5,13 +5,13 @@ add_task(async function() {
   Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
                                        "http://example.com/?q={searchTerms}");
   let engine = Services.search.getEngineByName("MozSearch");
-  let originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:mozilla");
 
   registerCleanupFunction(async function() {
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     Services.search.removeEngine(engine);
     try {
       BrowserTestUtils.removeTab(tab);
diff --git a/browser/base/content/test/urlbar/browser_action_searchengine_alias.js b/browser/base/content/test/urlbar/browser_action_searchengine_alias.js
index 336aaf25fcb3..2548fb27cc2e 100644
--- a/browser/base/content/test/urlbar/browser_action_searchengine_alias.js
+++ b/browser/base/content/test/urlbar/browser_action_searchengine_alias.js
@@ -6,13 +6,13 @@ add_task(async function() {
   Services.search.addEngineWithDetails("MozSearch", iconURI, "moz", "", "GET",
                                        "http://example.com/?q={searchTerms}");
   let engine = Services.search.getEngineByName("MozSearch");
-  let originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:mozilla");
 
   registerCleanupFunction(async function() {
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     Services.search.removeEngine(engine);
     try {
       BrowserTestUtils.removeTab(tab);
diff --git a/browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js b/browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js
index 69df5153397d..09a73781561f 100644
--- a/browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js
+++ b/browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js
@@ -21,13 +21,13 @@ add_task(async function switchToTab() {
 add_task(async function searchSuggestions() {
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let oldCurrentEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
   Services.prefs.setBoolPref(SUGGEST_ALL_PREF, true);
   let suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
   Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
   registerCleanupFunction(function() {
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
     Services.prefs.clearUserPref(SUGGEST_ALL_PREF);
     Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
   });
diff --git a/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js b/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
index 9cd985eee012..7bdadad98e83 100644
--- a/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
+++ b/browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
@@ -66,15 +66,15 @@ add_task(taskWithNewTab(async function test_disabled_ac() {
   Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
                                        "http://example.com/?q={searchTerms}");
   let engine = Services.search.getEngineByName("MozSearch");
-  let originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 
   function cleanup() {
     Preferences.set("browser.urlbar.suggest.history", suggestHistory);
     Preferences.set("browser.urlbar.suggest.bookmark", suggestBookmarks);
     Preferences.set("browser.urlbar.suggest.openpage", suggestOpenPages);
 
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     let mozSearchEngine = Services.search.getEngineByName("MozSearch");
     if (mozSearchEngine) {
       Services.search.removeEngine(mozSearchEngine);
diff --git a/browser/base/content/test/urlbar/browser_canonizeURL.js b/browser/base/content/test/urlbar/browser_canonizeURL.js
index 5a7e3544b6e8..dac8f4bff12a 100644
--- a/browser/base/content/test/urlbar/browser_canonizeURL.js
+++ b/browser/base/content/test/urlbar/browser_canonizeURL.js
@@ -44,9 +44,9 @@ add_task(async function checkPrefTurnsOffCanonize() {
   // Add a dummy search engine to avoid hitting the network.
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
-  registerCleanupFunction(() => { Services.search.currentEngine = oldCurrentEngine; });
+  let oldCurrentEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
+  registerCleanupFunction(() => { Services.search.defaultEngine = oldCurrentEngine; });
 
   let tabsToClose = [];
   // Ensure we don't end up loading something in the current tab becuase it's empty:
diff --git a/browser/base/content/test/urlbar/browser_dragdropURL.js b/browser/base/content/test/urlbar/browser_dragdropURL.js
index 41ab6f168f5b..db4e4bfa74f4 100644
--- a/browser/base/content/test/urlbar/browser_dragdropURL.js
+++ b/browser/base/content/test/urlbar/browser_dragdropURL.js
@@ -12,7 +12,7 @@ registerCleanupFunction(async function cleanup() {
   while (gBrowser.tabs.length > 1) {
     BrowserTestUtils.removeTab(gBrowser.tabs[gBrowser.tabs.length - 1]);
   }
-  Services.search.currentEngine = originalEngine;
+  Services.search.defaultEngine = originalEngine;
   let engine = Services.search.getEngineByName("MozSearch");
   Services.search.removeEngine(engine);
 });
@@ -23,8 +23,8 @@ add_task(async function test_setup() {
   Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
                                        "http://example.com/?q={searchTerms}");
   let engine = Services.search.getEngineByName("MozSearch");
-  originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 });
 
 add_task(async function checkDragURL() {
diff --git a/browser/base/content/test/urlbar/browser_search_favicon.js b/browser/base/content/test/urlbar/browser_search_favicon.js
index 4405244abc0b..47ade464a45a 100644
--- a/browser/base/content/test/urlbar/browser_search_favicon.js
+++ b/browser/base/content/test/urlbar/browser_search_favicon.js
@@ -4,7 +4,7 @@ var gRestyleSearchesPref = "browser.urlbar.restyleSearches";
 
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref(gRestyleSearchesPref);
-  Services.search.currentEngine = gOriginalEngine;
+  Services.search.defaultEngine = gOriginalEngine;
   Services.search.removeEngine(gEngine);
   return PlacesUtils.history.clear();
 });
@@ -23,8 +23,8 @@ add_task(async function() {
                                        "GET", "http://s.example.com/search");
   gEngine = Services.search.getEngineByName("SearchEngine");
   gEngine.addParam("q", "{searchTerms}", null);
-  gOriginalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = gEngine;
+  gOriginalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = gEngine;
 
   let uri = NetUtil.newURI("http://s.example.com/search?q=foobar&client=1");
   await PlacesTestUtils.addVisits({ uri, title: "Foo - SearchEngine Search" });
diff --git a/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js b/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
index ee0dd90f2dc7..82556628cf02 100644
--- a/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
+++ b/browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
@@ -8,11 +8,11 @@ add_task(async function init() {
   });
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
+  let oldCurrentEngine = Services.search.defaultEngine;
   Services.search.moveEngine(engine, 0);
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
   registerCleanupFunction(async function() {
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
 
     await PlacesUtils.history.clear();
     // Make sure the popup is closed for the next test.
diff --git a/browser/base/content/test/urlbar/browser_urlbarPlaceholder.js b/browser/base/content/test/urlbar/browser_urlbarPlaceholder.js
index ac68ca36eb5b..9ed4b6702166 100644
--- a/browser/base/content/test/urlbar/browser_urlbarPlaceholder.js
+++ b/browser/base/content/test/urlbar/browser_urlbarPlaceholder.js
@@ -10,7 +10,7 @@
 
 const TEST_ENGINE_BASENAME = "searchSuggestionEngine.xml";
 
-const originalEngine = Services.search.currentEngine;
+const originalEngine = Services.search.defaultEngine;
 const expectedString = gBrowserBundle.formatStringFromName("urlbar.placeholder",
   [originalEngine.name], 1);
 var extraEngine;
@@ -26,7 +26,7 @@ add_task(async function setup() {
   BrowserTestUtils.removeTab(urlTab);
 
   registerCleanupFunction(() => {
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     for (let tab of tabs) {
       BrowserTestUtils.removeTab(tab);
     }
@@ -36,13 +36,13 @@ add_task(async function setup() {
 add_task(async function test_change_default_engine_updates_placeholder() {
   tabs.push(await BrowserTestUtils.openNewForegroundTab(gBrowser));
 
-  Services.search.currentEngine = extraEngine;
+  Services.search.defaultEngine = extraEngine;
 
   await TestUtils.waitForCondition(
     () => gURLBar.getAttribute("placeholder") == gURLBar.getAttribute("defaultPlaceholder"),
     "The placeholder should match the default placeholder for non-built-in engines.");
 
-  Services.search.currentEngine = originalEngine;
+  Services.search.defaultEngine = originalEngine;
 
   await TestUtils.waitForCondition(
     () => gURLBar.getAttribute("placeholder") == expectedString,
diff --git a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
index 740f1fe84386..ce6129cbda2b 100644
--- a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
+++ b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
@@ -7,11 +7,11 @@ add_task(async function prepare() {
   Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let oldCurrentEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
   registerCleanupFunction(async function() {
     Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
 
     // Clicking suggestions causes visits to search results pages, so clear that
     // history now.
@@ -33,7 +33,7 @@ add_task(async function clickSuggestion() {
                "Expected suggestion engine");
   let item = gURLBar.popup.richlistbox.getItemAtIndex(idx);
 
-  let uri = Services.search.currentEngine.getSubmission(suggestion).uri;
+  let uri = Services.search.defaultEngine.getSubmission(suggestion).uri;
   let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser,
                                                    false, uri.spec);
   item.click();
@@ -51,7 +51,7 @@ async function testPressEnterOnSuggestion(expectedUrl = null, keyModifiers = {})
                "Expected suggestion engine");
 
   if (!expectedUrl) {
-    expectedUrl = Services.search.currentEngine.getSubmission(suggestion).uri.spec;
+    expectedUrl = Services.search.defaultEngine.getSubmission(suggestion).uri.spec;
   }
 
   let promiseLoad = waitForDocLoadAndStopIt(expectedUrl);
diff --git a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
index 935a926a09a5..e0514c2491f2 100644
--- a/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
+++ b/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
@@ -11,8 +11,8 @@ const ONEOFF_PREF = "browser.urlbar.oneOffSearches";
 add_task(async function prepare() {
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let oldCurrentEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
   let suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
   let defaults = Services.prefs.getDefaultBranch("browser.urlbar.");
   let searchSuggestionsDefault = defaults.getBoolPref("suggest.searches");
@@ -23,7 +23,7 @@ add_task(async function prepare() {
   Services.prefs.setBoolPref(ONEOFF_PREF, true);
   registerCleanupFunction(async function() {
     defaults.setBoolPref("suggest.searches", searchSuggestionsDefault);
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
     Services.prefs.clearUserPref(SUGGEST_ALL_PREF);
     Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
     Services.prefs.setBoolPref(CHOICE_PREF, suggestionsChoice);
diff --git a/browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js b/browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js
index 8f5e75821939..d3baf97f79d6 100644
--- a/browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js
+++ b/browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js
@@ -9,12 +9,12 @@ add_task(async function prepare() {
   Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let oldCurrentEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 
   registerCleanupFunction(async function() {
     Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
 
     // Clicking urlbar results causes visits to their associated pages, so clear
     // that history now.
@@ -108,7 +108,7 @@ async function compareCounts(clickCallback) {
   // * Telemetry histogram named "SEARCH_COUNTS"
   // * FHR
 
-  let engine = Services.search.currentEngine;
+  let engine = Services.search.defaultEngine;
   let engineID = "org.mozilla.testsearchsuggestions";
 
   // First, get the current counts.
diff --git a/browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js b/browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js
index 800a6d940f0d..b2579e349fff 100644
--- a/browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js
+++ b/browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js
@@ -21,11 +21,11 @@ add_task(async function init() {
   // Add a test search engine that returns suggestions on a delay.
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
+  let oldCurrentEngine = Services.search.defaultEngine;
   Services.search.moveEngine(engine, 0);
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
   registerCleanupFunction(async () => {
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
     await PlacesUtils.history.clear();
     // Make sure the popup is closed for the next test.
     gURLBar.blur();
diff --git a/browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js b/browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js
index d317ae164d20..b8ecc210a735 100644
--- a/browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js
+++ b/browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js
@@ -31,12 +31,12 @@ add_task(async function setup() {
 
   let engine = await SearchTestUtils.promiseNewSearchEngine(
     getRootDirectory(gTestPath) + TEST_ENGINE_BASENAME);
-  let oldCurrentEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let oldCurrentEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 
   registerCleanupFunction(async function() {
     await PlacesUtils.history.clear();
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
     gHttpServer.identity.remove(gScheme, gHost, gPort);
     gHttpServer.stop(() => {
       gHttpServer = null;
diff --git a/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js b/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
index 062f8abb1ba7..9da101889dec 100644
--- a/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
+++ b/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
@@ -9,11 +9,11 @@ ChromeUtils.defineModuleGetter(this, "AddonManager",
 const EXTENSION1_ID = "extension1@mozilla.com";
 const EXTENSION2_ID = "extension2@mozilla.com";
 
-let defaultEngineName = Services.search.currentEngine.name;
+let defaultEngineName = Services.search.defaultEngine.name;
 
 function restoreDefaultEngine() {
   let engine = Services.search.getEngineByName(defaultEngineName);
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
 }
 registerCleanupFunction(restoreDefaultEngine);
 
@@ -34,11 +34,11 @@ add_task(async function test_extension_setting_default_engine() {
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   await ext1.unload();
 
-  is(Services.search.currentEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
+  is(Services.search.defaultEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
 });
 
 /* This tests that uninstalling add-ons maintains the proper
@@ -72,19 +72,19 @@ add_task(async function test_extension_setting_multiple_default_engine() {
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   await ext2.startup();
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   await ext2.unload();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   await ext1.unload();
 
-  is(Services.search.currentEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
+  is(Services.search.defaultEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
 });
 
 /* This tests that uninstalling add-ons in reverse order maintains the proper
@@ -118,19 +118,19 @@ add_task(async function test_extension_setting_multiple_default_engine_reversed(
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   await ext2.startup();
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   await ext1.unload();
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   await ext2.unload();
 
-  is(Services.search.currentEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
+  is(Services.search.defaultEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
 });
 
 /* This tests that when the user changes the search engine and the add-on
@@ -151,14 +151,14 @@ add_task(async function test_user_changing_default_engine() {
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   let engine = Services.search.getEngineByName("Twitter");
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
 
   await ext1.unload();
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
   restoreDefaultEngine();
 });
 
@@ -185,25 +185,25 @@ add_task(async function test_user_change_with_disabling() {
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   let engine = Services.search.getEngineByName("Twitter");
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   let disabledPromise = awaitEvent("shutdown", EXTENSION1_ID);
   let addon = await AddonManager.getAddonByID(EXTENSION1_ID);
   await addon.disable();
   await disabledPromise;
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   let enabledPromise = awaitEvent("ready", EXTENSION1_ID);
   await addon.enable();
   await enabledPromise;
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
   await ext1.unload();
   restoreDefaultEngine();
 });
@@ -250,30 +250,30 @@ add_task(async function test_two_addons_with_first_disabled_before_second() {
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   let disabledPromise = awaitEvent("shutdown", EXTENSION1_ID);
   let addon1 = await AddonManager.getAddonByID(EXTENSION1_ID);
   await addon1.disable();
   await disabledPromise;
 
-  is(Services.search.currentEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
+  is(Services.search.defaultEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
 
   await ext2.startup();
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   let enabledPromise = awaitEvent("ready", EXTENSION1_ID);
   await addon1.enable();
   await enabledPromise;
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
   await ext2.unload();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
   await ext1.unload();
 
-  is(Services.search.currentEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
+  is(Services.search.defaultEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
 });
 
 /* This tests that when two add-ons are installed that change default
@@ -318,30 +318,30 @@ add_task(async function test_two_addons_with_first_disabled() {
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   await ext2.startup();
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   let disabledPromise = awaitEvent("shutdown", EXTENSION1_ID);
   let addon1 = await AddonManager.getAddonByID(EXTENSION1_ID);
   await addon1.disable();
   await disabledPromise;
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   let enabledPromise = awaitEvent("ready", EXTENSION1_ID);
   await addon1.enable();
   await enabledPromise;
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
   await ext2.unload();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
   await ext1.unload();
 
-  is(Services.search.currentEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
+  is(Services.search.defaultEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
 });
 
 /* This tests that when two add-ons are installed that change default
@@ -386,28 +386,28 @@ add_task(async function test_two_addons_with_second_disabled() {
 
   await ext1.startup();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   await ext2.startup();
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
 
   let disabledPromise = awaitEvent("shutdown", EXTENSION2_ID);
   let addon2 = await AddonManager.getAddonByID(EXTENSION2_ID);
   await addon2.disable();
   await disabledPromise;
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
 
   let enabledPromise = awaitEvent("ready", EXTENSION2_ID);
   await addon2.enable();
   await enabledPromise;
 
-  is(Services.search.currentEngine.name, "Twitter", "Default engine is Twitter");
+  is(Services.search.defaultEngine.name, "Twitter", "Default engine is Twitter");
   await ext2.unload();
 
-  is(Services.search.currentEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
+  is(Services.search.defaultEngine.name, "DuckDuckGo", "Default engine is DuckDuckGo");
   await ext1.unload();
 
-  is(Services.search.currentEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
+  is(Services.search.defaultEngine.name, defaultEngineName, `Default engine is ${defaultEngineName}`);
 });
diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js
index df66ad15d9d6..6b20ee443ef1 100644
--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js
+++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js
@@ -57,15 +57,15 @@ function addSearchEngine(basename) {
 }
 
 async function prepareSearchEngine() {
-  let oldCurrentEngine = Services.search.currentEngine;
+  let oldCurrentEngine = Services.search.defaultEngine;
   let suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
   Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
   let engine = await addSearchEngine(TEST_ENGINE_BASENAME);
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
 
   registerCleanupFunction(async function() {
     Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
-    Services.search.currentEngine = oldCurrentEngine;
+    Services.search.defaultEngine = oldCurrentEngine;
 
     // Make sure the popup is closed for the next test.
     gURLBar.blur();
diff --git a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
index 017becf4f589..2512aeb3f6a8 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
@@ -118,7 +118,7 @@ add_task(async function test_upgrade_default_position_engine() {
   await ext1.startup();
 
   let engine = Services.search.getEngineByName("MozSearch");
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
   Services.search.moveEngine(engine, 1);
 
   await ext1.upgrade({
@@ -141,7 +141,7 @@ add_task(async function test_upgrade_default_position_engine() {
   });
 
   engine = Services.search.getEngineByName("MozSearch");
-  equal(Services.search.currentEngine, engine, "Default engine should still be MozSearch");
+  equal(Services.search.defaultEngine, engine, "Default engine should still be MozSearch");
   equal(Services.search.getEngines().indexOf(engine), 1, "Engine is in position 1");
 
   await ext1.unload();
diff --git a/browser/components/search/test/browser_426329.js b/browser/components/search/test/browser_426329.js
index eafa40c5e226..3de0889fe791 100644
--- a/browser/components/search/test/browser_426329.js
+++ b/browser/components/search/test/browser_426329.js
@@ -65,10 +65,10 @@ function promiseSetEngine() {
         case "engine-added":
           var engine = ss.getEngineByName("Bug 426329");
           ok(engine, "Engine was added.");
-          ss.currentEngine = engine;
+          ss.defaultEngine = engine;
           break;
         case "engine-current":
-          ok(ss.currentEngine.name == "Bug 426329", "currentEngine set");
+          ok(ss.defaultEngine.name == "Bug 426329", "currentEngine set");
           searchBar = BrowserSearch.searchBar;
           searchButton = searchBar.querySelector(".search-go-button");
           ok(searchButton, "got search-go-button");
diff --git a/browser/components/search/test/browser_aboutSearchReset.js b/browser/components/search/test/browser_aboutSearchReset.js
index 665c8aa18795..22caedb080e1 100644
--- a/browser/components/search/test/browser_aboutSearchReset.js
+++ b/browser/components/search/test/browser_aboutSearchReset.js
@@ -68,7 +68,7 @@ var gTests = [
                                                    gBrowser.selectedBrowser);
     await loadPromise;
 
-    is(engine, Services.search.currentEngine,
+    is(engine, Services.search.defaultEngine,
        "the custom engine is still default");
     is(rawEngine.getAttr("loadPathHash"), initialHash,
        "the loadPathHash has been fixed");
@@ -81,7 +81,7 @@ var gTests = [
 {
   desc: "Test the 'Restore Search Defaults' button.",
   async run() {
-    let currentEngine = Services.search.currentEngine;
+    let currentEngine = Services.search.defaultEngine;
     let originalEngine = Services.search.originalDefaultEngine;
     let browser = gBrowser.selectedBrowser;
     let defaultEngineSpanText =
@@ -108,12 +108,12 @@ var gTests = [
                                                    {}, browser);
     await loadPromise;
 
-    is(originalEngine, Services.search.currentEngine,
+    is(originalEngine, Services.search.defaultEngine,
        "the default engine is back to the original one");
 
     checkTelemetryRecords(TELEMETRY_RESULT_ENUM.RESTORED_DEFAULT);
     is(Services.prefs.getCharPref(kStatusPref), "accepted");
-    Services.search.currentEngine = currentEngine;
+    Services.search.defaultEngine = currentEngine;
   },
 },
 
diff --git a/browser/components/search/test/browser_addEngine.js b/browser/components/search/test/browser_addEngine.js
index 4d9d563ae945..04af6153efd9 100644
--- a/browser/components/search/test/browser_addEngine.js
+++ b/browser/components/search/test/browser_addEngine.js
@@ -64,10 +64,10 @@ var gTests = [
       let aEngine = gSS.getEngineByAlias("fooalias");
       ok(!aEngine, "Alias was not parsed from engine description");
 
-      gSS.currentEngine = engine;
+      gSS.defaultEngine = engine;
     },
     current(engine) {
-      let currentEngine = gSS.currentEngine;
+      let currentEngine = gSS.defaultEngine;
       is(engine, currentEngine, "engine is current");
       is(engine.name, this.engine.name, "current engine was changed successfully");
 
@@ -80,7 +80,7 @@ var gTests = [
       // engines.
       Services.obs.removeObserver(observer, "browser-search-engine-modified");
 
-      let currentEngine = gSS.currentEngine;
+      let currentEngine = gSS.defaultEngine;
       ok(currentEngine, "An engine is present.");
       isnot(currentEngine.name, this.engine.name, "Current engine reset after removal");
 
diff --git a/browser/components/search/test/browser_contextmenu.js b/browser/components/search/test/browser_contextmenu.js
index 845043ef817e..ab4ec04cfefc 100644
--- a/browser/components/search/test/browser_contextmenu.js
+++ b/browser/components/search/test/browser_contextmenu.js
@@ -30,12 +30,12 @@ add_task(async function() {
         case "engine-added":
           var engine = ss.getEngineByName(ENGINE_NAME);
           ok(engine, "Engine was added.");
-          ss.currentEngine = engine;
+          ss.defaultEngine = engine;
           envService.set("XPCSHELL_TEST_PROFILE_DIR", originalValue);
           resProt.setSubstitution("search-plugins", originalSubstitution);
           break;
         case "engine-current":
-          is(ss.currentEngine.name, ENGINE_NAME, "currentEngine set");
+          is(ss.defaultEngine.name, ENGINE_NAME, "currentEngine set");
           resolve();
           break;
         case "engine-removed":
@@ -93,7 +93,7 @@ add_task(async function() {
 
   await new Promise(resolve => {
     searchDonePromise = resolve;
-    ss.removeEngine(ss.currentEngine);
+    ss.removeEngine(ss.defaultEngine);
   });
 
   gBrowser.removeCurrentTab();
diff --git a/browser/components/search/test/browser_google_behavior.js b/browser/components/search/test/browser_google_behavior.js
index 6c18c9d8fef4..11f3fab3fef5 100644
--- a/browser/components/search/test/browser_google_behavior.js
+++ b/browser/components/search/test/browser_google_behavior.js
@@ -61,10 +61,10 @@ function promiseContentSearchReady(browser) {
 
 for (let engine of searchEngineDetails) {
   add_task(async function() {
-    let previouslySelectedEngine = Services.search.currentEngine;
+    let previouslySelectedEngine = Services.search.defaultEngine;
 
     registerCleanupFunction(function() {
-      Services.search.currentEngine = previouslySelectedEngine;
+      Services.search.defaultEngine = previouslySelectedEngine;
     });
 
     await testSearchEngine(engine);
@@ -75,7 +75,7 @@ async function testSearchEngine(engineDetails) {
   let engine = Services.search.getEngineByName(engineDetails.name);
   Assert.ok(engine, `${engineDetails.name} is installed`);
 
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
   engine.alias = engineDetails.alias;
 
   // Test search URLs (including purposes).
diff --git a/browser/components/search/test/browser_healthreport.js b/browser/components/search/test/browser_healthreport.js
index daea794f32f6..fa40800409e8 100644
--- a/browser/components/search/test/browser_healthreport.js
+++ b/browser/components/search/test/browser_healthreport.js
@@ -56,13 +56,13 @@ function test() {
       case "engine-added":
         let engine = Services.search.getEngineByName("Foo");
         ok(engine, "Engine was added.");
-        Services.search.currentEngine = engine;
+        Services.search.defaultEngine = engine;
         break;
 
       case "engine-current":
         // We may be called again when resetting the engine at the end.
         if (!calledTestTelemetry) {
-          is(Services.search.currentEngine.name, "Foo", "Current engine is Foo");
+          is(Services.search.defaultEngine.name, "Foo", "Current engine is Foo");
           testTelemetry();
         }
         break;
diff --git a/browser/components/search/test/browser_hiddenOneOffs_diacritics.js b/browser/components/search/test/browser_hiddenOneOffs_diacritics.js
index 5ca124e8cb75..b9a5d24438d3 100644
--- a/browser/components/search/test/browser_hiddenOneOffs_diacritics.js
+++ b/browser/components/search/test/browser_hiddenOneOffs_diacritics.js
@@ -19,10 +19,10 @@ add_task(async function init() {
   });
   searchIcon = searchbar.querySelector(".searchbar-search-button");
 
-  let currentEngine = Services.search.currentEngine;
+  let currentEngine = Services.search.defaultEngine;
   await promiseNewEngine("testEngine_diacritics.xml", {setAsCurrent: false});
   registerCleanupFunction(() => {
-    Services.search.currentEngine = currentEngine;
+    Services.search.defaultEngine = currentEngine;
     Services.prefs.clearUserPref("browser.search.hiddenOneOffs");
   });
 });
diff --git a/browser/components/search/test/browser_oneOffContextMenu_setDefault.js b/browser/components/search/test/browser_oneOffContextMenu_setDefault.js
index 9eb278e572fa..a1651fc8f45b 100644
--- a/browser/components/search/test/browser_oneOffContextMenu_setDefault.js
+++ b/browser/components/search/test/browser_oneOffContextMenu_setDefault.js
@@ -16,10 +16,10 @@ const urlBarOneOffElement = document.getAnonymousElementByAttribute(
   urlbarPopup, "anonid", "one-off-search-buttons"
 );
 
-let originalEngine = Services.search.currentEngine;
+let originalEngine = Services.search.defaultEngine;
 
 function resetEngine() {
-  Services.search.currentEngine = originalEngine;
+  Services.search.defaultEngine = originalEngine;
 }
 
 registerCleanupFunction(resetEngine);
@@ -88,7 +88,7 @@ add_task(async function test_urlBarChangeEngine() {
   // This also checks the engine correctly changed.
   await promise;
 
-  let currentEngine = Services.search.currentEngine;
+  let currentEngine = Services.search.defaultEngine;
 
   // For the urlbar, we should keep the new engine's icon.
   Assert.equal(oneOffButton.id, URLBAR_BASE_ID + currentEngine.name,
@@ -111,7 +111,7 @@ function promiseCurrentEngineChanged() {
   return new Promise(resolve => {
     function observer(aSub, aTopic, aData) {
       if (aData == "engine-current") {
-        Assert.equal(Services.search.currentEngine.name, TEST_ENGINE_NAME, "currentEngine set");
+        Assert.equal(Services.search.defaultEngine.name, TEST_ENGINE_NAME, "currentEngine set");
         Services.obs.removeObserver(observer, "browser-search-engine-modified");
         resolve();
       }
diff --git a/browser/components/search/test/browser_searchEngine_behaviors.js b/browser/components/search/test/browser_searchEngine_behaviors.js
index a9a65d2bdb8a..b0496388d8b2 100644
--- a/browser/components/search/test/browser_searchEngine_behaviors.js
+++ b/browser/components/search/test/browser_searchEngine_behaviors.js
@@ -81,10 +81,10 @@ add_task(async function test_setup() {
 
 for (let engine of SEARCH_ENGINE_DETAILS) {
   add_task(async function() {
-    let previouslySelectedEngine = Services.search.currentEngine;
+    let previouslySelectedEngine = Services.search.defaultEngine;
 
     registerCleanupFunction(function() {
-      Services.search.currentEngine = previouslySelectedEngine;
+      Services.search.defaultEngine = previouslySelectedEngine;
     });
 
     await testSearchEngine(engine);
@@ -95,7 +95,7 @@ async function testSearchEngine(engineDetails) {
   let engine = Services.search.getEngineByName(engineDetails.name);
   Assert.ok(engine, `${engineDetails.name} is installed`);
 
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
   engine.alias = engineDetails.alias;
 
   let base = engineDetails.baseURL;
diff --git a/browser/components/search/test/head.js b/browser/components/search/test/head.js
index fdab3ddff1c1..928aab1140c3 100644
--- a/browser/components/search/test/head.js
+++ b/browser/components/search/test/head.js
@@ -60,16 +60,16 @@ function promiseNewEngine(basename, options = {}) {
     Services.search.init({
       onInitComplete() {
         let url = getRootDirectory(options.testPath || gTestPath) + basename;
-        let current = Services.search.currentEngine;
+        let current = Services.search.defaultEngine;
         Services.search.addEngine(url, options.iconURL || "", false, {
           onSuccess(engine) {
             info("Search engine added: " + basename);
             if (setAsCurrent) {
-              Services.search.currentEngine = engine;
+              Services.search.defaultEngine = engine;
             }
             registerCleanupFunction(() => {
               if (setAsCurrent) {
-                Services.search.currentEngine = current;
+                Services.search.defaultEngine = current;
               }
               Services.search.removeEngine(engine);
               info("Search engine removed: " + basename);
diff --git a/browser/modules/test/browser/browser_ContentSearch.js b/browser/modules/test/browser/browser_ContentSearch.js
index 83f882025149..282a97d322a3 100644
--- a/browser/modules/test/browser/browser_ContentSearch.js
+++ b/browser/modules/test/browser/browser_ContentSearch.js
@@ -11,7 +11,7 @@ Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/browser/components/search/test/head.js",
   this);
 
-let originalEngine = Services.search.currentEngine;
+let originalEngine = Services.search.defaultEngine;
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
@@ -24,7 +24,7 @@ add_task(async function setup() {
   });
 
   registerCleanupFunction(() => {
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
   });
 });
 
@@ -43,7 +43,7 @@ add_task(async function GetState() {
 add_task(async function SetCurrentEngine() {
   let { mm } = await addTab();
   let newCurrentEngine = null;
-  let oldCurrentEngine = Services.search.currentEngine;
+  let oldCurrentEngine = Services.search.defaultEngine;
   let engines = Services.search.getVisibleEngines();
   for (let engine of engines) {
     if (engine != oldCurrentEngine) {
@@ -78,7 +78,7 @@ add_task(async function SetCurrentEngine() {
     data: await currentEngineObj(newCurrentEngine),
   });
 
-  Services.search.currentEngine = oldCurrentEngine;
+  Services.search.defaultEngine = oldCurrentEngine;
   msg = await waitForTestMsg(mm, "CurrentEngine");
   checkMsg(msg, {
     type: "CurrentEngine",
@@ -88,7 +88,7 @@ add_task(async function SetCurrentEngine() {
 
 add_task(async function modifyEngine() {
   let { mm } = await addTab();
-  let engine = Services.search.currentEngine;
+  let engine = Services.search.defaultEngine;
   let oldAlias = engine.alias;
   engine.alias = "ContentSearchTest";
   let msg = await waitForTestMsg(mm, "CurrentState");
@@ -106,7 +106,7 @@ add_task(async function modifyEngine() {
 
 add_task(async function search() {
   let { browser } = await addTab();
-  let engine = Services.search.currentEngine;
+  let engine = Services.search.defaultEngine;
   let data = {
     engineName: engine.name,
     searchString: "ContentSearchTest",
@@ -125,7 +125,7 @@ add_task(async function searchInBackgroundTab() {
   // search page should be loaded in the same tab that performed the search, in
   // the background tab.
   let { browser } = await addTab();
-  let engine = Services.search.currentEngine;
+  let engine = Services.search.defaultEngine;
   let data = {
     engineName: engine.name,
     searchString: "ContentSearchTest",
@@ -377,7 +377,7 @@ var currentStateObj = async function() {
 };
 
 var currentEngineObj = async function() {
-  let engine = Services.search.currentEngine;
+  let engine = Services.search.defaultEngine;
   let uriFavicon = engine.getIconURLBySize(16, 16);
   let bundle = Services.strings.createBundle("chrome://global/locale/autocomplete.properties");
   return {
diff --git a/browser/modules/test/browser/browser_UsageTelemetry_content.js b/browser/modules/test/browser/browser_UsageTelemetry_content.js
index 244501869582..bae2d1fcaa63 100644
--- a/browser/modules/test/browser/browser_UsageTelemetry_content.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_content.js
@@ -16,8 +16,8 @@ add_task(async function setup() {
 
   // Make the first engine the default search engine.
   let engineDefault = Services.search.getEngineByName("MozSearch");
-  let originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engineDefault;
+  let originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engineDefault;
 
   // Move the second engine at the beginning of the one-off list.
   let engineOneOff = Services.search.getEngineByName("MozSearch2");
@@ -36,7 +36,7 @@ add_task(async function setup() {
 
   // Make sure to restore the engine once we're done.
   registerCleanupFunction(async function() {
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     Services.search.removeEngine(engineDefault);
     Services.search.removeEngine(engineOneOff);
     await PlacesUtils.history.clear();
diff --git a/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js b/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
index a70963850909..39c0b537db96 100644
--- a/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
@@ -20,8 +20,8 @@ add_task(async function setup() {
 
   // Make the first engine the default search engine.
   let engineDefault = Services.search.getEngineByName("MozSearch");
-  let originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engineDefault;
+  let originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engineDefault;
 
   // Move the second engine at the beginning of the one-off list.
   let engineOneOff = Services.search.getEngineByName("MozSearch2");
@@ -36,7 +36,7 @@ add_task(async function setup() {
 
   // Make sure to restore the engine once we're done.
   registerCleanupFunction(async function() {
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     Services.search.removeEngine(engineDefault);
     Services.search.removeEngine(engineOneOff);
     await PlacesUtils.history.clear();
diff --git a/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js b/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js
index c3bf3e72cee2..d9c9d93a37bb 100644
--- a/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js
@@ -69,8 +69,8 @@ add_task(async function setup() {
 
   // Make the first engine the default search engine.
   let engineDefault = Services.search.getEngineByName("MozSearch");
-  let originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engineDefault;
+  let originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engineDefault;
 
   // Move the second engine at the beginning of the one-off list.
   let engineOneOff = Services.search.getEngineByName("MozSearch2");
@@ -86,7 +86,7 @@ add_task(async function setup() {
   // Make sure to restore the engine once we're done.
   registerCleanupFunction(function() {
     Services.telemetry.canRecordExtended = oldCanRecord;
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     Services.search.removeEngine(engineDefault);
     Services.search.removeEngine(engineOneOff);
     Services.telemetry.setEventRecordingEnabled("navigation", false);
@@ -192,8 +192,8 @@ add_task(async function test_oneOff_enterSelection() {
     });
   });
 
-  let previousEngine = Services.search.currentEngine;
-  Services.search.currentEngine = suggestionEngine;
+  let previousEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = suggestionEngine;
 
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank");
 
@@ -212,7 +212,7 @@ add_task(async function test_oneOff_enterSelection() {
     URLBAR_SELECTED_RESULT_METHODS.enterSelection,
     "FX_SEARCHBAR_SELECTED_RESULT_METHOD");
 
-  Services.search.currentEngine = previousEngine;
+  Services.search.defaultEngine = previousEngine;
   Services.search.removeEngine(suggestionEngine);
   BrowserTestUtils.removeTab(tab);
 });
@@ -260,8 +260,8 @@ add_task(async function test_suggestion_click() {
     });
   });
 
-  let previousEngine = Services.search.currentEngine;
-  Services.search.currentEngine = suggestionEngine;
+  let previousEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = suggestionEngine;
 
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank");
 
@@ -293,7 +293,7 @@ add_task(async function test_suggestion_click() {
     URLBAR_SELECTED_RESULT_METHODS.click,
     "FX_SEARCHBAR_SELECTED_RESULT_METHOD");
 
-  Services.search.currentEngine = previousEngine;
+  Services.search.defaultEngine = previousEngine;
   Services.search.removeEngine(suggestionEngine);
   BrowserTestUtils.removeTab(tab);
 });
@@ -317,8 +317,8 @@ add_task(async function test_suggestion_enterSelection() {
     });
   });
 
-  let previousEngine = Services.search.currentEngine;
-  Services.search.currentEngine = suggestionEngine;
+  let previousEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = suggestionEngine;
 
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank");
 
@@ -335,7 +335,7 @@ add_task(async function test_suggestion_enterSelection() {
     URLBAR_SELECTED_RESULT_METHODS.enterSelection,
     "FX_SEARCHBAR_SELECTED_RESULT_METHOD");
 
-  Services.search.currentEngine = previousEngine;
+  Services.search.defaultEngine = previousEngine;
   Services.search.removeEngine(suggestionEngine);
   BrowserTestUtils.removeTab(tab);
 });
diff --git a/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js b/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js
index 8990b7237b2f..bf310b7880e0 100644
--- a/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js
@@ -88,13 +88,13 @@ async function withNewSearchEngine(taskFn) {
     });
   });
 
-  let previousEngine = Services.search.currentEngine;
-  Services.search.currentEngine = suggestionEngine;
+  let previousEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = suggestionEngine;
 
   try {
     await taskFn(suggestionEngine);
   } finally {
-    Services.search.currentEngine = previousEngine;
+    Services.search.defaultEngine = previousEngine;
     Services.search.removeEngine(suggestionEngine);
   }
 }
@@ -106,8 +106,8 @@ add_task(async function setup() {
 
   // Make it the default search engine.
   let engine = Services.search.getEngineByName("MozSearch");
-  let originalEngine = Services.search.currentEngine;
-  Services.search.currentEngine = engine;
+  let originalEngine = Services.search.defaultEngine;
+  Services.search.defaultEngine = engine;
 
   // Give it some mock internal aliases.
   engine.wrappedJSObject.__internalAliases = ["@mozaliasfoo", "@mozaliasbar"];
@@ -143,7 +143,7 @@ add_task(async function setup() {
   // Make sure to restore the engine once we're done.
   registerCleanupFunction(async function() {
     Services.telemetry.canRecordExtended = oldCanRecord;
-    Services.search.currentEngine = originalEngine;
+    Services.search.defaultEngine = originalEngine;
     Services.search.removeEngine(engine);
     Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
     Services.prefs.clearUserPref(ONEOFF_URLBAR_PREF);
diff --git a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
index 6ef47b3ff4c6..65bf549da6c2 100644
--- a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
+++ b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
@@ -531,7 +531,7 @@ add_task(async function ensure_search_engine() {
   Services.search.addEngineWithDetails("MozSearch", "", "", "", "GET",
                                        "http://s.example.com/search");
   let engine = Services.search.getEngineByName("MozSearch");
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
 });
 
 /**
diff --git a/toolkit/components/places/tests/unifiedcomplete/test_search_engine_current.js b/toolkit/components/places/tests/unifiedcomplete/test_search_engine_current.js
index f7d9eb79abb8..0e4725bc4a34 100644
--- a/toolkit/components/places/tests/unifiedcomplete/test_search_engine_current.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_search_engine_current.js
@@ -33,8 +33,8 @@ add_task(async function() {
   Services.search.addEngineWithDetails("MozSearch2", "", "", "", "GET",
                                        "http://s.example.com/search2");
   let engine = Services.search.getEngineByName("MozSearch2");
-  notEqual(Services.search.currentEngine, engine, "New engine shouldn't be the current engine yet");
-  Services.search.currentEngine = engine;
+  notEqual(Services.search.defaultEngine, engine, "New engine shouldn't be the current engine yet");
+  Services.search.defaultEngine = engine;
   await check_autocomplete({
     search: "mozilla",
     searchParam: "enable-actions",
diff --git a/toolkit/components/places/tests/unifiedcomplete/test_search_suggestions.js b/toolkit/components/places/tests/unifiedcomplete/test_search_suggestions.js
index bdc612bc4d21..5d72e40b98ac 100644
--- a/toolkit/components/places/tests/unifiedcomplete/test_search_suggestions.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_search_suggestions.js
@@ -35,9 +35,9 @@ add_task(async function setup() {
   });
 
   // Install the test engine.
-  let oldCurrentEngine = Services.search.currentEngine;
-  registerCleanupFunction(() => Services.search.currentEngine = oldCurrentEngine);
-  Services.search.currentEngine = engine;
+  let oldCurrentEngine = Services.search.defaultEngine;
+  registerCleanupFunction(() => Services.search.defaultEngine = oldCurrentEngine);
+  Services.search.defaultEngine = engine;
 
   // We must make sure the FormHistoryStartup component is initialized.
   Cc["@mozilla.org/satchel/form-history-startup;1"]
diff --git a/toolkit/components/search/tests/xpcshell/test_addEngineWithDetails.js b/toolkit/components/search/tests/xpcshell/test_addEngineWithDetails.js
index 96b6ec75ccdc..6483abbdf5b0 100644
--- a/toolkit/components/search/tests/xpcshell/test_addEngineWithDetails.js
+++ b/toolkit/components/search/tests/xpcshell/test_addEngineWithDetails.js
@@ -25,10 +25,10 @@ add_task(async function test_addEngineWithDetails() {
 
   // Set the engine as default; this should set a loadPath verification hash,
   // which should ensure we don't show the search reset prompt.
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
 
   let expectedURL = kSearchEngineURL.replace("{searchTerms}", kSearchTerm);
   let submission =
-    Services.search.currentEngine.getSubmission(kSearchTerm, null, "searchbar");
+    Services.search.defaultEngine.getSubmission(kSearchTerm, null, "searchbar");
   Assert.equal(submission.uri.spec, expectedURL);
 });
diff --git a/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js b/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js
index 1019d2e876d9..f3fc1ba9ed4b 100644
--- a/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js
+++ b/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js
@@ -43,15 +43,15 @@ add_task(async function test_addEngineWithDetails() {
 
   // Set the engine as default; this should set a loadPath verification hash,
   // which should ensure we don't show the search reset prompt.
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
 
   let expectedURL = kSearchEngineURL.replace("{searchTerms}", kSearchTerm);
   let submission =
-    Services.search.currentEngine.getSubmission(kSearchTerm, null, "searchbar");
+    Services.search.defaultEngine.getSubmission(kSearchTerm, null, "searchbar");
   Assert.equal(submission.uri.spec, expectedURL);
   let expectedSuggestURL = kSearchSuggestURL.replace("{searchTerms}", kSearchTerm);
   let submissionSuggest =
-    Services.search.currentEngine.getSubmission(kSearchTerm, URLTYPE_SUGGEST_JSON);
+    Services.search.defaultEngine.getSubmission(kSearchTerm, URLTYPE_SUGGEST_JSON);
   Assert.equal(submissionSuggest.uri.spec, expectedSuggestURL);
 });
 
diff --git a/toolkit/components/search/tests/xpcshell/test_notifications.js b/toolkit/components/search/tests/xpcshell/test_notifications.js
index ca3dc2c03129..d0d8c46eb13a 100644
--- a/toolkit/components/search/tests/xpcshell/test_notifications.js
+++ b/toolkit/components/search/tests/xpcshell/test_notifications.js
@@ -36,7 +36,7 @@ function search_observer(subject, topic, data) {
       let retrievedEngine = Services.search.getEngineByName("Test search engine");
       Assert.equal(engine, retrievedEngine);
       Services.search.defaultEngine = engine;
-      Services.search.currentEngine = engine;
+      Services.search.defaultEngine = engine;
       executeSoon(function() {
         Services.search.removeEngine(engine);
       });
diff --git a/toolkit/components/search/tests/xpcshell/test_searchReset.js b/toolkit/components/search/tests/xpcshell/test_searchReset.js
index 68c37a46a768..f80b1067dd00 100644
--- a/toolkit/components/search/tests/xpcshell/test_searchReset.js
+++ b/toolkit/components/search/tests/xpcshell/test_searchReset.js
@@ -46,7 +46,7 @@ add_task(async function test_no_prompt_when_valid_loadPathHash() {
 
   // After making it the currentEngine with the search service API,
   // the test engine should have a valid loadPathHash.
-  Services.search.currentEngine = engine;
+  Services.search.defaultEngine = engine;
   await promiseAfterCache();
   metadata = await promiseEngineMetadata();
   Assert.ok("loadPathHash" in metadata[kTestEngineShortName]);
@@ -56,7 +56,7 @@ add_task(async function test_no_prompt_when_valid_loadPathHash() {
 
   // A search should not cause the search reset prompt.
   let submission =
-    Services.search.currentEngine.getSubmission("foo", null, "searchbar");
+    Services.search.defaultEngine.getSubmission("foo", null, "searchbar");
   Assert.equal(submission.uri.spec,
                "http://www.google.com/search?q=foo");
 });
@@ -65,7 +65,7 @@ add_task(async function test_pending() {
   let checkWithPrefValue = (value, expectPrompt = false) => {
     Services.prefs.setCharPref(BROWSER_SEARCH_PREF + "reset.status", value);
     let submission =
-      Services.search.currentEngine.getSubmission("foo", null, "searchbar");
+      Services.search.defaultEngine.getSubmission("foo", null, "searchbar");
     Assert.equal(submission.uri.spec,
                  expectPrompt ? "about:searchreset?data=foo&purpose=searchbar" :
                    "http://www.google.com/search?q=foo");
@@ -83,7 +83,7 @@ add_task(async function test_promptURLs() {
   await removeLoadPathHash();
 
   // The default should still be the test engine.
-  let currentEngine = Services.search.currentEngine;
+  let currentEngine = Services.search.defaultEngine;
   Assert.equal(currentEngine.name, kTestEngineName);
   // but the submission url should be about:searchreset
   let url = (data, purpose) =>
@@ -98,7 +98,7 @@ add_task(async function test_promptURLs() {
   // Calling the currentEngine setter for the same engine should
   // prevent further prompts.
   // eslint-disable-next-line no-self-assign
-  Services.search.currentEngine = Services.search.currentEngine;
+  Services.search.defaultEngine = Services.search.defaultEngine;
   Assert.equal(url("foo", "searchbar"),
                "http://www.google.com/search?q=foo");
 
@@ -115,7 +115,7 @@ add_task(async function test_whitelist() {
   await removeLoadPathHash();
 
   // The default should still be the test engine.
-  let currentEngine = Services.search.currentEngine;
+  let currentEngine = Services.search.defaultEngine;
   Assert.equal(currentEngine.name, kTestEngineName);
   let expectPrompt = shouldPrompt => {
     let expectedURL =
diff --git a/toolkit/components/search/tests/xpcshell/test_selectedEngine.js b/toolkit/components/search/tests/xpcshell/test_selectedEngine.js
index 699eda00669d..de0ce015e117 100644
--- a/toolkit/components/search/tests/xpcshell/test_selectedEngine.js
+++ b/toolkit/components/search/tests/xpcshell/test_selectedEngine.js
@@ -10,7 +10,7 @@ add_task(async function test_defaultEngine() {
   await asyncInit();
   await installTestEngine();
 
-  Assert.equal(Services.search.currentEngine.name, getDefaultEngineName());
+  Assert.equal(Services.search.defaultEngine.name, getDefaultEngineName());
 });
 
 // Giving prefs a user value shouldn't change the selected engine.
@@ -20,7 +20,7 @@ add_task(async function test_selectedEngine() {
   Services.prefs.setCharPref(kSelectedEnginePref, kTestEngineName);
 
   await asyncReInit();
-  Assert.equal(Services.search.currentEngine.name, defaultEngineName);
+  Assert.equal(Services.search.defaultEngine.name, defaultEngineName);
 
   Services.prefs.clearUserPref(kSelectedEnginePref);
 
@@ -28,7 +28,7 @@ add_task(async function test_selectedEngine() {
   Services.prefs.setCharPref(kDefaultenginenamePref, kTestEngineName);
 
   await asyncReInit();
-  Assert.equal(Services.search.currentEngine.name, defaultEngineName);
+  Assert.equal(Services.search.defaultEngine.name, defaultEngineName);
 
   Services.prefs.clearUserPref(kDefaultenginenamePref);
 });
@@ -36,8 +36,8 @@ add_task(async function test_selectedEngine() {
 // Setting the search engine should be persisted across restarts.
 add_task(async function test_persistAcrossRestarts() {
   // Set the engine through the API.
-  Services.search.currentEngine = Services.search.getEngineByName(kTestEngineName);
-  Assert.equal(Services.search.currentEngine.name, kTestEngineName);
+  Services.search.defaultEngine = Services.search.getEngineByName(kTestEngineName);
+  Assert.equal(Services.search.defaultEngine.name, kTestEngineName);
   await promiseAfterCache();
 
   // Check that the a hash was saved.
@@ -46,18 +46,18 @@ add_task(async function test_persistAcrossRestarts() {
 
   // Re-init and check the engine is still the same.
   await asyncReInit();
-  Assert.equal(Services.search.currentEngine.name, kTestEngineName);
+  Assert.equal(Services.search.defaultEngine.name, kTestEngineName);
 
   // Cleanup (set the engine back to default).
   Services.search.resetToOriginalDefaultEngine();
-  Assert.equal(Services.search.currentEngine.name, getDefaultEngineName());
+  Assert.equal(Services.search.defaultEngine.name, getDefaultEngineName());
 });
 
 // An engine set without a valid hash should be ignored.
 add_task(async function test_ignoreInvalidHash() {
   // Set the engine through the API.
-  Services.search.currentEngine = Services.search.getEngineByName(kTestEngineName);
-  Assert.equal(Services.search.currentEngine.name, kTestEngineName);
+  Services.search.defaultEngine = Services.search.getEngineByName(kTestEngineName);
+  Assert.equal(Services.search.defaultEngine.name, kTestEngineName);
   await promiseAfterCache();
 
   // Then mess with the file (make the hash invalid).
@@ -67,14 +67,14 @@ add_task(async function test_ignoreInvalidHash() {
 
   // Re-init the search service, and check that the json file is ignored.
   await asyncReInit();
-  Assert.equal(Services.search.currentEngine.name, getDefaultEngineName());
+  Assert.equal(Services.search.defaultEngine.name, getDefaultEngineName());
 });
 
 // Resetting the engine to the default should remove the saved value.
 add_task(async function test_settingToDefault() {
   // Set the engine through the API.
-  Services.search.currentEngine = Services.search.getEngineByName(kTestEngineName);
-  Assert.equal(Services.search.currentEngine.name, kTestEngineName);
+  Services.search.defaultEngine = Services.search.getEngineByName(kTestEngineName);
+  Assert.equal(Services.search.defaultEngine.name, kTestEngineName);
   await promiseAfterCache();
 
   // Check that the current engine was saved.
@@ -82,7 +82,7 @@ add_task(async function test_settingToDefault() {
   Assert.equal(metadata.current, kTestEngineName);
 
   // Then set the engine back to the default through the API.
-  Services.search.currentEngine =
+  Services.search.defaultEngine =
     Services.search.getEngineByName(getDefaultEngineName());
   await promiseAfterCache();
 
@@ -93,15 +93,15 @@ add_task(async function test_settingToDefault() {
 
 add_task(async function test_resetToOriginalDefaultEngine() {
   let defaultName = getDefaultEngineName();
-  Assert.equal(Services.search.currentEngine.name, defaultName);
+  Assert.equal(Services.search.defaultEngine.name, defaultName);
 
-  Services.search.currentEngine =
+  Services.search.defaultEngine =
     Services.search.getEngineByName(kTestEngineName);
-  Assert.equal(Services.search.currentEngine.name, kTestEngineName);
+  Assert.equal(Services.search.defaultEngine.name, kTestEngineName);
   await promiseAfterCache();
 
   Services.search.resetToOriginalDefaultEngine();
-  Assert.equal(Services.search.currentEngine.name, defaultName);
+  Assert.equal(Services.search.defaultEngine.name, defaultName);
   await promiseAfterCache();
 });
 
@@ -116,8 +116,8 @@ add_task(async function test_fallback_kept_after_restart() {
       break;
     }
   }
-  Services.search.currentEngine = nonDefaultBuiltInEngine;
-  Assert.equal(Services.search.currentEngine.name, nonDefaultBuiltInEngine.name);
+  Services.search.defaultEngine = nonDefaultBuiltInEngine;
+  Assert.equal(Services.search.defaultEngine.name, nonDefaultBuiltInEngine.name);
   await promiseAfterCache();
 
   // Remove that engine...
@@ -128,18 +128,18 @@ add_task(async function test_fallback_kept_after_restart() {
 
   // Using the currentEngine getter should force a fallback to the
   // original default engine.
-  Assert.equal(Services.search.currentEngine.name, defaultName);
+  Assert.equal(Services.search.defaultEngine.name, defaultName);
 
   // Restoring the default engines should unhide our built-in test
   // engine, but not change the value of currentEngine.
   Services.search.restoreDefaultEngines();
   Assert.ok(!nonDefaultBuiltInEngine.hidden);
-  Assert.equal(Services.search.currentEngine.name, defaultName);
+  Assert.equal(Services.search.defaultEngine.name, defaultName);
   await promiseAfterCache();
 
   // After a restart, the currentEngine value should still be unchanged.
   await asyncReInit();
-  Assert.equal(Services.search.currentEngine.name, defaultName);
+  Assert.equal(Services.search.defaultEngine.name, defaultName);
 });
 
 
diff --git a/toolkit/components/search/tests/xpcshell/test_sendSubmissionURL.js b/toolkit/components/search/tests/xpcshell/test_sendSubmissionURL.js
index 8b2418555083..0c88f1bed779 100644
--- a/toolkit/components/search/tests/xpcshell/test_sendSubmissionURL.js
+++ b/toolkit/components/search/tests/xpcshell/test_sendSubmissionURL.js
@@ -30,7 +30,7 @@ const SUBMISSION_NO = new Map([
 function addAndMakeDefault(name, searchURL) {
    Services.search.addEngineWithDetails(name, null, null, null, "GET", searchURL);
    let engine = Services.search.getEngineByName(name);
-   Services.search.currentEngine = engine;
+   Services.search.defaultEngine = engine;
    return engine;
 }
 

From f61ae84285c68f3f03b597faf6984181adf182bf Mon Sep 17 00:00:00 2001
From: WR Updater Bot <graphics-team@mozilla.staktrace.com>
Date: Tue, 13 Nov 2018 10:18:11 +0000
Subject: [PATCH 12/33] Bug 1506738 - Update webrender to commit
 dfb2517eea37bce19e686032faae4053cb427ff8 (WR PR #3275). r=kats

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

--HG--
extra : moz-landing-system : lando
---
 gfx/webrender/src/renderer.rs       | 204 +++++++++++++++-------------
 gfx/webrender_bindings/revision.txt |   2 +-
 2 files changed, 113 insertions(+), 93 deletions(-)

diff --git a/gfx/webrender/src/renderer.rs b/gfx/webrender/src/renderer.rs
index 4761ac1c089d..55f1932751cf 100644
--- a/gfx/webrender/src/renderer.rs
+++ b/gfx/webrender/src/renderer.rs
@@ -57,7 +57,7 @@ use internal_types::{CacheTextureId, DebugOutput, FastHashMap, LayerIndex, Rende
 use internal_types::{TextureCacheAllocationKind, TextureCacheUpdate, TextureUpdateList, TextureUpdateSource};
 use internal_types::{RenderTargetInfo, SavedTargetIndex};
 use prim_store::DeferredResolve;
-use profiler::{BackendProfileCounters, FrameProfileCounters,
+use profiler::{BackendProfileCounters, FrameProfileCounters, TimeProfileCounter,
                GpuProfileTag, RendererProfileCounters, RendererProfileTimers};
 use device::query::GpuProfiler;
 use rayon::{ThreadPool, ThreadPoolBuilder};
@@ -1534,6 +1534,8 @@ pub struct Renderer {
     debug_flags: DebugFlags,
     backend_profile_counters: BackendProfileCounters,
     profile_counters: RendererProfileCounters,
+    resource_upload_time: u64,
+    gpu_cache_upload_time: u64,
     #[cfg(feature = "debug_renderer")]
     profiler: Profiler,
     #[cfg(feature = "debug_renderer")]
@@ -1985,6 +1987,8 @@ impl Renderer {
             debug_flags,
             backend_profile_counters: BackendProfileCounters::new(),
             profile_counters: RendererProfileCounters::new(),
+            resource_upload_time: 0,
+            gpu_cache_upload_time: 0,
             #[cfg(feature = "debug_renderer")]
             profiler: Profiler::new(),
             #[cfg(feature = "debug_renderer")]
@@ -2134,6 +2138,7 @@ impl Renderer {
                 } => {
                     self.pending_texture_updates.push(updates);
                     self.device.begin_frame();
+
                     self.update_texture_cache();
 
                     // Flush the render target pool on memory pressure.
@@ -2705,6 +2710,10 @@ impl Renderer {
         self.backend_profile_counters.reset();
         self.profile_counters.reset();
         self.profile_counters.frame_counter.inc();
+        stats.resource_upload_time = self.resource_upload_time;
+        self.resource_upload_time = 0;
+        stats.gpu_cache_upload_time = self.gpu_cache_upload_time;
+        self.gpu_cache_upload_time = 0;
 
         profile_timers.cpu_time.profile(|| {
             let _gm = self.gpu_profile.start_marker("end frame");
@@ -2774,7 +2783,11 @@ impl Renderer {
                 .update(&mut self.device, &update_list);
         }
 
-        let updated_rows = self.gpu_cache_texture.flush(&mut self.device);
+        let mut upload_time = TimeProfileCounter::new("GPU cache upload time", false);
+        let updated_rows = upload_time.profile(|| {
+            return self.gpu_cache_texture.flush(&mut self.device);
+        });
+        self.gpu_cache_upload_time += upload_time.get();
 
         let counters = &mut self.backend_profile_counters.resources.gpu_cache;
         counters.updated_rows.set(updated_rows);
@@ -2799,101 +2812,104 @@ impl Renderer {
         let _gm = self.gpu_profile.start_marker("texture cache update");
         let mut pending_texture_updates = mem::replace(&mut self.pending_texture_updates, vec![]);
 
-        for update_list in pending_texture_updates.drain(..) {
-            for allocation in update_list.allocations {
-                let is_realloc = matches!(allocation.kind, TextureCacheAllocationKind::Realloc(..));
-                match allocation.kind {
-                    TextureCacheAllocationKind::Alloc(info) |
-                    TextureCacheAllocationKind::Realloc(info) => {
-                        // Create a new native texture, as requested by the texture cache.
-                        //
-                        // Ensure no PBO is bound when creating the texture storage,
-                        // or GL will attempt to read data from there.
-                        let texture = self.device.create_texture(
-                            TextureTarget::Array,
-                            info.format,
-                            info.width,
-                            info.height,
-                            info.filter,
-                            // This needs to be a render target because some render
-                            // tasks get rendered into the texture cache.
-                            Some(RenderTargetInfo { has_depth: false }),
-                            info.layer_count,
-                        );
-
-                        let old = self.texture_resolver.texture_cache_map.insert(allocation.id, texture);
-                        assert_eq!(old.is_some(), is_realloc, "Renderer and RenderBackend disagree");
-                        if let Some(old) = old {
-                            self.device.blit_renderable_texture(
-                                self.texture_resolver.texture_cache_map.get_mut(&allocation.id).unwrap(),
-                                &old
+        let mut upload_time = TimeProfileCounter::new("Resource upload time", false);
+        upload_time.profile(|| {
+            for update_list in pending_texture_updates.drain(..) {
+                for allocation in update_list.allocations {
+                    let is_realloc = matches!(allocation.kind, TextureCacheAllocationKind::Realloc(..));
+                    match allocation.kind {
+                        TextureCacheAllocationKind::Alloc(info) |
+                        TextureCacheAllocationKind::Realloc(info) => {
+                            // Create a new native texture, as requested by the texture cache.
+                            //
+                            // Ensure no PBO is bound when creating the texture storage,
+                            // or GL will attempt to read data from there.
+                            let texture = self.device.create_texture(
+                                TextureTarget::Array,
+                                info.format,
+                                info.width,
+                                info.height,
+                                info.filter,
+                                // This needs to be a render target because some render
+                                // tasks get rendered into the texture cache.
+                                Some(RenderTargetInfo { has_depth: false }),
+                                info.layer_count,
                             );
-                            self.device.delete_texture(old);
+
+                            let old = self.texture_resolver.texture_cache_map.insert(allocation.id, texture);
+                            assert_eq!(old.is_some(), is_realloc, "Renderer and RenderBackend disagree");
+                            if let Some(old) = old {
+                                self.device.blit_renderable_texture(
+                                    self.texture_resolver.texture_cache_map.get_mut(&allocation.id).unwrap(),
+                                    &old
+                                );
+                                self.device.delete_texture(old);
+                            }
+                        },
+                        TextureCacheAllocationKind::Free => {
+                            let texture = self.texture_resolver.texture_cache_map.remove(&allocation.id).unwrap();
+                            self.device.delete_texture(texture);
+                        },
+                    }
+                }
+
+                for update in update_list.updates {
+                    let TextureCacheUpdate { id, rect, stride, offset, layer_index, source } = update;
+                    let texture = &self.texture_resolver.texture_cache_map[&id];
+                    let mut uploader = self.device.upload_texture(
+                        texture,
+                        &self.texture_cache_upload_pbo,
+                        0,
+                    );
+
+                    let bytes_uploaded = match source {
+                        TextureUpdateSource::Bytes { data } => {
+                            uploader.upload(
+                                rect, layer_index, stride,
+                                &data[offset as usize ..],
+                            )
                         }
-                    },
-                    TextureCacheAllocationKind::Free => {
-                        let texture = self.texture_resolver.texture_cache_map.remove(&allocation.id).unwrap();
-                        self.device.delete_texture(texture);
-                    },
+                        TextureUpdateSource::External { id, channel_index } => {
+                            let handler = self.external_image_handler
+                                .as_mut()
+                                .expect("Found external image, but no handler set!");
+                            // The filter is only relevant for NativeTexture external images.
+                            let size = match handler.lock(id, channel_index, ImageRendering::Auto).source {
+                                ExternalImageSource::RawData(data) => {
+                                    uploader.upload(
+                                        rect, layer_index, stride,
+                                        &data[offset as usize ..],
+                                    )
+                                }
+                                ExternalImageSource::Invalid => {
+                                    // Create a local buffer to fill the pbo.
+                                    let bpp = texture.get_format().bytes_per_pixel();
+                                    let width = stride.unwrap_or(rect.size.width * bpp);
+                                    let total_size = width * rect.size.height;
+                                    // WR haven't support RGBAF32 format in texture_cache, so
+                                    // we use u8 type here.
+                                    let dummy_data: Vec<u8> = vec![255; total_size as usize];
+                                    uploader.upload(rect, layer_index, stride, &dummy_data)
+                                }
+                                ExternalImageSource::NativeTexture(eid) => {
+                                    panic!("Unexpected external texture {:?} for the texture cache update of {:?}", eid, id);
+                                }
+                            };
+                            handler.unlock(id, channel_index);
+                            size
+                        }
+                    };
+                    self.profile_counters.texture_data_uploaded.add(bytes_uploaded >> 10);
                 }
             }
 
-            for update in update_list.updates {
-                let TextureCacheUpdate { id, rect, stride, offset, layer_index, source } = update;
-                let texture = &self.texture_resolver.texture_cache_map[&id];
-                let mut uploader = self.device.upload_texture(
-                    texture,
-                    &self.texture_cache_upload_pbo,
-                    0,
-                );
-
-                let bytes_uploaded = match source {
-                    TextureUpdateSource::Bytes { data } => {
-                        uploader.upload(
-                            rect, layer_index, stride,
-                            &data[offset as usize ..],
-                        )
-                    }
-                    TextureUpdateSource::External { id, channel_index } => {
-                        let handler = self.external_image_handler
-                            .as_mut()
-                            .expect("Found external image, but no handler set!");
-                        // The filter is only relevant for NativeTexture external images.
-                        let size = match handler.lock(id, channel_index, ImageRendering::Auto).source {
-                            ExternalImageSource::RawData(data) => {
-                                uploader.upload(
-                                    rect, layer_index, stride,
-                                    &data[offset as usize ..],
-                                )
-                            }
-                            ExternalImageSource::Invalid => {
-                                // Create a local buffer to fill the pbo.
-                                let bpp = texture.get_format().bytes_per_pixel();
-                                let width = stride.unwrap_or(rect.size.width * bpp);
-                                let total_size = width * rect.size.height;
-                                // WR haven't support RGBAF32 format in texture_cache, so
-                                // we use u8 type here.
-                                let dummy_data: Vec<u8> = vec![255; total_size as usize];
-                                uploader.upload(rect, layer_index, stride, &dummy_data)
-                            }
-                            ExternalImageSource::NativeTexture(eid) => {
-                                panic!("Unexpected external texture {:?} for the texture cache update of {:?}", eid, id);
-                            }
-                        };
-                        handler.unlock(id, channel_index);
-                        size
-                    }
-                };
-
-                self.profile_counters.texture_data_uploaded.add(bytes_uploaded >> 10);
-            }
-        }
-
-        drain_filter(
-            &mut self.notifications,
-            |n| { n.when() == Checkpoint::FrameTexturesUpdated },
-            |n| { n.notify(); },
-        );
+            drain_filter(
+                &mut self.notifications,
+                |n| { n.when() == Checkpoint::FrameTexturesUpdated },
+                |n| { n.notify(); },
+            );
+        });
+        self.resource_upload_time += upload_time.get();
     }
 
     pub(crate) fn draw_instanced_batch<T>(
@@ -4679,6 +4695,8 @@ pub struct RendererStats {
     pub alpha_target_count: usize,
     pub color_target_count: usize,
     pub texture_upload_kb: usize,
+    pub resource_upload_time: u64,
+    pub gpu_cache_upload_time: u64,
 }
 
 impl RendererStats {
@@ -4688,6 +4706,8 @@ impl RendererStats {
             alpha_target_count: 0,
             color_target_count: 0,
             texture_upload_kb: 0,
+            resource_upload_time: 0,
+            gpu_cache_upload_time: 0,
         }
     }
 }
diff --git a/gfx/webrender_bindings/revision.txt b/gfx/webrender_bindings/revision.txt
index e49f6e2500c9..0d49b49e9a28 100644
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1 +1 @@
-fbf65161bef7fbbe07dfd2c9b5b9833784422e9e
+dfb2517eea37bce19e686032faae4053cb427ff8

From 4daa00a2cdacb2d5a1be838de16b1fff1dc36ec7 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:17:34 +0000
Subject: [PATCH 13/33] Bug 1504929 - Mark
 AnimationInfo::GetAnimationGeneration as a const function. r=birtles

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

--HG--
extra : moz-landing-system : lando
---
 gfx/layers/AnimationInfo.h | 5 ++++-
 gfx/layers/Layers.h        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gfx/layers/AnimationInfo.h b/gfx/layers/AnimationInfo.h
index e04fcaf9e424..ddc6886288fc 100644
--- a/gfx/layers/AnimationInfo.h
+++ b/gfx/layers/AnimationInfo.h
@@ -48,7 +48,10 @@ public:
   {
     mAnimationGeneration = Some(aCount);
   }
-  Maybe<uint64_t> GetAnimationGeneration() { return mAnimationGeneration; }
+  Maybe<uint64_t> GetAnimationGeneration() const
+  {
+    return mAnimationGeneration;
+  }
 
   // ClearAnimations clears animations on this layer.
   void ClearAnimations();
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 0adbfce3ee75..2dc7bc9eb6f3 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -1379,7 +1379,7 @@ public:
   uint64_t GetCompositorAnimationsId() { return mAnimationInfo.GetCompositorAnimationsId(); }
   InfallibleTArray<AnimData>& GetAnimationData();
 
-  Maybe<uint64_t> GetAnimationGeneration()
+  Maybe<uint64_t> GetAnimationGeneration() const
   {
     return mAnimationInfo.GetAnimationGeneration();
   }

From 8ee7bcc4a72d002051a00f90cd339a85257de2eb Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:22:26 +0000
Subject: [PATCH 14/33] Bug 1504929 - Stop iterating EffectSets and
 KeyframeEffect::mProperties for each CSS properties that can be animated on
 the compositor. r=birtles

This change gets all effective CSS properties on an nsIFrame just once.

Note that LayerAnimationInfo::GetCSSPropertiesFor intentionally returns
nsCSSPropertyIDSet instead of nsCSSPropertyID since when we support individual
transform properties for the compositor the mapping between display item types
and nsCSSProperty has to be 1:N. E.g. all scale/translate/rotate properties are
mapped to transform display item.

Depends on D11424

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

--HG--
extra : moz-landing-system : lando
---
 dom/animation/EffectSet.h         |  4 +++
 dom/animation/KeyframeEffect.cpp  | 29 +++++++++++++++++++
 dom/animation/KeyframeEffect.h    |  8 ++++++
 layout/base/RestyleManager.cpp    | 16 +++++++++--
 layout/base/nsLayoutUtils.cpp     | 17 +++++++++++
 layout/base/nsLayoutUtils.h       |  8 ++++++
 layout/style/LayerAnimationInfo.h | 47 +++++++++++++++++++++++++++++++
 layout/style/nsCSSPropertyIDSet.h |  8 ++++++
 8 files changed, 134 insertions(+), 3 deletions(-)

diff --git a/dom/animation/EffectSet.h b/dom/animation/EffectSet.h
index 6509e0cb049e..d53e02bf8af1 100644
--- a/dom/animation/EffectSet.h
+++ b/dom/animation/EffectSet.h
@@ -188,6 +188,10 @@ public:
 
   static nsAtom** GetEffectSetPropertyAtoms();
 
+  const nsCSSPropertyIDSet& PropertiesWithImportantRules() const
+  {
+    return mPropertiesWithImportantRules;
+  }
   nsCSSPropertyIDSet& PropertiesWithImportantRules()
   {
     return mPropertiesWithImportantRules;
diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index a184d682fe43..e0d1aeb9ce93 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -286,6 +286,35 @@ KeyframeEffect::GetEffectiveAnimationOfProperty(nsCSSPropertyID aProperty) const
   return nullptr;
 }
 
+nsCSSPropertyIDSet
+KeyframeEffect::GetPropertiesForCompositor(const EffectSet& aEffects) const
+{
+  MOZ_ASSERT(
+    &aEffects ==
+      EffectSet::GetEffectSet(mTarget->mElement, mTarget->mPseudoType));
+
+  nsCSSPropertyIDSet properties;
+
+  if (!IsInEffect() && !IsCurrent()) {
+    return properties;
+  }
+
+  static constexpr nsCSSPropertyIDSet compositorAnimatables =
+    nsCSSPropertyIDSet::CompositorAnimatables();
+  for (const AnimationProperty& property : mProperties) {
+    if (!compositorAnimatables.HasProperty(property.mProperty)) {
+      continue;
+    }
+    if (!aEffects.PropertiesWithImportantRules()
+           .HasProperty(property.mProperty) ||
+        !aEffects.PropertiesForAnimationsLevel()
+           .HasProperty(property.mProperty)) {
+      properties.AddProperty(property.mProperty);
+    }
+  }
+  return properties;
+}
+
 bool
 KeyframeEffect::HasAnimationOfProperty(nsCSSPropertyID aProperty) const
 {
diff --git a/dom/animation/KeyframeEffect.h b/dom/animation/KeyframeEffect.h
index 678e3b26309d..2a0d5593400b 100644
--- a/dom/animation/KeyframeEffect.h
+++ b/dom/animation/KeyframeEffect.h
@@ -208,6 +208,14 @@ public:
   const AnimationProperty* GetEffectiveAnimationOfProperty(
     nsCSSPropertyID aProperty) const;
 
+  // Returns all the effective animated CSS properties that can be animated on
+  // the compositor and are not overridden by a higher cascade level.
+  //
+  // NOTE: This function is basically called for all KeyframeEffects on an
+  // element thus it takes |aEffects| to avoid multiple calls of
+  // EffectSet::GetEffect().
+  nsCSSPropertyIDSet GetPropertiesForCompositor(const EffectSet& aEffects) const;
+
   const InfallibleTArray<AnimationProperty>& Properties() const
   {
     return mProperties;
diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
index cd38bc47de47..f386d1783c51 100644
--- a/layout/base/RestyleManager.cpp
+++ b/layout/base/RestyleManager.cpp
@@ -1795,6 +1795,8 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
   uint64_t frameGeneration =
     RestyleManager::GetAnimationGenerationForFrame(aFrame);
 
+  Maybe<nsCSSPropertyIDSet> effectiveAnimationProperties;
+
   nsChangeHint hint = nsChangeHint(0);
   for (const LayerAnimationInfo::Record& layerInfo :
          LayerAnimationInfo::sRecords) {
@@ -1848,9 +1850,17 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
     // not have those properies just before. e.g, setting transform by
     // setKeyframes or changing target element from other target which prevents
     // running on the compositor, etc.
-    if (!generation &&
-        nsLayoutUtils::HasEffectiveAnimation(aFrame, layerInfo.mProperty)) {
-      hint |= layerInfo.mChangeHint;
+    if (!generation) {
+      if (!effectiveAnimationProperties) {
+        effectiveAnimationProperties.emplace(
+          nsLayoutUtils::GetAnimationPropertiesForCompositor(aFrame));
+      }
+      const nsCSSPropertyIDSet& propertiesForDisplayItem =
+        LayerAnimationInfo::GetCSSPropertiesFor(layerInfo.mDisplayItemType);
+      if (effectiveAnimationProperties->Intersects(propertiesForDisplayItem)) {
+        hint |=
+          LayerAnimationInfo::GetChangeHintFor(layerInfo.mDisplayItemType);
+      }
     }
   }
 
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 237b8e2a1a05..ed4a3fcfff8d 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -329,6 +329,23 @@ nsLayoutUtils::HasEffectiveAnimation(const nsIFrame* aFrame,
   );
 }
 
+/* static */ nsCSSPropertyIDSet
+nsLayoutUtils::GetAnimationPropertiesForCompositor(const nsIFrame* aFrame)
+{
+  nsCSSPropertyIDSet properties;
+
+  EffectSet* effects = EffectSet::GetEffectSet(aFrame);
+  if (!effects) {
+    return properties;
+  }
+
+  for (const KeyframeEffect* effect : *effects) {
+    properties |= effect->GetPropertiesForCompositor(*effects);
+  }
+
+  return properties;
+}
+
 static float
 GetSuitableScale(float aMaxScale, float aMinScale,
                  nscoord aVisibleDimension, nscoord aDisplayDimension)
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index 5216deef7cbf..50c8b5bd141b 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -2382,6 +2382,14 @@ public:
   static bool HasEffectiveAnimation(const nsIFrame* aFrame,
                                     nsCSSPropertyID aProperty);
 
+  /**
+   * Returns all effective animated CSS properties on |aFrame|. That means
+   * properties that can be animated on the compositor and are not overridden by
+   * a higher cascade level.
+   */
+  static nsCSSPropertyIDSet
+  GetAnimationPropertiesForCompositor(const nsIFrame* aFrame);
+
   /**
    * Checks if off-main-thread animations are enabled.
    */
diff --git a/layout/style/LayerAnimationInfo.h b/layout/style/LayerAnimationInfo.h
index ab8d78282ca6..ae92db71c717 100644
--- a/layout/style/LayerAnimationInfo.h
+++ b/layout/style/LayerAnimationInfo.h
@@ -33,6 +33,53 @@ struct LayerAnimationInfo {
   static DisplayItemType
   GetDisplayItemTypeForProperty(nsCSSPropertyID aProperty);
 
+  // Returns the corresponding CSS properties for |aDisplayItemType|.
+  //
+  // This function works only for display items tied to CSS properties that can
+  // be animated on the compositor.
+  static inline const nsCSSPropertyIDSet&
+  GetCSSPropertiesFor(DisplayItemType aDisplayItemType)
+  {
+    static const nsCSSPropertyIDSet transformProperties =
+      nsCSSPropertyIDSet{ eCSSProperty_transform };
+    static const nsCSSPropertyIDSet opacityProperties =
+      nsCSSPropertyIDSet{ eCSSProperty_opacity };
+    static const nsCSSPropertyIDSet empty = nsCSSPropertyIDSet();
+
+    switch (aDisplayItemType) {
+      case DisplayItemType::TYPE_OPACITY:
+        return opacityProperties;
+      case DisplayItemType::TYPE_TRANSFORM:
+        return transformProperties;
+      default:
+        MOZ_ASSERT_UNREACHABLE("Should not be called for display item types "
+                               "that are not able to have animations on the "
+                               "compositor");
+        return empty;
+    }
+  }
+
+  // Returns the appropriate change hint for updating the display item for
+  // |aDisplayItemType|.
+  //
+  // This function works only for display items tied to CSS properties that can
+  // be animated on the compositor.
+  static inline nsChangeHint
+  GetChangeHintFor(DisplayItemType aDisplayItemType)
+  {
+    switch (aDisplayItemType) {
+      case DisplayItemType::TYPE_OPACITY:
+        return nsChangeHint_UpdateOpacityLayer;
+      case DisplayItemType::TYPE_TRANSFORM:
+        return nsChangeHint_UpdateTransformLayer;
+      default:
+        MOZ_ASSERT_UNREACHABLE("Should not be called for display item types "
+                               "that are not able to have animations on the "
+                               "compositor");
+        return nsChangeHint(0);
+    }
+  }
+
   static const size_t kRecords =
     nsCSSPropertyIDSet::CompositorAnimatableCount();
   static const Record sRecords[kRecords];
diff --git a/layout/style/nsCSSPropertyIDSet.h b/layout/style/nsCSSPropertyIDSet.h
index d95fd6466e15..4c18511d1df1 100644
--- a/layout/style/nsCSSPropertyIDSet.h
+++ b/layout/style/nsCSSPropertyIDSet.h
@@ -142,6 +142,14 @@ public:
       return result;
     }
 
+    nsCSSPropertyIDSet& operator|=(const nsCSSPropertyIDSet& aOther)
+    {
+      for (size_t i = 0; i < mozilla::ArrayLength(mProperties); ++i) {
+        mProperties[i] |= aOther.mProperties[i];
+      }
+      return *this;
+    }
+
 private:
     typedef unsigned long property_set_type;
 public:

From dcccc1a459bb8534504d3af507164f3bd055fd89 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:22:24 +0000
Subject: [PATCH 15/33] Bug 1504929 - Introduce
 LayerAnimationInfo::sDisplayItemTypes and iterate it instead of
 LayerAnimationInfo::sRecords. r=birtles

Depends on D11425

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

--HG--
extra : moz-landing-system : lando
---
 layout/base/RestyleManager.cpp      | 14 ++++++--------
 layout/style/LayerAnimationInfo.cpp |  7 +++++++
 layout/style/LayerAnimationInfo.h   | 10 ++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
index f386d1783c51..c58cd9a86b85 100644
--- a/layout/base/RestyleManager.cpp
+++ b/layout/base/RestyleManager.cpp
@@ -1798,11 +1798,9 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
   Maybe<nsCSSPropertyIDSet> effectiveAnimationProperties;
 
   nsChangeHint hint = nsChangeHint(0);
-  for (const LayerAnimationInfo::Record& layerInfo :
-         LayerAnimationInfo::sRecords) {
+  for (auto displayItemType : LayerAnimationInfo::sDisplayItemTypes) {
     Maybe<uint64_t> generation =
-      layers::AnimationInfo::GetGenerationFromFrame(aFrame,
-                                                    layerInfo.mDisplayItemType);
+      layers::AnimationInfo::GetGenerationFromFrame(aFrame, displayItemType);
     if (generation && frameGeneration != *generation) {
       // If we have a transform layer bug don't have any transform style, we
       // probably just removed the transform but haven't destroyed the layer
@@ -1823,7 +1821,7 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
       // Note that we *don't* add nsChangeHint_UpdateTransformLayer since if we
       // did, ApplyRenderingChangeToTree would complain that we're updating a
       // transform layer without a transform.
-      if (layerInfo.mDisplayItemType == DisplayItemType::TYPE_TRANSFORM &&
+      if (displayItemType == DisplayItemType::TYPE_TRANSFORM &&
           !aFrame->StyleDisplay()->HasTransformStyle()) {
         // Add all the hints for a removing a transform if they are not already
         // set for this frame.
@@ -1834,7 +1832,7 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
         }
         continue;
       }
-      hint |= layerInfo.mChangeHint;
+      hint |= LayerAnimationInfo::GetChangeHintFor(displayItemType);
     }
 
     // We consider it's the first paint for the frame if we have an animation
@@ -1856,10 +1854,10 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
           nsLayoutUtils::GetAnimationPropertiesForCompositor(aFrame));
       }
       const nsCSSPropertyIDSet& propertiesForDisplayItem =
-        LayerAnimationInfo::GetCSSPropertiesFor(layerInfo.mDisplayItemType);
+        LayerAnimationInfo::GetCSSPropertiesFor(displayItemType);
       if (effectiveAnimationProperties->Intersects(propertiesForDisplayItem)) {
         hint |=
-          LayerAnimationInfo::GetChangeHintFor(layerInfo.mDisplayItemType);
+          LayerAnimationInfo::GetChangeHintFor(displayItemType);
       }
     }
   }
diff --git a/layout/style/LayerAnimationInfo.cpp b/layout/style/LayerAnimationInfo.cpp
index bc3fcfa84a6d..f59ef750c10a 100644
--- a/layout/style/LayerAnimationInfo.cpp
+++ b/layout/style/LayerAnimationInfo.cpp
@@ -19,6 +19,13 @@ namespace mozilla {
       DisplayItemType::TYPE_OPACITY,
       nsChangeHint_UpdateOpacityLayer } };
 
+/* static */ const Array<DisplayItemType,
+                         nsCSSPropertyIDSet::CompositorAnimatableCount()>
+  LayerAnimationInfo::sDisplayItemTypes = {
+    DisplayItemType::TYPE_OPACITY,
+    DisplayItemType::TYPE_TRANSFORM,
+  };
+
 /* static */ DisplayItemType
 LayerAnimationInfo::GetDisplayItemTypeForProperty(nsCSSPropertyID aProperty)
 {
diff --git a/layout/style/LayerAnimationInfo.h b/layout/style/LayerAnimationInfo.h
index ae92db71c717..4abb3516f4e0 100644
--- a/layout/style/LayerAnimationInfo.h
+++ b/layout/style/LayerAnimationInfo.h
@@ -11,6 +11,7 @@
 #include "nsCSSPropertyID.h"
 #include "nsCSSPropertyIDSet.h"
 #include "nsDisplayList.h" // For nsDisplayItem::Type
+#include "mozilla/Array.h"
 
 namespace mozilla {
 
@@ -80,6 +81,15 @@ struct LayerAnimationInfo {
     }
   }
 
+  // An array of DisplayItemType corresponding to the display item taht we can
+  // animate on the compositor.
+  //
+  // This is used to look up the appropriate change hint in cases when
+  // animations need updating but no other change hint is generated.
+  static const Array<DisplayItemType,
+                     nsCSSPropertyIDSet::CompositorAnimatableCount()>
+    sDisplayItemTypes;
+
   static const size_t kRecords =
     nsCSSPropertyIDSet::CompositorAnimatableCount();
   static const Record sRecords[kRecords];

From c592937db40e8d9849674e8c7ac54b53670d3cc1 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:23:20 +0000
Subject: [PATCH 16/33] Bug 1504929 - Further optimizations for
 RestyleManager::AddLayerChangesForAnimations.. r=birtles,sotaro

This change eliminates
 - nsLayoutUtils::LastContinuationOrIBSplitSibling calls for each CSS
   properties on WebRender
 - iterating over each display item for each compositor runnable CSS properties
 - a bunch of stuff in the case where the layer manager has not yet created,
   i.e. the compositor thread is not ready to receive animations

Depends on D11425

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

--HG--
extra : moz-landing-system : lando
---
 gfx/layers/AnimationInfo.cpp          | 62 +++++++++++++++++++++++++++
 gfx/layers/AnimationInfo.h            | 18 ++++++++
 gfx/layers/wr/WebRenderUserData.h     |  2 +-
 layout/base/RestyleManager.cpp        | 27 +++++++-----
 layout/base/nsLayoutUtils.cpp         |  2 +-
 layout/base/nsLayoutUtils.h           |  3 +-
 layout/generic/nsIFrame.h             |  4 ++
 layout/painting/FrameLayerBuilder.cpp | 62 +++++++++++++++++++++++++++
 layout/painting/FrameLayerBuilder.h   | 19 ++++++++
 9 files changed, 185 insertions(+), 14 deletions(-)

diff --git a/gfx/layers/AnimationInfo.cpp b/gfx/layers/AnimationInfo.cpp
index 605ded379820..28e5ee247bbd 100644
--- a/gfx/layers/AnimationInfo.cpp
+++ b/gfx/layers/AnimationInfo.cpp
@@ -5,9 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AnimationInfo.h"
+#include "mozilla/LayerAnimationInfo.h"
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/layers/AnimationHelper.h"
 #include "mozilla/dom/Animation.h"
+#include "nsIContent.h"
+#include "PuppetWidget.h"
 
 namespace mozilla {
 namespace layers {
@@ -189,5 +192,64 @@ AnimationInfo::GetGenerationFromFrame(nsIFrame* aFrame,
   return Nothing();
 }
 
+/* static */ void
+AnimationInfo::EnumerateGenerationOnFrame(
+  const nsIFrame* aFrame,
+  const nsIContent* aContent,
+  const CompositorAnimatableDisplayItemTypes& aDisplayItemTypes,
+  const AnimationGenerationCallback& aCallback)
+{
+  if (XRE_IsContentProcess()) {
+    if (nsIWidget* widget = nsContentUtils::WidgetForContent(aContent)) {
+      // In case of child processes, we might not have yet created the layer
+      // manager.  That means there is no animation generation we have, thus
+      // we call the callback function with |Nothing()| for the generation.
+      //
+      // Note that we need to use nsContentUtils::WidgetForContent() instead of
+      // TabChild::GetFrom(aFrame->PresShell())->WebWidget() because in the case
+      // of child popup content PuppetWidget::mTabChild is the same as the
+      // parent's one, which means mTabChild->IsLayersConnected() check in
+      // PuppetWidget::GetLayerManager queries the parent state, it results the
+      // assertion in the function failure.
+      if (widget->GetOwningTabChild() &&
+          !static_cast<widget::PuppetWidget*>(widget)->HasLayerManager()) {
+        for (auto displayItem : LayerAnimationInfo::sDisplayItemTypes) {
+          aCallback(Nothing(), displayItem);
+        }
+        return;
+      }
+    }
+  }
+
+  RefPtr<LayerManager> layerManager =
+    nsContentUtils::LayerManagerForContent(aContent);
+
+  if (layerManager &&
+      layerManager->GetBackendType() == layers::LayersBackend::LAYERS_WR) {
+    // In case of continuation, nsDisplayItem uses its last continuation, so we
+    // have to use the last continuation frame here.
+    if (nsLayoutUtils::IsFirstContinuationOrIBSplitSibling(aFrame)) {
+      aFrame = nsLayoutUtils::LastContinuationOrIBSplitSibling(aFrame);
+    }
+
+    for (auto displayItem : LayerAnimationInfo::sDisplayItemTypes) {
+      RefPtr<WebRenderAnimationData> animationData =
+        GetWebRenderUserData<WebRenderAnimationData>(aFrame,
+                                                     (uint32_t)displayItem);
+      Maybe<uint64_t> generation;
+      if (animationData) {
+        generation = animationData->GetAnimationInfo().GetAnimationGeneration();
+      }
+      aCallback(generation, displayItem);
+    }
+    return;
+  }
+
+  FrameLayerBuilder::EnumerateGenerationForDedicatedLayers(
+    aFrame,
+    LayerAnimationInfo::sDisplayItemTypes,
+    aCallback);
+}
+
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/AnimationInfo.h b/gfx/layers/AnimationInfo.h
index ddc6886288fc..b5267743a6e4 100644
--- a/gfx/layers/AnimationInfo.h
+++ b/gfx/layers/AnimationInfo.h
@@ -8,9 +8,12 @@
 #define GFX_ANIMATIONINFO_H
 
 #include "nsAutoPtr.h"
+#include "nsCSSPropertyIDSet.h"
 #include "nsDisplayItemTypes.h"
+#include "mozilla/Array.h"
 
 struct RawServoAnimationValue;
+class nsIContent;
 class nsIFrame;
 
 namespace mozilla {
@@ -75,6 +78,21 @@ public:
   static Maybe<uint64_t> GetGenerationFromFrame(nsIFrame* aFrame,
                                                 DisplayItemType aDisplayItemKey);
 
+  using CompositorAnimatableDisplayItemTypes =
+    Array<DisplayItemType, nsCSSPropertyIDSet::CompositorAnimatableCount()>;
+  using AnimationGenerationCallback =
+    std::function<bool(const Maybe<uint64_t>& aGeneration,
+                       DisplayItemType aDisplayItemType)>;
+  // Enumerates animation generations on |aFrame| for the given display item
+  // types and calls |aCallback| with the animation generation.
+  //
+  // The enumeration stops if |aCallback| returns false.
+  static void EnumerateGenerationOnFrame(
+    const nsIFrame* aFrame,
+    const nsIContent* aContent,
+    const CompositorAnimatableDisplayItemTypes& aDisplayItemTypes,
+    const AnimationGenerationCallback& aCallback);
+
 protected:
   AnimationArray mAnimations;
   uint64_t mCompositorAnimationsId;
diff --git a/gfx/layers/wr/WebRenderUserData.h b/gfx/layers/wr/WebRenderUserData.h
index 6769eaca27d2..e19cabd0bcb4 100644
--- a/gfx/layers/wr/WebRenderUserData.h
+++ b/gfx/layers/wr/WebRenderUserData.h
@@ -232,7 +232,7 @@ struct WebRenderUserDataProperty {
 };
 
 template<class T> already_AddRefed<T>
-GetWebRenderUserData(nsIFrame* aFrame, uint32_t aPerFrameKey)
+GetWebRenderUserData(const nsIFrame* aFrame, uint32_t aPerFrameKey)
 {
   MOZ_ASSERT(aFrame);
   WebRenderUserDataTable* userDataTable =
diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
index c58cd9a86b85..3f6c043b6eea 100644
--- a/layout/base/RestyleManager.cpp
+++ b/layout/base/RestyleManager.cpp
@@ -1797,11 +1797,11 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
 
   Maybe<nsCSSPropertyIDSet> effectiveAnimationProperties;
 
+  Maybe<uint64_t> generation;
   nsChangeHint hint = nsChangeHint(0);
-  for (auto displayItemType : LayerAnimationInfo::sDisplayItemTypes) {
-    Maybe<uint64_t> generation =
-      layers::AnimationInfo::GetGenerationFromFrame(aFrame, displayItemType);
-    if (generation && frameGeneration != *generation) {
+  auto maybeApplyChangeHint = [&](const Maybe<uint64_t>& aGeneration,
+                                  DisplayItemType aDisplayItemType) -> bool {
+    if (aGeneration && frameGeneration != *aGeneration) {
       // If we have a transform layer bug don't have any transform style, we
       // probably just removed the transform but haven't destroyed the layer
       // yet. In this case we will typically add the appropriate change hint
@@ -1821,7 +1821,7 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
       // Note that we *don't* add nsChangeHint_UpdateTransformLayer since if we
       // did, ApplyRenderingChangeToTree would complain that we're updating a
       // transform layer without a transform.
-      if (displayItemType == DisplayItemType::TYPE_TRANSFORM &&
+      if (aDisplayItemType == DisplayItemType::TYPE_TRANSFORM &&
           !aFrame->StyleDisplay()->HasTransformStyle()) {
         // Add all the hints for a removing a transform if they are not already
         // set for this frame.
@@ -1830,9 +1830,9 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
                 aHintForThisFrame))) {
           hint |= nsChangeHint_ComprehensiveAddOrRemoveTransform;
         }
-        continue;
+        return true;
       }
-      hint |= LayerAnimationInfo::GetChangeHintFor(displayItemType);
+      hint |= LayerAnimationInfo::GetChangeHintFor(aDisplayItemType);
     }
 
     // We consider it's the first paint for the frame if we have an animation
@@ -1854,13 +1854,20 @@ RestyleManager::AddLayerChangesForAnimation(nsIFrame* aFrame,
           nsLayoutUtils::GetAnimationPropertiesForCompositor(aFrame));
       }
       const nsCSSPropertyIDSet& propertiesForDisplayItem =
-        LayerAnimationInfo::GetCSSPropertiesFor(displayItemType);
+        LayerAnimationInfo::GetCSSPropertiesFor(aDisplayItemType);
       if (effectiveAnimationProperties->Intersects(propertiesForDisplayItem)) {
         hint |=
-          LayerAnimationInfo::GetChangeHintFor(displayItemType);
+          LayerAnimationInfo::GetChangeHintFor(aDisplayItemType);
       }
     }
-  }
+    return true;
+  };
+
+  AnimationInfo::EnumerateGenerationOnFrame(
+    aFrame,
+    aContent,
+    LayerAnimationInfo::sDisplayItemTypes,
+    maybeApplyChangeHint);
 
   if (hint) {
     aChangeListToProcess.AppendChange(aFrame, aContent, hint);
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index ed4a3fcfff8d..e5aebcc17651 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -4836,7 +4836,7 @@ nsLayoutUtils::LastContinuationOrIBSplitSibling(const nsIFrame* aFrame)
 }
 
 bool
-nsLayoutUtils::IsFirstContinuationOrIBSplitSibling(nsIFrame *aFrame)
+nsLayoutUtils::IsFirstContinuationOrIBSplitSibling(const nsIFrame *aFrame)
 {
   if (aFrame->GetPrevContinuation()) {
     return false;
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index 50c8b5bd141b..2c8d1ddd7722 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -1422,8 +1422,7 @@ public:
    * Is FirstContinuationOrIBSplitSibling(aFrame) going to return
    * aFrame?
    */
-  static bool
-  IsFirstContinuationOrIBSplitSibling(nsIFrame *aFrame);
+  static bool IsFirstContinuationOrIBSplitSibling(const nsIFrame *aFrame);
 
   /**
    * Check whether aFrame is a part of the scrollbar or scrollcorner of
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 632b426c56b8..64efce190f70 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -4091,6 +4091,10 @@ public:
                             ComputeSizeFlags    aFlags = eDefault);
 
   DisplayItemDataArray& DisplayItemData() { return mDisplayItemData; }
+  const DisplayItemDataArray& DisplayItemData() const
+  {
+    return mDisplayItemData;
+  }
 
   void AddDisplayItem(nsDisplayItem* aItem);
   bool RemoveDisplayItem(nsDisplayItem* aItem);
diff --git a/layout/painting/FrameLayerBuilder.cpp b/layout/painting/FrameLayerBuilder.cpp
index 810e4e263ee1..87a46823381b 100644
--- a/layout/painting/FrameLayerBuilder.cpp
+++ b/layout/painting/FrameLayerBuilder.cpp
@@ -6903,6 +6903,68 @@ FrameLayerBuilder::GetDedicatedLayer(nsIFrame* aFrame,
   return nullptr;
 }
 
+/* static */ void
+FrameLayerBuilder::EnumerateGenerationForDedicatedLayers(
+  const nsIFrame* aFrame,
+  const CompositorAnimatableDisplayItemTypes& aDisplayItemTypes,
+  const AnimationGenerationCallback& aCallback)
+{
+  std::bitset<static_cast<uint32_t>(DisplayItemType::TYPE_MAX)> notFoundTypes;
+  for (auto displayItem : aDisplayItemTypes) {
+    notFoundTypes.set(static_cast<uint32_t>(displayItem));
+  }
+
+  const SmallPointerArray<DisplayItemData>& array = aFrame->DisplayItemData();
+
+  for (uint32_t i = 0; i < array.Length(); i++) {
+    DisplayItemData* element =
+      DisplayItemData::AssertDisplayItemData(array.ElementAt(i));
+    if (!element->mParent->mLayerManager->IsWidgetLayerManager()) {
+      continue;
+    }
+
+    DisplayItemType foundType = DisplayItemType::TYPE_ZERO;
+    for (auto displayItem : aDisplayItemTypes) {
+      if (GetDisplayItemTypeFromKey(element->mDisplayItemKey) == displayItem) {
+        foundType = displayItem;
+        notFoundTypes.reset(static_cast<uint32_t>(displayItem));
+        break;
+      }
+    }
+    if (foundType == DisplayItemType::TYPE_ZERO) {
+      continue;
+    }
+
+    Maybe<uint64_t> generation;
+    if (element->mOptLayer) {
+      generation = element->mOptLayer->GetAnimationGeneration();
+    } else if (!element->mLayer->HasUserData(&gColorLayerUserData) &&
+               !element->mLayer->HasUserData(&gImageLayerUserData) &&
+               !element->mLayer->HasUserData(&gPaintedDisplayItemLayerUserData)) {
+      generation = element->mLayer->GetAnimationGeneration();
+    }
+
+    if (!aCallback(generation, foundType)) {
+      return;
+    }
+  }
+
+  // Bail out if we have already enumerated all possible layers for the given
+  // display item types.
+  if (notFoundTypes.none()) {
+    return;
+  }
+
+  // If there are any display item types that the nsIFrame doesn't have, we need
+  // to call the callback function for them respectively.
+  for (auto displayItem : aDisplayItemTypes) {
+    if (notFoundTypes[static_cast<uint32_t>(displayItem)] &&
+        !aCallback(Nothing(), displayItem)) {
+      return;
+    }
+  }
+}
+
 gfxSize
 FrameLayerBuilder::GetPaintedLayerScaleForFrame(nsIFrame* aFrame)
 {
diff --git a/layout/painting/FrameLayerBuilder.h b/layout/painting/FrameLayerBuilder.h
index aa6b029ff7cb..ebf079059a9b 100644
--- a/layout/painting/FrameLayerBuilder.h
+++ b/layout/painting/FrameLayerBuilder.h
@@ -8,6 +8,7 @@
 #define FRAMELAYERBUILDER_H_
 
 #include "nsAutoPtr.h"
+#include "nsCSSPropertyIDSet.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTArray.h"
@@ -509,6 +510,24 @@ public:
   static Layer* GetDedicatedLayer(nsIFrame* aFrame,
                                   DisplayItemType aDisplayItemType);
 
+  using CompositorAnimatableDisplayItemTypes =
+    Array<DisplayItemType, nsCSSPropertyIDSet::CompositorAnimatableCount()>;
+  using AnimationGenerationCallback =
+    std::function<bool(const Maybe<uint64_t>& aGeneration,
+                       DisplayItemType aDisplayItemType)>;
+  /**
+   * Enumerates layers for the given display item types and calls |aCallback|
+   * with the animation generation for the layer.  If there is no corresponding
+   * layer for the display item or the layer has no animation, the animation
+   * generation is Nothing().
+   *
+   * The enumeration stops if |aCallback| returns false.
+   */
+  static void EnumerateGenerationForDedicatedLayers(
+    const nsIFrame* aFrame,
+    const CompositorAnimatableDisplayItemTypes& aDisplayItemTypes,
+    const AnimationGenerationCallback& aCallback);
+
   /**
    * This callback must be provided to EndTransaction. The callback data
    * must be the nsDisplayListBuilder containing this FrameLayerBuilder.

From d3095c2c9262ebb9796ee05df963da62c2f7c595 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:17:42 +0000
Subject: [PATCH 17/33] Bug 1504929 - Drop LayerAnimationInfo::sRecords.
 r=birtles

Depends on D11426

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

--HG--
extra : moz-landing-system : lando
---
 layout/build/nsLayoutStatics.cpp    |  4 ---
 layout/style/LayerAnimationInfo.cpp | 48 -----------------------------
 layout/style/LayerAnimationInfo.h   | 15 ---------
 3 files changed, 67 deletions(-)

diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index fc0b587edb5f..9bcbc202f813 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -258,10 +258,6 @@ nsLayoutStatics::Initialize()
 
   ServiceWorkerRegistrar::Initialize();
 
-#ifdef DEBUG
-  mozilla::LayerAnimationInfo::Initialize();
-#endif
-
   MediaDecoder::InitStatics();
 
   PromiseDebugging::Init();
diff --git a/layout/style/LayerAnimationInfo.cpp b/layout/style/LayerAnimationInfo.cpp
index f59ef750c10a..f0ebbecf2dd9 100644
--- a/layout/style/LayerAnimationInfo.cpp
+++ b/layout/style/LayerAnimationInfo.cpp
@@ -11,14 +11,6 @@
 
 namespace mozilla {
 
-/* static */ const LayerAnimationInfo::Record LayerAnimationInfo::sRecords[] =
-  { { eCSSProperty_transform,
-      DisplayItemType::TYPE_TRANSFORM,
-      nsChangeHint_UpdateTransformLayer },
-    { eCSSProperty_opacity,
-      DisplayItemType::TYPE_OPACITY,
-      nsChangeHint_UpdateOpacityLayer } };
-
 /* static */ const Array<DisplayItemType,
                          nsCSSPropertyIDSet::CompositorAnimatableCount()>
   LayerAnimationInfo::sDisplayItemTypes = {
@@ -40,44 +32,4 @@ LayerAnimationInfo::GetDisplayItemTypeForProperty(nsCSSPropertyID aProperty)
   return DisplayItemType::TYPE_ZERO;
 }
 
-#ifdef DEBUG
-/* static */ void
-LayerAnimationInfo::Initialize()
-{
-  for (const Record& record : sRecords) {
-    MOZ_ASSERT(nsCSSProps::PropHasFlags(record.mProperty,
-                                        CSSPropFlags::CanAnimateOnCompositor),
-               "CSS property with entry in LayerAnimation::sRecords does not "
-               "have the CSSPropFlags::CanAnimateOnCompositor flag");
-  }
-
-  nsCSSPropertyIDSet properties;
-  // Check that every property with the flag for animating on the
-  // compositor has an entry in LayerAnimationInfo::sRecords.
-  for (nsCSSPropertyID prop = nsCSSPropertyID(0);
-       prop < eCSSProperty_COUNT;
-       prop = nsCSSPropertyID(prop + 1)) {
-    if (nsCSSProps::PropHasFlags(prop,
-                                 CSSPropFlags::CanAnimateOnCompositor)) {
-      bool found = false;
-      for (const Record& record : sRecords) {
-        if (record.mProperty == prop) {
-          found = true;
-          properties.AddProperty(record.mProperty);
-          break;
-        }
-      }
-      MOZ_ASSERT(found,
-                 "CSS property with the CSSPropFlags::CanAnimateOnCompositor "
-                 "flag does not have an entry in LayerAnimationInfo::sRecords");
-      MOZ_ASSERT(GetDisplayItemTypeForProperty(prop) !=
-                   DisplayItemType::TYPE_ZERO,
-                 "GetDisplayItemTypeForProperty should return a valid display "
-                 "item type");
-    }
-  }
-  MOZ_ASSERT(properties.Equals(nsCSSPropertyIDSet::CompositorAnimatables()));
-}
-#endif
-
 } // namespace mozilla
diff --git a/layout/style/LayerAnimationInfo.h b/layout/style/LayerAnimationInfo.h
index 4abb3516f4e0..adc34b86851c 100644
--- a/layout/style/LayerAnimationInfo.h
+++ b/layout/style/LayerAnimationInfo.h
@@ -16,17 +16,6 @@
 namespace mozilla {
 
 struct LayerAnimationInfo {
-#ifdef DEBUG
-  static void Initialize();
-#endif
-  // For CSS properties that may be animated on a separate layer, represents
-  // a record of the corresponding layer type and change hint.
-  struct Record {
-    nsCSSPropertyID mProperty;
-    DisplayItemType mDisplayItemType;
-    nsChangeHint mChangeHint;
-  };
-
   // Returns the corresponding display item type for |aProperty| when it is
   // animated on the compositor.
   // Returns DisplayItemType::TYPE_ZERO if |aProperty| cannot be animated on the
@@ -89,10 +78,6 @@ struct LayerAnimationInfo {
   static const Array<DisplayItemType,
                      nsCSSPropertyIDSet::CompositorAnimatableCount()>
     sDisplayItemTypes;
-
-  static const size_t kRecords =
-    nsCSSPropertyIDSet::CompositorAnimatableCount();
-  static const Record sRecords[kRecords];
 };
 
 } // namespace mozilla

From 163ee505df86fd7d9d2e3571d5cc635434a7f11a Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:17:44 +0000
Subject: [PATCH 18/33] Bug 1504929 - Avoid hashmap lookups in
 nsLayoutUtils::HasEffectiveAnimation and
 EffectCompositor::FindAnimationsForCompositor. r=birtles

Depends on D11427

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

--HG--
extra : moz-landing-system : lando
---
 dom/animation/EffectCompositor.cpp |  7 ++++---
 dom/animation/KeyframeEffect.cpp   | 22 ++++++++++++----------
 dom/animation/KeyframeEffect.h     | 11 ++++++++---
 layout/base/nsLayoutUtils.cpp      |  4 ++--
 layout/painting/nsDisplayList.cpp  |  3 ++-
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/dom/animation/EffectCompositor.cpp b/dom/animation/EffectCompositor.cpp
index 7c97dd64ec37..404993edb4c1 100644
--- a/dom/animation/EffectCompositor.cpp
+++ b/dom/animation/EffectCompositor.cpp
@@ -82,7 +82,8 @@ enum class MatchForCompositor {
 static MatchForCompositor
 IsMatchForCompositor(const KeyframeEffect& aEffect,
                      nsCSSPropertyID aProperty,
-                     const nsIFrame* aFrame)
+                     const nsIFrame* aFrame,
+                     const EffectSet& aEffects)
 {
   const Animation* animation = aEffect.GetAnimation();
   MOZ_ASSERT(animation);
@@ -103,7 +104,7 @@ IsMatchForCompositor(const KeyframeEffect& aEffect,
     return MatchForCompositor::NoAndBlockThisProperty;
   }
 
-  if (!aEffect.HasEffectiveAnimationOfProperty(aProperty)) {
+  if (!aEffect.HasEffectiveAnimationOfProperty(aProperty, aEffects)) {
     return MatchForCompositor::No;
   }
 
@@ -205,7 +206,7 @@ FindAnimationsForCompositor(const nsIFrame* aFrame,
   bool foundRunningAnimations = false;
   for (KeyframeEffect* effect : *effects) {
     MatchForCompositor matchResult =
-      IsMatchForCompositor(*effect, aProperty, aFrame);
+      IsMatchForCompositor(*effect, aProperty, aFrame, *effects);
 
     if (matchResult == MatchForCompositor::NoAndBlockThisProperty) {
       // For a given |aFrame|, we don't want some animations of |aProperty| to
diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index e0d1aeb9ce93..94d51d643397 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -263,20 +263,22 @@ KeyframeEffect::SetKeyframes(
 }
 
 const AnimationProperty*
-KeyframeEffect::GetEffectiveAnimationOfProperty(nsCSSPropertyID aProperty) const
+KeyframeEffect::GetEffectiveAnimationOfProperty(nsCSSPropertyID aProperty,
+                                                const EffectSet& aEffects) const
 {
-  EffectSet* effectSet =
-    EffectSet::GetEffectSet(mTarget->mElement, mTarget->mPseudoType);
+  MOZ_ASSERT(
+    &aEffects ==
+      EffectSet::GetEffectSet(mTarget->mElement, mTarget->mPseudoType));
+
   for (size_t propIdx = 0, propEnd = mProperties.Length();
        propIdx != propEnd; ++propIdx) {
     if (aProperty == mProperties[propIdx].mProperty) {
       const AnimationProperty* result = &mProperties[propIdx];
       // Skip if there is a property of animation level that is overridden
       // by !important rules.
-      if (effectSet &&
-          effectSet->PropertiesWithImportantRules()
+      if (aEffects.PropertiesWithImportantRules()
             .HasProperty(result->mProperty) &&
-          effectSet->PropertiesForAnimationsLevel()
+          aEffects.PropertiesForAnimationsLevel()
             .HasProperty(result->mProperty)) {
         result = nullptr;
       }
@@ -1280,16 +1282,16 @@ KeyframeEffect::CanThrottle() const
     MOZ_ASSERT(nsCSSPropertyIDSet::CompositorAnimatables()
                  .HasProperty(property.mProperty),
                "The property should be able to run on the compositor");
-    MOZ_ASSERT(HasEffectiveAnimationOfProperty(property.mProperty),
-               "There should be an effective animation of the property while "
-               "it is marked as being run on the compositor");
-
     if (!effectSet) {
       effectSet = EffectSet::GetEffectSet(mTarget->mElement,
                                           mTarget->mPseudoType);
       MOZ_ASSERT(effectSet, "CanThrottle should be called on an effect "
                             "associated with a target element");
     }
+    MOZ_ASSERT(HasEffectiveAnimationOfProperty(property.mProperty, *effectSet),
+               "There should be an effective animation of the property while "
+               "it is marked as being run on the compositor");
+
 
     DisplayItemType displayItemType =
       LayerAnimationInfo::GetDisplayItemTypeForProperty(property.mProperty);
diff --git a/dom/animation/KeyframeEffect.h b/dom/animation/KeyframeEffect.h
index 2a0d5593400b..546ba4e3246a 100644
--- a/dom/animation/KeyframeEffect.h
+++ b/dom/animation/KeyframeEffect.h
@@ -199,14 +199,19 @@ public:
   // property is not overridden by !important rules.
   // Also EffectiveAnimationOfProperty returns true under the same condition.
   //
+  // |aEffect| should be the EffectSet containing this KeyframeEffect since
+  // this function is typically called for all KeyframeEffects on an element
+  // so that we can avoid multiple calls of EffectSet::GetEffect().
+  //
   // NOTE: We don't currently check for !important rules for properties that
   // can't run on the compositor.
-  bool HasEffectiveAnimationOfProperty(nsCSSPropertyID aProperty) const
+  bool HasEffectiveAnimationOfProperty(nsCSSPropertyID aProperty,
+                                       const EffectSet& aEffect) const
   {
-    return GetEffectiveAnimationOfProperty(aProperty) != nullptr;
+    return GetEffectiveAnimationOfProperty(aProperty, aEffect) != nullptr;
   }
   const AnimationProperty* GetEffectiveAnimationOfProperty(
-    nsCSSPropertyID aProperty) const;
+    nsCSSPropertyID aProperty, const EffectSet& aEffect) const;
 
   // Returns all the effective animated CSS properties that can be animated on
   // the compositor and are not overridden by a higher cascade level.
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index e5aebcc17651..4b23ede9dad7 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -321,10 +321,10 @@ nsLayoutUtils::HasEffectiveAnimation(const nsIFrame* aFrame,
 
 
   return HasMatchingAnimations(effects,
-    [&aProperty](KeyframeEffect& aEffect)
+    [&aProperty, &effects](KeyframeEffect& aEffect)
     {
       return (aEffect.IsInEffect() || aEffect.IsCurrent()) &&
-             aEffect.HasEffectiveAnimationOfProperty(aProperty);
+             aEffect.HasEffectiveAnimationOfProperty(aProperty, *effects);
     }
   );
 }
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index b57cf6f2dd6d..a7ff3925a392 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -674,6 +674,7 @@ AddAnimationsForProperty(nsIFrame* aFrame,
     nsCSSProps::PropHasFlags(aProperty, CSSPropFlags::CanAnimateOnCompositor),
     "inconsistent property flags");
 
+  EffectSet* effects = EffectSet::GetEffectSet(styleFrame);
   // Add from first to last (since last overrides)
   for (size_t animIdx = 0; animIdx < compositorAnimations.Length(); animIdx++) {
     dom::Animation* anim = compositorAnimations[animIdx];
@@ -686,7 +687,7 @@ AddAnimationsForProperty(nsIFrame* aFrame,
     MOZ_ASSERT(keyframeEffect,
                "A playing animation should have a keyframe effect");
     const AnimationProperty* property =
-      keyframeEffect->GetEffectiveAnimationOfProperty(aProperty);
+      keyframeEffect->GetEffectiveAnimationOfProperty(aProperty, *effects);
     if (!property) {
       continue;
     }

From e8d577185df14d760f5eb20d67c59bc0e4243777 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:17:56 +0000
Subject: [PATCH 19/33] Bug 1504929 - Make `if` conditions in
 KeyframeEffect::GetEffectiveAnimationOfProperty negative. r=birtles

I.e., continue the loop if the CSS property is not what we want and set the
result value only if the CSS property is effective.

This change makes the function match
what KeyframeEffect::GetEffectiveAnimationProperties does in the similar loop
so that we can unify the iteration into a single function in the next commit.

Depends on D11597

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

--HG--
extra : moz-landing-system : lando
---
 dom/animation/KeyframeEffect.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index 94d51d643397..a925220550c1 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -270,20 +270,21 @@ KeyframeEffect::GetEffectiveAnimationOfProperty(nsCSSPropertyID aProperty,
     &aEffects ==
       EffectSet::GetEffectSet(mTarget->mElement, mTarget->mPseudoType));
 
-  for (size_t propIdx = 0, propEnd = mProperties.Length();
-       propIdx != propEnd; ++propIdx) {
-    if (aProperty == mProperties[propIdx].mProperty) {
-      const AnimationProperty* result = &mProperties[propIdx];
-      // Skip if there is a property of animation level that is overridden
-      // by !important rules.
-      if (aEffects.PropertiesWithImportantRules()
-            .HasProperty(result->mProperty) &&
-          aEffects.PropertiesForAnimationsLevel()
-            .HasProperty(result->mProperty)) {
-        result = nullptr;
-      }
-      return result;
+  for (const AnimationProperty& property : mProperties) {
+    if (aProperty != property.mProperty) {
+      continue;
     }
+
+    const AnimationProperty* result = nullptr;
+    // Only include the property if it is not overridden by !important rules in
+    // the transitions level.
+    if (!aEffects.PropertiesWithImportantRules()
+           .HasProperty(property.mProperty) ||
+        !aEffects.PropertiesForAnimationsLevel()
+           .HasProperty(property.mProperty)) {
+      result = &property;
+    }
+    return result;
   }
   return nullptr;
 }

From e74997c54d5d2af297b6cb06010fd5f3ffc620d3 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:18:09 +0000
Subject: [PATCH 20/33] Bug 1504929 - Factor out IsEffectiveProperty().
 r=birtles

Depends on D11598

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

--HG--
extra : moz-landing-system : lando
---
 dom/animation/KeyframeEffect.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index a925220550c1..03e899c79788 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -262,6 +262,15 @@ KeyframeEffect::SetKeyframes(
   }
 }
 
+static bool
+IsEffectiveProperty(const EffectSet& aEffects, nsCSSPropertyID aProperty)
+{
+  return !aEffects.PropertiesWithImportantRules()
+           .HasProperty(aProperty) ||
+         !aEffects.PropertiesForAnimationsLevel()
+           .HasProperty(aProperty);
+}
+
 const AnimationProperty*
 KeyframeEffect::GetEffectiveAnimationOfProperty(nsCSSPropertyID aProperty,
                                                 const EffectSet& aEffects) const
@@ -278,10 +287,7 @@ KeyframeEffect::GetEffectiveAnimationOfProperty(nsCSSPropertyID aProperty,
     const AnimationProperty* result = nullptr;
     // Only include the property if it is not overridden by !important rules in
     // the transitions level.
-    if (!aEffects.PropertiesWithImportantRules()
-           .HasProperty(property.mProperty) ||
-        !aEffects.PropertiesForAnimationsLevel()
-           .HasProperty(property.mProperty)) {
+    if (IsEffectiveProperty(aEffects, property.mProperty)) {
       result = &property;
     }
     return result;
@@ -308,10 +314,7 @@ KeyframeEffect::GetPropertiesForCompositor(const EffectSet& aEffects) const
     if (!compositorAnimatables.HasProperty(property.mProperty)) {
       continue;
     }
-    if (!aEffects.PropertiesWithImportantRules()
-           .HasProperty(property.mProperty) ||
-        !aEffects.PropertiesForAnimationsLevel()
-           .HasProperty(property.mProperty)) {
+    if (IsEffectiveProperty(aEffects, property.mProperty)) {
       properties.AddProperty(property.mProperty);
     }
   }

From e0aa8f4fcbeaafd929ccb53623f6b03cfae09e7d Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:18:23 +0000
Subject: [PATCH 21/33] Bug 1504929 - Break
 RestyleManager::GetAnimationGenerationForFrame into EffectSet::GetEffect and
 EffectSet::GetAnimationGeneration in AddAnimationsForProperty.
 r=birtles,sotaro

Since we use the EffectSet later in the same function.

Depends on D11599

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

--HG--
extra : moz-landing-system : lando
---
 layout/painting/nsDisplayList.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index a7ff3925a392..1517b4572e6a 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -598,10 +598,11 @@ AddAnimationsForProperty(nsIFrame* aFrame,
   // layer, we still need to mark it as up-to-date with regards to animations.
   // Otherwise, in RestyleManager we'll notice the discrepancy between the
   // animation generation numbers and update the layer indefinitely.
+  // Note that EffectSet::GetEffectSet expects to work with the style frame
+  // instead of the primary frame.
+  EffectSet* effects = EffectSet::GetEffectSet(styleFrame);
   uint64_t animationGeneration =
-    // Note that GetAnimationGenerationForFrame() calles EffectSet::GetEffectSet
-    // that expects to work with the style frame instead of the primary frame.
-    RestyleManager::GetAnimationGenerationForFrame(styleFrame);
+    effects ? effects->GetAnimationGeneration() : 0;
   aAnimationInfo.SetAnimationGeneration(animationGeneration);
 
   EffectCompositor::ClearIsRunningOnCompositor(styleFrame, aProperty);
@@ -674,7 +675,6 @@ AddAnimationsForProperty(nsIFrame* aFrame,
     nsCSSProps::PropHasFlags(aProperty, CSSPropFlags::CanAnimateOnCompositor),
     "inconsistent property flags");
 
-  EffectSet* effects = EffectSet::GetEffectSet(styleFrame);
   // Add from first to last (since last overrides)
   for (size_t animIdx = 0; animIdx < compositorAnimations.Length(); animIdx++) {
     dom::Animation* anim = compositorAnimations[animIdx];

From 23793e3a2172787eca440889a8c4ec3cc6069862 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Tue, 13 Nov 2018 10:18:30 +0000
Subject: [PATCH 22/33] Bug 1504929 - Start animations once after a
 MozReftestInvalidate event is received. r=sotaro

We need the same workaround for
https://bugzilla.mozilla.org/show_bug.cgi?id=1489327 .

And unfortunately we have to disable animate-backface-hidden.html on MacOSX opt
builds for WebRender because the test fails intermittently, we will enable it
in bug 1506758.

Depends on D11601

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

--HG--
extra : moz-landing-system : lando
---
 .../transform-3d/animate-backface-hidden.html | 19 +++++++++---------
 .../animate-preserve3d-child.html             | 16 +++++++++------
 .../animate-preserve3d-parent.html            | 20 +++++++++----------
 layout/reftests/transform-3d/reftest.list     |  6 +++---
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/layout/reftests/transform-3d/animate-backface-hidden.html b/layout/reftests/transform-3d/animate-backface-hidden.html
index a373ed93a02f..dc99d16823a3 100644
--- a/layout/reftests/transform-3d/animate-backface-hidden.html
+++ b/layout/reftests/transform-3d/animate-backface-hidden.html
@@ -16,8 +16,6 @@ body { padding: 50px }
   background: blue;
   height: 200px; width: 200px;
   backface-visibility: hidden;
-  /* use a -99.9s delay to start at 99.9% and then move to 0% */
-  animation: flip 100s -99.9s linear 2 paused;
 }
 
 </style>
@@ -27,14 +25,6 @@ body { padding: 50px }
 
 <script>
 
-document.getElementById("test").addEventListener("animationstart", StartListener);
-
-function StartListener(event) {
-  var test = document.getElementById("test");
-  test.style.animationPlayState = 'running';
-  test.addEventListener("animationiteration", IterationListener);
-}
-
 function IterationListener(event) {
   setTimeout(RemoveReftestWait, 0);
 }
@@ -43,4 +33,13 @@ function RemoveReftestWait() {
   document.documentElement.classList.remove("reftest-wait");
 }
 
+document.addEventListener('MozReftestInvalidate', () => {
+  test.addEventListener("animationstart", () => {
+    test.style.animationPlayState = 'running';
+    test.addEventListener("animationiteration", IterationListener);
+  });
+  /* use a -99.9s delay to start at 99.9% and then move to 0% */
+  test.style.animation = 'flip 100s -99.9s linear 2 paused';
+}, false);
+
 </script>
diff --git a/layout/reftests/transform-3d/animate-preserve3d-child.html b/layout/reftests/transform-3d/animate-preserve3d-child.html
index bf2aea4585b4..fcf77f9756a3 100644
--- a/layout/reftests/transform-3d/animate-preserve3d-child.html
+++ b/layout/reftests/transform-3d/animate-preserve3d-child.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<html class="reftest-wait">
+<html class="reftest-wait reftest-no-flush">
 <title>Testcase, bug 1176969</title>
 <style>
 
@@ -17,8 +17,6 @@ body { padding: 50px }
   height: 200px; width: 200px;
   border: 1px solid black;
   transform-style: preserve-3d;
-  /* use a -99.9s delay to start at 99.9% and then move to 0% */
-  animation: spin 100s -99.9s linear 2;
 }
 
 @keyframes noop {
@@ -29,7 +27,6 @@ body { padding: 50px }
   height: 100px; width: 100px; margin: 50px;
   background: yellow;
   box-shadow: 3px 3px olive;
-  animation: noop infinite 10s linear;
 }
 
 </style>
@@ -43,8 +40,6 @@ body { padding: 50px }
 
 <script>
 
-document.getElementById("parent").addEventListener("animationiteration", IterationListener);
-
 function IterationListener(event) {
   setTimeout(RemoveReftestWait, 0);
 }
@@ -53,4 +48,13 @@ function RemoveReftestWait() {
   document.documentElement.classList.remove("reftest-wait");
 }
 
+document.addEventListener('MozReftestInvalidate', () => {
+  const parentElement = document.getElementById('parent');
+  parentElement.addEventListener('animationiteration', IterationListener);
+
+  /* use a -99.9s delay to start at 99.9% and then move to 0% */
+  parentElement.style.animation = 'spin 100s -99.9s linear 2';
+  child.style.animation = 'noop infinite 10s linear';
+}, false);
+
 </script>
diff --git a/layout/reftests/transform-3d/animate-preserve3d-parent.html b/layout/reftests/transform-3d/animate-preserve3d-parent.html
index 9aa8816d3f89..0131d33e6f15 100644
--- a/layout/reftests/transform-3d/animate-preserve3d-parent.html
+++ b/layout/reftests/transform-3d/animate-preserve3d-parent.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<html class="reftest-wait">
+<html class="reftest-wait reftest-no-flush">
 <title>Testcase, bug 1176969</title>
 <style>
 
@@ -17,8 +17,6 @@ body { padding: 50px }
   height: 200px; width: 200px;
   border: 1px solid black;
   transform-style: preserve-3d;
-  /* use a -99.9s delay to start at 99.9% and then move to 0% */
-  animation: spin 100s -99.9s linear 2 paused;
 }
 
 #child {
@@ -39,14 +37,6 @@ body { padding: 50px }
 
 <script>
 
-document.getElementById("parent").addEventListener("animationstart", StartListener);
-
-function StartListener(event) {
-  var test = document.getElementById("parent");
-  test.style.animationPlayState = 'running';
-  test.addEventListener("animationiteration", IterationListener);
-}
-
 function IterationListener(event) {
   setTimeout(RemoveReftestWait, 0);
 }
@@ -55,4 +45,12 @@ function RemoveReftestWait() {
   document.documentElement.classList.remove("reftest-wait");
 }
 
+document.addEventListener('MozReftestInvalidate', () => {
+  const test = document.getElementById("parent");
+  test.addEventListener("animationiteration", IterationListener);
+
+  /* use a -99.9s delay to start at 99.9% and then move to 0% */
+  test.style.animation = 'spin 100s -99.9s linear 2';
+}, false);
+
 </script>
diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
index ba6c1d9bf9ae..81f605fbc012 100644
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -71,9 +71,9 @@ fuzzy(0-3,0-99) == animate-cube-degrees.html animate-cube-degrees-ref.html # sub
 == animate-cube-degrees-zoom.html animate-cube-degrees-zoom-ref.html
 != animate-cube-degrees-ref.html animate-cube-degrees-zoom-ref.html
 fuzzy-if(gtkWidget,0-128,0-100) fuzzy-if(Android||OSX==1010||(gtkWidget&&layersGPUAccelerated),0-143,0-100) fuzzy-if(winWidget||OSX<1010,0-141,0-100) == preserves3d-nested.html preserves3d-nested-ref.html
-fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
-fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android
-== animate-backface-hidden.html about:blank
+skip-if(cocoaWidget&&webrender) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
+skip-if(cocoaWidget&&webrender) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android
+skip-if(cocoaWidget&&webrender) == animate-backface-hidden.html about:blank # intermittent failure on MacOSX builds (bug 1505613)
 == 1245450-1.html green-rect.html
 fuzzy(0-1,0-2000) == opacity-preserve3d-1.html opacity-preserve3d-1-ref.html
 fuzzy(0-1,0-15000) == opacity-preserve3d-2.html opacity-preserve3d-2-ref.html

From 88030616a1dac6625df2f38e870e4fe03a8d1c00 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Tue, 13 Nov 2018 10:38:24 +0000
Subject: [PATCH 23/33] Bug 1466613 - Add a gfxCriticalNote to provide more
 details on replay failure. r=jrmuizel

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

--HG--
extra : moz-landing-system : lando
---
 gfx/2d/InlineTranslator.cpp                   | 6 ++++++
 gfx/2d/InlineTranslator.h                     | 3 +++
 gfx/webrender_bindings/Moz2DImageRenderer.cpp | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gfx/2d/InlineTranslator.cpp b/gfx/2d/InlineTranslator.cpp
index 8fac5ed339a0..47d79675a9ce 100644
--- a/gfx/2d/InlineTranslator.cpp
+++ b/gfx/2d/InlineTranslator.cpp
@@ -56,18 +56,21 @@ InlineTranslator::TranslateRecording(char *aData, size_t aLen)
   uint32_t magicInt;
   ReadElement(reader, magicInt);
   if (magicInt != mozilla::gfx::kMagicInt) {
+    mError = "Magic";
     return false;
   }
 
   uint16_t majorRevision;
   ReadElement(reader, majorRevision);
   if (majorRevision != kMajorRevision) {
+    mError = "Major";
     return false;
   }
 
   uint16_t minorRevision;
   ReadElement(reader, minorRevision);
   if (minorRevision > kMinorRevision) {
+    mError = "Minor";
     return false;
   }
 
@@ -78,16 +81,19 @@ InlineTranslator::TranslateRecording(char *aData, size_t aLen)
                                [&] (RecordedEvent *recordedEvent) {
                                  // Make sure that the whole event was read from the stream successfully.
                                  if (!reader.good()) {
+                                     mError = " READ";
                                      return false;
                                  }
 
                                  if (!recordedEvent->PlayEvent(this)) {
+                                     mError = " PLAY";
                                      return false;
                                  }
 
                                  return true;
                               });
     if (!success) {
+      mError = RecordedEvent::GetEventName(static_cast<RecordedEvent::EventType>(eventType)) + mError;
       return false;
     }
 
diff --git a/gfx/2d/InlineTranslator.h b/gfx/2d/InlineTranslator.h
index 35d885f0b495..cb0e705459c1 100644
--- a/gfx/2d/InlineTranslator.h
+++ b/gfx/2d/InlineTranslator.h
@@ -8,6 +8,7 @@
 #define mozilla_layout_InlineTranslator_h
 
 #include <istream>
+#include <string>
 
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Filters.h"
@@ -184,10 +185,12 @@ public:
   mozilla::gfx::DrawTarget* GetReferenceDrawTarget() final { return mBaseDT; }
 
   void* GetFontContext() final { return mFontContext; }
+  std::string GetError() { return mError; }
 
 private:
   RefPtr<DrawTarget> mBaseDT;
   void*              mFontContext;
+  std::string        mError;
 
   nsRefPtrHashtable<nsPtrHashKey<void>, DrawTarget> mDrawTargets;
   nsRefPtrHashtable<nsPtrHashKey<void>, Path> mPaths;
diff --git a/gfx/webrender_bindings/Moz2DImageRenderer.cpp b/gfx/webrender_bindings/Moz2DImageRenderer.cpp
index 5a9331e6ed65..3e8d1928d635 100644
--- a/gfx/webrender_bindings/Moz2DImageRenderer.cpp
+++ b/gfx/webrender_bindings/Moz2DImageRenderer.cpp
@@ -445,7 +445,10 @@ static bool Moz2DRenderCallback(const Range<const uint8_t> aBlob,
 
     Range<const uint8_t> blob(aBlob.begin() + offset, aBlob.begin() + end);
     ret = translator.TranslateRecording((char*)blob.begin().get(), blob.length());
-    MOZ_RELEASE_ASSERT(ret);
+    if (!ret) {
+      gfxCriticalNote << "Replay failure: " << translator.GetError();
+      MOZ_RELEASE_ASSERT(false);
+    }
     offset = extra_end;
   }
 

From 17eea57296515a30ce684ebd4fb4e82bd7919588 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Tue, 13 Nov 2018 10:39:02 +0000
Subject: [PATCH 24/33] Bug 1466613 - Robustify DrawTargetRecording codepaths
 that create new drawtargets. r=mstange

Badly-behaved consumers of DrawTargetRecording can trigger recording of
draw calls that will fail to allocate required draw targets when the
recording is replayed. This patch tries to guard against this by
detecting these situations at record-time rather than crashing at
replay-time. When such a situation is detected, it will crash (for
content processes, to catch such scenarios) or gracefully fail (for
other processes).

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

--HG--
extra : moz-landing-system : lando
---
 gfx/2d/2D.h                          | 12 ++++++++++
 gfx/2d/DrawTargetD2D1.cpp            |  7 ++++++
 gfx/2d/DrawTargetD2D1.h              |  2 ++
 gfx/2d/DrawTargetDual.cpp            |  6 +++++
 gfx/2d/DrawTargetDual.h              |  4 +++-
 gfx/2d/DrawTargetOffset.h            |  6 +++++
 gfx/2d/DrawTargetRecording.cpp       | 33 +++++++++++++++++++++++-----
 gfx/2d/DrawTargetRecording.h         |  4 +++-
 gfx/2d/DrawTargetSkia.cpp            |  6 +++++
 gfx/2d/DrawTargetSkia.h              |  1 +
 gfx/2d/DrawTargetTiled.h             |  4 ++++
 gfx/2d/DrawTargetWrapAndRecord.cpp   |  6 +++++
 gfx/2d/DrawTargetWrapAndRecord.h     |  3 +++
 gfx/tests/crashtests/1470437.html    | 10 +++++++++
 gfx/tests/crashtests/crashtests.list |  1 +
 layout/generic/TextDrawTarget.h      |  6 +++++
 16 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 gfx/tests/crashtests/1470437.html

diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
index 32fb380d3bb5..f09b29a6a103 100644
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -1375,6 +1375,18 @@ public:
   virtual already_AddRefed<DrawTarget>
     CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const = 0;
 
+  /**
+   * Returns false if CreateSimilarDrawTarget would return null with the same
+   * parameters. May return true even in cases where CreateSimilarDrawTarget
+   * return null (i.e. this function returning false has meaning, but returning
+   * true doesn't guarantee anything).
+   */
+  virtual bool
+    CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const
+  {
+    return true;
+  }
+
   /**
    * Create a draw target optimized for drawing a shadow.
    *
diff --git a/gfx/2d/DrawTargetD2D1.cpp b/gfx/2d/DrawTargetD2D1.cpp
index c87ded0d4ef3..faeee6e960ac 100644
--- a/gfx/2d/DrawTargetD2D1.cpp
+++ b/gfx/2d/DrawTargetD2D1.cpp
@@ -1004,6 +1004,13 @@ DrawTargetD2D1::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFor
   return dt.forget();
 }
 
+bool
+DrawTargetD2D1::CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const
+{
+  return (mDC->GetMaximumBitmapSize() >= UINT32(aSize.width) &&
+          mDC->GetMaximumBitmapSize() >= UINT32(aSize.height));
+}
+
 already_AddRefed<PathBuilder>
 DrawTargetD2D1::CreatePathBuilder(FillRule aFillRule) const
 {
diff --git a/gfx/2d/DrawTargetD2D1.h b/gfx/2d/DrawTargetD2D1.h
index 94cb4dd728c7..58ddaa14ce5c 100644
--- a/gfx/2d/DrawTargetD2D1.h
+++ b/gfx/2d/DrawTargetD2D1.h
@@ -117,6 +117,8 @@ public:
   
   virtual already_AddRefed<DrawTarget>
     CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
+  virtual bool
+    CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
 
   virtual already_AddRefed<PathBuilder> CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const override;
 
diff --git a/gfx/2d/DrawTargetDual.cpp b/gfx/2d/DrawTargetDual.cpp
index b12015e0e7e6..27ab7a1275a4 100644
--- a/gfx/2d/DrawTargetDual.cpp
+++ b/gfx/2d/DrawTargetDual.cpp
@@ -220,5 +220,11 @@ DrawTargetDual::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFor
   return mA->CreateSimilarDrawTarget(aSize, aFormat);
 }
 
+bool
+DrawTargetDual::CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const
+{
+  return mA->CanCreateSimilarDrawTarget(aSize, aFormat);
+}
+
 } // namespace gfx
 } // namespace mozilla
diff --git a/gfx/2d/DrawTargetDual.h b/gfx/2d/DrawTargetDual.h
index c5788db5f48b..4394f47f579b 100644
--- a/gfx/2d/DrawTargetDual.h
+++ b/gfx/2d/DrawTargetDual.h
@@ -143,7 +143,9 @@ public:
      
   virtual already_AddRefed<DrawTarget>
     CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
-     
+  virtual bool
+    CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
+
   virtual already_AddRefed<PathBuilder> CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const override
   {
     return mA->CreatePathBuilder(aFillRule);
diff --git a/gfx/2d/DrawTargetOffset.h b/gfx/2d/DrawTargetOffset.h
index bab7a09a93e8..52b8cc856fc9 100644
--- a/gfx/2d/DrawTargetOffset.h
+++ b/gfx/2d/DrawTargetOffset.h
@@ -139,6 +139,12 @@ public:
     return mDrawTarget->CreateSimilarDrawTarget(aSize, aFormat);
   }
 
+  virtual bool
+    CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override
+  {
+    return mDrawTarget->CanCreateSimilarDrawTarget(aSize, aFormat);
+  }
+
   virtual already_AddRefed<PathBuilder> CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const override
   {
     return mDrawTarget->CreatePathBuilder(aFillRule);
diff --git a/gfx/2d/DrawTargetRecording.cpp b/gfx/2d/DrawTargetRecording.cpp
index cd77019b26b3..96c6660a4ba1 100644
--- a/gfx/2d/DrawTargetRecording.cpp
+++ b/gfx/2d/DrawTargetRecording.cpp
@@ -567,18 +567,39 @@ DrawTargetRecording::CreateSourceSurfaceFromNativeSurface(const NativeSurface &a
 already_AddRefed<DrawTarget>
 DrawTargetRecording::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const
 {
-  RefPtr<DrawTarget> similarDT = new DrawTargetRecording(this, aSize, aFormat);
-  mRecorder->RecordEvent(RecordedCreateSimilarDrawTarget(similarDT.get(),
-                                                         aSize,
-                                                         aFormat));
+  RefPtr<DrawTarget> similarDT;
+  if (mFinalDT->CanCreateSimilarDrawTarget(aSize, aFormat)) {
+    similarDT = new DrawTargetRecording(this, aSize, aFormat);
+    mRecorder->RecordEvent(RecordedCreateSimilarDrawTarget(similarDT.get(),
+                                                           aSize,
+                                                           aFormat));
+  } else if (XRE_IsContentProcess()) {
+    // Crash any content process that calls this function with arguments that
+    // would fail to create a similar draw target. We do this to root out bad
+    // callers. We don't want to crash any important processes though so for
+    // for those we'll just gracefully return nullptr.
+    MOZ_CRASH("Content-process DrawTargetRecording can't create requested similar drawtarget");
+  }
   return similarDT.forget();
 }
 
+bool
+DrawTargetRecording::CanCreateSimilarDrawTarget(const IntSize& aSize, SurfaceFormat aFormat) const
+{
+  return mFinalDT->CanCreateSimilarDrawTarget(aSize, aFormat);
+}
+
 RefPtr<DrawTarget>
 DrawTargetRecording::CreateClippedDrawTarget(const IntSize& aMaxSize, const Matrix& aTransform, SurfaceFormat aFormat) const
 {
-  RefPtr<DrawTarget> similarDT = new DrawTargetRecording(this, aMaxSize, aFormat);
-  mRecorder->RecordEvent(RecordedCreateClippedDrawTarget(similarDT.get(), aMaxSize, aTransform, aFormat));
+  RefPtr<DrawTarget> similarDT;
+  if (mFinalDT->CanCreateSimilarDrawTarget(aMaxSize, aFormat)) {
+   similarDT = new DrawTargetRecording(this, aMaxSize, aFormat);
+    mRecorder->RecordEvent(RecordedCreateClippedDrawTarget(similarDT.get(), aMaxSize, aTransform, aFormat));
+  } else if (XRE_IsContentProcess()) {
+    // See CreateSimilarDrawTarget
+    MOZ_CRASH("Content-process DrawTargetRecording can't create requested clipped drawtarget");
+  }
   return similarDT;
 }
 
diff --git a/gfx/2d/DrawTargetRecording.h b/gfx/2d/DrawTargetRecording.h
index 5f750d82e2f8..55012f24fc30 100644
--- a/gfx/2d/DrawTargetRecording.h
+++ b/gfx/2d/DrawTargetRecording.h
@@ -303,7 +303,9 @@ public:
   virtual already_AddRefed<DrawTarget>
     CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
 
-   /**
+  bool CanCreateSimilarDrawTarget(const IntSize& aSize,
+                                  SurfaceFormat aFormat) const override;
+  /**
    * Create a similar DrawTarget whose requested size may be clipped based
    * on this DrawTarget's rect transformed to the new target's space.
    */
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
index 79343c64548f..7fdc27463259 100644
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -1705,6 +1705,12 @@ DrawTargetSkia::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFor
   return target.forget();
 }
 
+bool
+DrawTargetSkia::CanCreateSimilarDrawTarget(const IntSize& aSize, SurfaceFormat aFormat) const
+{
+  return size_t(std::max(aSize.width, aSize.height)) < GetMaxSurfaceSize();
+}
+
 bool
 DrawTargetSkia::UsingSkiaGPU() const
 {
diff --git a/gfx/2d/DrawTargetSkia.h b/gfx/2d/DrawTargetSkia.h
index e459d2ce2b83..b0c3ab7800fa 100644
--- a/gfx/2d/DrawTargetSkia.h
+++ b/gfx/2d/DrawTargetSkia.h
@@ -126,6 +126,7 @@ public:
     CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const override;
   virtual already_AddRefed<DrawTarget>
     CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
+  virtual bool CanCreateSimilarDrawTarget(const IntSize& aSize, SurfaceFormat aFormat) const override;
   virtual already_AddRefed<PathBuilder> CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const override;
   virtual already_AddRefed<GradientStops> CreateGradientStops(GradientStop *aStops, uint32_t aNumStops, ExtendMode aExtendMode = ExtendMode::CLAMP) const override;
   virtual already_AddRefed<FilterNode> CreateFilter(FilterType aType) override;
diff --git a/gfx/2d/DrawTargetTiled.h b/gfx/2d/DrawTargetTiled.h
index 4b029c5da7c2..59e9de405299 100644
--- a/gfx/2d/DrawTargetTiled.h
+++ b/gfx/2d/DrawTargetTiled.h
@@ -154,6 +154,10 @@ public:
     return mTiles[0].mDrawTarget->CreateSimilarDrawTarget(aSize, aFormat);
   }
 
+  virtual bool CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override {
+    return mTiles[0].mDrawTarget->CanCreateSimilarDrawTarget(aSize, aFormat);
+  }
+
   virtual already_AddRefed<PathBuilder> CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const override
   {
     return mTiles[0].mDrawTarget->CreatePathBuilder(aFillRule);
diff --git a/gfx/2d/DrawTargetWrapAndRecord.cpp b/gfx/2d/DrawTargetWrapAndRecord.cpp
index b56ba989d0f5..0aaeefaad735 100644
--- a/gfx/2d/DrawTargetWrapAndRecord.cpp
+++ b/gfx/2d/DrawTargetWrapAndRecord.cpp
@@ -675,6 +675,12 @@ DrawTargetWrapAndRecord::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFo
   return similarDT.forget();
 }
 
+bool
+DrawTargetWrapAndRecord::CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const
+{
+  return mFinalDT->CanCreateSimilarDrawTarget(aSize, aFormat);
+}
+
 already_AddRefed<PathBuilder>
 DrawTargetWrapAndRecord::CreatePathBuilder(FillRule aFillRule) const
 {
diff --git a/gfx/2d/DrawTargetWrapAndRecord.h b/gfx/2d/DrawTargetWrapAndRecord.h
index 3d6275ea7e9c..c75f1a51848e 100644
--- a/gfx/2d/DrawTargetWrapAndRecord.h
+++ b/gfx/2d/DrawTargetWrapAndRecord.h
@@ -270,6 +270,9 @@ public:
   virtual already_AddRefed<DrawTarget>
     CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
 
+  virtual bool
+    CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override;
+
   /*
    * Create a path builder with the specified fillmode.
    *
diff --git a/gfx/tests/crashtests/1470437.html b/gfx/tests/crashtests/1470437.html
new file mode 100644
index 000000000000..c88008fe00ba
--- /dev/null
+++ b/gfx/tests/crashtests/1470437.html
@@ -0,0 +1,10 @@
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=windows-1252"><style>
+:last-child{
+    background-image: -moz-element(#id3);
+    border-width: 9596.6vmin;
+    border-style: dotted;
+}
+</style>
+</head><body><rect id="id3">
+</rect></body></html>
\ No newline at end of file
diff --git a/gfx/tests/crashtests/crashtests.list b/gfx/tests/crashtests/crashtests.list
index 1f9345b96fc5..09cea82c65b5 100644
--- a/gfx/tests/crashtests/crashtests.list
+++ b/gfx/tests/crashtests/crashtests.list
@@ -167,6 +167,7 @@ load 1408078-1.html
 load 1464243.html
 load 1467847-1.html
 load 1468020.html
+load 1470437.html
 load 1470440.html
 load 1478035.html
 load 1490704-1.html
diff --git a/layout/generic/TextDrawTarget.h b/layout/generic/TextDrawTarget.h
index 1f20f0f4eba6..ec6730335098 100644
--- a/layout/generic/TextDrawTarget.h
+++ b/layout/generic/TextDrawTarget.h
@@ -569,6 +569,12 @@ public:
     return nullptr;
   }
 
+  bool
+  CanCreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const override {
+    MOZ_CRASH("TextDrawTarget: Method shouldn't be called");
+    return false;
+  }
+
   already_AddRefed<PathBuilder> CreatePathBuilder(FillRule aFillRule) const override {
     MOZ_CRASH("TextDrawTarget: Method shouldn't be called");
     return nullptr;

From 76cb4247d3c393d6efe9c57fbd4c993b94baa2f4 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Tue, 13 Nov 2018 10:39:27 +0000
Subject: [PATCH 25/33] Bug 1466613 - Prevent creation of DynamicImage
 instances that are excessively large. r=mstange

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

--HG--
extra : moz-landing-system : lando
---
 layout/painting/nsImageRenderer.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/layout/painting/nsImageRenderer.cpp b/layout/painting/nsImageRenderer.cpp
index 785767ab55de..eec6c3a77481 100644
--- a/layout/painting/nsImageRenderer.cpp
+++ b/layout/painting/nsImageRenderer.cpp
@@ -732,8 +732,13 @@ nsImageRenderer::DrawableForElement(const nsRect& aImageRect,
     nsRect destRect = aImageRect - aImageRect.TopLeft();
     nsIntSize roundedOut = destRect.ToOutsidePixels(appUnitsPerDevPixel).Size();
     IntSize imageSize(roundedOut.width, roundedOut.height);
-    RefPtr<gfxDrawable> drawable =
-      nsSVGIntegrationUtils::DrawableFromPaintServer(
+
+    RefPtr<gfxDrawable> drawable;
+
+    SurfaceFormat format = aContext.GetDrawTarget()->GetFormat();
+    // Don't allow creating images that are too big
+    if (aContext.GetDrawTarget()->CanCreateSimilarDrawTarget(imageSize, format)) {
+      drawable = nsSVGIntegrationUtils::DrawableFromPaintServer(
         mPaintServerFrame,
         mForFrame,
         mSize,
@@ -741,6 +746,7 @@ nsImageRenderer::DrawableForElement(const nsRect& aImageRect,
         aContext.GetDrawTarget(),
         aContext.CurrentMatrixDouble(),
         nsSVGIntegrationUtils::FLAG_SYNC_DECODE_IMAGES);
+    }
 
     return drawable.forget();
   }

From 8e1f58b955c06aecaf2dd6c8f040903423ea4aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 13 Nov 2018 10:55:59 +0000
Subject: [PATCH 26/33] Bug 1506592 - Make sure to only display the broken
 image icon if there's a request at all. r=bzbarsky

This is enough to fix the devtools regression and matches what other browsers
do in the no-attribute case.

Also, I think this change over all makes sense: it doesn't make any sense to
display the broken image icon if there's no request, and we already assume in
EnsureIntrinsicSizeAndRatio() that we don't paint the icon for those (and make
the intrinsic size 0x0).

We still show the border, which matches other UAs (note that devtools
effectively masks the border away with mask-image).

This technically also can change behavior of <object> and <input>, but I think
it's better to be consistent, since EnsureIntrinsicSizeAndRatio also doesn't
special-case <img> either.

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

--HG--
extra : moz-landing-system : lando
---
 dom/base/nsIImageLoadingContent.idl           |  2 +-
 layout/generic/nsImageFrame.cpp               | 57 +++++++++----------
 layout/generic/nsImageFrame.h                 |  1 +
 .../reftests/image-element/broken-icon.html   |  9 +++
 layout/reftests/image-element/empty-src.html  |  9 +++
 .../reftests/image-element/invalid-src-2.html |  9 +++
 .../reftests/image-element/invalid-src.html   |  9 +++
 layout/reftests/image-element/no-src.html     |  9 +++
 layout/reftests/image-element/reftest.list    |  5 ++
 9 files changed, 78 insertions(+), 32 deletions(-)
 create mode 100644 layout/reftests/image-element/broken-icon.html
 create mode 100644 layout/reftests/image-element/empty-src.html
 create mode 100644 layout/reftests/image-element/invalid-src-2.html
 create mode 100644 layout/reftests/image-element/invalid-src.html
 create mode 100644 layout/reftests/image-element/no-src.html

diff --git a/dom/base/nsIImageLoadingContent.idl b/dom/base/nsIImageLoadingContent.idl
index 6e6fb3cf6cdf..8b7d326eab46 100644
--- a/dom/base/nsIImageLoadingContent.idl
+++ b/dom/base/nsIImageLoadingContent.idl
@@ -71,7 +71,7 @@ interface nsIImageLoadingContent : imgINotificationObserver
    * the image was blocked.  This status always refers to the
    * CURRENT_REQUEST load.
    */
-  [noscript] readonly attribute short imageBlockingStatus;
+  [noscript, infallible] readonly attribute short imageBlockingStatus;
 
   /**
    * Used to register an image decoder observer.  Typically, this will
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 85ed4083ba21..db3b8edef982 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -151,6 +151,29 @@ NS_NewImageFrameForGeneratedContentIndex(nsIPresShell* aPresShell,
     aStyle, nsImageFrame::Kind::ContentPropertyAtIndex);
 }
 
+bool
+nsImageFrame::ShouldShowBrokenImageIcon() const
+{
+  // NOTE(emilio, https://github.com/w3c/csswg-drafts/issues/2832): WebKit and
+  // Blink behave differently here for content: url(..), for now adapt to
+  // Blink's behavior.
+  if (mKind != Kind::ImageElement) {
+    return false;
+  }
+
+  // check for broken images. valid null images (eg. img src="") are
+  // not considered broken because they have no image requests
+  if (nsCOMPtr<imgIRequest> currentRequest = GetCurrentRequest()) {
+    uint32_t imageStatus;
+    return NS_SUCCEEDED(currentRequest->GetImageStatus(&imageStatus)) &&
+           (imageStatus & imgIRequest::STATUS_ERROR);
+  }
+
+  nsCOMPtr<nsIImageLoadingContent> loader = do_QueryInterface(mContent);
+  MOZ_ASSERT(loader);
+  return loader->GetImageBlockingStatus() != nsIContentPolicy::ACCEPT;
+}
+
 nsImageFrame*
 nsImageFrame::CreateContinuingFrame(nsIPresShell* aPresShell,
                                     ComputedStyle* aStyle) const
@@ -936,37 +959,8 @@ nsImageFrame::EnsureIntrinsicSizeAndRatio()
     return;
   }
 
-  // NOTE(emilio, https://github.com/w3c/csswg-drafts/issues/2832): WebKit
-  // and Blink behave differently here for content: url(..), for now adapt to
-  // Blink's behavior.
-  const bool mayDisplayBrokenIcon = mKind == Kind::ImageElement;
-  if (!mayDisplayBrokenIcon) {
-    return;
-  }
-  // image request is null or image size not known, probably an
-  // invalid image specified
-  bool imageInvalid = false;
-
-  // check for broken images. valid null images (eg. img src="") are
-  // not considered broken because they have no image requests
-  if (nsCOMPtr<imgIRequest> currentRequest = GetCurrentRequest()) {
-    uint32_t imageStatus;
-    imageInvalid =
-      NS_SUCCEEDED(currentRequest->GetImageStatus(&imageStatus)) &&
-      (imageStatus & imgIRequest::STATUS_ERROR);
-  } else {
-    MOZ_ASSERT(mKind == Kind::ImageElement);
-
-    nsCOMPtr<nsIImageLoadingContent> loader = do_QueryInterface(mContent);
-    MOZ_ASSERT(loader);
-    // check if images are user-disabled (or blocked for other reasons)
-    int16_t imageBlockingStatus;
-    loader->GetImageBlockingStatus(&imageBlockingStatus);
-    imageInvalid = imageBlockingStatus != nsIContentPolicy::ACCEPT;
-  }
-
   // invalid image specified. make the image big enough for the "broken" icon
-  if (imageInvalid) {
+  if (ShouldShowBrokenImageIcon()) {
     nscoord edgeLengthToUse =
       nsPresContext::CSSPixelsToAppUnits(
         ICON_SIZE + (2 * (ICON_PADDING + ALT_BORDER_WIDTH)));
@@ -1494,7 +1488,8 @@ nsImageFrame::DisplayAltFeedback(gfxContext& aRenderingContext,
   ImgDrawResult result = ImgDrawResult::NOT_READY;
 
   // Check if we should display image placeholders
-  if (!gIconLoad->mPrefShowPlaceholders ||
+  if (!ShouldShowBrokenImageIcon() ||
+      !gIconLoad->mPrefShowPlaceholders ||
       (isLoading && !gIconLoad->mPrefShowLoadingPlaceholder)) {
     result = ImgDrawResult::SUCCESS;
   } else {
diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h
index a9887c21c74a..b65fbb6aef03 100644
--- a/layout/generic/nsImageFrame.h
+++ b/layout/generic/nsImageFrame.h
@@ -107,6 +107,7 @@ public:
 
   void ResponsiveContentDensityChanged();
   void SetupForContentURLRequest();
+  bool ShouldShowBrokenImageIcon() const;
 
 #ifdef ACCESSIBILITY
   virtual mozilla::a11y::AccType AccessibleType() override;
diff --git a/layout/reftests/image-element/broken-icon.html b/layout/reftests/image-element/broken-icon.html
new file mode 100644
index 000000000000..f2f6b7c451c6
--- /dev/null
+++ b/layout/reftests/image-element/broken-icon.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  img {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<img src="broken">
diff --git a/layout/reftests/image-element/empty-src.html b/layout/reftests/image-element/empty-src.html
new file mode 100644
index 000000000000..36091cdc1909
--- /dev/null
+++ b/layout/reftests/image-element/empty-src.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  img {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<img src>
diff --git a/layout/reftests/image-element/invalid-src-2.html b/layout/reftests/image-element/invalid-src-2.html
new file mode 100644
index 000000000000..c385acca6dd0
--- /dev/null
+++ b/layout/reftests/image-element/invalid-src-2.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  img {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<img src="http://yada yada">
diff --git a/layout/reftests/image-element/invalid-src.html b/layout/reftests/image-element/invalid-src.html
new file mode 100644
index 000000000000..26821d39b2ae
--- /dev/null
+++ b/layout/reftests/image-element/invalid-src.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  img {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<img src="yada yada">
diff --git a/layout/reftests/image-element/no-src.html b/layout/reftests/image-element/no-src.html
new file mode 100644
index 000000000000..6cc51078c020
--- /dev/null
+++ b/layout/reftests/image-element/no-src.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  img {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<img>
diff --git a/layout/reftests/image-element/reftest.list b/layout/reftests/image-element/reftest.list
index 2d6923cb6e25..eff23b9b4290 100644
--- a/layout/reftests/image-element/reftest.list
+++ b/layout/reftests/image-element/reftest.list
@@ -45,5 +45,10 @@ HTTP == invalidate-1.html invalidate-1-ref.html
 == pattern-html-01.html pattern-html-01-ref.svg
 == pattern-html-02.html pattern-html-02-ref.svg
 == referenced-from-binding-01.html referenced-from-binding-01-ref.html
+!= broken-icon.html no-src.html
+!= broken-icon.html empty-src.html
+== empty-src.html no-src.html
+== broken-icon.html invalid-src.html
+fails == invalid-src.html invalid-src-2.html # bug 1506804
 
 fuzzy-if(skiaContent,0-1,0-30000) == mask-image-element.html mask-image-element-ref.html

From 6f80f44f249dc670f4e06a2fe0bf0b4080e6595a Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Tue, 13 Nov 2018 10:23:58 +0000
Subject: [PATCH 27/33] Bug 1495667 - Re-enable
 js/xpconnect/tests/marionette/test_loader_global_sharing.py on Windows.
 r=jgraham

Previously disabled via bug 1433905 to allow a refactoring of Marionette, this test can be re-enabled now given that bug 1433873 also got landed.

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

--HG--
extra : moz-landing-system : lando
---
 js/xpconnect/tests/marionette/manifest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/xpconnect/tests/marionette/manifest.ini b/js/xpconnect/tests/marionette/manifest.ini
index 6611a3c205c7..3f76a6c653f6 100644
--- a/js/xpconnect/tests/marionette/manifest.ini
+++ b/js/xpconnect/tests/marionette/manifest.ini
@@ -1,3 +1,3 @@
 
 [test_loader_global_sharing.py]
-skip-if = !manage_instance || appname == 'fennec' || (os == "win" && !(debug || asan)) # Bug 1495667
+skip-if = !manage_instance || appname == 'fennec'

From ca4ca8e8042a6592f229551a72aa3cc4510878e5 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Tue, 13 Nov 2018 10:39:00 +0000
Subject: [PATCH 28/33] Bug 1506774 - Discard TypeScripts whenever we discard
 JIT code. r=jonco

Bug 1506479 started unifying discarding of TypeScript and JIT code. This patch
removes the JIT_SCRIPT_RELEASE_TYPES_PERIOD heuristic so we now use the same
preserve-code heuristics for both.

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

--HG--
extra : moz-landing-system : lando
---
 js/src/gc/GC.cpp      | 44 +++++--------------------------------------
 js/src/gc/GCRuntime.h |  4 ----
 2 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
index b0b43d999eba..6c3e7510bea0 100644
--- a/js/src/gc/GC.cpp
+++ b/js/src/gc/GC.cpp
@@ -993,7 +993,6 @@ GCRuntime::GCRuntime(JSRuntime* rt) :
     fullGCForAtomsRequested_(false),
     minorGCNumber(0),
     majorGCNumber(0),
-    jitReleaseNumber(0),
     number(0),
     isFull(false),
     incrementalState(gc::State::NotActive),
@@ -1341,12 +1340,6 @@ js::gc::DumpArenaInfo()
 
 #endif // JS_GC_ZEAL
 
-/*
- * Lifetime in number of major GCs for type sets attached to scripts containing
- * observed types.
- */
-static const unsigned JIT_SCRIPT_RELEASE_TYPES_PERIOD = 20;
-
 bool
 GCRuntime::init(uint32_t maxbytes, uint32_t maxNurseryBytes)
 {
@@ -1364,8 +1357,6 @@ GCRuntime::init(uint32_t maxbytes, uint32_t maxNurseryBytes)
             setMarkStackLimit(atoi(size), lock);
         }
 
-        jitReleaseNumber = majorGCNumber + JIT_SCRIPT_RELEASE_TYPES_PERIOD;
-
         if (!nursery().init(maxNurseryBytes, lock)) {
             return false;
         }
@@ -3961,33 +3952,6 @@ GCRuntime::waitBackgroundSweepEnd()
     }
 }
 
-bool
-GCRuntime::shouldReleaseObservedTypes()
-{
-    bool releaseTypes = false;
-
-    if (cleanUpEverything) {
-        releaseTypes = true;
-    }
-
-#ifdef JS_GC_ZEAL
-    if (zealModeBits != 0) {
-        releaseTypes = true;
-    }
-#endif
-
-    /* We may miss the exact target GC due to resets. */
-    if (majorGCNumber >= jitReleaseNumber) {
-        releaseTypes = true;
-    }
-
-    if (releaseTypes) {
-        jitReleaseNumber = majorGCNumber + JIT_SCRIPT_RELEASE_TYPES_PERIOD;
-    }
-
-    return releaseTypes;
-}
-
 struct IsAboutToBeFinalizedFunctor {
     template <typename T> bool operator()(Cell** t) {
         mozilla::DebugOnly<const Cell*> prior = *t;
@@ -4559,12 +4523,14 @@ GCRuntime::prepareZonesForCollection(JS::gcreason::Reason reason, bool* isFullOu
 }
 
 static void
-DiscardJITCodeForGC(JSRuntime* rt, bool releaseTypes)
+DiscardJITCodeForGC(JSRuntime* rt)
 {
     js::CancelOffThreadIonCompile(rt, JS::Zone::Mark);
     for (GCZonesIter zone(rt); !zone.done(); zone.next()) {
         gcstats::AutoPhase ap(rt->gc.stats(), gcstats::PhaseKind::MARK_DISCARD_CODE);
-        zone->discardJitCode(rt->defaultFreeOp(), /* discardBaselineCode = */ true, releaseTypes);
+        zone->discardJitCode(rt->defaultFreeOp(),
+                             /* discardBaselineCode = */ true,
+                             /* releaseTypes = */ true);
     }
 }
 
@@ -4671,7 +4637,7 @@ GCRuntime::beginMarkPhase(JS::gcreason::Reason reason, AutoGCSession& session)
 
         // Discard JIT code. For incremental collections, the sweep phase will
         // also discard JIT code.
-        DiscardJITCodeForGC(rt, shouldReleaseObservedTypes());
+        DiscardJITCodeForGC(rt);
 
         /*
          * Relazify functions after discarding JIT code (we can't relazify
diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index f855278393dd..2104bed0730d 100644
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -632,7 +632,6 @@ class GCRuntime
     IncrementalProgress endMarkingSweepGroup(FreeOp* fop, SliceBudget& budget);
     void markIncomingCrossCompartmentPointers(MarkColor color);
     IncrementalProgress beginSweepingSweepGroup(FreeOp* fop, SliceBudget& budget);
-    bool shouldReleaseObservedTypes();
     void sweepDebuggerOnMainThread(FreeOp* fop);
     void sweepJitDataOnMainThread(FreeOp* fop);
     IncrementalProgress endSweepingSweepGroup(FreeOp* fop, SliceBudget& budget);
@@ -816,9 +815,6 @@ class GCRuntime
     /* Incremented at the start of every major GC. */
     MainThreadData<uint64_t> majorGCNumber;
 
-    /* The major GC number at which to release observed type information. */
-    MainThreadData<uint64_t> jitReleaseNumber;
-
     /* Incremented on every GC slice. */
     MainThreadData<uint64_t> number;
 

From 5207710f6bb761c1f40445310734e98d5e8d0990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 13 Nov 2018 11:00:46 +0000
Subject: [PATCH 29/33] Bug 1506580 - Remove useless pointer-chase + function
 call in nsPresContext::AppUnitsPerDevPixel. r=miko

We already keep a cached version of the up-to-date value in nsPresContext,
there's no need to go through nsDeviceContext at all.

I don't expect this to fix bug 1424968 entirely, but it should make it a bit
better.

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

--HG--
extra : moz-landing-system : lando
---
 layout/base/nsPresContext.cpp | 27 +++++++++++----------------
 layout/base/nsPresContext.h   |  5 ++++-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 25e709a6877f..af6d0b4bdf71 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -638,7 +638,7 @@ nsPresContext::AppUnitsPerDevPixelChanged()
     MediaFeatureChangeReason::ResolutionChange
   });
 
-  mCurAppUnitsPerDevPixel = AppUnitsPerDevPixel();
+  mCurAppUnitsPerDevPixel = mDeviceContext->AppUnitsPerDevPixel();
 }
 
 void
@@ -648,7 +648,7 @@ nsPresContext::PreferenceChanged(const char* aPrefName)
   if (prefName.EqualsLiteral("layout.css.dpi") ||
       prefName.EqualsLiteral("layout.css.devPixelsPerPx")) {
 
-    int32_t oldAppUnitsPerDevPixel = AppUnitsPerDevPixel();
+    int32_t oldAppUnitsPerDevPixel = mDeviceContext->AppUnitsPerDevPixel();
     if (mDeviceContext->CheckDPIChange() && mShell) {
       nsCOMPtr<nsIPresShell> shell = mShell;
       // Re-fetch the view manager's window dimensions in case there's a deferred
@@ -662,11 +662,11 @@ nsPresContext::PreferenceChanged(const char* aPrefName)
       float oldWidthDevPixels = oldWidthAppUnits/oldAppUnitsPerDevPixel;
       float oldHeightDevPixels = oldHeightAppUnits/oldAppUnitsPerDevPixel;
 
-      nscoord width = NSToCoordRound(oldWidthDevPixels*AppUnitsPerDevPixel());
-      nscoord height = NSToCoordRound(oldHeightDevPixels*AppUnitsPerDevPixel());
-      vm->SetWindowDimensions(width, height);
-
       AppUnitsPerDevPixelChanged();
+
+      nscoord width = NSToCoordRound(oldWidthDevPixels * AppUnitsPerDevPixel());
+      nscoord height = NSToCoordRound(oldHeightDevPixels * AppUnitsPerDevPixel());
+      vm->SetWindowDimensions(width, height);
     }
     return;
   }
@@ -803,7 +803,7 @@ nsPresContext::Init(nsDeviceContext* aDeviceContext)
 
   if (mDeviceContext->SetFullZoom(mFullZoom))
     mDeviceContext->FlushFontCache();
-  mCurAppUnitsPerDevPixel = AppUnitsPerDevPixel();
+  mCurAppUnitsPerDevPixel = mDeviceContext->AppUnitsPerDevPixel();
 
   mEventManager = new mozilla::EventStateManager();
 
@@ -1280,12 +1280,13 @@ nsPresContext::SetFullZoom(float aZoom)
   mSuppressResizeReflow = true;
 
   mFullZoom = aZoom;
+
+  AppUnitsPerDevPixelChanged();
+
   mShell->GetViewManager()->
     SetWindowDimensions(NSToCoordRound(oldWidthDevPixels * AppUnitsPerDevPixel()),
                         NSToCoordRound(oldHeightDevPixels * AppUnitsPerDevPixel()));
 
-  AppUnitsPerDevPixelChanged();
-
   mSuppressResizeReflow = false;
 }
 
@@ -1831,7 +1832,7 @@ nsPresContext::UIResolutionChangedInternalScale(double aScale)
   mPendingUIResolutionChanged = false;
 
   mDeviceContext->CheckDPIChange(&aScale);
-  if (mCurAppUnitsPerDevPixel != AppUnitsPerDevPixel()) {
+  if (mCurAppUnitsPerDevPixel != mDeviceContext->AppUnitsPerDevPixel()) {
     AppUnitsPerDevPixelChanged();
   }
 
@@ -2916,12 +2917,6 @@ bool nsPresContext::GetPaintFlashing() const
   return mPaintFlashing;
 }
 
-int32_t
-nsPresContext::AppUnitsPerDevPixel() const
-{
-  return mDeviceContext->AppUnitsPerDevPixel();
-}
-
 nscoord
 nsPresContext::GfxUnitsToAppUnits(gfxFloat aGfxUnits) const
 {
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 1841492b659f..c9a181b6749b 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -658,7 +658,10 @@ public:
    */
   gfxSize ScreenSizeInchesForFontInflation(bool* aChanged = nullptr);
 
-  int32_t AppUnitsPerDevPixel() const;
+  int32_t AppUnitsPerDevPixel() const
+  {
+    return mCurAppUnitsPerDevPixel;
+  }
 
   static nscoord CSSPixelsToAppUnits(int32_t aPixels)
   { return NSToCoordRoundWithClamp(float(aPixels) *

From 2c0c506ad0bd00abe2487d5c1cef62feae9d61bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Mon, 12 Nov 2018 12:14:30 +0000
Subject: [PATCH 30/33] Bug 1504205 - Enable Ctrl+Shift+D shortcut on Linux.
 r=stransky

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

--HG--
extra : moz-landing-system : lando
---
 browser/base/content/browser-sets.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 4f7539458461..486ca34346d5 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -231,9 +231,9 @@
     <key keycode="&findAgainCmd.commandkey2;"  command="cmd_findPrevious" modifiers="shift"/>
 
     <key id="addBookmarkAsKb" key="&bookmarkThisPageCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel"/>
+    <key id="bookmarkAllTabsKb" key="&bookmarkThisPageCmd.commandkey;" oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueCurrentPages);" modifiers="accel,shift"/>
 # Accel+Shift+A-F are reserved on GTK
 #ifndef MOZ_WIDGET_GTK
-    <key id="bookmarkAllTabsKb" key="&bookmarkThisPageCmd.commandkey;" oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueCurrentPages);" modifiers="accel,shift"/>
     <key id="manBookmarkKb" key="&bookmarksCmd.commandkey;" command="Browser:ShowAllBookmarks" modifiers="accel,shift"/>
 #else
     <key id="manBookmarkKb" key="&bookmarksGtkCmd.commandkey;" command="Browser:ShowAllBookmarks" modifiers="accel,shift"/>

From f6061f385fd9d0284ee16c79ca5782fddd5e1b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Tue, 13 Nov 2018 11:53:32 +0000
Subject: [PATCH 31/33] Bug 1506341 - Let the autohiding menu bar match the tab
 bar's height. r=stransky

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

--HG--
extra : moz-landing-system : lando
---
 browser/themes/linux/browser.css   | 9 +++++++++
 browser/themes/shared/tabs.inc.css | 9 +++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 7424fcfa16b3..81d7b19551fa 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -646,6 +646,15 @@ notification[value="translation"] menulist > .menulist-dropmarker {
     visibility: visible;
   }
 
+  /* When temporarily showing the menu bar, make it at least as tall as the tab
+   * bar such that the window controls don't appear to move up. */
+  :root[tabsintitlebar] #toolbar-menubar[autohide="true"] {
+    height: var(--tab-min-height);
+  }
+  :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] {
+    height: calc(var(--tab-min-height) + var(--space-above-tabbar));
+  }
+
   /* Add extra space to titlebar for dragging */
   :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar,
   :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar {
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 52b8167e0d00..0197e6714184 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -6,18 +6,15 @@
 %filter substitution
 %define horizontalTabPadding 9px
 
-#titlebar,
-#tabbrowser-tabs {
+:root {
   --tab-min-height: 33px;
 }
 
-:root[uidensity=compact] #titlebar,
-:root[uidensity=compact] #tabbrowser-tabs {
+:root[uidensity=compact] {
   --tab-min-height: 29px;
 }
 
-:root[uidensity=touch] #titlebar,
-:root[uidensity=touch] #tabbrowser-tabs {
+:root[uidensity=touch] {
   --tab-min-height: 41px;
 }
 

From 601e1dfa28f121bd0dbc4df570da92e9666b754b Mon Sep 17 00:00:00 2001
From: reimu <r2hkri@gmail.com>
Date: Tue, 13 Nov 2018 12:01:38 +0000
Subject: [PATCH 32/33] Bug 1504522 - Remove gBrowser.serializationHelper
 getter because it's unused r=dao

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

--HG--
extra : moz-landing-system : lando
---
 browser/base/content/tabbrowser.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
index 1a45c850f050..e075d3c4564f 100644
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -23,10 +23,6 @@ window._gBrowser = {
     ChromeUtils.defineModuleGetter(this, "UrlbarProviderOpenTabs",
       "resource:///modules/UrlbarProviderOpenTabs.jsm");
 
-    XPCOMUtils.defineLazyServiceGetters(this, {
-      serializationHelper: ["@mozilla.org/network/serialization-helper;1", "nsISerializationHelper"],
-    });
-
     Services.obs.addObserver(this, "contextual-identity-updated");
 
     Services.els.addSystemEventListener(document, "keydown", this, false);

From 6ca25ecbe69edd09cd011594383149c45f473de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 13 Nov 2018 12:47:40 +0000
Subject: [PATCH 33/33] Bug 1499170 - Add an atom bit to know whether we're
 ascii lowercase. r=njn

And thus massively speed up ascii-case-insensitive atom comparisons when both
atoms are lowercase (which is the common case by far).

This removes almost all the slow selector-matching in this page, and it seems
an easier fix than storing the lowercased version of all class-names in quirks
mode in elements and selectors...

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

--HG--
extra : moz-landing-system : lando
---
 dom/base/nsAttrValue.cpp                      | 14 +--
 dom/base/nsContentUtils.h                     | 19 ++++
 servo/components/style/gecko/regen_atoms.py   |  4 +-
 .../style/gecko_string_cache/mod.rs           | 78 +++++++++-------
 xpcom/ds/Atom.py                              | 10 ++
 xpcom/ds/StaticAtoms.py                       |  6 +-
 xpcom/ds/nsAtom.h                             | 31 ++++---
 xpcom/ds/nsAtomTable.cpp                      | 93 ++++++++-----------
 xpcom/ds/nsGkAtoms.cpp                        |  6 +-
 xpcom/ds/nsGkAtoms.h                          | 11 ++-
 10 files changed, 148 insertions(+), 124 deletions(-)

diff --git a/dom/base/nsAttrValue.cpp b/dom/base/nsAttrValue.cpp
index ed9f2ee54a8c..7edbef56b491 100644
--- a/dom/base/nsAttrValue.cpp
+++ b/dom/base/nsAttrValue.cpp
@@ -1169,16 +1169,13 @@ nsAttrValue::Contains(nsAtom* aValue, nsCaseTreatment aCaseSensitive) const
     case eAtomBase:
     {
       nsAtom* atom = GetAtomValue();
-
       if (aCaseSensitive == eCaseMatters) {
         return aValue == atom;
       }
 
       // For performance reasons, don't do a full on unicode case insensitive
       // string comparison. This is only used for quirks mode anyway.
-      return
-        nsContentUtils::EqualsIgnoreASCIICase(nsDependentAtomString(aValue),
-                                              nsDependentAtomString(atom));
+      return nsContentUtils::EqualsIgnoreASCIICase(aValue, atom);
     }
     default:
     {
@@ -1188,16 +1185,11 @@ nsAttrValue::Contains(nsAtom* aValue, nsCaseTreatment aCaseSensitive) const
           return array->Contains(aValue);
         }
 
-        nsDependentAtomString val1(aValue);
-
-        for (RefPtr<nsAtom> *cur = array->Elements(),
-                               *end = cur + array->Length();
-             cur != end; ++cur) {
+        for (RefPtr<nsAtom>& cur : *array) {
           // For performance reasons, don't do a full on unicode case
           // insensitive string comparison. This is only used for quirks mode
           // anyway.
-          if (nsContentUtils::EqualsIgnoreASCIICase(val1,
-                nsDependentAtomString(*cur))) {
+          if (nsContentUtils::EqualsIgnoreASCIICase(aValue, cur)) {
             return true;
           }
         }
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index 5275e0c79ffb..934b94aa8018 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -2058,6 +2058,25 @@ public:
 
   static JSContext *GetCurrentJSContext();
 
+  /**
+   * Case insensitive comparison between two atoms.
+   */
+  static bool EqualsIgnoreASCIICase(nsAtom* aAtom1, nsAtom* aAtom2)
+  {
+    if (aAtom1 == aAtom2) {
+      return true;
+    }
+
+    // If both are ascii lowercase already, we know that the slow comparison
+    // below is going to return false.
+    if (aAtom1->IsAsciiLowercase() && aAtom2->IsAsciiLowercase()) {
+      return false;
+    }
+
+    return EqualsIgnoreASCIICase(nsDependentAtomString(aAtom1),
+                                 nsDependentAtomString(aAtom2));
+  }
+
   /**
    * Case insensitive comparison between two strings. However it only ignores
    * case for ASCII characters a-z.
diff --git a/servo/components/style/gecko/regen_atoms.py b/servo/components/style/gecko/regen_atoms.py
index 36ec0f704344..18c28a13b495 100755
--- a/servo/components/style/gecko/regen_atoms.py
+++ b/servo/components/style/gecko/regen_atoms.py
@@ -16,8 +16,8 @@ sys.path.insert(0, os.path.join(os.path.dirname(GECKO_DIR), "properties"))
 import build
 
 
-# Matches lines like `GK_ATOM(foo, "foo", 0x12345678, nsStaticAtom, PseudoElementAtom)`.
-PATTERN = re.compile('^GK_ATOM\(([^,]*),[^"]*"([^"]*)",\s*(0x[0-9a-f]+),\s*([^,]*),\s*([^)]*)\)',
+# Matches lines like `GK_ATOM(foo, "foo", 0x12345678, true, nsStaticAtom, PseudoElementAtom)`.
+PATTERN = re.compile('^GK_ATOM\(([^,]*),[^"]*"([^"]*)",\s*(0x[0-9a-f]+),\s*[^,]*,\s*([^,]*),\s*([^)]*)\)',
                      re.MULTILINE)
 FILE = "include/nsGkAtomList.h"
 
diff --git a/servo/components/style/gecko_string_cache/mod.rs b/servo/components/style/gecko_string_cache/mod.rs
index 6d9e5c60f806..ed0cc19dae27 100644
--- a/servo/components/style/gecko_string_cache/mod.rs
+++ b/servo/components/style/gecko_string_cache/mod.rs
@@ -175,13 +175,19 @@ impl WeakAtom {
     /// Returns whether this atom is static.
     #[inline]
     pub fn is_static(&self) -> bool {
-        unsafe { (*self.as_ptr()).mIsStatic() != 0 }
+        self.0.mIsStatic() != 0
+    }
+
+    /// Returns whether this atom is ascii lowercase.
+    #[inline]
+    fn is_ascii_lowercase(&self) -> bool {
+        self.0.mIsAsciiLowercase() != 0
     }
 
     /// Returns the length of the atom string.
     #[inline]
     pub fn len(&self) -> u32 {
-        unsafe { (*self.as_ptr()).mLength() }
+        self.0.mLength()
     }
 
     /// Returns whether this atom is the empty string.
@@ -199,41 +205,54 @@ impl WeakAtom {
 
     /// Convert this atom to ASCII lower-case
     pub fn to_ascii_lowercase(&self) -> Atom {
-        let slice = self.as_slice();
-        match slice
-            .iter()
-            .position(|&char16| (b'A' as u16) <= char16 && char16 <= (b'Z' as u16))
-        {
-            None => self.clone(),
-            Some(i) => {
-                let mut buffer: [u16; 64] = unsafe { mem::uninitialized() };
-                let mut vec;
-                let mutable_slice = if let Some(buffer_prefix) = buffer.get_mut(..slice.len()) {
-                    buffer_prefix.copy_from_slice(slice);
-                    buffer_prefix
-                } else {
-                    vec = slice.to_vec();
-                    &mut vec
-                };
-                for char16 in &mut mutable_slice[i..] {
-                    if *char16 <= 0x7F {
-                        *char16 = (*char16 as u8).to_ascii_lowercase() as u16
-                    }
-                }
-                Atom::from(&*mutable_slice)
-            },
+        if self.is_ascii_lowercase() {
+            return self.clone();
         }
+
+        let slice = self.as_slice();
+        let mut buffer: [u16; 64] = unsafe { mem::uninitialized() };
+        let mut vec;
+        let mutable_slice = if let Some(buffer_prefix) = buffer.get_mut(..slice.len()) {
+            buffer_prefix.copy_from_slice(slice);
+            buffer_prefix
+        } else {
+            vec = slice.to_vec();
+            &mut vec
+        };
+        for char16 in &mut *mutable_slice {
+            if *char16 <= 0x7F {
+                *char16 = (*char16 as u8).to_ascii_lowercase() as u16
+            }
+        }
+        Atom::from(&*mutable_slice)
     }
 
     /// Return whether two atoms are ASCII-case-insensitive matches
+    #[inline]
     pub fn eq_ignore_ascii_case(&self, other: &Self) -> bool {
         if self == other {
             return true;
         }
 
+        // If we know both atoms are ascii-lowercase, then we can stick with
+        // pointer equality.
+        if self.is_ascii_lowercase() && other.is_ascii_lowercase() {
+            debug_assert!(!self.eq_ignore_ascii_case_slow(other));
+            return false;
+        }
+
+        self.eq_ignore_ascii_case_slow(other)
+    }
+
+    fn eq_ignore_ascii_case_slow(&self, other: &Self) -> bool {
         let a = self.as_slice();
         let b = other.as_slice();
-        a.len() == b.len() && a.iter().zip(b).all(|(&a16, &b16)| {
+
+        if a.len() != b.len() {
+            return false;
+        }
+
+        a.iter().zip(b).all(|(&a16, &b16)| {
             if a16 <= 0x7F && b16 <= 0x7F {
                 (a16 as u8).eq_ignore_ascii_case(&(b16 as u8))
             } else {
@@ -241,13 +260,6 @@ impl WeakAtom {
             }
         })
     }
-
-    /// Return whether this atom is an ASCII-case-insensitive match for the given string
-    pub fn eq_str_ignore_ascii_case(&self, other: &str) -> bool {
-        self.chars()
-            .map(|r| r.map(|c: char| c.to_ascii_lowercase()))
-            .eq(other.chars().map(|c: char| Ok(c.to_ascii_lowercase())))
-    }
 }
 
 impl fmt::Debug for WeakAtom {
diff --git a/xpcom/ds/Atom.py b/xpcom/ds/Atom.py
index f88c1e927e7e..1c9bcb7795bf 100644
--- a/xpcom/ds/Atom.py
+++ b/xpcom/ds/Atom.py
@@ -10,6 +10,7 @@ class Atom():
         self.ty = ty
         self.atom_type = self.__class__.__name__
         self.hash = hash_string(string)
+        self.is_ascii_lowercase = is_ascii_lowercase(string)
 
 
 class PseudoElementAtom(Atom):
@@ -52,3 +53,12 @@ def hash_string(s):
     for c in s:
         h = wrapping_multiply(GOLDEN_RATIO_U32, rotate_left_5(h) ^ ord(c))
     return h
+
+
+# Returns true if lowercasing this string in an ascii-case-insensitive way
+# would leave the string unchanged.
+def is_ascii_lowercase(s):
+    for c in s:
+        if c >= 'A' and c <= 'Z':
+            return False
+    return True
diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
index 89bdabf38d37..ef2ac3449fa8 100644
--- a/xpcom/ds/StaticAtoms.py
+++ b/xpcom/ds/StaticAtoms.py
@@ -2355,9 +2355,9 @@ def generate_nsgkatomlist_h(output, *ignore):
                  "#ifdef small\n"
                  "#undef small\n"
                  "#endif\n\n"
-                 "// GK_ATOM(identifier, string, hash, gecko_type, atom_type)\n" +
-                 "".join(["GK_ATOM(%s, \"%s\", 0x%08x, %s, %s)\n" %
-                            (a.ident, a.string, a.hash, a.ty, a.atom_type)
+                 "// GK_ATOM(identifier, string, hash, is_ascii_lower, gecko_type, atom_type)\n" +
+                 "".join(["GK_ATOM(%s, \"%s\", 0x%08x, %s, %s, %s)\n" %
+                            (a.ident, a.string, a.hash, str(a.is_ascii_lowercase).lower(), a.ty, a.atom_type)
                           for a in STATIC_ATOMS]))
 
 
diff --git a/xpcom/ds/nsAtom.h b/xpcom/ds/nsAtom.h
index a9f80c77c452..f8d173fb5222 100644
--- a/xpcom/ds/nsAtom.h
+++ b/xpcom/ds/nsAtom.h
@@ -21,9 +21,7 @@ class nsDynamicAtom;
 // This class encompasses both static and dynamic atoms.
 //
 // - In places where static and dynamic atoms can be used, use RefPtr<nsAtom>.
-//   This is by far the most common case. (The exception to this is the HTML5
-//   parser, which does its own weird thing, and uses non-refcounted dynamic
-//   atoms.)
+//   This is by far the most common case.
 //
 // - In places where only static atoms can appear, use nsStaticAtom* to avoid
 //   unnecessary refcounting. This is a moderately common case.
@@ -75,6 +73,13 @@ public:
   //
   uint32_t hash() const { return mHash; }
 
+  // This function returns true if ToLowercaseASCII would return the string
+  // unchanged.
+  bool IsAsciiLowercase() const
+  {
+    return mIsAsciiLowercase;
+  }
+
   // We can't use NS_INLINE_DECL_THREADSAFE_REFCOUNTING because the refcounting
   // of this type is special.
   MozExternalRefCountType AddRef();
@@ -84,16 +89,20 @@ public:
 
 protected:
   // Used by nsStaticAtom.
-  constexpr nsAtom(uint32_t aLength, uint32_t aHash)
+  constexpr nsAtom(uint32_t aLength, uint32_t aHash, bool aIsAsciiLowercase)
     : mLength(aLength)
     , mIsStatic(true)
+    , mIsAsciiLowercase(aIsAsciiLowercase)
     , mHash(aHash)
   {}
 
   // Used by nsDynamicAtom.
-  nsAtom(const nsAString& aString, uint32_t aHash)
+  nsAtom(const nsAString& aString,
+         uint32_t aHash,
+         bool aIsAsciiLowercase)
     : mLength(aString.Length())
     , mIsStatic(false)
+    , mIsAsciiLowercase(aIsAsciiLowercase)
     , mHash(aHash)
   {
   }
@@ -101,8 +110,8 @@ protected:
   ~nsAtom() = default;
 
   const uint32_t mLength:30;
-  // NOTE: There's one free bit here.
   const uint32_t mIsStatic:1;
+  const uint32_t mIsAsciiLowercase:1;
   const uint32_t mHash;
 };
 
@@ -123,8 +132,8 @@ public:
   // Atom.py and assert in nsAtomTable::RegisterStaticAtoms that the two
   // hashes match.
   constexpr nsStaticAtom(uint32_t aLength, uint32_t aHash,
-                         uint32_t aStringOffset)
-    : nsAtom(aLength, aHash)
+                         uint32_t aStringOffset, bool aIsAsciiLowercase)
+    : nsAtom(aLength, aHash, aIsAsciiLowercase)
     , mStringOffset(aStringOffset)
   {}
 
@@ -167,14 +176,10 @@ private:
 
   // These shouldn't be used directly, even by friend classes. The
   // Create()/Destroy() methods use them.
-  static nsDynamicAtom* CreateInner(const nsAString& aString, uint32_t aHash);
-  nsDynamicAtom(const nsAString& aString, uint32_t aHash);
+  nsDynamicAtom(const nsAString& aString, uint32_t aHash, bool aIsAsciiLowercase);
   ~nsDynamicAtom() {}
 
-  // Creation/destruction is done by friend classes. The first Create() is for
-  // dynamic normal atoms, the second is for dynamic HTML5 atoms.
   static nsDynamicAtom* Create(const nsAString& aString, uint32_t aHash);
-  static nsDynamicAtom* Create(const nsAString& aString);
   static void Destroy(nsDynamicAtom* aAtom);
 
   mozilla::ThreadSafeAutoRefCnt mRefCnt;
diff --git a/xpcom/ds/nsAtomTable.cpp b/xpcom/ds/nsAtomTable.cpp
index 16f33d10b024..6a3aaa3e62cc 100644
--- a/xpcom/ds/nsAtomTable.cpp
+++ b/xpcom/ds/nsAtomTable.cpp
@@ -66,42 +66,45 @@ enum class GCKind {
 // replaying.
 static Atomic<int32_t, ReleaseAcquire, recordreplay::Behavior::DontPreserve> gUnusedAtomCount(0);
 
-nsDynamicAtom::nsDynamicAtom(const nsAString& aString, uint32_t aHash)
-  : nsAtom(aString, aHash)
+nsDynamicAtom::nsDynamicAtom(const nsAString& aString, uint32_t aHash, bool aIsAsciiLowercase)
+  : nsAtom(aString, aHash, aIsAsciiLowercase)
   , mRefCnt(1)
 {
 }
 
-nsDynamicAtom*
-nsDynamicAtom::CreateInner(const nsAString& aString, uint32_t aHash)
+// Returns true if ToLowercaseASCII would return the string unchanged.
+static bool
+IsAsciiLowercase(const char16_t* aString, const uint32_t aLength)
 {
-  // We tack the chars onto the end of the nsDynamicAtom object.
-  size_t numCharBytes = (aString.Length() + 1) * sizeof(char16_t);
-  size_t numTotalBytes = sizeof(nsDynamicAtom) + numCharBytes;
+  for (uint32_t i = 0; i < aLength; ++i) {
+    if (IS_ASCII_UPPER(aString[i])) {
+      return false;
+    }
+  }
 
-  nsDynamicAtom* atom = (nsDynamicAtom*)moz_xmalloc(numTotalBytes);
-  new (atom) nsDynamicAtom(aString, aHash);
-  memcpy(const_cast<char16_t*>(atom->String()),
-         PromiseFlatString(aString).get(), numCharBytes);
-
-  MOZ_ASSERT(atom->String()[atom->GetLength()] == char16_t(0));
-  MOZ_ASSERT(atom->Equals(aString));
-
-  return atom;
+  return true;
 }
 
 nsDynamicAtom*
 nsDynamicAtom::Create(const nsAString& aString, uint32_t aHash)
 {
-  nsDynamicAtom* atom = CreateInner(aString, aHash);
-  MOZ_ASSERT(atom->mHash == HashString(atom->String(), atom->GetLength()));
-  return atom;
-}
+  // We tack the chars onto the end of the nsDynamicAtom object.
+  size_t numCharBytes = (aString.Length() + 1) * sizeof(char16_t);
+  size_t numTotalBytes = sizeof(nsDynamicAtom) + numCharBytes;
 
-nsDynamicAtom*
-nsDynamicAtom::Create(const nsAString& aString)
-{
-  return CreateInner(aString, /* hash */ 0);
+  bool isAsciiLower = ::IsAsciiLowercase(aString.Data(), aString.Length());
+
+  nsDynamicAtom* atom = (nsDynamicAtom*)moz_xmalloc(numTotalBytes);
+  new (atom) nsDynamicAtom(aString, aHash, isAsciiLower);
+  memcpy(const_cast<char16_t*>(atom->String()),
+         PromiseFlatString(aString).get(), numCharBytes);
+
+  MOZ_ASSERT(atom->String()[atom->GetLength()] == char16_t(0));
+  MOZ_ASSERT(atom->Equals(aString));
+  MOZ_ASSERT(atom->mHash == HashString(atom->String(), atom->GetLength()));
+  MOZ_ASSERT(atom->mIsAsciiLowercase == isAsciiLower);
+
+  return atom;
 }
 
 void
@@ -181,26 +184,22 @@ struct AtomTableKey
     MOZ_ASSERT(HashString(mUTF16String, mLength) == mHash);
   }
 
-  AtomTableKey(const char16_t* aUTF16String, uint32_t aLength,
-               uint32_t* aHashOut)
+  AtomTableKey(const char16_t* aUTF16String, uint32_t aLength)
     : mUTF16String(aUTF16String)
     , mUTF8String(nullptr)
     , mLength(aLength)
   {
     mHash = HashString(mUTF16String, mLength);
-    *aHashOut = mHash;
   }
 
   AtomTableKey(const char* aUTF8String,
                uint32_t aLength,
-               uint32_t* aHashOut,
                bool* aErr)
     : mUTF16String(nullptr)
     , mUTF8String(aUTF8String)
     , mLength(aLength)
   {
     mHash = HashUTF8AsUTF16(mUTF8String, mLength, aErr);
-    *aHashOut = mHash;
   }
 
   const char16_t* mUTF16String;
@@ -641,6 +640,7 @@ nsAtomTable::RegisterStaticAtoms(const nsStaticAtom* aAtoms, size_t aAtomsLen)
     const nsStaticAtom* atom = &aAtoms[i];
     MOZ_ASSERT(nsCRT::IsAscii(atom->String()));
     MOZ_ASSERT(NS_strlen(atom->String()) == atom->GetLength());
+    MOZ_ASSERT(atom->IsAsciiLowercase() == ::IsAsciiLowercase(atom->String(), atom->GetLength()));
 
     // This assertion ensures the static atom's precomputed hash value matches
     // what would be computed by mozilla::HashString(aStr), which is what we use
@@ -677,9 +677,8 @@ NS_Atomize(const char* aUTF8String)
 already_AddRefed<nsAtom>
 nsAtomTable::Atomize(const nsACString& aUTF8String)
 {
-  uint32_t hash;
   bool err;
-  AtomTableKey key(aUTF8String.Data(), aUTF8String.Length(), &hash, &err);
+  AtomTableKey key(aUTF8String.Data(), aUTF8String.Length(), &err);
   if (MOZ_UNLIKELY(err)) {
     MOZ_ASSERT_UNREACHABLE("Tried to atomize invalid UTF-8.");
     // The input was invalid UTF-8. Let's replace the errors with U+FFFD
@@ -694,13 +693,12 @@ nsAtomTable::Atomize(const nsACString& aUTF8String)
 
   if (he->mAtom) {
     RefPtr<nsAtom> atom = he->mAtom;
-
     return atom.forget();
   }
 
   nsString str;
   CopyUTF8toUTF16(aUTF8String, str);
-  RefPtr<nsAtom> atom = dont_AddRef(nsDynamicAtom::Create(str, hash));
+  RefPtr<nsAtom> atom = dont_AddRef(nsDynamicAtom::Create(str, key.mHash));
 
   he->mAtom = atom;
 
@@ -724,19 +722,18 @@ NS_Atomize(const char16_t* aUTF16String)
 already_AddRefed<nsAtom>
 nsAtomTable::Atomize(const nsAString& aUTF16String)
 {
-  uint32_t hash;
-  AtomTableKey key(aUTF16String.Data(), aUTF16String.Length(), &hash);
+  AtomTableKey key(aUTF16String.Data(), aUTF16String.Length());
   nsAtomSubTable& table = SelectSubTable(key);
   MutexAutoLock lock(table.mLock);
   AtomTableEntry* he = table.Add(key);
 
   if (he->mAtom) {
     RefPtr<nsAtom> atom = he->mAtom;
-
     return atom.forget();
   }
 
-  RefPtr<nsAtom> atom = dont_AddRef(nsDynamicAtom::Create(aUTF16String, hash));
+  RefPtr<nsAtom> atom =
+    dont_AddRef(nsDynamicAtom::Create(aUTF16String, key.mHash));
   he->mAtom = atom;
 
   return atom.forget();
@@ -754,8 +751,7 @@ nsAtomTable::AtomizeMainThread(const nsAString& aUTF16String)
 {
   MOZ_ASSERT(NS_IsMainThread());
   RefPtr<nsAtom> retVal;
-  uint32_t hash;
-  AtomTableKey key(aUTF16String.Data(), aUTF16String.Length(), &hash);
+  AtomTableKey key(aUTF16String.Data(), aUTF16String.Length());
   auto p = sRecentlyUsedMainThreadAtoms.Lookup(key);
   if (p) {
     retVal = p.Data();
@@ -770,7 +766,7 @@ nsAtomTable::AtomizeMainThread(const nsAString& aUTF16String)
     retVal = he->mAtom;
   } else {
     RefPtr<nsAtom> newAtom =
-      dont_AddRef(nsDynamicAtom::Create(aUTF16String, hash));
+      dont_AddRef(nsDynamicAtom::Create(aUTF16String, key.mHash));
     he->mAtom = newAtom;
     retVal = newAtom.forget();
   }
@@ -810,8 +806,7 @@ NS_GetStaticAtom(const nsAString& aUTF16String)
 nsStaticAtom*
 nsAtomTable::GetStaticAtom(const nsAString& aUTF16String)
 {
-  uint32_t hash;
-  AtomTableKey key(aUTF16String.Data(), aUTF16String.Length(), &hash);
+  AtomTableKey key(aUTF16String.Data(), aUTF16String.Length());
   nsAtomSubTable& table = SelectSubTable(key);
   MutexAutoLock lock(table.mLock);
   AtomTableEntry* he = table.Search(key);
@@ -823,21 +818,11 @@ nsAtomTable::GetStaticAtom(const nsAString& aUTF16String)
 void ToLowerCaseASCII(RefPtr<nsAtom>& aAtom)
 {
   // Assume the common case is that the atom is already ASCII lowercase.
-  bool reAtomize = false;
-  const nsDependentString existing(aAtom->GetUTF16String(), aAtom->GetLength());
-  for (size_t i = 0; i < existing.Length(); ++i) {
-    if (IS_ASCII_UPPER(existing[i])) {
-      reAtomize = true;
-      break;
-    }
-  }
-
-  // If the string was already lowercase, we're done.
-  if (!reAtomize) {
+  if (aAtom->IsAsciiLowercase()) {
     return;
   }
 
   nsAutoString lowercased;
-  ToLowerCaseASCII(existing, lowercased);
+  ToLowerCaseASCII(nsDependentAtomString(aAtom), lowercased);
   aAtom = NS_Atomize(lowercased);
 }
diff --git a/xpcom/ds/nsGkAtoms.cpp b/xpcom/ds/nsGkAtoms.cpp
index 24b04e58b8e8..0ad57d46adab 100644
--- a/xpcom/ds/nsGkAtoms.cpp
+++ b/xpcom/ds/nsGkAtoms.cpp
@@ -20,7 +20,7 @@ extern constexpr GkAtoms gGkAtoms = {
   //   u"bb",
   //   u"ccc",
   //
-  #define GK_ATOM(name_, value_, hash_, type_, atom_type_) \
+  #define GK_ATOM(name_, value_, hash_, is_ascii_lower_, type_, atom_type_) \
     u"" value_,
   #include "nsGkAtomList.h"
   #undef GK_ATOM
@@ -48,12 +48,12 @@ extern constexpr GkAtoms gGkAtoms = {
     //     offsetof(GkAtoms, mAtoms[static_cast<size_t>(GkAtoms::Atoms::ccc)]) -
     //     offsetof(GkAtoms, ccc_string)),
     //
-    #define GK_ATOM(name_, value_, hash_, type_, atom_type_)                   \
+    #define GK_ATOM(name_, value_, hash_, is_ascii_lower_, type_, atom_type_)  \
       nsStaticAtom(                                                            \
         sizeof(value_) - 1, hash_,                                             \
         offsetof(GkAtoms,                                                      \
                  mAtoms[static_cast<size_t>(GkAtoms::Atoms::name_)]) -         \
-        offsetof(GkAtoms, name_##_string)),
+        offsetof(GkAtoms, name_##_string), is_ascii_lower_),
     #include "nsGkAtomList.h"
     #undef GK_ATOM
   }
diff --git a/xpcom/ds/nsGkAtoms.h b/xpcom/ds/nsGkAtoms.h
index 7c7669456d55..95beb73918d0 100644
--- a/xpcom/ds/nsGkAtoms.h
+++ b/xpcom/ds/nsGkAtoms.h
@@ -58,8 +58,9 @@
   class name_ : public nsStaticAtom                                            \
   {                                                                            \
   public:                                                                      \
-    constexpr name_(uint32_t aLength, uint32_t aHash, uint32_t aOffset)        \
-      : nsStaticAtom(aLength, aHash, aOffset) {}                               \
+    constexpr name_(uint32_t aLength, uint32_t aHash, uint32_t aOffset,        \
+                    bool aIsAsciiLowercase)                                    \
+      : nsStaticAtom(aLength, aHash, aOffset, aIsAsciiLowercase) {}            \
   };
 
 DEFINE_STATIC_ATOM_SUBCLASS(nsCSSAnonBoxPseudoStaticAtom)
@@ -86,7 +87,7 @@ struct GkAtoms
   //   const char16_t bb_string[sizeof("bb")];
   //   const char16_t ccc_string[sizeof("ccc")];
   //
-  #define GK_ATOM(name_, value_, hash_, type_, atom_type_) \
+  #define GK_ATOM(name_, value_, hash_, is_ascii_lower_, type_, atom_type_) \
     const char16_t name_##_string[sizeof(value_)];
   #include "nsGkAtomList.h"
   #undef GK_ATOM
@@ -99,7 +100,7 @@ struct GkAtoms
     //   bb,
     //   ccc,
     //
-    #define GK_ATOM(name_, value_, hash_, type_, atom_type_) \
+    #define GK_ATOM(name_, value_, hash_, is_ascii_lower_, type_, atom_type_) \
       name_,
     #include "nsGkAtomList.h"
     #undef GK_ATOM
@@ -166,7 +167,7 @@ public:
   //       &mozilla::detail::gGkAtoms.mAtoms[
   //         static_cast<size_t>(mozilla::detail::GkAtoms::Atoms::ccc)]);
   //
-  #define GK_ATOM(name_, value_, hash_, type_, atom_type_)                    \
+  #define GK_ATOM(name_, value_, hash_, is_ascii_lower_, type_, atom_type_)   \
     static constexpr nsStaticAtom* name_ =                                    \
       const_cast<nsStaticAtom*>(                                              \
         &mozilla::detail::gGkAtoms.mAtoms[                                    \