PORTREVISION=	9

commit deccfad4c8ba

Author: Matt Woodrow <mwoodrow@mozilla.com>

Date:   Thu Oct 12 13:10:27 2017 +1300

    Bug 1261175. r=tnikkel, a=ritu

    --HG--

    extra : source : 8281ed36bd4946af69af747b199814cc1a51fb52

---

 view/nsViewManager.cpp | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git view/nsViewManager.cpp view/nsViewManager.cpp

index f3540f3478da..230512c0dcc0 100644

--- view/nsViewManager.cpp

+++ view/nsViewManager.cpp

@@ -100,7 +100,7 @@ nsViewManager::~nsViewManager()

     gViewManagers = nullptr;

   }

-  mPresShell = nullptr;

+  MOZ_RELEASE_ASSERT(!mPresShell, "Releasing nsViewManager without having called Destroy on the PresShell!");

 }

 // We don't hold a reference to the presentation context because it

commit e215b167b9b9

Author: cku <cku@mozilla.com>

Date:   Tue Oct 3 11:29:19 2017 +0800

    Bug 1343147 - Do not double applying transform vector of the root frame in a glyph mask into the target context. r=mstange, a=ritu

    When we generate the glyph mask for a transformed frame in

    GenerateAndPushTextMask, the transform vector had been applied into aContext[1],

    so we should find a way to prevent applying the vector again when painting the

    glyph mask.

    In bug 1299715, I tried to prevent double apply at [2], it caused two problems:

    1. We only skip generating nsDisplayTransform, but we may still create a

    nsDisplayPerspactive bellow. Since the parent of a nsDisplayPerspective must be

    a nsDisplayTransform, which have been ignored, so we hit this assertion.

    2. We skip all transform for all frames while painting the glyph mask, which is

    not correct. We should only skip double applying transform vector of the root

    frame.

    This patch fixes both of these issues:

    a. We will still create a nsDisplayTransform for the root frame if need. But

    the transform matrix we apply into the target context will be an identity

    matrix, so we fix #1 above.

    b. In #a, we change the transform matrix to an identity matrix only for the root

    frame of the  glyph mask, so we fix #2.

    [1]

    https://hg.mozilla.org/mozilla-central/file/59e5ec5729db/layout/painting/nsDisplayList.cpp#l752

    [2]

    https://hg.mozilla.org/mozilla-central/file/ce2c129f0a87/layout/generic/nsFrame.cpp#l2806

    MozReview-Commit-ID: 973lkQQxLB6

    --HG--

    extra : source : 84451d723686bc47b81c44ed2ddf6c61f3e35915

---

 layout/generic/nsFrame.cpp        | 13 +++++--------

 layout/painting/nsDisplayList.cpp |  9 ++++++++-

 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git layout/generic/nsFrame.cpp layout/generic/nsFrame.cpp

index 37f2e2801220..dbfd61b7e142 100644

--- layout/generic/nsFrame.cpp

+++ layout/generic/nsFrame.cpp

@@ -2803,14 +2803,11 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,

     buildingDisplayList.SetReferenceFrameAndCurrentOffset(outerReferenceFrame,

       GetOffsetToCrossDoc(outerReferenceFrame));

-    if (!aBuilder->IsForGenerateGlyphMask() &&

-        !aBuilder->IsForPaintingSelectionBG()) {

-      nsDisplayTransform *transformItem =

-        new (aBuilder) nsDisplayTransform(aBuilder, this,

-                                          &resultList, dirtyRect, 0,

-                                          allowAsyncAnimation);

-      resultList.AppendNewToTop(transformItem);

-    }

+    nsDisplayTransform *transformItem =

+      new (aBuilder) nsDisplayTransform(aBuilder, this,

+                                        &resultList, dirtyRect, 0,

+                                        allowAsyncAnimation);

+    resultList.AppendNewToTop(transformItem);

     if (hasPerspective) {

       if (clipCapturedBy == ContainerItemType::ePerspective) {

diff --git layout/painting/nsDisplayList.cpp layout/painting/nsDisplayList.cpp

index 801e1ea2fb4d..6477bda52f01 100644

--- layout/painting/nsDisplayList.cpp

+++ layout/painting/nsDisplayList.cpp

@@ -7976,11 +7976,18 @@ already_AddRefed<Layer> nsDisplayTransform::BuildLayer(nsDisplayListBuilder *aBu

                                                        LayerManager *aManager,

                                                        const ContainerLayerParameters& aContainerParameters)

 {

+  // While generating a glyph mask, the transform vector of the root frame had

+  // been applied into the target context, so stop applying it again here.

+  const bool shouldSkipTransform =

+    (aBuilder->RootReferenceFrame() == mFrame) &&

+    (aBuilder->IsForGenerateGlyphMask() || aBuilder->IsForPaintingSelectionBG());

+

   /* For frames without transform, it would not be removed for

    * backface hidden here.  But, it would be removed by the init

    * function of nsDisplayTransform.

    */

-  const Matrix4x4& newTransformMatrix = GetTransformForRendering();

+  const Matrix4x4 newTransformMatrix =

+    shouldSkipTransform ? Matrix4x4(): GetTransformForRendering();

   uint32_t flags = FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR;

   RefPtr<ContainerLayer> container = aManager->GetLayerBuilder()->

diff --git dom/svg/crashtests/1343147.svg dom/svg/crashtests/1343147.svg

new file mode 100644

index 000000000000..d9c2611ca822

--- /dev/null

+++ dom/svg/crashtests/1343147.svg

@@ -0,0 +1,13 @@

+<svg xmlns="http://www.w3.org/2000/svg">

+<style>

+<![CDATA[

+  svg {

+    background-image: linear-gradient(lime, lime);

+    background-clip: text;

+  }

+  text { transform: skewy(30grad); }

+  g { perspective: 0; }

+]]>

+</style>

+  <g><text>hello</text></g>

+</svg>

diff --git dom/svg/crashtests/crashtests.list dom/svg/crashtests/crashtests.list

index 1727a206ec4f..57ab320161e2 100644

--- dom/svg/crashtests/crashtests.list

+++ dom/svg/crashtests/crashtests.list

@@ -90,4 +90,5 @@ load 1329849-5.svg

 load 1329849-6.svg

 load 1329093-1.html

 load 1329093-2.html

+load 1343147.svg

 load 1402798.html

commit e530ba4d4394

Author: Thomas Wisniewski <wisniewskit@gmail.com>

Date:   Tue Jul 4 20:59:26 2017 -0400

    Bug 1355576 - Add ability to clear all localStorage with the browsingData API; r=bsilverberg,janv

    MozReview-Commit-ID: 4UUqg62yIo9

    --HG--

    extra : rebase_source : 9c6154bbe878fc3921d22027fdc90dbdaed05be9

---

 browser/components/extensions/ext-browsingData.js  | 10 +++

 .../extensions/schemas/browsing_data.json          |  1 -

 .../extensions/test/browser/browser-common.ini     |  1 +

 .../browser_ext_browsingData_localStorage.js       | 93 ++++++++++++++++++++++

 .../test/xpcshell/test_ext_browsingData.js         |  4 +-

 dom/storage/LocalStorageManager.cpp                |  3 +-

 dom/storage/StorageObserver.cpp                    | 12 +++

 .../extensions/schemas/browsing_data.json          |  1 -

 8 files changed, 120 insertions(+), 5 deletions(-)

diff --git browser/components/extensions/ext-browsingData.js browser/components/extensions/ext-browsingData.js

index fd59141dd15d..109ec9601487 100644

--- browser/components/extensions/ext-browsingData.js

+++ browser/components/extensions/ext-browsingData.js

@@ -83,6 +83,10 @@ const clearHistory = options => {

   return sanitizer.items.history.clear(makeRange(options));

 };

+const clearLocalStorage = async function(options) {

+  Services.obs.notifyObservers(null, "extension:purge-localStorage");

+};

+

 const clearPasswords = async function(options) {

   let loginManager = Services.logins;

   let yieldCounter = 0;

@@ -152,6 +156,9 @@ const doRemoval = (options, dataToRemove, extension) => {

         case "history":

           removalPromises.push(clearHistory(options));

           break;

+        case "localStorage":

+          removalPromises.push(clearLocalStorage(options));

+          break;

         case "passwords":

           removalPromises.push(clearPasswords(options));

           break;

@@ -225,6 +232,9 @@ this.browsingData = class extends ExtensionAPI {

         removeHistory(options) {

           return doRemoval(options, {history: true});

         },

+        removeLocalStorage(options) {

+          return doRemoval(options, {localStorage: true});

+        },

         removePasswords(options) {

           return doRemoval(options, {passwords: true});

         },

diff --git browser/components/extensions/schemas/browsing_data.json browser/components/extensions/schemas/browsing_data.json

index a780f5640c8f..7755714eb898 100644

--- browser/components/extensions/schemas/browsing_data.json

+++ browser/components/extensions/schemas/browsing_data.json

@@ -341,7 +341,6 @@

         "description": "Clears websites' local storage data.",

         "type": "function",

         "async": "callback",

-        "unsupported": true,

         "parameters": [

           {

             "$ref": "RemovalOptions",

diff --git browser/components/extensions/test/browser/browser-common.ini browser/components/extensions/test/browser/browser-common.ini

index 464b8ba18f37..e3f7700f3939 100644

--- browser/components/extensions/test/browser/browser-common.ini

+++ browser/components/extensions/test/browser/browser-common.ini

@@ -46,6 +46,7 @@ skip-if = (os == 'win' && !debug) # bug 1352668

 [browser_ext_browserAction_theme_icons.js]

 [browser_ext_browsingData_formData.js]

 [browser_ext_browsingData_history.js]

+[browser_ext_browsingData_localStorage.js]

 [browser_ext_browsingData_pluginData.js]

 [browser_ext_browsingData_serviceWorkers.js]

 [browser_ext_commands_execute_browser_action.js]

diff --git browser/components/extensions/test/browser/browser_ext_browsingData_localStorage.js browser/components/extensions/test/browser/browser_ext_browsingData_localStorage.js

new file mode 100644

index 000000000000..215f26d1fcb6

--- /dev/null

+++ browser/components/extensions/test/browser/browser_ext_browsingData_localStorage.js

@@ -0,0 +1,93 @@

+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */

+/* vim: set sts=2 sw=2 et tw=80: */

+"use strict";

+

+add_task(async function testLocalStorage() {

+  async function background() {

+    function openTabs() {

+      let promise = new Promise(resolve => {

+        let tabURLs = [

+          "http://example.com/",

+          "http://example.net/",

+        ];

+

+        let tabs;

+        let waitingCount = tabURLs.length;

+

+        let listener = async msg => {

+          if (msg !== "content-script-ready" || --waitingCount) {

+            return;

+          }

+          browser.runtime.onMessage.removeListener(listener);

+          resolve(Promise.all(tabs));

+        };

+

+        browser.runtime.onMessage.addListener(listener);

+

+        tabs = tabURLs.map(url => {

+          return browser.tabs.create({url: url});

+        });

+      });

+

+      return promise;

+    }

+

+    function sendMessageToTabs(tabs, message) {

+      return Promise.all(

+        tabs.map(tab => { return browser.tabs.sendMessage(tab.id, message); }));

+    }

+

+    let tabs = await openTabs();

+

+    await sendMessageToTabs(tabs, "resetLocalStorage");

+    await sendMessageToTabs(tabs, "checkLocalStorageSet");

+    await browser.browsingData.removeLocalStorage({});

+    await sendMessageToTabs(tabs, "checkLocalStorageCleared");

+

+    await sendMessageToTabs(tabs, "resetLocalStorage");

+    await sendMessageToTabs(tabs, "checkLocalStorageSet");

+    await browser.browsingData.remove({}, {localStorage: true});

+    await sendMessageToTabs(tabs, "checkLocalStorageCleared");

+

+    browser.tabs.remove(tabs.map(tab => tab.id));

+

+    browser.test.notifyPass("done");

+  }

+

+  function contentScript() {

+    browser.runtime.onMessage.addListener(msg => {

+      if (msg === "resetLocalStorage") {

+        localStorage.clear();

+        localStorage.setItem("test", "test");

+      } else if (msg === "checkLocalStorageSet") {

+        browser.test.assertEq("test", localStorage.getItem("test"));

+      } else if (msg === "checkLocalStorageCleared") {

+        browser.test.assertEq(null, localStorage.getItem("test"));

+      }

+    });

+    browser.runtime.sendMessage("content-script-ready");

+  }

+

+  let extension = ExtensionTestUtils.loadExtension({

+    background,

+    manifest: {

+      "permissions": ["browsingData"],

+      "content_scripts": [{

+        "matches": [

+          "http://example.com/",

+          "http://example.net/",

+        ],

+        "js": ["content-script.js"],

+        "run_at": "document_start",

+      }],

+    },

+    files: {

+      "content-script.js": contentScript,

+    },

+  });

+

+  await extension.startup();

+  await extension.awaitFinish("done");

+  await extension.unload();

+});

+

diff --git browser/components/extensions/test/xpcshell/test_ext_browsingData.js browser/components/extensions/test/xpcshell/test_ext_browsingData.js

index 0c1c4874ca44..0b8972058e64 100644

--- browser/components/extensions/test/xpcshell/test_ext_browsingData.js

+++ browser/components/extensions/test/xpcshell/test_ext_browsingData.js

@@ -44,7 +44,7 @@ add_task(async function testInvalidArguments() {

 add_task(async function testUnimplementedDataType() {

   function background() {

-    browser.browsingData.remove({}, {localStorage: true});

+    browser.browsingData.remove({}, {indexedDB: true});

     browser.test.sendMessage("finished");

   }

@@ -61,6 +61,6 @@ add_task(async function testUnimplementedDataType() {

     await extension.unload();

   });

-  let warningObserved = messages.find(line => /Firefox does not support dataTypes: localStorage/.test(line));

+  let warningObserved = messages.find(line => /Firefox does not support dataTypes: indexedDB/.test(line));

   ok(warningObserved, "Warning issued when calling remove with an unimplemented dataType.");

 });

diff --git dom/storage/LocalStorageManager.cpp dom/storage/LocalStorageManager.cpp

index a161de2bc596..f366e7874a90 100644

--- dom/storage/LocalStorageManager.cpp

+++ dom/storage/LocalStorageManager.cpp

@@ -386,7 +386,8 @@ LocalStorageManager::Observe(const char* aTopic,

   }

   // Clear everything, caches + database

-  if (!strcmp(aTopic, "cookie-cleared")) {

+  if (!strcmp(aTopic, "cookie-cleared") ||

+      !strcmp(aTopic, "extension:purge-localStorage-caches")) {

     ClearCaches(LocalStorageCache::kUnloadComplete, pattern, EmptyCString());

     return NS_OK;

   }

diff --git dom/storage/StorageObserver.cpp dom/storage/StorageObserver.cpp

index e5b010f88c7b..48d484748209 100644

--- dom/storage/StorageObserver.cpp

+++ dom/storage/StorageObserver.cpp

@@ -66,6 +66,7 @@ StorageObserver::Init()

   obs->AddObserver(sSelf, "browser:purge-domain-data", true);

   obs->AddObserver(sSelf, "last-pb-context-exited", true);

   obs->AddObserver(sSelf, "clear-origin-attributes-data", true);

+  obs->AddObserver(sSelf, "extension:purge-localStorage", true);

   // Shutdown

   obs->AddObserver(sSelf, "profile-after-change", true);

@@ -270,6 +271,23 @@ StorageObserver::Observe(nsISupports* aSubject,

     Notify("session-only-cleared", NS_ConvertUTF8toUTF16(originSuffix),

            originScope);

+

+    return NS_OK;

+  }

+

+  if (!strcmp(aTopic, "extension:purge-localStorage")) {

+    StorageDBChild* storageChild = StorageDBChild::GetOrCreate();

+    if (NS_WARN_IF(!storageChild)) {

+      return NS_ERROR_FAILURE;

+    }

+

+    storageChild->AsyncClearAll();

+

+    if (XRE_IsParentProcess()) {

+      storageChild->SendClearAll();

+    }

+

+    Notify("extension:purge-localStorage-caches");

     return NS_OK;

   }

diff --git mobile/android/components/extensions/schemas/browsing_data.json mobile/android/components/extensions/schemas/browsing_data.json

index 483a462d422c..1019c1a23953 100644

--- mobile/android/components/extensions/schemas/browsing_data.json

+++ mobile/android/components/extensions/schemas/browsing_data.json

@@ -345,7 +345,6 @@

         "description": "Clears websites' local storage data.",

         "type": "function",

         "async": "callback",

-        "unsupported": true,

         "parameters": [

           {

             "$ref": "RemovalOptions",

commit 4a1737e0c456

Author: David Keeler <dkeeler@mozilla.com>

Date:   Fri Sep 15 14:47:54 2017 -0700

    Bug 1369561 - Address misc. SnprintfLiteral correctness nits. r=jld, r=froydnj, a=ritu

    --HG--

    extra : source : f5533b6cd09c35eef381e311940b5bd5231d3553

---

 security/sandbox/linux/SandboxUtil.cpp | 17 ++++++++++-------

 xpcom/base/nsSystemInfo.cpp            |  2 +-

 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git security/sandbox/linux/SandboxUtil.cpp security/sandbox/linux/SandboxUtil.cpp

index ad6003ecaad5..999329882364 100644

--- security/sandbox/linux/SandboxUtil.cpp

+++ security/sandbox/linux/SandboxUtil.cpp

@@ -62,7 +62,6 @@ UnshareUserNamespace()

   uid_t uid = getuid();

   gid_t gid = getgid();

   char buf[80];

-  size_t len;

   if (syscall(__NR_unshare, CLONE_NEWUSER) != 0) {

     return false;

@@ -84,17 +83,21 @@ UnshareUserNamespace()

   // current thread.  However, CLONE_NEWUSER can be unshared only in a

   // single-threaded process, so those are equivalent if we reach this

   // point.

-  len = size_t(SprintfLiteral(buf, "%u %u 1\n", uid, uid));

-  MOZ_ASSERT(len < sizeof(buf));

-  if (!WriteStringToFile("/proc/self/uid_map", buf, len)) {

+  int len = SprintfLiteral(buf, "%u %u 1\n", uid, uid);

+  if (len >= int(sizeof(buf)) || len < 0) {

+    return false;

+  }

+  if (!WriteStringToFile("/proc/self/uid_map", buf, size_t(len))) {

     MOZ_CRASH("Failed to write /proc/self/uid_map");

   }

   Unused << WriteStringToFile("/proc/self/setgroups", "deny", 4);

-  len = size_t(SprintfLiteral(buf, "%u %u 1\n", gid, gid));

-  MOZ_ASSERT(len < sizeof(buf));

-  if (!WriteStringToFile("/proc/self/gid_map", buf, len)) {

+  len = SprintfLiteral(buf, "%u %u 1\n", gid, gid);

+  if (len >= int(sizeof(buf)) || len < 0) {

+    return false;

+  }

+  if (!WriteStringToFile("/proc/self/gid_map", buf, size_t(len))) {

     MOZ_CRASH("Failed to write /proc/self/gid_map");

   }

   return true;

diff --git xpcom/base/nsSystemInfo.cpp xpcom/base/nsSystemInfo.cpp

index e5a7fe97be03..782dc9abf37d 100644

--- xpcom/base/nsSystemInfo.cpp

+++ xpcom/base/nsSystemInfo.cpp

@@ -706,7 +706,7 @@ nsSystemInfo::Init()

   }

   nsAutoCString secondaryLibrary;

-  if (gtkver_len > 0) {

+  if (gtkver_len > 0 && gtkver_len < int(sizeof(gtkver))) {

     secondaryLibrary.Append(nsDependentCSubstring(gtkver, gtkver_len));

   }

commit b481800095d4

Author: Stone Shih <sshih@mozilla.com>

Date:   Tue Sep 19 15:41:52 2017 +0800

    Bug 1375146 - Revise sending drag event. r=smaug, a=ritu

    --HG--

    extra : source : d4496b8befbf0ef5ae124a9fbda37ad5b885f9e1

---

 dom/events/EventStateManager.cpp | 7 ++++---

 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git dom/events/EventStateManager.cpp dom/events/EventStateManager.cpp

index b94dc0c88e01..1f48884058de 100644

--- dom/events/EventStateManager.cpp

+++ dom/events/EventStateManager.cpp

@@ -1292,8 +1292,9 @@ EventStateManager::DispatchCrossProcessEvent(WidgetEvent* aEvent,

     return;

   }

   case eDragEventClass: {

-    if (remote->Manager()->IsContentParent()) {

-      remote->Manager()->AsContentParent()->MaybeInvokeDragSession(remote);

+    RefPtr<TabParent> tabParent = remote;

+    if (tabParent->Manager()->IsContentParent()) {

+      tabParent->Manager()->AsContentParent()->MaybeInvokeDragSession(tabParent);

     }

     nsCOMPtr<nsIDragSession> dragSession = nsContentUtils::GetDragSession();

@@ -1309,7 +1310,7 @@ EventStateManager::DispatchCrossProcessEvent(WidgetEvent* aEvent,

       }

     }

-    remote->SendRealDragEvent(*aEvent->AsDragEvent(), action, dropEffect);

+    tabParent->SendRealDragEvent(*aEvent->AsDragEvent(), action, dropEffect);

     return;

   }

   case ePluginEventClass: {

diff --git widget/gtk/nsLookAndFeel.cpp widget/gtk/nsLookAndFeel.cpp

index 6bb3e27c6653..f4c35d82200a 100644

--- widget/gtk/nsLookAndFeel.cpp

+++ widget/gtk/nsLookAndFeel.cpp

@@ -29,11 +29,9 @@

 #include "mozilla/gfx/2D.h"

-#if MOZ_WIDGET_GTK != 2

 #include <cairo-gobject.h>

 #include "WidgetStyleCache.h"

 #include "prenv.h"

-#endif

 using mozilla::LookAndFeel;

@@ -49,9 +47,6 @@ using mozilla::LookAndFeel;

 nsLookAndFeel::nsLookAndFeel()

     : nsXPLookAndFeel(),

-#if (MOZ_WIDGET_GTK == 2)

-      mStyle(nullptr),

-#endif

       mDefaultFontCached(false), mButtonFontCached(false),

       mFieldFontCached(false), mMenuFontCached(false),

       mInitialized(false)

@@ -66,12 +61,8 @@ nsLookAndFeel::NativeInit()

 nsLookAndFeel::~nsLookAndFeel()

 {

-#if (MOZ_WIDGET_GTK == 2)

-    g_object_unref(mStyle);

-#endif

 }

-#if MOZ_WIDGET_GTK != 2

 // Modifies color |*aDest| as if a pattern of color |aSource| was painted with

 // CAIRO_OPERATOR_OVER to a surface with color |*aDest|.

 static void

@@ -228,42 +219,19 @@ GetBorderColors(GtkStyleContext* aContext,

     *aDarkColor = GDK_RGBA_TO_NS_RGBA(darkColor);

     return ret;

 }

-#endif

 nsresult

 nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

 {

     EnsureInit();

-#if (MOZ_WIDGET_GTK == 3)

     GdkRGBA gdk_color;

-#endif

     nsresult res = NS_OK;

     switch (aID) {

         // These colors don't seem to be used for anything anymore in Mozilla

         // (except here at least TextSelectBackground and TextSelectForeground)

         // The CSS2 colors below are used.

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID_WindowBackground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WindowForeground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WidgetBackground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WidgetForeground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_WidgetSelectBackground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_WidgetSelectForeground:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]);

-        break;

-#else

     case eColorID_WindowBackground:

     case eColorID_WidgetBackground:

     case eColorID_TextBackground:

@@ -303,35 +271,12 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID__moz_html_cellhighlighttext:

         aColor = sTextSelectedText;

         break;

-#endif

     case eColorID_Widget3DHighlight:

         aColor = NS_RGB(0xa0,0xa0,0xa0);

         break;

     case eColorID_Widget3DShadow:

         aColor = NS_RGB(0x40,0x40,0x40);

         break;

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID_TextBackground:

-        // not used?

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_TextForeground: 

-        // not used?

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_TextSelectBackground:

-    case eColorID_IMESelectedRawTextBackground:

-    case eColorID_IMESelectedConvertedTextBackground:

-        // still used

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_TextSelectForeground:

-    case eColorID_IMESelectedRawTextForeground:

-    case eColorID_IMESelectedConvertedTextForeground:

-        // still used

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]);

-        break;

-#endif

     case eColorID_IMERawInputBackground:

     case eColorID_IMEConvertedTextBackground:

         aColor = NS_TRANSPARENT;

@@ -352,53 +297,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

       aColor = NS_RGB(0xff, 0, 0);

       break;

-#if (MOZ_WIDGET_GTK == 2)

-        // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors

-    case eColorID_activeborder:

-        // active window border

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_activecaption:

-        // active window caption background

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_appworkspace:

-        // MDI background color

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_background:

-        // desktop background

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_captiontext:

-        // text in active window caption, size box, and scrollbar arrow box (!)

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_graytext:

-        // disabled text in windows, menus, etc.

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);

-        break;

-    case eColorID_highlight:

-        // background of selected item

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_highlighttext:

-        // text of selected item

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]);

-        break;

-    case eColorID_inactiveborder:

-        // inactive window border

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID_inactivecaption:

-        // inactive window caption

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_INSENSITIVE]);

-        break;

-    case eColorID_inactivecaptiontext:

-        // text in inactive window caption

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);

-        break;

-#else

         // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors

     case eColorID_activeborder: {

         // active window border

@@ -433,7 +331,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         ReleaseStyleContext(style);

         break;

     }

-#endif

     case eColorID_infobackground:

         // tooltip background color

         aColor = sInfoBackground;

@@ -452,11 +349,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         break;

     case eColorID_scrollbar:

         // scrollbar gray area

-#if (MOZ_WIDGET_GTK == 2)

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_ACTIVE]);

-#else

         aColor = sMozScrollbar;

-#endif

         break;

     case eColorID_threedlightshadow:

@@ -465,11 +358,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID_threedface:

     case eColorID_buttonface:

         // 3-D face color

-#if (MOZ_WIDGET_GTK == 3)

         aColor = sMozWindowBackground;

-#else

-        aColor = sButtonBackground;

-#endif

         break;

     case eColorID_buttontext:

@@ -491,56 +380,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         aColor = sFrameInnerDarkBorder;

         break;

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID_threeddarkshadow:

-        // 3-D shadow outer edge color

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->black);

-        break;

-

-    case eColorID_window:

-    case eColorID_windowframe:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-

-    case eColorID_windowtext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-

-    case eColorID__moz_eventreerow:

-    case eColorID__moz_field:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_fieldtext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_dialog:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_dialogtext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);

-        break;

-    case eColorID__moz_dragtargetzone:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);

-        break; 

-    case eColorID__moz_buttondefault:

-        // default button border color

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->black);

-        break;

-    case eColorID__moz_buttonhoverface:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_PRELIGHT]);

-        break;

-    case eColorID__moz_buttonhovertext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_PRELIGHT]);

-        break;

-    case eColorID__moz_cellhighlight:

-    case eColorID__moz_html_cellhighlight:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_ACTIVE]);

-        break;

-    case eColorID__moz_cellhighlighttext:

-    case eColorID__moz_html_cellhighlighttext:

-        aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_ACTIVE]);

-        break;

-#else

     case eColorID_threeddarkshadow:

         // Hardcode to black

         aColor = NS_RGB(0x00,0x00,0x00);

@@ -574,7 +413,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID__moz_buttonhovertext:

         aColor = sButtonHoverText;

         break;

-#endif

     case eColorID__moz_menuhover:

         aColor = sMenuHover;

         break;

@@ -590,11 +428,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     case eColorID__moz_comboboxtext:

         aColor = sComboBoxText;

         break;

-#if (MOZ_WIDGET_GTK == 2)

-    case eColorID__moz_combobox:

-        aColor = sComboBoxBackground;

-        break;

-#endif

     case eColorID__moz_menubartext:

         aColor = sMenuBarText;

         break;

@@ -602,11 +435,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

         aColor = sMenuBarHoverText;

         break;

     case eColorID__moz_gtk_info_bar_text:

-#if (MOZ_WIDGET_GTK == 3)

         aColor = sInfoBarText;

-#else

-        aColor = sInfoText;

-#endif

         break;

     default:

         /* default color is BLACK */

@@ -618,27 +447,6 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)

     return res;

 }

-#if (MOZ_WIDGET_GTK == 2)

-static void darken_gdk_color(GdkColor *src, GdkColor *dest)

-{

-    gdouble red;

-    gdouble green;

-    gdouble blue;

-

-    red = (gdouble) src->red / 65535.0;

-    green = (gdouble) src->green / 65535.0;

-    blue = (gdouble) src->blue / 65535.0;

-

-    red *= 0.93;

-    green *= 0.93;

-    blue *= 0.93;

-

-    dest->red = red * 65535.0;

-    dest->green = green * 65535.0;

-    dest->blue = blue * 65535.0;

-}

-#endif

-

 static int32_t CheckWidgetStyle(GtkWidget* aWidget, const char* aStyle, int32_t aResult) {

     gboolean value = FALSE;

     gtk_widget_style_get(aWidget, aStyle, &value, nullptr);

@@ -826,14 +634,8 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)

         res = NS_ERROR_NOT_IMPLEMENTED;

         break;

     case eIntID_TouchEnabled:

-#if MOZ_WIDGET_GTK == 3

         aResult = mozilla::widget::WidgetUtils::IsTouchDeviceSupportPresent();

         break;

-#else

-        aResult = 0;

-        res = NS_ERROR_NOT_IMPLEMENTED;

-#endif

-        break;

     case eIntID_MacGraphiteTheme:

         aResult = 0;

         res = NS_ERROR_NOT_IMPLEMENTED;

@@ -905,24 +707,20 @@ nsLookAndFeel::GetFloatImpl(FloatID aID, float &aResult)

 }

 static void

-GetSystemFontInfo(GtkWidget *aWidget,

+GetSystemFontInfo(GtkStyleContext *aStyle,

                   nsString *aFontName,

                   gfxFontStyle *aFontStyle)

 {

-    GtkSettings *settings = gtk_widget_get_settings(aWidget);

-

     aFontStyle->style       = NS_FONT_STYLE_NORMAL;

-    gchar *fontname;

-    g_object_get(settings, "gtk-font-name", &fontname, nullptr);

-

+    // As in

+    // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333

     PangoFontDescription *desc;

-    desc = pango_font_description_from_string(fontname);

+    gtk_style_context_get(aStyle, gtk_style_context_get_state(aStyle),

+                          "font", &desc, nullptr);

     aFontStyle->systemFont = true;

-    g_free(fontname);

-

     NS_NAMED_LITERAL_STRING(quote, "\"");

     NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc));

     *aFontName = quote + family + quote;

@@ -953,96 +751,28 @@ GetSystemFontInfo(GtkWidget *aWidget,

     pango_font_description_free(desc);

 }

-static void

-GetSystemFontInfo(LookAndFeel::FontID aID,

-                  nsString *aFontName,

-                  gfxFontStyle *aFontStyle)

-{

-    if (aID == LookAndFeel::eFont_Widget) {

-        GtkWidget *label = gtk_label_new("M");

-        GtkWidget *parent = gtk_fixed_new();

-        GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

-

-        gtk_container_add(GTK_CONTAINER(parent), label);

-        gtk_container_add(GTK_CONTAINER(window), parent);

-

-        gtk_widget_ensure_style(label);

-        GetSystemFontInfo(label, aFontName, aFontStyle);

-        gtk_widget_destroy(window);  // no unref, windows are different

-

-    } else if (aID == LookAndFeel::eFont_Button) {

-        GtkWidget *label = gtk_label_new("M");

-        GtkWidget *parent = gtk_fixed_new();

-        GtkWidget *button = gtk_button_new();

-        GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

-

-        gtk_container_add(GTK_CONTAINER(button), label);

-        gtk_container_add(GTK_CONTAINER(parent), button);

-        gtk_container_add(GTK_CONTAINER(window), parent);

-

-        gtk_widget_ensure_style(label);

-        GetSystemFontInfo(label, aFontName, aFontStyle);

-        gtk_widget_destroy(window);  // no unref, windows are different

-

-    } else if (aID == LookAndFeel::eFont_Field) {

-        GtkWidget *entry = gtk_entry_new();

-        GtkWidget *parent = gtk_fixed_new();

-        GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

-

-        gtk_container_add(GTK_CONTAINER(parent), entry);

-        gtk_container_add(GTK_CONTAINER(window), parent);

-

-        gtk_widget_ensure_style(entry);

-        GetSystemFontInfo(entry, aFontName, aFontStyle);

-        gtk_widget_destroy(window);  // no unref, windows are different

-

-    } else {

-        MOZ_ASSERT(aID == LookAndFeel::eFont_Menu, "unexpected font ID");

-        GtkWidget *accel_label = gtk_accel_label_new("M");

-        GtkWidget *menuitem = gtk_menu_item_new();

-        GtkWidget *menu = gtk_menu_new();

-        g_object_ref_sink(menu);

-

-        gtk_container_add(GTK_CONTAINER(menuitem), accel_label);

-        gtk_menu_shell_append((GtkMenuShell *)GTK_MENU(menu), menuitem);

-

-        gtk_widget_ensure_style(accel_label);

-        GetSystemFontInfo(accel_label, aFontName, aFontStyle);

-        g_object_unref(menu);

-    }

-}

-

 bool

 nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,

                            gfxFontStyle& aFontStyle,

                            float aDevPixPerCSSPixel)

 {

-  nsString *cachedFontName = nullptr;

-  gfxFontStyle *cachedFontStyle = nullptr;

-  bool *isCached = nullptr;

-

   switch (aID) {

     case eFont_Menu:         // css2

     case eFont_PullDownMenu: // css3

-      cachedFontName = &mMenuFontName;

-      cachedFontStyle = &mMenuFontStyle;

-      isCached = &mMenuFontCached;

-      aID = eFont_Menu;

-      break;

+      aFontName = mMenuFontName;

+      aFontStyle = mMenuFontStyle;

+      return true;

     case eFont_Field:        // css3

     case eFont_List:         // css3

-      cachedFontName = &mFieldFontName;

-      cachedFontStyle = &mFieldFontStyle;

-      isCached = &mFieldFontCached;

-      aID = eFont_Field;

-      break;

+      aFontName = mFieldFontName;

+      aFontStyle = mFieldFontStyle;

+      return true;

     case eFont_Button:       // css3

-      cachedFontName = &mButtonFontName;

-      cachedFontStyle = &mButtonFontStyle;

-      isCached = &mButtonFontCached;

-      break;

+      aFontName = mButtonFontName;

+      aFontStyle = mButtonFontStyle;

+      return true;

     case eFont_Caption:      // css2

     case eFont_Icon:         // css2

@@ -1057,21 +787,11 @@ nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,

     case eFont_Dialog:       // css3

     case eFont_Tooltips:     // moz

     case eFont_Widget:       // moz

-      cachedFontName = &mDefaultFontName;

-      cachedFontStyle = &mDefaultFontStyle;

-      isCached = &mDefaultFontCached;

-      aID = eFont_Widget;

-      break;

-  }

-

-  if (!*isCached) {

-    GetSystemFontInfo(aID, cachedFontName, cachedFontStyle);

-    *isCached = true;

+    default:

+      aFontName = mDefaultFontName;

+      aFontStyle = mDefaultFontStyle;

+      return true;

   }

-

-  aFontName = *cachedFontName;

-  aFontStyle = *cachedFontStyle;

-  return true;

 }

 void

@@ -1087,70 +807,6 @@ nsLookAndFeel::EnsureInit()

     // gtk does non threadsafe refcounting

     MOZ_ASSERT(NS_IsMainThread());

-#if (MOZ_WIDGET_GTK == 2)

-    NS_ASSERTION(!mStyle, "already initialized");

-    // GtkInvisibles come with a refcount that is not floating

-    // (since their initialization code calls g_object_ref_sink) and

-    // their destroy code releases that reference (which means they

-    // have to be explicitly destroyed, since calling unref enough

-    // to cause destruction would lead to *another* unref).

-    // However, this combination means that it's actually still ok

-    // to use the normal pattern, which is to g_object_ref_sink

-    // after construction, and then destroy *and* unref when we're

-    // done.  (Though we could skip the g_object_ref_sink and the

-    // corresponding g_object_unref, but that's particular to

-    // GtkInvisibles and GtkWindows.)

-    GtkWidget *widget = gtk_invisible_new();

-    g_object_ref_sink(widget); // effectively g_object_ref (see above)

-

-    gtk_widget_ensure_style(widget);

-    mStyle = gtk_style_copy(gtk_widget_get_style(widget));

-

-    gtk_widget_destroy(widget);

-    g_object_unref(widget);

-        

-    // tooltip foreground and background

-    GtkStyle *style = gtk_rc_get_style_by_paths(gtk_settings_get_default(),

-                                                "gtk-tooltips", "GtkWindow",

-                                                GTK_TYPE_WINDOW);

-    if (style) {

-        sInfoBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-        sInfoText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-

-    // menu foreground & menu background

-    GtkWidget *accel_label = gtk_accel_label_new("M");

-    GtkWidget *menuitem = gtk_menu_item_new();

-    GtkWidget *menu = gtk_menu_new();

-

-    g_object_ref_sink(menu);

-

-    gtk_container_add(GTK_CONTAINER(menuitem), accel_label);

-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);

-

-    gtk_widget_set_style(accel_label, nullptr);

-    gtk_widget_set_style(menu, nullptr);

-    gtk_widget_realize(menu);

-    gtk_widget_realize(accel_label);

-

-    style = gtk_widget_get_style(accel_label);

-    if (style) {

-        sMenuText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-

-    style = gtk_widget_get_style(menu);

-    if (style) {

-        sMenuBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-    }

-    

-    style = gtk_widget_get_style(menuitem);

-    if (style) {

-        sMenuHover = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_PRELIGHT]);

-        sMenuHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_PRELIGHT]);

-    }

-

-    g_object_unref(menu);

-#else

     GdkRGBA color;

     GtkStyleContext *style;

@@ -1195,6 +851,12 @@ nsLookAndFeel::EnsureInit()

         }

     }

+    // The label is not added to a parent widget, but shared for constructing

+    // different style contexts.  The node hierarchy is constructed only on

+    // the label style context.

+    GtkWidget *labelWidget = gtk_label_new("M");

+    g_object_ref_sink(labelWidget);

+

     // Scrollbar colors

     style = ClaimStyleContext(MOZ_GTK_SCROLLBAR_TROUGH_VERTICAL);

     gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);

@@ -1208,6 +870,13 @@ nsLookAndFeel::EnsureInit()

     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);

     sMozWindowText = GDK_RGBA_TO_NS_RGBA(color);

     ReleaseStyleContext(style);

+    style = ClaimStyleContext(MOZ_GTK_WINDOW_CONTAINER);

+    {

+        GtkStyleContext* labelStyle = CreateStyleForWidget(labelWidget, style);

+        GetSystemFontInfo(labelStyle, &mDefaultFontName, &mDefaultFontStyle);

+        g_object_unref(labelStyle);

+    }

+    ReleaseStyleContext(style);

     // tooltip foreground and background

     style = ClaimStyleContext(MOZ_GTK_TOOLTIP);

@@ -1224,6 +893,9 @@ nsLookAndFeel::EnsureInit()

     {

         GtkStyleContext* accelStyle =

             CreateStyleForWidget(gtk_accel_label_new("M"), style);

+

+        GetSystemFontInfo(accelStyle, &mMenuFontName, &mMenuFontStyle);

+

         gtk_style_context_get_color(accelStyle, GTK_STATE_FLAG_NORMAL, &color);

         sMenuText = GDK_RGBA_TO_NS_RGBA(color);

         gtk_style_context_get_color(accelStyle, GTK_STATE_FLAG_INSENSITIVE, &color);

@@ -1243,17 +915,8 @@ nsLookAndFeel::EnsureInit()

     gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);

     sMenuHoverText = GDK_RGBA_TO_NS_RGBA(color);

     ReleaseStyleContext(style);

-#endif

-    // button styles

     GtkWidget *parent = gtk_fixed_new();

-    GtkWidget *button = gtk_button_new();

-    GtkWidget *label = gtk_label_new("M");

-#if (MOZ_WIDGET_GTK == 2)

-    GtkWidget *combobox = gtk_combo_box_new();

-    GtkWidget *comboboxLabel = gtk_label_new("M");

-    gtk_container_add(GTK_CONTAINER(combobox), comboboxLabel);

-#endif

     GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);

     GtkWidget *treeView = gtk_tree_view_new();

     GtkWidget *linkButton = gtk_link_button_new("http://example.com/");

@@ -1262,94 +925,14 @@ nsLookAndFeel::EnsureInit()

     GtkWidget *entry = gtk_entry_new();

     GtkWidget *textView = gtk_text_view_new();

-    gtk_container_add(GTK_CONTAINER(button), label);

-    gtk_container_add(GTK_CONTAINER(parent), button);

     gtk_container_add(GTK_CONTAINER(parent), treeView);

     gtk_container_add(GTK_CONTAINER(parent), linkButton);

-#if (MOZ_WIDGET_GTK == 2)

-    gtk_container_add(GTK_CONTAINER(parent), combobox);

-#endif

     gtk_container_add(GTK_CONTAINER(parent), menuBar);

     gtk_menu_shell_append(GTK_MENU_SHELL(menuBar), menuBarItem);

     gtk_container_add(GTK_CONTAINER(window), parent);

     gtk_container_add(GTK_CONTAINER(parent), entry);

     gtk_container_add(GTK_CONTAINER(parent), textView);

-#if (MOZ_WIDGET_GTK == 2)

-    gtk_widget_set_style(button, nullptr);

-    gtk_widget_set_style(label, nullptr);

-    gtk_widget_set_style(treeView, nullptr);

-    gtk_widget_set_style(linkButton, nullptr);

-    gtk_widget_set_style(combobox, nullptr);

-    gtk_widget_set_style(comboboxLabel, nullptr);

-    gtk_widget_set_style(menuBar, nullptr);

-    gtk_widget_set_style(entry, nullptr);

-

-    gtk_widget_realize(button);

-    gtk_widget_realize(label);

-    gtk_widget_realize(treeView);

-    gtk_widget_realize(linkButton);

-    gtk_widget_realize(combobox);

-    gtk_widget_realize(comboboxLabel);

-    gtk_widget_realize(menuBar);

-    gtk_widget_realize(entry);

-

-    style = gtk_widget_get_style(label);

-    if (style) {

-        sButtonText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-

-    style = gtk_widget_get_style(comboboxLabel);

-    if (style) {

-        sComboBoxText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-    }

-    style = gtk_widget_get_style(combobox);

-    if (style) {

-        sComboBoxBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-    }

-

-    style = gtk_widget_get_style(menuBar);

-    if (style) {

-        sMenuBarText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);

-        sMenuBarHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_SELECTED]);

-    }

-

-    // GTK's guide to fancy odd row background colors:

-    // 1) Check if a theme explicitly defines an odd row color

-    // 2) If not, check if it defines an even row color, and darken it

-    //    slightly by a hardcoded value (gtkstyle.c)

-    // 3) If neither are defined, take the base background color and

-    //    darken that by a hardcoded value

-    colorValuePtr = nullptr;

-    gtk_widget_style_get(treeView,

-                         "odd-row-color", &colorValuePtr,

-                         nullptr);

-

-    if (colorValuePtr) {

-        colorValue = *colorValuePtr;

-    } else {

-        gtk_widget_style_get(treeView,

-                             "even-row-color", &colorValuePtr,

-                             nullptr);

-        if (colorValuePtr)

-            darken_gdk_color(colorValuePtr, &colorValue);

-        else

-            darken_gdk_color(&treeView->style->base[GTK_STATE_NORMAL], &colorValue);

-    }

-

-    sOddCellBackground = GDK_COLOR_TO_NS_RGB(colorValue);

-    if (colorValuePtr)

-        gdk_color_free(colorValuePtr);

-

-    style = gtk_widget_get_style(button);

-    if (style) {

-        sButtonBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);

-        sFrameOuterLightBorder =

-            GDK_COLOR_TO_NS_RGB(style->light[GTK_STATE_NORMAL]);

-        sFrameInnerDarkBorder =

-            GDK_COLOR_TO_NS_RGB(style->dark[GTK_STATE_NORMAL]);

-    }

-#else

     // Text colors

     GdkRGBA bgColor;

     // If the text window background is translucent, then the background of

@@ -1381,8 +964,10 @@ nsLookAndFeel::EnsureInit()

     // Button text color

     style = ClaimStyleContext(MOZ_GTK_BUTTON);

     {

-        GtkStyleContext* labelStyle =

-            CreateStyleForWidget(gtk_label_new("M"), style);

+        GtkStyleContext* labelStyle = CreateStyleForWidget(labelWidget, style);

+

+        GetSystemFontInfo(labelStyle, &mButtonFontName, &mButtonFontStyle);

+

         gtk_style_context_get_color(labelStyle, GTK_STATE_FLAG_NORMAL, &color);

         sButtonText = GDK_RGBA_TO_NS_RGBA(color);

         gtk_style_context_get_color(labelStyle, GTK_STATE_FLAG_PRELIGHT, &color);

@@ -1446,7 +1031,6 @@ nsLookAndFeel::EnsureInit()

     gtk_style_context_add_class(style, GTK_STYLE_CLASS_INFO);

     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);

     sInfoBarText = GDK_RGBA_TO_NS_RGBA(color);

-#endif

     // Some themes have a unified menu bar, and support window dragging on it

     gboolean supports_menubar_drag = FALSE;

     GParamSpec *param_spec =

@@ -1493,7 +1074,11 @@ nsLookAndFeel::EnsureInit()

                          "cursor-aspect-ratio", &sCaretRatio,

                          nullptr);

+    GetSystemFontInfo(gtk_widget_get_style_context(entry),

+                      &mFieldFontName, &mFieldFontStyle);

+

     gtk_widget_destroy(window);

+    g_object_unref(labelWidget);

 }

 // virtual

@@ -1515,11 +1100,6 @@ nsLookAndFeel::RefreshImpl()

     mFieldFontCached = false;

     mMenuFontCached = false;

-#if (MOZ_WIDGET_GTK == 2)

-    g_object_unref(mStyle);

-    mStyle = nullptr;

-#endif

-

     mInitialized = false;

 }

diff --git widget/gtk/nsLookAndFeel.h widget/gtk/nsLookAndFeel.h

index 9a4015e95415..38cd51c056d6 100644

--- widget/gtk/nsLookAndFeel.h

+++ widget/gtk/nsLookAndFeel.h

@@ -33,9 +33,6 @@ public:

     virtual bool GetEchoPasswordImpl();

 protected:

-#if (MOZ_WIDGET_GTK == 2)

-    struct _GtkStyle *mStyle;

-#endif

     // Cached fonts

     bool mDefaultFontCached;

@@ -63,7 +60,6 @@ protected:

     nscolor sMenuHoverText;

     nscolor sButtonText;

     nscolor sButtonHoverText;

-    nscolor sButtonBackground;

     nscolor sFrameOuterLightBorder;

     nscolor sFrameInnerDarkBorder;

     nscolor sOddCellBackground;

@@ -77,9 +73,7 @@ protected:

     nscolor sTextSelectedText;

     nscolor sTextSelectedBackground;

     nscolor sMozScrollbar;

-#if (MOZ_WIDGET_GTK == 3)

     nscolor sInfoBarText;

-#endif

     char16_t sInvisibleCharacter;

     float   sCaretRatio;

     bool    sMenuSupportsDrag;

commit efbe3a9af876

Author: Manish Goregaokar <manishearth@gmail.com>

Date:   Wed Aug 2 11:24:35 2017 -0700

    Bug 1386887 - Clean up FFI lifetimes to work on nightly; r=emilio

    MozReview-Commit-ID: 5WAIVd6p2du

---

 layout/style/ServoBindingList.h  | 4 ++--

 layout/style/ServoBindingTypes.h | 2 ++

 layout/style/ServoBindings.h     | 4 ++--

 layout/style/ServoBindings.toml  | 4 +++-

 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git layout/style/ServoBindingList.h layout/style/ServoBindingList.h

index 6c669ebb3d3e..87ade14ea4de 100644

--- layout/style/ServoBindingList.h

+++ layout/style/ServoBindingList.h

@@ -379,10 +379,10 @@ SERVO_BINDING_FUNC(Servo_DeclarationBlock_HasCSSWideKeyword, bool,

                    nsCSSPropertyID property)

 // Compose animation value for a given property.

 // |base_values| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>.

-// We use void* to avoid exposing nsRefPtrHashtable in FFI.

+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI.

 SERVO_BINDING_FUNC(Servo_AnimationCompose, void,

                    RawServoAnimationValueMapBorrowedMut animation_values,

-                   void* base_values,

+                   RawServoAnimationValueTableBorrowed base_values,

                    nsCSSPropertyID property,

                    RawGeckoAnimationPropertySegmentBorrowed animation_segment,

                    RawGeckoAnimationPropertySegmentBorrowed last_segment,

diff --git layout/style/ServoBindingTypes.h layout/style/ServoBindingTypes.h

index aaf4fc27e1b9..69be15ee9f51 100644

--- layout/style/ServoBindingTypes.h

+++ layout/style/ServoBindingTypes.h

@@ -54,6 +54,8 @@ class nsXBLBinding;

 using mozilla::dom::StyleChildrenIterator;

 using mozilla::ServoElementSnapshot;

+typedef void* RawServoAnimationValueTableBorrowed;

+

 typedef nsINode RawGeckoNode;

 typedef mozilla::dom::Element RawGeckoElement;

 typedef nsIDocument RawGeckoDocument;

diff --git layout/style/ServoBindings.h layout/style/ServoBindings.h

index 493ca63f932b..c6ced6d1fedb 100644

--- layout/style/ServoBindings.h

+++ layout/style/ServoBindings.h

@@ -268,9 +268,9 @@ double Gecko_GetPositionInSegment(

 // Get servo's AnimationValue for |aProperty| from the cached base style

 // |aBaseStyles|.

 // |aBaseStyles| is nsRefPtrHashtable<nsUint32HashKey, RawServoAnimationValue>.

-// We use void* to avoid exposing nsRefPtrHashtable in FFI.

+// We use RawServoAnimationValueTableBorrowed to avoid exposing nsRefPtrHashtable in FFI.

 RawServoAnimationValueBorrowedOrNull Gecko_AnimationGetBaseStyle(

-  void* aBaseStyles,

+  RawServoAnimationValueTableBorrowed aBaseStyles,

   nsCSSPropertyID aProperty);

 void Gecko_StyleTransition_SetUnsupportedProperty(

   mozilla::StyleTransition* aTransition,

diff --git layout/style/ServoBindings.toml layout/style/ServoBindings.toml

index 11e372541235..3c3902beea80 100644

--- layout/style/ServoBindings.toml

+++ layout/style/ServoBindings.toml

@@ -357,6 +357,7 @@ raw-lines = [

     "pub type ServoStyleContextBorrowed<'a> = &'a ::properties::ComputedValues;",

     "pub type ServoStyleContextBorrowedOrNull<'a> = Option<&'a ::properties::ComputedValues>;",

     "pub type ServoComputedDataBorrowed<'a> = &'a ServoComputedData;",

+    "pub type RawServoAnimationValueTableBorrowed<'a> = &'a ();"

 ]

 whitelist-functions = ["Servo_.*", "Gecko_.*"]

 structs-types = [

@@ -389,7 +390,7 @@ structs-types = [

     "RawGeckoPresContext",

     "RawGeckoPresContextOwned",

     "RawGeckoStyleAnimationList",

-    "RawGeckoStyleChildrenIteratorBorrowedMut",

+    "RawGeckoStyleChildrenIterator",

     "RawGeckoServoStyleRuleList",

     "RawGeckoURLExtraData",

     "RawGeckoXBLBinding",

@@ -526,6 +527,7 @@ servo-borrow-types = [

     "RawGeckoFontFaceRuleList",

     "RawGeckoServoStyleRuleList",

     "RawGeckoServoAnimationValueList",

+    "RawGeckoStyleChildrenIterator",

 ]

 fixups = [

     # hack for gecko-owned string

https://github.com/kinetiknz/cubeb/commit/16f9ccc064f2

--- media/libcubeb/src/cubeb_jack.cpp.orig	2017-07-07 05:37:16 UTC

+++ media/libcubeb/src/cubeb_jack.cpp

@@ -8,7 +8,9 @@

  */

 #define _DEFAULT_SOURCE

 #define _BSD_SOURCE

+#ifndef __FreeBSD__

 #define _POSIX_SOURCE

+#endif

 #include <dlfcn.h>

 #include <stdio.h>

 #include <string.h>

commit e1c252eab1f4

Author: Milan Sreckovic <milan@mozilla.com>

Date:   Mon Oct 23 16:22:47 2017 -0400

    Bug 1387799 - Keep an extra reference. r=jrmuizel, a=ritu

    --HG--

    extra : source : 8199078921c6b4c0ee4c984100d33750dfe8e144

---

 gfx/layers/ipc/CompositorBridgeChild.cpp | 11 ++++++++---

 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git gfx/layers/ipc/CompositorBridgeChild.cpp gfx/layers/ipc/CompositorBridgeChild.cpp

index 9419f4b2da36..55fd9c10871b 100644

--- gfx/layers/ipc/CompositorBridgeChild.cpp

+++ gfx/layers/ipc/CompositorBridgeChild.cpp

@@ -523,10 +523,14 @@ CompositorBridgeChild::RecvHideAllPlugins(const uintptr_t& aParentWidget)

 }

 mozilla::ipc::IPCResult

-CompositorBridgeChild::RecvDidComposite(const uint64_t& aId, const uint64_t& aTransactionId,

+CompositorBridgeChild::RecvDidComposite(const uint64_t& aId,

+                                        const uint64_t& aTransactionId,

                                         const TimeStamp& aCompositeStart,

                                         const TimeStamp& aCompositeEnd)

 {

+  // Hold a reference to keep texture pools alive.  See bug 1387799

+  AutoTArray<RefPtr<TextureClientPool>,2> texturePools = mTexturePools;

+

   if (mLayerManager) {

     MOZ_ASSERT(aId == 0);

     MOZ_ASSERT(mLayerManager->GetBackendType() == LayersBackend::LAYERS_CLIENT ||

@@ -541,13 +545,14 @@ CompositorBridgeChild::RecvDidComposite(const uint64_t& aId, const uint64_t& aTr

     }

   }

-  for (size_t i = 0; i < mTexturePools.Length(); i++) {

-    mTexturePools[i]->ReturnDeferredClients();

+  for (size_t i = 0; i < texturePools.Length(); i++) {

+    texturePools[i]->ReturnDeferredClients();

   }

   return IPC_OK();

 }

+

 void

 CompositorBridgeChild::ActorDestroy(ActorDestroyReason aWhy)

 {

commit d20c7d929c84

Author: Ethan <ettseng@mozilla.com>

Date:   Fri Sep 1 17:29:44 2017 +0800

    Bug 1393283 - Use the last ESR version as the spoofed Firefox version. r=tihuang, r=mcmanus

---

 .../test/browser/browser_navigator.js              |  2 +-

 netwerk/protocol/http/nsHttpHandler.cpp            | 16 +++----

 .../resistfingerprinting/nsRFPService.cpp          | 56 ++++++++++++++++++++++

 .../components/resistfingerprinting/nsRFPService.h |  3 ++

 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git browser/components/resistfingerprinting/test/browser/browser_navigator.js browser/components/resistfingerprinting/test/browser/browser_navigator.js

index 25c393d8bb2a..9f52e34a9451 100644

--- browser/components/resistfingerprinting/test/browser/browser_navigator.js

+++ browser/components/resistfingerprinting/test/browser/browser_navigator.js

@@ -91,7 +91,7 @@ add_task(async function setup() {

   let appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);

   let appVersion = parseInt(appInfo.version);