diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index b6994ef..c2c5ef7 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,106 @@
+-------------------------------------------------------------------
+Tue Feb  6 07:03:42 UTC 2018 - fstrba@suse.com
+
+- Added patch:
+  * mozilla-alsa-sandbox.patch: Fix bmo#1430274, ALSA sound (still
+    or again?) not working in Firefox 58 due to sandboxing.
+
+-------------------------------------------------------------------
+Mon Jan 29 22:32:21 UTC 2018 - wr@rosenauer.org
+
+- update to Firefox 58.0.1
+  MFSA 2018-05
+  *  Arbitrary code execution through unsanitized browser UI (bmo#1432966)
+- use correct language packs
+- readd mozilla-enable-csd.patch as it only lands for FF59 upstream
+- allow larger number of nested elements (mozilla-bmo256180.patch)
+
+-------------------------------------------------------------------
+Tue Jan 23 20:40:57 UTC 2018 - wr@rosenauer.org
+
+- update to Firefox 58.0 (bsc#1077291)
+  * Added Nepali (ne-NP) locale
+  * Added support for form autofill for credit card
+  * Optimize page load by caching JavaScript internal representation
+  MFSA 2018-02
+  * CVE-2018-5091 (bmo#1423086)
+    Use-after-free with DTMF timers
+  * CVE-2018-5092 (bmo#1418074)
+    Use-after-free in Web Workers
+  * CVE-2018-5093 (bmo#1415291)
+    Buffer overflow in WebAssembly during Memory/Table resizing
+  * CVE-2018-5094 (bmo#1415883)
+    Buffer overflow in WebAssembly with garbage collection on
+    uninitialized memory
+  * CVE-2018-5095 (bmo#1418447)
+    Integer overflow in Skia library during edge builder allocation
+  * CVE-2018-5097 (bmo#1387427)
+    Use-after-free when source document is manipulated during XSLT
+  * CVE-2018-5098 (bmo#1399400)
+    Use-after-free while manipulating form input elements
+  * CVE-2018-5099 (bmo#1416878)
+    Use-after-free with widget listener
+  * CVE-2018-5100 (bmo#1417405)
+    Use-after-free when IsPotentiallyScrollable arguments are freed
+    from memory
+  * CVE-2018-5101 (bmo#1417661)
+    Use-after-free with floating first-letter style elements
+  * CVE-2018-5102 (bmo#1419363)
+    Use-after-free in HTML media elements
+  * CVE-2018-5103 (bmo#1423159)
+    Use-after-free during mouse event handling
+  * CVE-2018-5104 (bmo#1425000)
+    Use-after-free during font face manipulation
+  * CVE-2018-5105 (bmo#1390882)
+    WebExtensions can save and execute files on local file system
+    without user prompts
+  * CVE-2018-5106 (bmo#1408708)
+    Developer Tools can expose style editor information cross-origin
+    through service worker
+  * CVE-2018-5107 (bmo#1379276)
+    Printing process will follow symlinks for local file access
+  * CVE-2018-5108 (bmo#1421099)
+    Manually entered blob URL can be accessed by subsequent private browsing tabs
+  * CVE-2018-5109 (bmo#1405599)
+    Audio capture prompts and starts with incorrect origin attribution
+  * CVE-2018-5110 (bmo#1423275) (affects only OS X)
+    Cursor can be made invisible on OS X
+  * CVE-2018-5111 (bmo#1321619)
+    URL spoofing in addressbar through drag and drop
+  * CVE-2018-5112 (bmo#1425224)
+    Extension development tools panel can open a non-relative URL in the panel
+  * CVE-2018-5113 (bmo#1425267)
+    WebExtensions can load non-HTTPS pages with browser.identity.launchWebAuthFlow
+  * CVE-2018-5114 (bmo#1421324)
+    The old value of a cookie changed to HttpOnly remains accessible to scripts
+  * CVE-2018-5115 (bmo#1409449)
+    Background network requests can open HTTP authentication in unrelated foreground tabs
+  * CVE-2018-5116 (bmo#1396399)
+    WebExtension ActiveTab permission allows cross-origin frame content access
+  * CVE-2018-5117 (bmo#1395508)
+    URL spoofing with right-to-left text aligned left-to-right
+  * CVE-2018-5118 (bmo#1420049)
+    Activity Stream images can attempt to load local content through file:
+  * CVE-2018-5119 (bmo#1420507)
+    Reader view will load cross-origin content in violation of CORS headers
+  * CVE-2018-5121 (bmo#1402368) (affects only OS X)
+    OS X Tibetan characters render incompletely in the addressbar
+  * CVE-2018-5122 (bmo#1413841)
+    Potential integer overflow in DoCrypt
+  * CVE-2018-5090
+    Memory safety bugs fixed in Firefox 58
+  * CVE-2018-5089
+    Memory safety bugs fixed in Firefox 58 and Firefox ESR 52.6
+- requires NSS 3.34.1
+- requires rust 1.21
+- removed obsolete patches:
+  mozilla-bindgen-systemlibs.patch
+  mozilla-bmo1360278.patch
+  mozilla-bmo1399611-csd.patch
+  mozilla-rust-1.23.patch
+- rebased patches
+- updated man-page
+
 -------------------------------------------------------------------
 Tue Jan  9 18:48:02 UTC 2018 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index e9697f9..89a5735 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -18,11 +18,11 @@
 
 
 # changed with every update
-%define major 57
-%define mainver %major.0.4
+%define major 58
+%define mainver %major.0.1
 %define update_channel release
 %define branding 1
-%define releasedate 20180103231032
+%define releasedate 20180128191252
 
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
@@ -73,10 +73,10 @@ BuildRequires:  libnotify-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.17
-BuildRequires:  mozilla-nss-devel >= 3.33
+BuildRequires:  mozilla-nss-devel >= 3.34.1
 BuildRequires:  python-devel
 BuildRequires:  python2-xml
-BuildRequires:  rust >= 1.19
+BuildRequires:  rust >= 1.21
 BuildRequires:  rust-std
 BuildRequires:  startup-notification-devel
 BuildRequires:  unzip
@@ -153,10 +153,9 @@ Patch4:         mozilla-openaes-decl.patch
 Patch5:         mozilla-no-stdcxx-check.patch
 Patch6:         mozilla-reduce-files-per-UnifiedBindings.patch
 Patch7:         mozilla-aarch64-startup-crash.patch
-Patch8:         mozilla-bindgen-systemlibs.patch
-Patch9:         mozilla-bmo1360278.patch
-Patch10:        mozilla-bmo1399611-csd.patch
-Patch11:        mozilla-rust-1.23.patch
+Patch8:         mozilla-enable-csd.patch
+Patch9:         mozilla-bmo256180.patch
+Patch10:        mozilla-alsa-sandbox.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-no-default-ualocale.patch
@@ -211,7 +210,7 @@ of %{appname}.
 %package translations-other
 Summary:        Extra translations for %{appname}
 Group:          System/Localization
-Provides:       locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh)
+Provides:       locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;ne-NP;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh)
 Requires:       %{name} = %{version}
 Obsoletes:      %{name}-translations < %{version}-%{release}
 
@@ -270,7 +269,6 @@ cd $RPM_BUILD_DIR/mozilla
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -381,7 +379,7 @@ ac_add_options --with-arch=armv7-a
 ac_add_options --disable-webrtc
 %endif
 EOF
-make -f client.mk build
+./mach build
 
 %install
 cd $RPM_BUILD_DIR/obj
diff --git a/_constraints b/_constraints
index 57c2694..61bd64a 100644
--- a/_constraints
+++ b/_constraints
@@ -2,10 +2,10 @@
 <constraints>
   <hardware>
     <disk>
-      <size unit="G">13</size>
+      <size unit="G">16</size>
     </disk>
     <memory>
-      <size unit="M">6000</size>
+      <size unit="M">9000</size>
     </memory>
   </hardware>
   <overwrite>
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index 42e3784..d16c86e 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6441a12de7f0735fd9a2b4580bb7cdccec86b34acda3a8718ce9b0bf39a59ca7
-size 28824
+oid sha256:088110e577f98b08da247cfe931afdbcec697e74890362d95895360bda0d8989
+size 28404
diff --git a/create-tar.sh b/create-tar.sh
index c169287..6097ca5 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -7,8 +7,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="afa87f9be3a8852da3a30f286b15ae599c7874f6"
-VERSION="57.0.4"
+RELEASE_TAG="FIREFOX_58_0_1_RELEASE"
+VERSION="58.0.1"
 
 # mozilla
 if [ -d mozilla ]; then
@@ -54,7 +54,7 @@ tar $compression -cf firefox-$VERSION-source.tar.xz --exclude=.hgtags --exclude=
 # l10n
 echo "fetching locales..."
 test ! -d l10n && mkdir l10n
-for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
+for locale in $(awk '{ print $1; }' l10n_changesets.txt); do
   case $locale in
     ja-JP-mac|en-US)
       ;;
@@ -62,7 +62,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
       echo "reading changeset information for $locale"
       _changeset=$(grep ^$locale l10n_changesets.txt | awk '{ print $2; }')
       echo "fetching $locale changeset $_changeset ..."
-      hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale
+      hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale
       [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $_changeset
       ;;
   esac
diff --git a/firefox-57.0.4-source.tar.xz b/firefox-57.0.4-source.tar.xz
deleted file mode 100644
index 5f55e4c..0000000
--- a/firefox-57.0.4-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ab9870937e8683ea435f8cbd4ff52d4e53a263d3ab31e6ba2d6fe61f3aa636c
-size 267408064
diff --git a/firefox-58.0.1-source.tar.xz b/firefox-58.0.1-source.tar.xz
new file mode 100644
index 0000000..61b937e
--- /dev/null
+++ b/firefox-58.0.1-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:423e214603cf8e0d6b16bfbb428be20e2b868278129821f017b659fc0934253a
+size 265350860
diff --git a/firefox-kde.patch b/firefox-kde.patch
index a840dc4..ff51f53 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  9f19902f8bcde21fa63172a85818fb11714878d8
+# Parent  89cbe8c49d05965b87815143d1944ab6964f12c7
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1252 @@
+@@ -0,0 +1,1248 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -104,12 +104,6 @@ new file mode 100644
 +                accesskey="&moveToNewWindow.accesskey;"
 +                tbattr="tabbrowser-multiple"
 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
-+#ifdef E10S_TESTING_ONLY
-+      <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window"
-+                tbattr="tabbrowser-remote"
-+                hidden="true"
-+                oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
-+#endif
 +      <menuseparator id="context_sendTabToDevice_separator"/>
 +      <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
 +            accesskey="&sendTabToDevice.accesskey;">
@@ -435,8 +429,7 @@ new file mode 100644
 +                            mainViewId="pageActionPanelMainView"
 +                            viewCacheId="appMenu-viewCache">
 +        <panelview id="pageActionPanelMainView"
-+                   context="pageActionPanelContextMenu"
-+                   oncontextmenu="BrowserPageActions.onContextMenu(event);"
++                   context="pageActionContextMenu"
 +                   class="PanelUI-subView">
 +          <vbox class="panel-subview-body"/>
 +        </panelview>
@@ -458,13 +451,24 @@ new file mode 100644
 +      <label id="pageActionFeedbackMessage"/>
 +    </panel>
 +
-+    <menupopup id="pageActionPanelContextMenu"
++    <menupopup id="pageActionContextMenu"
 +               onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
-+      <menuitem id="pageActionPanelContextMenu-toggleUrlbar"
-+                add-label="&pageAction.addToUrlbar.label;"
-+                remove-label="&pageAction.removeFromUrlbar.label;"
++      <menuitem class="pageActionContextMenuItem builtInUnpinned"
 +                label="&pageAction.addToUrlbar.label;"
-+                oncommand="BrowserPageActions.toggleShownInUrlbarForContextAction();"/>
++                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++      <menuitem class="pageActionContextMenuItem builtInPinned"
++                label="&pageAction.removeFromUrlbar.label;"
++                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++      <menuitem class="pageActionContextMenuItem extensionUnpinned"
++                label="&pageAction.allowInUrlbar.label;"
++                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++      <menuitem class="pageActionContextMenuItem extensionPinned"
++                label="&pageAction.disallowInUrlbar.label;"
++                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
++      <menuseparator class="pageActionContextMenuItem extensionPinned extensionUnpinned"/>
++      <menuitem class="pageActionContextMenuItem extensionPinned extensionUnpinned"
++                label="&pageAction.manageExtension.label;"
++                oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/>
 +    </menupopup>
 +
 +    <!-- Bookmarks and history tooltip -->
@@ -642,7 +646,6 @@ new file mode 100644
 +#endif
 +
 +      <tabs id="tabbrowser-tabs"
-+            class="tabbrowser-tabs"
 +            tabbrowser="content"
 +            flex="1"
 +            setfocus="false"
@@ -787,7 +790,6 @@ new file mode 100644
 +                     tabscrolling="true"
 +                     showcommentcolumn="true"
 +                     showimagecolumn="true"
-+                     enablehistory="true"
 +                     newlines="stripsurroundingwhitespace"
 +                     ontextentered="this.handleCommand(param);"
 +                     ontextreverted="return this.handleRevert();"
@@ -812,14 +814,14 @@ new file mode 100644
 +                         tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/>
 +                  <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
 +                         tooltiptext="&urlbar.cameraBlocked.tooltip;"/>
-+                  <image data-permission-id="indexedDB" class="blocked-permission-icon indexedDB-icon" role="button"
-+                         tooltiptext="&urlbar.indexedDBBlocked.tooltip;"/>
 +                  <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
 +                         tooltiptext="&urlbar.microphoneBlocked.tooltip;"/>
 +                  <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
 +                         tooltiptext="&urlbar.screenBlocked.tooltip;"/>
 +                  <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
 +                         tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
++                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
++                         tooltiptext="&urlbar.popupBlocked.tooltip;"/>
 +                </box>
 +                <box id="notification-popup-box"
 +                     hidden="true"
@@ -832,6 +834,8 @@ new file mode 100644
 +                         tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
 +                  <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
 +                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
++                  <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
++                         tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/>
 +                  <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
 +                         tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/>
 +                  <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
@@ -873,17 +877,11 @@ new file mode 100644
 +                <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
 +                <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
 +              </box>
-+              <hbox id="page-action-buttons">
++              <hbox id="page-action-buttons" context="pageActionContextMenu">
 +                <hbox id="userContext-icons" hidden="true">
 +                  <label id="userContext-label"/>
 +                  <image id="userContext-indicator"/>
 +                </hbox>
-+                <image id="page-report-button"
-+                       class="urlbar-icon urlbar-page-action"
-+                       role="button"
-+                       hidden="true"
-+                       tooltiptext="&pageReportIcon.tooltip;"
-+                       onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
 +                <image id="reader-mode-button"
 +                       class="urlbar-icon urlbar-page-action"
 +                       role="button"
@@ -902,8 +900,6 @@ new file mode 100644
 +                <hbox id="star-button-box"
 +                      hidden="true"
 +                      class="urlbar-icon-wrapper urlbar-page-action"
-+                      context="pageActionPanelContextMenu"
-+                      oncontextmenu="BrowserPageActions.onContextMenu(event);"
 +                      onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
 +                  <image id="star-button"
 +                         class="urlbar-icon"
@@ -1261,7 +1257,7 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -58,16 +58,18 @@ browser.jar:
+@@ -52,16 +52,18 @@ browser.jar:
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
@@ -1343,7 +1339,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
 --- a/browser/components/preferences/in-content/main.js
 +++ b/browser/components/preferences/in-content/main.js
-@@ -203,16 +203,23 @@ var gMainPane = {
+@@ -193,16 +193,23 @@ var gMainPane = {
            this._backoffIndex++ : backoffTimes.length - 1]);
        };
  
@@ -1367,7 +1363,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
      performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
  
      this.updateDefaultPerformanceSettingsPref();
-@@ -952,16 +959,27 @@ var gMainPane = {
+@@ -898,16 +905,27 @@ var gMainPane = {
        // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
        this._backoffIndex = 0;
  
@@ -1472,7 +1468,7 @@ new file mode 100644
 +        return NS_ERROR_FAILURE;
 +
 +    str->SetData( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" ));
-+    command->AppendElement( str, false );
++    command->AppendElement( str );
 +
 +    if( nsKDEUtils::command( command ))
 +        *aIsDefaultBrowser = true;
@@ -1493,10 +1489,10 @@ new file mode 100644
 +        return NS_ERROR_FAILURE;
 +
 +    cmdstr->SetData( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" ));
-+    command->AppendElement( cmdstr, false );
++    command->AppendElement( cmdstr );
 +
 +    paramstr->SetData( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
-+    command->AppendElement( paramstr, false );
++    command->AppendElement( paramstr );
 +
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
@@ -1546,7 +1542,7 @@ new file mode 100644
 +    else
 +        return NS_ERROR_NOT_IMPLEMENTED;
 +
-+    command->AppendElement( str, false );
++    command->AppendElement( str );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
 +
@@ -1564,14 +1560,14 @@ new file mode 100644
 +        return NS_ERROR_FAILURE;
 +
 +    cmdstr->SetData( NS_LITERAL_CSTRING( "RUN" ));
-+    command->AppendElement( cmdstr, false );
++    command->AppendElement( cmdstr );
 +    nsAutoCString app;
 +    nsresult rv = aApplication->GetNativePath( app );
 +    NS_ENSURE_SUCCESS( rv, rv );
 +    appstr->SetData( app );
-+    command->AppendElement( appstr, false );
++    command->AppendElement( appstr );
 +    uristr->SetData( aURI );
-+    command->AppendElement( uristr, false );
++    command->AppendElement( uristr );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
 +
@@ -1589,7 +1585,7 @@ new file mode 100644
 +        return NS_ERROR_FAILURE;
 +
 +    str->SetData( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" ));
-+    command->AppendElement( str, false );
++    command->AppendElement( str );
 +
 +    nsCOMPtr<nsIArray> output;
 +    if( !nsKDEUtils::command( command, getter_AddRefs( output ) ) )
@@ -1711,7 +1707,7 @@ new file mode 100644
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -666,16 +666,18 @@
+@@ -657,16 +657,18 @@
  @RESPATH@/browser/defaults/blocklists
  @RESPATH@/browser/defaults/pinning
  
diff --git a/firefox.1 b/firefox.1
index c6a553a..6b38688 100644
--- a/firefox.1
+++ b/firefox.1
@@ -1,9 +1,12 @@
-.TH FIREFOX 1 "January 04, 2006" firefox "Linux User's Manual"
+.TH FIREFOX 1 "November 30, 2017" firefox "Linux User's Manual"
 .SH NAME
 firefox \- a Web browser for X11 derived from the Mozilla browser
 
 .SH SYNOPSIS
 .B firefox
+[\fIOPTIONS\fR ...] [\fIURL\fR]
+
+.B firefox-bin
 [\fIOPTIONS\fR] [\fIURL\fR]
 
 .SH DESCRIPTION
@@ -12,27 +15,11 @@ standards compliance, performance and portability.
 
 .SH USAGE
 \fBfirefox\fR is a simple shell script that will set up the
-environment for the actual executable.
+environment for the actual executable, \fBfirefox-bin\fR.
 
 .SH OPTIONS
 A summary of the options supported by \fBfirefox\fR is included below.
 
-.SS "GTK options"
-\fB\-\-gdk-debug=\fR\fIFLAGS\fR
-Gdk debugging flags to set
-.TP
-\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR
-Gdk debugging flags to unset
-.TP
-\fB\-\-gtk-debug=\fR\fIFLAGS\fR
-Gtk+ debugging flags to set
-.TP
-\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR
-Gtk+ debugging flags to unset
-.TP
-\fB\-\-gtk-module=\fR\fIMODULE\fR
-Load an additional Gtk module
-
 .SS "X11 options"
 .TP
 .BI \-\-display= DISPLAY
@@ -41,13 +28,6 @@ X display to use
 .B \--sync
 Make X calls synchronous
 .TP
-.B \-\-no-xshm
-Don't use X shared memory extension
-.TP
-.BI \-\-xim-preedit= STYLE
-.TP
-.BI \-\-xim-status= STYLE
-.TP
 .B \-\-g-fatal-warnings
 Make all warnings fatal
 
@@ -56,73 +36,106 @@ Make all warnings fatal
 .B \-h, \-help
 Show summary of options.
 .TP
-\fB\-height\fR \fIvalue\fR
-Set height of startup window to \fIvalue\fR.
-.TP
-\fB\-width\fR \fIvalue\fR
-Set width of startup window to \fIvalue\fR.
-.TP
 .B \-v, \-version
-Print \fB/usr/bin/firefox-bin\fR version.
-.TP
-\fB\-CreateProfile\fR \fIprofile\fR
-Create \fIprofile\fR.
+Print Firefox version.
 .TP
 \fB\-P\fR \fIprofile\fR
 Start with \fIprofile\fR.
 .TP
-.B \-ProfileManager
-Start with profile manager.
+\fB\-\-profile\fR \fIpath\fR
+Start with profile at \fIpath\fR.
 .TP
-\fB\-UILocale\fR \fIlang-region\fR
-Start with \fIlang-region\fR resources.
+\fB\-\-migration\fR
+Start with migration wizard.
 .TP
-\fB\-contentLocale\fR \fIlang-region\fR
-Start with \fIlang-region\fR resources.
+.B \-\-ProfileManager
+Start with ProfileManager.
 .TP
-\fB\-remote\fR \fIcommand\fR
-Execute \fIcommand\fR in an already running Firefox process.  For more info,
-see: \fIhttp://www.mozilla.org/unix/remote.html\fR
+\fB\-\-no\-remote\fR
+Do not accept or send remote commands; implies \fB--new-instance\fR.
 .TP
-.B \-no-remote
-Don't try to control an already running instance.
+\fB\-\-new\-instance\fR
+Open new instance, not a new window in running instance.
 .TP
-.B \-jsconsole
-Start with Javascript Console
+\fB\-\-UILocale\fR \fIlocale\fR
+Start with \fIlocale\fR resources as UI Locale.
 .TP
-\fB\-chrome\fR \fIurl\fR
-Load the specified chrome.
-.TP
-\fB\-new-window\fR \fIurl\fR
-Open URL in a new window if Firefox is already running.
-.TP
-\fB\-new-tab\fR \fIurl\fR
-Open URL in a new tab if Firefox is already running.
-.TP
-\fB\-preferences\fR
-Open Firefox preferences menu.
-.TP
-.B \-safe-mode
+\fB\-\-save\-mode\fR
 Disables extensions and themes for this session.
 .TP
+\fB\-\-headless\fR
+Run without a GUI.
+.TP
+\fB\-\-marionette\fR
+Enable remote control server.
+.TP
+\fB\-\-browser\fR
+Open a browser window.
+.TP
+\fB\-\-new-window\fR \fIurl\fR
+Open \fIurl\fR in a new window.
+.TP
+\fB\-\-new-tab\fR \fIurl\fR
+Open \fIurl\fR in a new tab.
+.TP
+\fB\-\-private-window\fR \fIurl\fR
+Open \fIurl\fR in a new private window.
+.TP
+\fB\-\-preferences\fR
+Open Preferences dialog.
+.TP
+\fB\-\-screenshot\fR [\fIpath\fR]
+Save screenshot to \fIpath\fR or in working directory.
+.TP
+\fB\-\-window-size\fR \fIwidth\fR[,\fIheight\fR]
+Width and optionally height of screenshot.
+.TP
+\fB\-\-search\fR \fIterm\fR
+Search \fIterm\fR with your default search engine.
+.TP
+
+
+\fB\-\-jsconsole\fR
+Open the Browser Console.
+.TP
+\fB\-\-jsdebugger\fR
+Open the Browser Toolbox.
+.TP
+\fB\-\-wait-for-jsdebugger\fR
+Spin event loop until JS debugger connects.  Enables debugging (some) application startup code paths.  Only has an effect when \fI--jsdebugger\fR is also supplied.
+.TP
+\fB\-\-devtools\fR
+Open DevTools on initial load.
+.TP
+\fB\-\-start-debugger-server\fR [ws:][\fIport\fR|\fIpath\fR]
+Start the debugger server on a TCP port or Unix domain socket path. Defaults to TCP port 6000. Use WebSocket protocol if ws: prefix is specified.
+.TP
+\fB\-\-recording\fR \fIfile\fR
+Record drawing for a given URL.
+.TP
+\fB\-\-recording-output\fR \fIfile\fR
+Specify destination file for a drawing recording.
+.TP
+\fB\-\-setDefaultBrowser\fR
+Set this app as the default browser.
 
 .SH FILES
 \fI/usr/bin/firefox\fR - shell script wrapping
 \fBfirefox\fR
 .br
-\fI/usr/lib/firefox/firefox\fR - \fBfirefox\fR
+\fI/usr/lib64/firefox/firefox-bin\fR - \fBfirefox\fR
 executable
 
 .SH VERSION
-3.0
+57.0
 
 .SH BUGS
 To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
 
-.SH "SEE ALSO"
-.BR mozilla(1)
-
 .SH AUTHORS
 .TP
 .B The Mozilla Organization
 .I http://www.mozilla.org/about.html
+.TP
+.B Tobias Girstmair
+.I https://gir.st/
diff --git a/l10n-57.0.4.tar.xz b/l10n-57.0.4.tar.xz
deleted file mode 100644
index d343c9d..0000000
--- a/l10n-57.0.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:82bdb63b072ba7544f985bf331d3156b2c3b6a7a62d4dae4c024007ed7f2fc76
-size 51599812
diff --git a/l10n-58.0.1.tar.xz b/l10n-58.0.1.tar.xz
new file mode 100644
index 0000000..c56d6aa
--- /dev/null
+++ b/l10n-58.0.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34ed9161fda7110953d067f9de94377a085d9b30a438e7402865f3382726fc6b
+size 48920352
diff --git a/l10n_changesets.txt b/l10n_changesets.txt
index e5007c5..55c7b5b 100644
--- a/l10n_changesets.txt
+++ b/l10n_changesets.txt
@@ -1,96 +1,97 @@
-ach 845e30d48dfc
-af fb2bb189a1a8
-an a6cb9e55ca54
-ar b064d5ee568d
-as c8c7ce08a50d
-ast 7eb260478bd8
-az e53e6a85563a
-be 3ee97e7a07c4
-bg f5cbdea3b4bb
-bn-BD bd83d95fe12f
-bn-IN 101048b9a8bd
-br 1b53314687e2
-bs b3e804dbc8e2
-ca ef0d1d4ef0de
-cak a3648bb10a20
-cs 528911ffcb44
-cy 21e09e135ce7
-da 9c08e8177409
-de 3d02afaa90f1
-dsb 4f2a125adbc5
-el a925e0e24aaf
-en-GB 440d6fbf0938
-en-ZA 4bd5e2534230
-eo 42248b1fda32
-es-AR 39d7f70fbd4a
-es-CL e0806844a966
-es-ES 385b05704e12
-es-MX 4322b61a47fd
-et fc5042e8d705
-eu 1010ee63a76a
-fa 988038c98e07
-ff 0ae0e4ad0400
-fi 83ae1ba711f8
-fr 0acb9b019381
-fy-NL f66ad8f570c9
-ga-IE b6bd9e6bf934
-gd 2b1b66f8236b
-gl bd2efa51e288
-gn ef1c4c22501c
-gu-IN 9b4d89d58ee1
-he 923c4ce99db2
-hi-IN 62f4cab806a5
-hr 26c2911d2b28
-hsb 9a556a68f383
-hu 43fb04933e45
-hy-AM 6020222039ca
-id bc055f358395
-is b265b8439970
-it 72e0f73d8188
-ja 9e9796b48f28
-ja-JP-mac 2cbb5add9822
-ka 43d1466fc89b
-kab 8e739627fb01
-kk 51aee666e469
-km 79239374c86f
-kn a6dd05b338cf
-ko 0fccbb892229
-lij d1d09ea09eff
-lt 5f5779c69338
-lv f0fd0c3546e0
-mai 64d402c5dbc1
-mk b3fb89cac86c
-ml 9d626ede460e
-mr 1a23c6401834
-ms 15a3d7fccea1
-my 2e2cc78ff945
-nb-NO 467ca2ff0cd1
-nl 10957cbee7f0
-nn-NO 71fce03b2c6b
-or 8c482206a700
-pa-IN a2af69c875ad
-pl ce3a564b00c2
-pt-BR 71346ac29bfc
-pt-PT 387686b89f52
-rm de3c6abf95ab
-ro 6e3dfa0ea030
-ru 760cda086381
-si 355b25c93905
-sk 5444e00cc3e6
-sl cb6eb7e6ba4a
-son e9a07815a9aa
-sq c61933c72577
-sr 74f5c2f98346
-sv-SE f75dd8e9c4df
-ta ad1bce7770b4
-te dde86e2a2c17
-th 1950402ffa30
-tr e8700165617b
-uk e7b649fcf3bb
-ur 9881f47a738d
-uz 9ac534694f99
-vi 601e9a63473e
-xh 4d22de472867
-zh-CN 8aff87add86f
-zh-TW 2ac3b80bdb6e
+ach 51053376f3b4
+af 9699e648d04f
+an 35bf2af54c6e
+ar 11e28461eedd
+as f48681f3cb1c
+ast a0365b2d2204
+az c9f8178b760e
+be 6a81fe13730e
+bg f5f7827ddaf6
+bn-BD 40173c2773dc
+bn-IN 8a4d7efa4656
+br 87dd84f3fb15
+bs f9194e1b9d1f
+ca 2393377daf04
+cak 358337cd8e62
+cs b2f2d66e474f
+cy cd528119b1f0
+da 3d4f38f6c602
+de c4580757245b
+dsb 6cae073a841f
+el 7c198d3d5d8c
+en-GB 108b5a928fb5
+en-ZA 5b50bebf4e4f
+eo eb148ada0d56
+es-AR 08d927e7ad92
+es-CL 02584a2d25b7
+es-ES 1c9d3c3c689d
+es-MX 6435282dbc75
+et e29f6a05d5a8
+eu 756e60b234ec
+fa 8aee74bd73fe
+ff b529c4fc084b
+fi 124ad6d2caeb
+fr 87ec33d89386
+fy-NL 3705ebdd28f5
+ga-IE 2453123d83ab
+gd da7de9b6e635
+gl 99003c9cd063
+gn 54547111d875
+gu-IN 88180147b7f5
+he 9837e2cc4a95
+hi-IN e1dddb32c7d0
+hr 1699e5d11dfc
+hsb b779311b0bd0
+hu 5f446a971f03
+hy-AM 024da8b34b46
+id 0f0141ed9bb6
+is 4b3c58c9d645
+it 6e2c7978b0e7
+ja f30c0c2f2bc4
+ja-JP-mac 4230da7b0695
+ka 6650158784f6
+kab 6b3c6e707013
+kk 1e85339bcb5c
+km d934d1e2fbba
+kn 9d356f38d208
+ko 6370c2a0f030
+lij 0ab26fda46bc
+lt 450e1219d46f
+lv 78a846f93b16
+mai 53cf7cd14176
+mk 3d22bc5b8e99
+ml 128c7b806403
+mr 074d705e44b7
+ms 7fa602755a3b
+my eee9ab816d7c
+nb-NO 963968719128
+ne-NP c318f683bdb7
+nl fca30e75c8a2
+nn-NO 484b14dee153
+or 9420e75f84ba
+pa-IN 5634ac6e7d9b
+pl 45fa8ed87819
+pt-BR 38d2f920e7b1
+pt-PT 60446c901737
+rm cf0859e63177
+ro 7fea5671214f
+ru 67b070efcbd9
+si 5b5533ef2e97
+sk 4c17a502b748
+sl 8c446da2c7c5
+son 914d74ec145e
+sq 704b52416e5e
+sr cbf4a5eafb4d
+sv-SE 2e8d40795c69
+ta 26d7cbe37e4a
+te 9338813fedc1
+th aa91b43781fe
+tr a392fcf83ab9
+uk 214311bf7877
+ur 60247a51a921
+uz 51175e255277
+vi 2731355cccc7
+xh a756d272d1fe
+zh-CN 9ab59b4c446a
+zh-TW a56ff00fa7b0
 
diff --git a/mozilla-alsa-sandbox.patch b/mozilla-alsa-sandbox.patch
new file mode 100644
index 0000000..70b6a3a
--- /dev/null
+++ b/mozilla-alsa-sandbox.patch
@@ -0,0 +1,12 @@
+--- mozilla/security/sandbox/linux/moz.build	2018-02-06 07:58:27.127145777 +0100
++++ mozilla/security/sandbox/linux/moz.build	2018-02-06 08:01:22.213706297 +0100
+@@ -77,6 +77,9 @@
+         'SandboxOpenedFiles.cpp',
+     ]
+ 
++if CONFIG['MOZ_ALSA']:
++    DEFINES['MOZ_ALSA'] = True
++
+ # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
+ # dependency like the one in libxul does, but this way the behavior is
+ # consistent.  See also the comment in SandboxLogging.h.
diff --git a/mozilla-bindgen-systemlibs.patch b/mozilla-bindgen-systemlibs.patch
deleted file mode 100644
index b2d7418..0000000
--- a/mozilla-bindgen-systemlibs.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-# HG changeset patch
-# Parent  e85dde0eabf214916c69924aa49192ab412e00a1
-
-diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4
---- a/build/autoconf/config.status.m4
-+++ b/build/autoconf/config.status.m4
-@@ -40,16 +40,31 @@ define([AC_SUBST_LIST],
- [ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_LIST on the same variable ($1)])],
- [ifdef([AC_SUBST_LIST_$1], ,
- [define([AC_SUBST_LIST_$1], )dnl
- AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
-     (''' $1 ''', list(r''' [$]$1 '''.split()))
- AC_DIVERT_POP()dnl
- ])])])])
- 
-+dnl Like AC_SUBST, but makes the value available as a string of quoted strings
-+dnl in python, with values got from the value of the environment variable,
-+dnl split on whitespaces. The value is suitable for embedding into a .toml
-+dnl list.
-+define([AC_SUBST_TOML_LIST],
-+[ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_LIST on the same variable ($1)])],
-+[ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_LIST on the same variable ($1)])],
-+[ifdef([AC_SUBST_LIST_$1], ,
-+[define([AC_SUBST_LIST_$1], )dnl
-+AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
-+    (''' $1 ''', r''' %s ''' % str(', '.join("'%s'" % s for s in r''' [$]$1 '''.split())))
-+AC_DIVERT_POP()dnl
-+])])])])
-+
-+
- dnl Ignore AC_SUBSTs for variables we don't have use for but that autoconf
- dnl itself exports.
- define([AC_SUBST_CFLAGS], )
- define([AC_SUBST_CPPFLAGS], )
- define([AC_SUBST_CXXFLAGS], )
- define([AC_SUBST_FFLAGS], )
- define([AC_SUBST_DEFS], )
- define([AC_SUBST_LDFLAGS], )
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -897,25 +897,24 @@ def check_have_64_bit(have_64_bit, compi
-         configure_error('The target compiler does not agree with configure '
-                         'about the target bitness.')
- 
- option(env='BINDGEN_CFLAGS',
-        nargs=1,
-        help='Options bindgen should pass to the C/C++ parser')
- 
- @depends('BINDGEN_CFLAGS')
--@checking('bindgen cflags', lambda s: s if s and s.strip() else 'no')
-+@checking('bindgen cflags', lambda s: s if s and s[0].strip() else 'no')
- def bindgen_cflags(value):
-     if value and len(value):
-         # Reformat the env value for substitution into a toml list.
-         flags = value[0].split()
--        return ', '.join('"' + flag + '"' for flag in flags)
--    return ''
-+        return flags
- 
--set_config('BINDGEN_CFLAGS', bindgen_cflags)
-+add_old_configure_assignment('_BINDGEN_CFLAGS', bindgen_cflags)
- 
- @depends(c_compiler)
- def default_debug_flags(compiler_info):
-     # Debug info is ON by default.
-     if compiler_info.type in ('msvc', 'clang-cl'):
-         return '-Zi'
-     return '-g'
- 
-diff --git a/layout/style/bindgen.toml.in b/layout/style/bindgen.toml.in
---- a/layout/style/bindgen.toml.in
-+++ b/layout/style/bindgen.toml.in
-@@ -1,4 +1,4 @@
- [build]
- args = [
--    @BINDGEN_CFLAGS@
-+    @BINDGEN_SYSTEM_FLAGS@
- ]
-diff --git a/old-configure.in b/old-configure.in
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -4453,16 +4453,19 @@ android)
- esac
- 
- AC_SUBST(MOZ_TREE_CAIRO)
- AC_SUBST_LIST(MOZ_CAIRO_CFLAGS)
- AC_SUBST_LIST(MOZ_CAIRO_LIBS)
- AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
- AC_SUBST(MOZ_TREE_PIXMAN)
- 
-+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS"
-+AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_FLAGS)
-+
- dnl ========================================================
- dnl disable xul
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(xul,
- [  --disable-xul           Disable XUL],
-     MOZ_XUL= )
- if test "$MOZ_XUL"; then
-   AC_DEFINE(MOZ_XUL)
diff --git a/mozilla-bmo1360278.patch b/mozilla-bmo1360278.patch
deleted file mode 100644
index 40b8b2f..0000000
--- a/mozilla-bmo1360278.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-
-# HG changeset patch
-# User Robin Grenet <robin.grenet@wanadoo.fr>
-# Date 1510835758 -3600
-# Node ID f540f9e801cb2e0be5259baea13dfce953ccb520
-# Parent  0abbf75bd0ecfa99ab4386f551a622983f5f27ea
-Bug 1360278 - Add preference to trigger context menu on mouse up for GTK+ and macOS, r=mstange,smaug
-
-MozReview-Commit-ID: Bg60bD8jIg6
-
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -229,16 +229,20 @@ pref("dom.script_loader.bytecode_cache.e
- pref("dom.script_loader.bytecode_cache.strategy", 0);
- 
- // Fastback caching - if this pref is negative, then we calculate the number
- // of content viewers to cache based on the amount of available memory.
- pref("browser.sessionhistory.max_total_viewers", -1);
- 
- pref("ui.use_native_colors", true);
- pref("ui.click_hold_context_menus", false);
-+
-+// Pop up context menu on mouseup instead of mousedown, if that's the OS default.
-+// Note: ignored on Windows (context menus always use mouseup)
-+pref("ui.context_menus.after_mouseup", false);
- // Duration of timeout of incremental search in menus (ms).  0 means infinite.
- pref("ui.menu.incremental_search.timeout", 1000);
- // If true, all popups won't hide automatically on blur
- pref("ui.popup.disable_autohide", false);
- 
- pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
- // 0 = default: always, except in high contrast mode
- // 1 = always
-diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
---- a/widget/cocoa/nsChildView.mm
-+++ b/widget/cocoa/nsChildView.mm
-@@ -4695,18 +4695,20 @@ NSEvent* gLastDragMouseDownEvent = nil;
-   [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-   geckoEvent.button = WidgetMouseEvent::eRightButton;
-   geckoEvent.mClickCount = [theEvent clickCount];
- 
-   mGeckoChild->DispatchInputEvent(&geckoEvent);
-   if (!mGeckoChild)
-     return;
- 
--  // Let the superclass do the context menu stuff.
--  [super rightMouseDown:theEvent];
-+  if (!nsBaseWidget::ShowContextMenuAfterMouseUp()) {
-+    // Let the superclass do the context menu stuff.
-+    [super rightMouseDown:theEvent];
-+  }
- 
-   NS_OBJC_END_TRY_ABORT_BLOCK;
- }
- 
- - (void)rightMouseUp:(NSEvent *)theEvent
- {
-   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
- 
-@@ -4719,16 +4721,33 @@ NSEvent* gLastDragMouseDownEvent = nil;
-   WidgetMouseEvent geckoEvent(true, eMouseUp, mGeckoChild,
-                               WidgetMouseEvent::eReal);
-   [self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
-   geckoEvent.button = WidgetMouseEvent::eRightButton;
-   geckoEvent.mClickCount = [theEvent clickCount];
- 
-   nsAutoRetainCocoaObject kungFuDeathGrip(self);
-   mGeckoChild->DispatchInputEvent(&geckoEvent);
-+  if (!mGeckoChild)
-+    return;
-+
-+  if (nsBaseWidget::ShowContextMenuAfterMouseUp()) {
-+    // Let the superclass do the context menu stuff, but pretend it's rightMouseDown.
-+    NSEvent *dupeEvent = [NSEvent mouseEventWithType:NSRightMouseDown
-+                                            location:theEvent.locationInWindow
-+                                       modifierFlags:theEvent.modifierFlags
-+                                           timestamp:theEvent.timestamp
-+                                        windowNumber:theEvent.windowNumber
-+                                             context:theEvent.context
-+                                         eventNumber:theEvent.eventNumber
-+                                          clickCount:theEvent.clickCount
-+                                            pressure:theEvent.pressure];
-+
-+    [super rightMouseDown:dupeEvent];
-+  }
- 
-   NS_OBJC_END_TRY_ABORT_BLOCK;
- }
- 
- - (void)rightMouseDragged:(NSEvent*)theEvent
- {
-   if (!mGeckoChild)
-     return;
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -2733,16 +2733,29 @@ nsWindow::InitButtonEvent(WidgetMouseEve
- }
- 
- static guint ButtonMaskFromGDKButton(guint button)
- {
-     return GDK_BUTTON1_MASK << (button - 1);
- }
- 
- void
-+nsWindow::DispatchContextMenuEventFromMouseEvent(uint16_t domButton,
-+                                                 GdkEventButton *aEvent)
-+{
-+    if (domButton == WidgetMouseEvent::eRightButton && MOZ_LIKELY(!mIsDestroyed)) {
-+        WidgetMouseEvent contextMenuEvent(true, eContextMenu, this,
-+                                          WidgetMouseEvent::eReal);
-+        InitButtonEvent(contextMenuEvent, aEvent);
-+        contextMenuEvent.pressure = mLastMotionPressure;
-+        DispatchInputEvent(&contextMenuEvent);
-+    }
-+}
-+
-+void
- nsWindow::OnButtonPressEvent(GdkEventButton *aEvent)
- {
-     LOG(("Button %u press on %p\n", aEvent->button, (void *)this));
- 
-     // If you double click in GDK, it will actually generate a second
-     // GDK_BUTTON_PRESS before sending the GDK_2BUTTON_PRESS, and this is
-     // different than the DOM spec.  GDK puts this in the queue
-     // programatically, so it's safe to assume that if there's a
-@@ -2801,23 +2814,18 @@ nsWindow::OnButtonPressEvent(GdkEventBut
-     WidgetMouseEvent event(true, eMouseDown, this, WidgetMouseEvent::eReal);
-     event.button = domButton;
-     InitButtonEvent(event, aEvent);
-     event.pressure = mLastMotionPressure;
- 
-     DispatchInputEvent(&event);
- 
-     // right menu click on linux should also pop up a context menu
--    if (domButton == WidgetMouseEvent::eRightButton &&
--        MOZ_LIKELY(!mIsDestroyed)) {
--        WidgetMouseEvent contextMenuEvent(true, eContextMenu, this,
--                                          WidgetMouseEvent::eReal);
--        InitButtonEvent(contextMenuEvent, aEvent);
--        contextMenuEvent.pressure = mLastMotionPressure;
--        DispatchInputEvent(&contextMenuEvent);
-+    if (!nsBaseWidget::ShowContextMenuAfterMouseUp()) {
-+        DispatchContextMenuEventFromMouseEvent(domButton, aEvent);
-     }
- }
- 
- void
- nsWindow::OnButtonReleaseEvent(GdkEventButton *aEvent)
- {
-     LOG(("Button %u release on %p\n", aEvent->button, (void *)this));
- 
-@@ -2843,16 +2851,21 @@ nsWindow::OnButtonReleaseEvent(GdkEventB
-     event.button = domButton;
-     InitButtonEvent(event, aEvent);
-     gdouble pressure = 0;
-     gdk_event_get_axis ((GdkEvent*)aEvent, GDK_AXIS_PRESSURE, &pressure);
-     event.pressure = pressure ? pressure : mLastMotionPressure;
- 
-     DispatchInputEvent(&event);
-     mLastMotionPressure = pressure;
-+
-+    // right menu click on linux should also pop up a context menu
-+    if (nsBaseWidget::ShowContextMenuAfterMouseUp()) {
-+        DispatchContextMenuEventFromMouseEvent(domButton, aEvent);
-+    }
- }
- 
- void
- nsWindow::OnContainerFocusInEvent(GdkEventFocus *aEvent)
- {
-     LOGFOCUS(("OnContainerFocusInEvent [%p]\n", (void *)this));
- 
-     // Unset the urgency hint, if possible
-diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
---- a/widget/gtk/nsWindow.h
-+++ b/widget/gtk/nsWindow.h
-@@ -240,16 +240,18 @@ private:
-     LayoutDeviceIntSize GetSafeWindowSize(LayoutDeviceIntSize aSize);
- 
-     void               EnsureGrabs  (void);
-     void               GrabPointer  (guint32 aTime);
-     void               ReleaseGrabs (void);
- 
-     void               UpdateClientOffset();
- 
-+    void               DispatchContextMenuEventFromMouseEvent(uint16_t domButton,
-+                                                              GdkEventButton *aEvent);
- public:
-     void               ThemeChanged(void);
-     void               OnDPIChanged(void);
-     void               OnCheckResize(void);
-     void               OnCompositedChanged(void);
- 
- #ifdef MOZ_X11
-     Window             mOldFocusWindow;
-diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
---- a/widget/nsBaseWidget.cpp
-+++ b/widget/nsBaseWidget.cpp
-@@ -1213,16 +1213,32 @@ nsBaseWidget::DispatchEventToAPZOnly(moz
-   if (mAPZC) {
-     MOZ_ASSERT(APZThreadUtils::IsControllerThread());
-     uint64_t inputBlockId = 0;
-     ScrollableLayerGuid guid;
-     mAPZC->ReceiveInputEvent(*aEvent, &guid, &inputBlockId);
-   }
- }
- 
-+// static
-+bool
-+nsBaseWidget::ShowContextMenuAfterMouseUp()
-+{
-+  static bool gContextMenuAfterMouseUp = false;
-+  static bool gContextMenuAfterMouseUpCached = false;
-+  if (!gContextMenuAfterMouseUpCached) {
-+    Preferences::AddBoolVarCache(&gContextMenuAfterMouseUp,
-+                                 "ui.context_menus.after_mouseup",
-+                                 false);
-+
-+    gContextMenuAfterMouseUpCached = true;
-+  }
-+  return gContextMenuAfterMouseUp;
-+}
-+
- nsIDocument*
- nsBaseWidget::GetDocument() const
- {
-   if (mWidgetListener) {
-     if (nsIPresShell* presShell = mWidgetListener->GetPresShell()) {
-       return presShell->GetDocument();
-     }
-   }
-diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h
---- a/widget/nsBaseWidget.h
-+++ b/widget/nsBaseWidget.h
-@@ -412,16 +412,22 @@ public:
-   void NotifyLiveResizeStopped();
- 
- #if defined(MOZ_WIDGET_ANDROID)
-   void RecvToolbarAnimatorMessageFromCompositor(int32_t) override {};
-   void UpdateRootFrameMetrics(const ScreenPoint& aScrollOffset, const CSSToScreenScale& aZoom) override {};
-   void RecvScreenPixels(mozilla::ipc::Shmem&& aMem, const ScreenIntSize& aSize) override {};
- #endif
- 
-+  /**
-+   * Whether context menus should only appear on mouseup instead of mousedown,
-+   * on OSes where they normally appear on mousedown (macOS, *nix).
-+   */
-+  static bool ShowContextMenuAfterMouseUp();
-+
- protected:
-   // These are methods for CompositorWidgetWrapper, and should only be
-   // accessed from that class. Derived widgets can choose which methods to
-   // implement, or none if supporting out-of-process compositing.
-   virtual bool PreRender(mozilla::widget::WidgetRenderingContext* aContext) {
-     return true;
-   }
-   virtual void PostRender(mozilla::widget::WidgetRenderingContext* aContext)
-
diff --git a/mozilla-bmo1399611-csd.patch b/mozilla-bmo1399611-csd.patch
deleted file mode 100644
index 3aca76a..0000000
--- a/mozilla-bmo1399611-csd.patch
+++ /dev/null
@@ -1,1744 +0,0 @@
-diff -up firefox-57.0b8/browser/app/profile/firefox.js.1399611 firefox-57.0b8/browser/app/profile/firefox.js
---- firefox-57.0b8/browser/app/profile/firefox.js.1399611	2017-10-16 12:11:45.364240654 +0200
-+++ firefox-57.0b8/browser/app/profile/firefox.js	2017-10-16 12:28:03.860720910 +0200
-@@ -457,11 +457,7 @@ pref("browser.tabs.loadBookmarksInBackgr
- pref("browser.tabs.loadBookmarksInTabs", false);
- pref("browser.tabs.tabClipWidth", 140);
- pref("browser.tabs.tabMinWidth", 76);
--#ifdef UNIX_BUT_NOT_MAC
--pref("browser.tabs.drawInTitlebar", false);
--#else
- pref("browser.tabs.drawInTitlebar", true);
--#endif
- 
- // Offer additional drag space to the user. The drag space
- // will only be shown if browser.tabs.drawInTitlebar is true.
-diff -up firefox-57.0b8/browser/base/content/browser-tabsintitlebar.js.1399611 firefox-57.0b8/browser/base/content/browser-tabsintitlebar.js
---- firefox-57.0b8/browser/base/content/browser-tabsintitlebar.js.1399611	2017-10-09 22:17:13.000000000 +0200
-+++ firefox-57.0b8/browser/base/content/browser-tabsintitlebar.js	2017-10-16 12:11:45.364240654 +0200
-@@ -14,6 +14,11 @@ var TabsInTitlebar = {
-     this._readPref();
-     Services.prefs.addObserver(this._prefName, this);
- 
-+    // Always disable on unsupported GTK versions.
-+    if (AppConstants.MOZ_WIDGET_TOOLKIT == "gtk3") {
-+      this.allowedBy("gtk", window.matchMedia("(-moz-gtk-csd-available)"));
-+    }
-+
-     // We need to update the appearance of the titlebar when the menu changes
-     // from the active to the inactive state. We can't, however, rely on
-     // DOMMenuBarInactive, because the menu fires this event and then removes
-diff -up firefox-57.0b8/browser/base/moz.build.1399611 firefox-57.0b8/browser/base/moz.build
---- firefox-57.0b8/browser/base/moz.build.1399611	2017-09-29 18:16:45.000000000 +0200
-+++ firefox-57.0b8/browser/base/moz.build	2017-10-16 12:11:45.364240654 +0200
-@@ -57,7 +57,7 @@ DEFINES['APP_LICENSE_BLOCK'] = '%s/conte
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
-     DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
- 
--if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
-+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):
-     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
-diff -up firefox-57.0b8/browser/themes/linux/browser.css.1399611 firefox-57.0b8/browser/themes/linux/browser.css
---- firefox-57.0b8/browser/themes/linux/browser.css.1399611	2017-10-05 06:17:37.000000000 +0200
-+++ firefox-57.0b8/browser/themes/linux/browser.css	2017-10-16 12:11:45.365240651 +0200
-@@ -556,7 +556,9 @@ html|span.ac-emphasize-text-url {
- 
- #nav-bar,
- #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
--#TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
-+#TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
-+#main-window[tabsintitlebar] #toolbar-menubar:not([autohide="true"]),
-+#main-window[tabsintitlebar] #TabsToolbar {
-   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
- }
- 
-@@ -713,3 +715,85 @@ html|span.ac-emphasize-text-url {
- .restore-tabs-button:hover:active:not([disabled="true"]) {
-   padding: 3px;
- }
-+
-+@media not all and (-moz-gtk-csd-available) {
-+  #main-window > #titlebar {
-+    /* We need to hide the titlebar explicitly on versions of GTK without CSD. */
-+    display: none;
-+  }
-+}
-+
-+/* Titlebar/CSD */
-+@media (-moz-gtk-csd-available) {
-+  #main-window[tabsintitlebar][sizemode="normal"] > #titlebar {
-+    min-height: calc(var(--tab-min-height) + 12px);
-+  }
-+
-+  #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
-+    visibility: hidden;
-+  }
-+  #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
-+    visibility: visible;
-+  }
-+
-+  #main-window[tabsintitlebar][sizemode="normal"] > #titlebar {
-+    -moz-appearance: -moz-window-titlebar;
-+  }
-+  #main-window[tabsintitlebar][sizemode="maximized"] > #titlebar {
-+    -moz-appearance: -moz-window-titlebar-maximized;
-+  }
-+
-+  /* The button box must appear on top of the navigator-toolbox in order for
-+   * click and hover mouse events to work properly for the button in the restored
-+   * window state. Otherwise, elements in the navigator-toolbox, like the menubar,
-+   * can swallow those events.
-+   */
-+  #titlebar-buttonbox {
-+    z-index: 1;
-+  }
-+
-+  /* titlebar command buttons */
-+  /* Use full scale icons here as the Gtk+ does. */
-+  @media (-moz-gtk-csd-minimize-button) {
-+    #titlebar-min {
-+      list-style-image: url("moz-icon://stock/window-minimize-symbolic");
-+      -moz-appearance: -moz-window-button-minimize;
-+    }
-+  }
-+  @media not all and (-moz-gtk-csd-minimize-button) {
-+    #titlebar-min {
-+      display: none;
-+    }
-+  }
-+
-+  @media (-moz-gtk-csd-maximize-button) {
-+    #titlebar-max {
-+      list-style-image: url("moz-icon://stock/window-maximize-symbolic");
-+      -moz-appearance: -moz-window-button-maximize;
-+    }
-+    #main-window[sizemode="maximized"] #titlebar-max {
-+      list-style-image: url("moz-icon://stock/window-restore-symbolic");
-+      -moz-appearance: -moz-window-button-restore;
-+    }
-+  }
-+  @media not all and (-moz-gtk-csd-maximize-button) {
-+    #titlebar-max {
-+      display: none;
-+    }
-+    #main-window[sizemode="maximized"] #titlebar-max {
-+      display: none;
-+    }
-+  }
-+
-+  @media (-moz-gtk-csd-close-button) {
-+    #titlebar-close {
-+      list-style-image: url("moz-icon://stock/window-close-symbolic");
-+      -moz-appearance: -moz-window-button-close;
-+    }
-+  }
-+  @media not all and (-moz-gtk-csd-close-button) {
-+    #titlebar-close {
-+      display: none;
-+    }
-+  }
-+}
-diff -up firefox-57.0b8/dom/base/nsGkAtomList.h.1399611 firefox-57.0b8/dom/base/nsGkAtomList.h
---- firefox-57.0b8/dom/base/nsGkAtomList.h.1399611	2017-09-15 06:15:41.000000000 +0200
-+++ firefox-57.0b8/dom/base/nsGkAtomList.h	2017-10-16 12:11:45.365240651 +0200
-@@ -2270,6 +2270,10 @@ GK_ATOM(touch_enabled, "touch-enabled")
- GK_ATOM(menubar_drag, "menubar-drag")
- GK_ATOM(swipe_animation_enabled, "swipe-animation-enabled")
- GK_ATOM(physical_home_button, "physical-home-button")
-+GK_ATOM(gtk_csd_available, "gtk-csd-available")
-+GK_ATOM(gtk_csd_minimize_button, "gtk-csd-minimize-button")
-+GK_ATOM(gtk_csd_maximize_button, "gtk-csd-maximize-button")
-+GK_ATOM(gtk_csd_close_button, "gtk-csd-close-button")
- 
- // windows theme selector metrics
- GK_ATOM(windows_classic, "windows-classic")
-@@ -2306,6 +2310,10 @@ GK_ATOM(_moz_device_orientation, "-moz-d
- GK_ATOM(_moz_is_resource_document, "-moz-is-resource-document")
- GK_ATOM(_moz_swipe_animation_enabled, "-moz-swipe-animation-enabled")
- GK_ATOM(_moz_physical_home_button, "-moz-physical-home-button")
-+GK_ATOM(_moz_gtk_csd_available, "-moz-gtk-csd-available")
-+GK_ATOM(_moz_gtk_csd_minimize_button, "-moz-gtk-csd-minimize-button")
-+GK_ATOM(_moz_gtk_csd_maximize_button, "-moz-gtk-csd-maximize-button")
-+GK_ATOM(_moz_gtk_csd_close_button, "-moz-gtk-csd-close-button")
- 
- // application commands
- GK_ATOM(Back, "Back")
-diff -up firefox-57.0b8/gfx/src/nsThemeConstants.h.1399611 firefox-57.0b8/gfx/src/nsThemeConstants.h
---- firefox-57.0b8/gfx/src/nsThemeConstants.h.1399611	2017-06-12 18:37:10.000000000 +0200
-+++ firefox-57.0b8/gfx/src/nsThemeConstants.h	2017-10-16 12:11:45.365240651 +0200
-@@ -299,6 +299,7 @@ enum ThemeWidgetType : uint8_t {
-   NS_THEME_MAC_SOURCE_LIST,
-   NS_THEME_MAC_SOURCE_LIST_SELECTION,
-   NS_THEME_MAC_ACTIVE_SOURCE_LIST_SELECTION,
-+  NS_THEME_GTK_WINDOW_DECORATION,
- 
-   ThemeWidgetType_COUNT
- };
-diff -up firefox-57.0b8/layout/style/nsCSSRuleProcessor.cpp.1399611 firefox-57.0b8/layout/style/nsCSSRuleProcessor.cpp
---- firefox-57.0b8/layout/style/nsCSSRuleProcessor.cpp.1399611	2017-08-02 14:27:54.000000000 +0200
-+++ firefox-57.0b8/layout/style/nsCSSRuleProcessor.cpp	2017-10-16 12:11:45.365240651 +0200
-@@ -1180,6 +1180,30 @@ nsCSSRuleProcessor::InitSystemMetrics()
-     sSystemMetrics->AppendElement(nsGkAtoms::physical_home_button);
-   }
- 
-+  rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDAvailable,
-+                           &metricResult);
-+  if (NS_SUCCEEDED(rv) && metricResult) {
-+    sSystemMetrics->AppendElement(nsGkAtoms::gtk_csd_available);
-+  }
-+
-+  rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDMinimizeButton,
-+                           &metricResult);
-+  if (NS_SUCCEEDED(rv) && metricResult) {
-+    sSystemMetrics->AppendElement(nsGkAtoms::gtk_csd_minimize_button);
-+  }
-+
-+  rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDMaximizeButton,
-+                           &metricResult);
-+  if (NS_SUCCEEDED(rv) && metricResult) {
-+    sSystemMetrics->AppendElement(nsGkAtoms::gtk_csd_maximize_button);
-+  }
-+
-+  rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDCloseButton,
-+                           &metricResult);
-+  if (NS_SUCCEEDED(rv) && metricResult) {
-+    sSystemMetrics->AppendElement(nsGkAtoms::gtk_csd_close_button);
-+  }
-+
- #ifdef XP_WIN
-   if (NS_SUCCEEDED(
-         LookAndFeel::GetInt(LookAndFeel::eIntID_WindowsThemeIdentifier,
-diff -up firefox-57.0b8/layout/style/nsMediaFeatures.cpp.1399611 firefox-57.0b8/layout/style/nsMediaFeatures.cpp
---- firefox-57.0b8/layout/style/nsMediaFeatures.cpp.1399611	2017-09-15 06:15:42.000000000 +0200
-+++ firefox-57.0b8/layout/style/nsMediaFeatures.cpp	2017-10-16 12:11:45.366240647 +0200
-@@ -788,6 +788,42 @@ nsMediaFeatures::features[] = {
-     GetSystemMetric
-   },
- 
-+  {
-+    &nsGkAtoms::_moz_gtk_csd_available,
-+    nsMediaFeature::eMinMaxNotAllowed,
-+    nsMediaFeature::eBoolInteger,
-+    nsMediaFeature::eNoRequirements,
-+    { &nsGkAtoms::gtk_csd_available },
-+    GetSystemMetric
-+  },
-+
-+  {
-+    &nsGkAtoms::_moz_gtk_csd_minimize_button,
-+    nsMediaFeature::eMinMaxNotAllowed,
-+    nsMediaFeature::eBoolInteger,
-+    nsMediaFeature::eNoRequirements,
-+    { &nsGkAtoms::gtk_csd_minimize_button },
-+    GetSystemMetric
-+  },
-+
-+  {
-+    &nsGkAtoms::_moz_gtk_csd_maximize_button,
-+    nsMediaFeature::eMinMaxNotAllowed,
-+    nsMediaFeature::eBoolInteger,
-+    nsMediaFeature::eNoRequirements,
-+    { &nsGkAtoms::gtk_csd_maximize_button },
-+    GetSystemMetric
-+  },
-+
-+  {
-+    &nsGkAtoms::_moz_gtk_csd_close_button,
-+    nsMediaFeature::eMinMaxNotAllowed,
-+    nsMediaFeature::eBoolInteger,
-+    nsMediaFeature::eNoRequirements,
-+    { &nsGkAtoms::gtk_csd_close_button },
-+    GetSystemMetric
-+  },
-+
-   // Internal -moz-is-glyph media feature: applies only inside SVG glyphs.
-   // Internal because it is really only useful in the user agent anyway
-   //  and therefore not worth standardizing.
-diff -up firefox-57.0b8/modules/libpref/init/all.js.1399611 firefox-57.0b8/modules/libpref/init/all.js
---- firefox-57.0b8/modules/libpref/init/all.js.1399611	2017-10-12 18:12:09.000000000 +0200
-+++ firefox-57.0b8/modules/libpref/init/all.js	2017-10-16 12:11:45.366240647 +0200
-@@ -4911,6 +4911,7 @@ pref("gfx.apitrace.enabled",false);
- pref("gfx.xrender.enabled",false);
- pref("widget.chrome.allow-gtk-dark-theme", false);
- pref("widget.content.allow-gtk-dark-theme", false);
-+pref("widget.allow-client-side-decoration", false);
- #endif
- #endif
- 
-diff -up firefox-57.0b8/toolkit/modules/moz.build.1399611 firefox-57.0b8/toolkit/modules/moz.build
---- firefox-57.0b8/toolkit/modules/moz.build.1399611	2017-09-15 06:15:40.000000000 +0200
-+++ firefox-57.0b8/toolkit/modules/moz.build	2017-10-16 12:11:45.366240647 +0200
-@@ -259,7 +259,7 @@ EXTRA_JS_MODULES.sessionstore += [
- ]
- 
- DEFINES['INSTALL_COMPACT_THEMES'] = 1
--if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
-+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):
-     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
-diff -up firefox-57.0b8/widget/gtk/gtk3drawing.cpp.1399611 firefox-57.0b8/widget/gtk/gtk3drawing.cpp
---- firefox-57.0b8/widget/gtk/gtk3drawing.cpp.1399611	2017-09-15 06:15:40.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/gtk3drawing.cpp	2017-10-16 12:11:45.367240644 +0200
-@@ -17,6 +17,7 @@
- #include "WidgetStyleCache.h"
- 
- #include <math.h>
-+#include <dlfcn.h>
- 
- static gboolean checkbox_check_state;
- static gboolean notebook_has_tab_gap;
-@@ -39,9 +40,25 @@ static gint
- moz_gtk_menu_item_paint(WidgetNodeType widget, cairo_t *cr, GdkRectangle* rect,
-                         GtkWidgetState* state, GtkTextDirection direction);
- 
-+static void
-+moz_gtk_add_style_margin(GtkStyleContext* style,
-+                         gint* left, gint* top, gint* right, gint* bottom);
-+static void
-+moz_gtk_add_style_border(GtkStyleContext* style,
-+                         gint* left, gint* top, gint* right, gint* bottom);
-+static void
-+moz_gtk_add_style_padding(GtkStyleContext* style,
-+                          gint* left, gint* top, gint* right, gint* bottom);
-+static void moz_gtk_add_margin_border_padding(GtkStyleContext *style,
-+                                              gint* left, gint* top,
-+                                              gint* right, gint* bottom);
-+static void moz_gtk_add_border_padding(GtkStyleContext *style,
-+                                       gint* left, gint* top,
-+                                       gint* right, gint* bottom);
- static GtkBorder
- GetMarginBorderPadding(GtkStyleContext* aStyle);
- 
-+
- // GetStateFlagsFromGtkWidgetState() can be safely used for the specific
- // GtkWidgets that set both prelight and active flags.  For other widgets,
- // either the GtkStateFlags or Gecko's GtkWidgetState need to be carefully
-@@ -233,6 +250,43 @@ moz_gtk_splitter_get_metrics(gint orient
-     return MOZ_GTK_SUCCESS;
- }
- 
-+void
-+moz_gtk_get_window_border(gint* top, gint* right, gint* bottom, gint* left)
-+{
-+  MOZ_ASSERT(gtk_check_version(3, 20, 0) == nullptr,
-+             "Window decorations are only supported on GTK 3.20+.");
-+
-+  GtkStyleContext* style = GetStyleContext(MOZ_GTK_WINDOW);
-+
-+  *top = *right = *bottom = *left = 0;
-+  moz_gtk_add_border_padding(style, left, top, right, bottom);
-+  GtkBorder windowMargin;
-+  gtk_style_context_get_margin(style, GTK_STATE_FLAG_NORMAL, &windowMargin);
-+
-+  style = GetStyleContext(MOZ_GTK_WINDOW_DECORATION);
-+
-+  // Available on GTK 3.20+.
-+  static auto sGtkRenderBackgroundGetClip =
-+    (void (*)(GtkStyleContext*, gdouble, gdouble, gdouble, gdouble, GdkRectangle*))
-+    dlsym(RTLD_DEFAULT, "gtk_render_background_get_clip");
-+
-+  GdkRectangle shadowClip;
-+  sGtkRenderBackgroundGetClip(style, 0, 0, 0, 0, &shadowClip);
-+
-+  // Transfer returned inset rectangle to GtkBorder
-+  GtkBorder shadowBorder = {
-+      static_cast<gint16>(-shadowClip.x),                    // left
-+      static_cast<gint16>(shadowClip.width + shadowClip.x),  // right
-+      static_cast<gint16>(-shadowClip.y),                    // top
-+      static_cast<gint16>(shadowClip.height + shadowClip.y), // bottom
-+  };
-+
-+  *left += MAX(windowMargin.left, shadowBorder.left);
-+  *right += MAX(windowMargin.right, shadowBorder.right);
-+  *top += MAX(windowMargin.top, shadowBorder.top);
-+  *bottom += MAX(windowMargin.bottom, shadowBorder.bottom);
-+}
-+
- static gint
- moz_gtk_window_paint(cairo_t *cr, GdkRectangle* rect,
-                      GtkTextDirection direction)
-@@ -302,6 +356,24 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec
- }
- 
- static gint
-+moz_gtk_header_bar_button_paint(cairo_t *cr, GdkRectangle* rect,
-+                                GtkWidgetState* state,
-+                                GtkReliefStyle relief, GtkWidget* widget,
-+                                GtkTextDirection direction)
-+{
-+    GtkBorder margin;
-+    GtkStyleContext* style = gtk_widget_get_style_context(widget);
-+    gtk_style_context_get_margin(style, GTK_STATE_FLAG_NORMAL, &margin);
-+
-+    rect->x += margin.left;
-+    rect->y += margin.top;
-+    rect->width -= margin.left + margin.right;
-+    rect->height -= margin.top + margin.bottom;
-+
-+    return moz_gtk_button_paint(cr, rect, state, relief, widget, direction);
-+}
-+
-+static gint
- moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect,
-                      GtkWidgetState* state,
-                      gboolean selected, gboolean inconsistent,
-@@ -1948,6 +2020,38 @@ moz_gtk_info_bar_paint(cairo_t *cr, GdkR
-     return MOZ_GTK_SUCCESS;
- }
- 
-+static gint
-+moz_gtk_header_bar_paint(WidgetNodeType widgetType,
-+                         cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state)
-+{
-+    GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state);
-+    GtkStyleContext *style;
-+
-+    style = GetStyleContext(widgetType, GTK_TEXT_DIR_LTR,
-+                            state_flags);
-+    InsetByMargin(rect, style);
-+    gtk_render_background(style, cr, rect->x, rect->y, rect->width,
-+                          rect->height);
-+    gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height);
-+
-+    return MOZ_GTK_SUCCESS;
-+}
-+
-+void
-+moz_gtk_header_bar_paint(cairo_t *cr, GdkRectangle* rect)
-+{
-+    static GtkWidgetState state;
-+    moz_gtk_header_bar_paint(MOZ_GTK_HEADER_BAR, cr, rect, &state);
-+}
-+
-+void
-+moz_gtk_get_header_bar_border(gint* top, gint* right, gint* bottom, gint* left)
-+{
-+    *left = *top = *right = *bottom = 0;
-+    moz_gtk_add_border_padding(GetStyleContext(MOZ_GTK_HEADER_BAR),
-+                               left, top, right, bottom);
-+}
-+
- static void
- moz_gtk_add_style_margin(GtkStyleContext* style,
-                          gint* left, gint* top, gint* right, gint* bottom)
-@@ -1999,6 +2103,14 @@ static void moz_gtk_add_margin_border_pa
-     moz_gtk_add_style_padding(style, left, top, right, bottom);
- }
- 
-+static void moz_gtk_add_border_padding(GtkStyleContext *style,
-+                                       gint* left, gint* top,
-+                                       gint* right, gint* bottom)
-+{
-+    moz_gtk_add_style_border(style, left, top, right, bottom);
-+    moz_gtk_add_style_padding(style, left, top, right, bottom);
-+}
-+
- static GtkBorder
- GetMarginBorderPadding(GtkStyleContext* aStyle)
- {
-@@ -2054,8 +2166,7 @@ moz_gtk_get_widget_border(WidgetNodeType
-             // XXX: Subtract 1 pixel from the padding to account for the default
-             // padding in forms.css. See bug 1187385.
-             *left = *top = *right = *bottom = -1;
--            moz_gtk_add_style_padding(style, left, top, right, bottom);
--            moz_gtk_add_style_border(style, left, top, right, bottom);
-+            moz_gtk_add_border_padding(style, left, top, right, bottom);
- 
-             return MOZ_GTK_SUCCESS;
-         }
-@@ -2076,10 +2187,8 @@ moz_gtk_get_widget_border(WidgetNodeType
-             *left = *top = *right = *bottom =
-                 gtk_container_get_border_width(GTK_CONTAINER(
-                                                GetWidget(MOZ_GTK_TREE_HEADER_CELL)));
--
-             style = GetStyleContext(MOZ_GTK_TREE_HEADER_CELL);
--            moz_gtk_add_style_border(style, left, top, right, bottom);
--            moz_gtk_add_style_padding(style, left, top, right, bottom);
-+            moz_gtk_add_border_padding(style, left, top, right, bottom);
-             return MOZ_GTK_SUCCESS;
-         }
-     case MOZ_GTK_TREE_HEADER_SORTARROW:
-@@ -2105,8 +2214,7 @@ moz_gtk_get_widget_border(WidgetNodeType
-                 gtk_container_get_border_width(GTK_CONTAINER(
-                                                GetWidget(MOZ_GTK_COMBOBOX_BUTTON)));
-             style = GetStyleContext(MOZ_GTK_COMBOBOX_BUTTON);
--            moz_gtk_add_style_padding(style, left, top, right, bottom);
--            moz_gtk_add_style_border(style, left, top, right, bottom);
-+            moz_gtk_add_border_padding(style, left, top, right, bottom);
- 
-             /* If there is no separator, don't try to count its width. */
-             separator_width = 0;
-@@ -2160,10 +2268,8 @@ moz_gtk_get_widget_border(WidgetNodeType
-             style = gtk_widget_get_style_context(w);
- 
-             *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w));
--            moz_gtk_add_style_border(style,
--                                     left, top, right, bottom);
--            moz_gtk_add_style_padding(style,
--                                      left, top, right, bottom);
-+            moz_gtk_add_border_padding(style,
-+                                       left, top, right, bottom);
-             return MOZ_GTK_SUCCESS;
-         }
-     case MOZ_GTK_MENUPOPUP:
-@@ -2210,6 +2316,21 @@ moz_gtk_get_widget_border(WidgetNodeType
- 
-             return MOZ_GTK_SUCCESS;
-         }
-+    case MOZ_GTK_HEADER_BAR:
-+    case MOZ_GTK_HEADER_BAR_MAXIMIZED:
-+        {
-+            style = GetStyleContext(widget);
-+            moz_gtk_add_border_padding(style, left, top, right, bottom);
-+            return MOZ_GTK_SUCCESS;
-+        }
-+    case MOZ_GTK_HEADER_BAR_BUTTON_CLOSE:
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MINIMIZE:
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MAXIMIZE:
-+        {
-+            style = GetStyleContext(widget);
-+            moz_gtk_add_margin_border_padding(style, left, top, right, bottom);
-+            return MOZ_GTK_SUCCESS;
-+        }
- 
-     /* These widgets have no borders, since they are not containers. */
-     case MOZ_GTK_CHECKBUTTON_LABEL:
-@@ -2646,6 +2767,36 @@ GetScrollbarMetrics(GtkOrientation aOrie
-     return metrics;
- }
- 
-+void
-+moz_gtk_window_decoration_paint(cairo_t *cr, GdkRectangle* rect)
-+{
-+    gint top, right, bottom, left;
-+    moz_gtk_get_window_border(&top, &right, &bottom, &left);
-+
-+    cairo_save(cr);
-+    cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
-+    cairo_rectangle(cr, rect->x, rect->y, left, rect->height);
-+    cairo_fill(cr);
-+    cairo_rectangle(cr, rect->x+rect->width-right, rect->y, right, rect->height);
-+    cairo_fill(cr);
-+    cairo_rectangle(cr, rect->x, rect->y, rect->width, top);
-+    cairo_fill(cr);
-+    cairo_rectangle(cr, rect->x, rect->height-bottom, rect->width, bottom);
-+    cairo_fill(cr);
-+    cairo_restore(cr);
-+
-+    GtkStyleContext* style = GetStyleContext(MOZ_GTK_WINDOW_DECORATION,
-+                                               GTK_TEXT_DIR_NONE);
-+    rect->x += left;
-+    rect->y += top;
-+    rect->width -= left + right;
-+    rect->height -= top + bottom;
-+
-+    gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height);
-+    gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height);
-+}
-+
-+
- /* cairo_t *cr argument has to be a system-cairo. */
- gint
- moz_gtk_widget_paint(WidgetNodeType widget, cairo_t *cr,
-@@ -2671,6 +2822,14 @@ moz_gtk_widget_paint(WidgetNodeType widg
-                                     GetWidget(MOZ_GTK_BUTTON),
-                                     direction);
-         break;
-+    case MOZ_GTK_HEADER_BAR_BUTTON_CLOSE:
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MINIMIZE:
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MAXIMIZE:
-+        return moz_gtk_header_bar_button_paint(cr, rect, state,
-+                                               (GtkReliefStyle) flags,
-+                                               GetWidget(widget),
-+                                               direction);
-+        break;
-     case MOZ_GTK_CHECKBUTTON:
-     case MOZ_GTK_RADIOBUTTON:
-         return moz_gtk_toggle_paint(cr, rect, state,
-@@ -2877,6 +3036,10 @@ moz_gtk_widget_paint(WidgetNodeType widg
-     case MOZ_GTK_INFO_BAR:
-         return moz_gtk_info_bar_paint(cr, rect, state);
-         break;
-+    case MOZ_GTK_HEADER_BAR:
-+    case MOZ_GTK_HEADER_BAR_MAXIMIZED:
-+        return moz_gtk_header_bar_paint(widget, cr, rect, state);
-+        break;
-     default:
-         g_warning("Unknown widget type: %d", widget);
-     }
-diff -up firefox-57.0b8/widget/gtk/gtkdrawing.h.1399611 firefox-57.0b8/widget/gtk/gtkdrawing.h
---- firefox-57.0b8/widget/gtk/gtkdrawing.h.1399611	2017-06-12 18:37:20.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/gtkdrawing.h	2017-10-16 12:11:45.367240644 +0200
-@@ -268,8 +268,14 @@ typedef enum {
-   MOZ_GTK_SPLITTER_SEPARATOR_VERTICAL,
-   /* Paints the background of a window, dialog or page. */
-   MOZ_GTK_WINDOW,
-+  /* Used only as a container for MOZ_GTK_HEADER_BAR_MAXIMIZED. */
-+  MOZ_GTK_WINDOW_MAXIMIZED,
-   /* Window container for all widgets */
-   MOZ_GTK_WINDOW_CONTAINER,
-+  /* Window with the 'csd' style class. */
-+  MOZ_GTK_WINDOW_CSD,
-+  /* Client-side window decoration node. Available on GTK 3.20+. */
-+  MOZ_GTK_WINDOW_DECORATION,
-   /* Paints a GtkInfoBar, for notifications. */
-   MOZ_GTK_INFO_BAR,
-   /* Used for widget tree construction. */
-@@ -290,6 +296,14 @@ typedef enum {
-   MOZ_GTK_COMBOBOX_ENTRY_ARROW,
-   /* Used for scrolled window shell. */
-   MOZ_GTK_SCROLLED_WINDOW,
-+  /* Paints a GtkHeaderBar */
-+  MOZ_GTK_HEADER_BAR,
-+  /* Paints a GtkHeaderBar in maximized state */
-+  MOZ_GTK_HEADER_BAR_MAXIMIZED,
-+  /* Paints a GtkHeaderBar title buttons */
-+  MOZ_GTK_HEADER_BAR_BUTTON_CLOSE,
-+  MOZ_GTK_HEADER_BAR_BUTTON_MINIMIZE,
-+  MOZ_GTK_HEADER_BAR_BUTTON_MAXIMIZE,
- 
-   MOZ_GTK_WIDGET_NODE_COUNT
- } WidgetNodeType;
-@@ -542,6 +556,32 @@ gint moz_gtk_get_menu_separator_height(g
-  */
- gint moz_gtk_splitter_get_metrics(gint orientation, gint* size);
- 
-+#if (MOZ_WIDGET_GTK == 3)
-+/**
-+ * Gets the margins to be used for window decorations, typically the extra space
-+ * required to draw a drop shadow (obtained from gtk_render_background_get_clip).
-+ * Only available on GTK 3.20+.
-+ */
-+void moz_gtk_get_window_border(gint* top, gint* right, gint* bottom, gint* left);
-+
-+/**
-+ * Draw window decorations, typically a shadow.
-+ * Only available on GTK 3.20+.
-+ */
-+void moz_gtk_window_decoration_paint(cairo_t *cr, GdkRectangle* rect);
-+
-+/**
-+ * Gets the border of window header bar, only available on GTK 3.20+.
-+ */
-+void moz_gtk_get_header_bar_border(gint* top, gint* right, gint* bottom, gint* left);
-+
-+/**
-+ * Draw window header bar, only available on GTK 3.20+.
-+ */
-+void moz_gtk_header_bar_paint(cairo_t *cr, GdkRectangle* rect);
-+
-+#endif
-+
- /**
-  * Get the YTHICKNESS of a tab (notebook extension).
-  */
-diff -up firefox-57.0b8/widget/gtk/mozgtk/mozgtk.c.1399611 firefox-57.0b8/widget/gtk/mozgtk/mozgtk.c
---- firefox-57.0b8/widget/gtk/mozgtk/mozgtk.c.1399611	2017-10-09 22:17:13.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/mozgtk/mozgtk.c	2017-10-16 12:11:45.367240644 +0200
-@@ -580,6 +580,8 @@ STUB(gtk_style_context_set_state)
- STUB(gtk_style_properties_lookup_property)
- STUB(gtk_tree_view_column_get_button)
- STUB(gtk_widget_get_preferred_size)
-+STUB(gtk_widget_get_preferred_width)
-+STUB(gtk_widget_get_preferred_height)
- STUB(gtk_widget_get_state_flags)
- STUB(gtk_widget_get_style_context)
- STUB(gtk_widget_path_append_type)
-@@ -589,6 +591,10 @@ STUB(gtk_widget_path_iter_add_class)
- STUB(gtk_widget_path_get_object_type)
- STUB(gtk_widget_path_new)
- STUB(gtk_widget_path_unref)
-+STUB(gtk_widget_set_margin_left)
-+STUB(gtk_widget_set_margin_right)
-+STUB(gtk_widget_set_margin_top)
-+STUB(gtk_widget_set_margin_bottom)
- STUB(gtk_widget_set_visual)
- STUB(gtk_app_chooser_dialog_new_for_content_type)
- STUB(gtk_app_chooser_get_type)
-@@ -601,6 +607,7 @@ STUB(gtk_color_chooser_get_type)
- STUB(gtk_color_chooser_set_rgba)
- STUB(gtk_color_chooser_get_rgba)
- STUB(gtk_color_chooser_set_use_alpha)
-+STUB(gtk_window_get_size)
- #endif
- 
- #ifdef GTK2_SYMBOLS
-diff -up firefox-57.0b8/widget/gtk/nsLookAndFeel.cpp.1399611 firefox-57.0b8/widget/gtk/nsLookAndFeel.cpp
---- firefox-57.0b8/widget/gtk/nsLookAndFeel.cpp.1399611	2017-09-21 06:10:10.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/nsLookAndFeel.cpp	2017-10-16 12:11:45.367240644 +0200
-@@ -642,6 +642,22 @@ nsLookAndFeel::GetIntImpl(IntID aID, int
-     case eIntID_ContextMenuOffsetHorizontal:
-         aResult = 2;
-         break;
-+    case eIntID_GTKCSDAvailable:
-+        EnsureInit();
-+        aResult = sCSDAvailable;
-+        break;
-+    case eIntID_GTKCSDMaximizeButton:
-+        EnsureInit();
-+        aResult = sCSDMaximizeButton;
-+        break;
-+    case eIntID_GTKCSDMinimizeButton:
-+        EnsureInit();
-+        aResult = sCSDMinimizeButton;
-+        break;
-+    case eIntID_GTKCSDCloseButton:
-+        EnsureInit();
-+        aResult = sCSDCloseButton;
-+        break;
-     default:
-         aResult = 0;
-         res     = NS_ERROR_FAILURE;
-@@ -1048,6 +1064,40 @@ nsLookAndFeel::EnsureInit()
- 
-     gtk_widget_destroy(window);
-     g_object_unref(labelWidget);
-+
-+    // Require GTK 3.20 for client-side decoration support.
-+    // 3.20 exposes gtk_render_background_get_clip, which is required for
-+    // calculating shadow metrics for decorated windows.
-+    sCSDAvailable = gtk_check_version(3, 20, 0) == nullptr;
-+    if (sCSDAvailable) {
-+        sCSDAvailable =
-+            mozilla::Preferences::GetBool("widget.allow-client-side-decoration",
-+                                          false);
-+    }
-+
-+    const gchar* decorationLayout = nullptr;
-+    if (gtk_check_version(3, 12, 0) == nullptr) {
-+        static auto sGtkHeaderBarGetDecorationLayoutPtr =
-+          (const gchar* (*)(GtkWidget*))
-+          dlsym(RTLD_DEFAULT, "gtk_header_bar_get_decoration_layout");
-+
-+        GtkWidget* headerBar = GetWidget(MOZ_GTK_HEADER_BAR);
-+        decorationLayout = sGtkHeaderBarGetDecorationLayoutPtr(headerBar);
-+        if (!decorationLayout) {
-+            g_object_get(settings, "gtk-decoration-layout", &decorationLayout,
-+                         nullptr);
-+        }
-+    }
-+
-+    if (decorationLayout) {
-+        sCSDCloseButton = (strstr(decorationLayout, "close") != nullptr);
-+        sCSDMaximizeButton = (strstr(decorationLayout, "maximize") != nullptr);
-+        sCSDMinimizeButton = (strstr(decorationLayout, "minimize") != nullptr);
-+    } else {
-+        sCSDCloseButton = true;
-+        sCSDMaximizeButton = true;
-+        sCSDMinimizeButton = true;
-+    }
- }
- 
- // virtual
-diff -up firefox-57.0b8/widget/gtk/nsLookAndFeel.h.1399611 firefox-57.0b8/widget/gtk/nsLookAndFeel.h
---- firefox-57.0b8/widget/gtk/nsLookAndFeel.h.1399611	2017-09-21 06:10:10.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/nsLookAndFeel.h	2017-10-16 12:11:45.367240644 +0200
-@@ -32,6 +32,8 @@ public:
-     virtual char16_t GetPasswordCharacterImpl();
-     virtual bool GetEchoPasswordImpl();
- 
-+    bool IsCSDAvailable() const { return sCSDAvailable; }
-+
- protected:
- 
-     // Cached fonts
-@@ -82,6 +84,10 @@ protected:
-     char16_t sInvisibleCharacter;
-     float   sCaretRatio;
-     bool    sMenuSupportsDrag;
-+    bool    sCSDAvailable;
-+    bool    sCSDMaximizeButton;
-+    bool    sCSDMinimizeButton;
-+    bool    sCSDCloseButton;
-     bool    mInitialized;
- 
-     void EnsureInit();
-diff -up firefox-57.0b8/widget/gtk/nsNativeThemeGTK.cpp.1399611 firefox-57.0b8/widget/gtk/nsNativeThemeGTK.cpp
---- firefox-57.0b8/widget/gtk/nsNativeThemeGTK.cpp.1399611	2017-09-19 06:18:28.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/nsNativeThemeGTK.cpp	2017-10-16 12:11:45.368240640 +0200
-@@ -23,6 +23,7 @@
- #include "nsIDOMHTMLInputElement.h"
- #include "nsGkAtoms.h"
- #include "nsAttrValueInlines.h"
-+#include "nsWindow.h"
- 
- #include "mozilla/EventStates.h"
- #include "mozilla/Services.h"
-@@ -703,6 +704,24 @@ nsNativeThemeGTK::GetGtkWidgetAndState(u
-   case NS_THEME_GTK_INFO_BAR:
-     aGtkWidgetType = MOZ_GTK_INFO_BAR;
-     break;
-+  case NS_THEME_WINDOW_TITLEBAR:
-+    aGtkWidgetType = MOZ_GTK_HEADER_BAR;
-+    break;
-+  case NS_THEME_WINDOW_TITLEBAR_MAXIMIZED:
-+    aGtkWidgetType = MOZ_GTK_HEADER_BAR_MAXIMIZED;
-+    break;
-+  case NS_THEME_WINDOW_BUTTON_CLOSE:
-+    aGtkWidgetType = MOZ_GTK_HEADER_BAR_BUTTON_CLOSE;
-+    break;
-+  case NS_THEME_WINDOW_BUTTON_MINIMIZE:
-+    aGtkWidgetType = MOZ_GTK_HEADER_BAR_BUTTON_MINIMIZE;
-+    break;
-+  case NS_THEME_WINDOW_BUTTON_MAXIMIZE:
-+    aGtkWidgetType = MOZ_GTK_HEADER_BAR_BUTTON_MAXIMIZE;
-+    break;
-+  case NS_THEME_WINDOW_BUTTON_RESTORE:
-+    aGtkWidgetType = MOZ_GTK_HEADER_BAR_BUTTON_MAXIMIZE;
-+    break;
-   default:
-     return false;
-   }
-@@ -1627,6 +1646,10 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
-   case NS_THEME_MENULIST:
-   case NS_THEME_TOOLBARBUTTON:
-   case NS_THEME_TREEHEADERCELL:
-+  case NS_THEME_WINDOW_BUTTON_CLOSE:
-+  case NS_THEME_WINDOW_BUTTON_MINIMIZE:
-+  case NS_THEME_WINDOW_BUTTON_MAXIMIZE:
-+  case NS_THEME_WINDOW_BUTTON_RESTORE:
-     {
-       if (aWidgetType == NS_THEME_MENULIST) {
-         // Include the arrow size.
-@@ -1892,9 +1915,21 @@ nsNativeThemeGTK::ThemeSupportsWidget(ns
-   case NS_THEME_DIALOG:
- #if (MOZ_WIDGET_GTK == 3)
-   case NS_THEME_GTK_INFO_BAR:
-+  case NS_THEME_GTK_WINDOW_DECORATION:
- #endif
-     return !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
- 
-+  case NS_THEME_WINDOW_BUTTON_CLOSE:
-+  case NS_THEME_WINDOW_BUTTON_MINIMIZE:
-+  case NS_THEME_WINDOW_BUTTON_MAXIMIZE:
-+  case NS_THEME_WINDOW_BUTTON_RESTORE:
-+  case NS_THEME_WINDOW_TITLEBAR:
-+  case NS_THEME_WINDOW_TITLEBAR_MAXIMIZED:
-+    // GtkHeaderBar is available on GTK 3.10+, which is used for styling
-+    // title bars and title buttons.
-+    return gtk_check_version(3, 10, 0) == nullptr &&
-+           !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
-+
-   case NS_THEME_MENULIST_BUTTON:
-     if (aFrame && aFrame->GetWritingMode().IsVertical()) {
-       return false;
-@@ -1978,6 +2013,13 @@ nsNativeThemeGTK::GetWidgetTransparency(
- #else
-     return eTransparent;
- #endif
-+  case NS_THEME_GTK_WINDOW_DECORATION:
-+  {
-+    nsWindow* window = static_cast<nsWindow*>(aFrame->GetNearestWidget());
-+    if (window)
-+      return window->IsComposited() ? eTransparent : eOpaque;
-+    return eOpaque;
-+  }
-   }
- 
-   return eUnknownTransparency;
-diff -up firefox-57.0b8/widget/gtk/nsWindow.cpp.1399611 firefox-57.0b8/widget/gtk/nsWindow.cpp
---- firefox-57.0b8/widget/gtk/nsWindow.cpp.1399611	2017-10-16 12:11:45.361240666 +0200
-+++ firefox-57.0b8/widget/gtk/nsWindow.cpp	2017-10-16 12:11:45.369240636 +0200
-@@ -85,6 +85,7 @@
- #include "nsIPropertyBag2.h"
- #include "GLContext.h"
- #include "gfx2DGlue.h"
-+#include "nsLookAndFeel.h"
- 
- #ifdef ACCESSIBILITY
- #include "mozilla/a11y/Accessible.h"
-@@ -139,6 +140,8 @@ using namespace mozilla::widget;
- 
- #include "mozilla/layers/APZCTreeManager.h"
- 
-+#include "gtkdrawing.h"
-+
- using namespace mozilla;
- using namespace mozilla::gfx;
- using namespace mozilla::widget;
-@@ -186,6 +189,8 @@ static gboolean expose_event_cb
- #else
- static gboolean expose_event_cb           (GtkWidget *widget,
-                                            cairo_t *rect);
-+static gboolean expose_event_decoration_draw_cb (GtkWidget *widget,
-+                                                cairo_t *cr);
- #endif
- static gboolean configure_event_cb        (GtkWidget *widget,
-                                            GdkEventConfigure *event);
-@@ -231,7 +236,6 @@ static void     screen_composited_change
-                                                   gpointer user_data);
- static void     widget_composited_changed_cb     (GtkWidget* widget,
-                                                   gpointer user_data);
--
- #if (MOZ_WIDGET_GTK == 3)
- static void     scale_changed_cb          (GtkWidget* widget,
-                                            GParamSpec* aPSpec,
-@@ -440,6 +444,7 @@ nsWindow::nsWindow()
- 
-     mContainer           = nullptr;
-     mGdkWindow           = nullptr;
-+    mIsCSDEnabled        = false;
-     mShell               = nullptr;
-     mCompositorWidgetDelegate = nullptr;
-     mHasMappedToplevel   = false;
-@@ -481,6 +486,9 @@ nsWindow::nsWindow()
-     mLastScrollEventTime = GDK_CURRENT_TIME;
- #endif
-     mPendingConfigures = 0;
-+    mDrawWindowDecoration = false;
-+    mDecorationSize = {0,0,0,0};
-+    mCSDSupportLevel = CSD_SUPPORT_UNKNOWN;
- }
- 
- nsWindow::~nsWindow()
-@@ -1479,8 +1487,8 @@ LayoutDeviceIntRect
- nsWindow::GetScreenBounds()
- {
-     LayoutDeviceIntRect rect;
--    if (mIsTopLevel && mContainer) {
--        // use the point including window decorations
-+    if (mIsTopLevel && mContainer && !IsClientDecorated()) {
-+        // use the point including default Gtk+ window decorations
-         gint x, y;
-         gdk_window_get_root_origin(gtk_widget_get_window(GTK_WIDGET(mContainer)), &x, &y);
-         rect.MoveTo(GdkPointToDevicePixels({ x, y }));
-@@ -1606,6 +1614,10 @@ nsWindow::SetCursor(nsCursor aCursor)
-                 return;
- 
-             gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(mContainer)), newCursor);
-+            if (IsClientDecorated()) {
-+                gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(mShell)),
-+                                      newCursor);
-+            }
-         }
-     }
- }
-@@ -1662,6 +1674,10 @@ nsWindow::SetCursor(imgIContainer* aCurs
-     if (cursor) {
-         if (mContainer) {
-             gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(mContainer)), cursor);
-+            if (IsClientDecorated()) {
-+                gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(mShell)),
-+                                      cursor);
-+            }
-             rv = NS_OK;
-         }
- #if (MOZ_WIDGET_GTK == 3)
-@@ -2176,6 +2192,12 @@ nsWindow::OnExposeEvent(cairo_t *cr)
-         return TRUE;
-     }
- 
-+    // Clip upper part of the mContainer to get visible rounded corners
-+    // of GtkHeaderBar which is renderd to mShell.
-+    if (mIsCSDEnabled) {
-+        ApplyCSDClipping();
-+    }
-+
-     // If this widget uses OMTC...
-     if (GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_CLIENT ||
-         GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_WR) {
-@@ -2586,6 +2608,53 @@ nsWindow::OnMotionNotifyEvent(GdkEventMo
-         }
-     }
- #endif /* MOZ_X11 */
-+    // Client is decorated and we're getting the motion event for mShell
-+    // window which draws the CSD decorations around mContainer.
-+    if (IsClientDecorated()) {
-+        if (aEvent->window == gtk_widget_get_window(mShell)) {
-+            GdkWindowEdge edge;
-+            LayoutDeviceIntPoint refPoint =
-+                GdkEventCoordsToDevicePixels(aEvent->x, aEvent->y);
-+            if (CheckResizerEdge(refPoint, edge)) {
-+                nsCursor cursor = eCursor_none;
-+                switch (edge) {
-+                case GDK_WINDOW_EDGE_NORTH:
-+                    cursor = eCursor_n_resize;
-+                    break;
-+                case GDK_WINDOW_EDGE_NORTH_WEST:
-+                    cursor = eCursor_nw_resize;
-+                    break;
-+                case GDK_WINDOW_EDGE_NORTH_EAST:
-+                    cursor = eCursor_ne_resize;
-+                    break;
-+                case GDK_WINDOW_EDGE_WEST:
-+                    cursor = eCursor_w_resize;
-+                    break;
-+                case GDK_WINDOW_EDGE_EAST:
-+                    cursor = eCursor_e_resize;
-+                    break;
-+                case GDK_WINDOW_EDGE_SOUTH:
-+                    cursor = eCursor_s_resize;
-+                    break;
-+                case GDK_WINDOW_EDGE_SOUTH_WEST:
-+                    cursor = eCursor_sw_resize;
-+                    break;
-+                case GDK_WINDOW_EDGE_SOUTH_EAST:
-+                    cursor = eCursor_se_resize;
-+                    break;
-+                }
-+                SetCursor(cursor);
-+                return;
-+            }
-+        }
-+        // We're not on resize handle - check if we need to reset cursor back.
-+        if (mCursor == eCursor_n_resize || mCursor == eCursor_nw_resize ||
-+            mCursor == eCursor_ne_resize ||  mCursor == eCursor_w_resize ||
-+            mCursor == eCursor_e_resize || mCursor == eCursor_s_resize ||
-+            mCursor == eCursor_sw_resize || mCursor == eCursor_se_resize) {
-+            SetCursor(eCursor_standard);
-+        }
-+    }
- 
-     WidgetMouseEvent event(true, eMouseMove, this, WidgetMouseEvent::eReal);
- 
-@@ -2756,6 +2825,20 @@ nsWindow::OnButtonPressEvent(GdkEventBut
-     if (CheckForRollup(aEvent->x_root, aEvent->y_root, false, false))
-         return;
- 
-+    if (IsClientDecorated() && aEvent->window == gtk_widget_get_window(mShell)) {
-+        // Check to see if the event is within our window's resize region
-+        GdkWindowEdge edge;
-+        LayoutDeviceIntPoint refPoint =
-+            GdkEventCoordsToDevicePixels(aEvent->x, aEvent->y);
-+        if (CheckResizerEdge(refPoint, edge)) {
-+            gdk_window_begin_resize_drag(gtk_widget_get_window(mShell),
-+                                         edge, aEvent->button,
-+                                         aEvent->x_root, aEvent->y_root,
-+                                         aEvent->time);
-+            return;
-+        }
-+    }
-+
-     gdouble pressure = 0;
-     gdk_event_get_axis ((GdkEvent*)aEvent, GDK_AXIS_PRESSURE, &pressure);
-     mLastMotionPressure = pressure;
-@@ -3341,6 +3424,8 @@ nsWindow::OnWindowStateEvent(GtkWidget *
- #endif //ACCESSIBILITY
-     }
- 
-+    UpdateClientDecorations();
-+
-     if (mWidgetListener) {
-       mWidgetListener->SizeModeChanged(mSizeState);
-       if (aEvent->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
-@@ -3405,6 +3490,7 @@ nsWindow::OnCompositedChanged()
-       presShell->ThemeChanged();
-     }
-   }
-+  UpdateClientDecorations();
- }
- 
- void
-@@ -3593,7 +3679,8 @@ nsWindow::Create(nsIWidget* aParent,
-     GtkWindow      *topLevelParent = nullptr;
-     nsWindow       *parentnsWindow = nullptr;
-     GtkWidget      *eventWidget = nullptr;
--    bool            shellHasCSD = false;
-+    GtkWidget      *drawWidget = nullptr;
-+    bool            drawToContainer = false;
- 
-     if (aParent) {
-         parentnsWindow = static_cast<nsWindow*>(aParent);
-@@ -3640,29 +3727,47 @@ nsWindow::Create(nsIWidget* aParent,
-               GTK_WINDOW_TOPLEVEL : GTK_WINDOW_POPUP;
-         mShell = gtk_window_new(type);
- 
--        bool useAlphaVisual = (mWindowType == eWindowType_popup &&
--                               aInitData->mSupportTranslucency);
-+        bool useAlphaVisual = false;
-+#if (MOZ_WIDGET_GTK == 3)
-+        // When CSD is available we can emulate it for toplevel windows.
-+        // Content is rendered to mContainer and transparent decorations to mShell.
-+        if (GetCSDSupportLevel() != CSD_SUPPORT_NONE &&
-+            mWindowType == eWindowType_toplevel) {
-+            int32_t isCSDAvailable = false;
-+            nsresult rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDAvailable,
-+                                             &isCSDAvailable);
-+            if (NS_SUCCEEDED(rv)) {
-+                mIsCSDEnabled = useAlphaVisual = isCSDAvailable;
-+            }
-+        } else
-+#endif
-+        if (mWindowType == eWindowType_popup) {
-+            useAlphaVisual = aInitData->mSupportTranslucency;
-+        }
- 
-         // mozilla.widget.use-argb-visuals is a hidden pref defaulting to false
-         // to allow experimentation
-         if (Preferences::GetBool("mozilla.widget.use-argb-visuals", false))
-             useAlphaVisual = true;
- 
-+        // An ARGB visual is only useful if we are on a compositing
-+        // window manager.
-+        GdkScreen *screen = gtk_widget_get_screen(mShell);
-+        if (useAlphaVisual && !gdk_screen_is_composited(screen)) {
-+            useAlphaVisual = false;
-+        }
-+
-         // We need to select an ARGB visual here instead of in
-         // SetTransparencyMode() because it has to be done before the
--        // widget is realized.  An ARGB visual is only useful if we
--        // are on a compositing window manager.
-+        // widget is realized.
-         if (useAlphaVisual) {
--            GdkScreen *screen = gtk_widget_get_screen(mShell);
--            if (gdk_screen_is_composited(screen)) {
- #if (MOZ_WIDGET_GTK == 2)
--                GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
--                gtk_widget_set_colormap(mShell, colormap);
-+            GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
-+            gtk_widget_set_colormap(mShell, colormap);
- #else
--                GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
--                gtk_widget_set_visual(mShell, visual);
-+            GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-+            gtk_widget_set_visual(mShell, visual);
- #endif
--            }
-         }
- 
-         // We only move a general managed toplevel window if someone has
-@@ -3756,24 +3861,56 @@ nsWindow::Create(nsIWidget* aParent,
-         mContainer = MOZ_CONTAINER(container);
- 
- #if (MOZ_WIDGET_GTK == 3)
--        // "csd" style is set when widget is realized so we need to call
--        // it explicitly now.
--        gtk_widget_realize(mShell);
--
--        // We can't draw directly to top-level window when client side
--        // decorations are enabled. We use container with GdkWindow instead.
--        GtkStyleContext* style = gtk_widget_get_style_context(mShell);
--        shellHasCSD = gtk_style_context_has_class(style, "csd");
--#endif
--        if (!shellHasCSD) {
--            // Use mShell's window for drawing and events.
--            gtk_widget_set_has_window(container, FALSE);
--            // Prevent GtkWindow from painting a background to flicker.
--            gtk_widget_set_app_paintable(mShell, TRUE);
--        }
--        // Set up event widget
--        eventWidget = shellHasCSD ? container : mShell;
-+        /* There are tree possible situations here:
-+         *
-+         * 1) We're running on Gtk+ < 3.20 without any decorations. Content
-+         *    is rendered to mShell window and we listen Gtk+ events on mShell.
-+         * 2) We're running on Gtk+ > 3.20 and window decorations are drawn
-+         *    by default by Gtk+. Content is rendered to mContainer,
-+         *    we listen events on mContainer. mShell contains default Gtk+
-+         *    window decorations rendered by Gtk+.
-+         * 3) We're running on Gtk+ > 3.20 and both window decorations and
-+         *    content is rendered by gecko. We emulate Gtk+ decoration rendering
-+         *    to mShell and we need to listen Gtk events on both mShell
-+         *    and mContainer.
-+         */
-+
-+        // When client side decorations are enabled (rendered by us or by Gtk+)
-+        // the decoration is rendered to mShell (toplevel) window and
-+        // we draw our content to mContainer.
-+        if (mIsCSDEnabled) {
-+            drawToContainer = true;
-+        } else {
-+            // mIsCSDEnabled can be disabled by preference so look at actual
-+            // toplevel window style to to detect active "csd" style.
-+            // The "csd" style is set when widget is realized so we need to call
-+            // it explicitly now.
-+            gtk_widget_realize(mShell);
-+
-+            GtkStyleContext* style = gtk_widget_get_style_context(mShell);
-+            drawToContainer = gtk_style_context_has_class(style, "csd");
-+        }
-+#endif
-+        drawWidget = (drawToContainer) ? container : mShell;
-+        // When we draw decorations on our own we need to handle resize events
-+        // because Gtk+ does not provide resizers for undecorated windows.
-+        // The CSD on mShell borders act as resize handlers
-+        // so we need to listen there.
-+        eventWidget = (drawToContainer && !mIsCSDEnabled) ? container : mShell;
-+
-         gtk_widget_add_events(eventWidget, kEvents);
-+        if (eventWidget != drawWidget) {
-+            // CSD is rendered by us (not by Gtk+) so we also need to listen
-+            // at mShell window for events.
-+            gtk_widget_add_events(drawWidget, kEvents);
-+        }
-+
-+        // Prevent GtkWindow from painting a background to flicker.
-+        gtk_widget_set_app_paintable(drawWidget, TRUE);
-+
-+        // gtk_container_add() realizes the child widget so we need to
-+        // set it now.
-+        gtk_widget_set_has_window(container, drawToContainer);
- 
-         gtk_container_add(GTK_CONTAINER(mShell), container);
-         gtk_widget_realize(container);
-@@ -3783,7 +3920,7 @@ nsWindow::Create(nsIWidget* aParent,
-         gtk_widget_grab_focus(container);
- 
-         // the drawing window
--        mGdkWindow = gtk_widget_get_window(eventWidget);
-+        mGdkWindow = gtk_widget_get_window(drawWidget);
- 
-         if (mWindowType == eWindowType_popup) {
-             // gdk does not automatically set the cursor for "temporary"
-@@ -3856,6 +3993,11 @@ nsWindow::Create(nsIWidget* aParent,
- 
-     // label the drawing window with this object so we can find our way home
-     g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", this);
-+    if (mIsCSDEnabled) {
-+        // label the CSD window with this object so we can find our way home
-+        g_object_set_data(G_OBJECT(gtk_widget_get_window(mShell)),
-+                          "nsWindow", this);
-+    }
- 
-     if (mContainer)
-         g_object_set_data(G_OBJECT(mContainer), "nsWindow", this);
-@@ -3893,6 +4035,10 @@ nsWindow::Create(nsIWidget* aParent,
-         g_signal_connect_after(default_settings,
-                                "notify::gtk-font-name",
-                                G_CALLBACK(theme_changed_cb), this);
-+        if (mIsCSDEnabled) {
-+            g_signal_connect(G_OBJECT(mShell), "draw",
-+                             G_CALLBACK(expose_event_decoration_draw_cb), nullptr);
-+        }
-     }
- 
-     if (mContainer) {
-@@ -3943,7 +4089,7 @@ nsWindow::Create(nsIWidget* aParent,
-                          G_CALLBACK(drag_data_received_event_cb), nullptr);
- 
-         GtkWidget *widgets[] = { GTK_WIDGET(mContainer),
--                                 !shellHasCSD ? mShell : nullptr };
-+                                 !drawToContainer ? mShell : nullptr };
-         for (size_t i = 0; i < ArrayLength(widgets) && widgets[i]; ++i) {
-             // Visibility events are sent to the owning widget of the relevant
-             // window but do not propagate to parent widgets so connect on
-@@ -3973,7 +4119,6 @@ nsWindow::Create(nsIWidget* aParent,
-         // Don't let GTK mess with the shapes of our GdkWindows
-         GTK_PRIVATE_SET_FLAG(eventWidget, GTK_HAS_SHAPE_MASK);
- #endif
--
-         // These events are sent to the owning widget of the relevant window
-         // and propagate up to the first widget that handles the events, so we
-         // need only connect on mShell, if it exists, to catch events on its
-@@ -4110,6 +4255,12 @@ nsWindow::NativeResize()
-          size.width, size.height));
- 
-     if (mIsTopLevel) {
-+        // When we draw decorations add extra space to draw shadows
-+        // around the main window.
-+        if (mDrawWindowDecoration) {
-+            size.width += mDecorationSize.left + mDecorationSize.right;
-+            size.height += mDecorationSize.top + mDecorationSize.bottom;
-+        }
-         gtk_window_resize(GTK_WINDOW(mShell), size.width, size.height);
-     }
-     else if (mContainer) {
-@@ -4166,6 +4317,11 @@ nsWindow::NativeMoveResize()
-     if (mIsTopLevel) {
-         // x and y give the position of the window manager frame top-left.
-         gtk_window_move(GTK_WINDOW(mShell), topLeft.x, topLeft.y);
-+
-+        if (mDrawWindowDecoration) {
-+            size.width += mDecorationSize.left + mDecorationSize.right;
-+            size.height += mDecorationSize.top + mDecorationSize.bottom;
-+        }
-         // This sets the client window size.
-         gtk_window_resize(GTK_WINDOW(mShell), size.width, size.height);
-     }
-@@ -5524,6 +5680,33 @@ expose_event_cb(GtkWidget *widget, cairo
- 
-     return FALSE;
- }
-+
-+/* static */
-+gboolean
-+expose_event_decoration_draw_cb(GtkWidget *widget, cairo_t *cr)
-+{
-+  GdkWindow* gdkWindow = gtk_widget_get_window(widget);
-+  if (gtk_cairo_should_draw_window(cr, gdkWindow)) {
-+      RefPtr<nsWindow> window = get_window_for_gtk_widget(widget);
-+      if (!window) {
-+          NS_WARNING("Cannot get nsWindow from GtkWidget");
-+      }
-+      else if (window->IsClientDecorated()) {
-+          cairo_save(cr);
-+          gtk_cairo_transform_to_window(cr, widget, gdkWindow);
-+
-+          GdkRectangle rect = {0,0,0,0};
-+          gtk_window_get_size(GTK_WINDOW(widget), &rect.width, &rect.height);
-+          moz_gtk_window_decoration_paint(cr, &rect);
-+
-+          rect.height = 40;
-+          moz_gtk_header_bar_paint(cr, &rect);
-+          cairo_restore(cr);
-+      }
-+  }
-+  return TRUE;
-+}
-+
- #endif //MOZ_WIDGET_GTK == 2
- 
- static gboolean
-@@ -6576,6 +6759,28 @@ nsWindow::ClearCachedResources()
-     }
- }
- 
-+NS_IMETHODIMP
-+nsWindow::SetNonClientMargins(LayoutDeviceIntMargin &aMargins)
-+{
-+  SetDrawsInTitlebar(aMargins.top == 0);
-+  return NS_OK;
-+}
-+
-+void
-+nsWindow::SetDrawsInTitlebar(bool aState)
-+{
-+  if (!mIsCSDEnabled || aState == mDrawWindowDecoration)
-+    return;
-+
-+  if (mShell) {
-+    gtk_window_set_decorated(GTK_WINDOW(mShell), !aState);
-+    gtk_widget_set_app_paintable(mShell, aState);
-+  }
-+
-+  mDrawWindowDecoration = aState;
-+  UpdateClientDecorations();
-+}
-+
- gint
- nsWindow::GdkScaleFactor()
- {
-@@ -6846,6 +7051,157 @@ nsWindow::SynthesizeNativeTouchPoint(uin
- }
- #endif
- 
-+bool
-+nsWindow::IsClientDecorated() const
-+{
-+    return mDrawWindowDecoration && mSizeState == nsSizeMode_Normal;
-+}
-+
-+int
-+nsWindow::GetClientResizerSize()
-+{
-+  if (!mShell)
-+    return 0;
-+
-+  // GTK uses a default size of 20px as of 3.20.
-+  gint size = 20;
-+  gtk_widget_style_get(mShell, "decoration-resize-handle", &size, nullptr);
-+
-+  return GdkCoordToDevicePixels(size);
-+}
-+
-+nsWindow::CSDSupportLevel
-+nsWindow::GetCSDSupportLevel() {
-+    if (mCSDSupportLevel != CSD_SUPPORT_UNKNOWN) {
-+        return mCSDSupportLevel;
-+    }
-+    // TODO: MATE
-+    const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
-+    if (currentDesktop) {
-+        if (strcmp(currentDesktop, "GNOME") == 0) {
-+            mCSDSupportLevel = CSD_SUPPORT_FULL;
-+        } else if (strcmp(currentDesktop, "XFCE") == 0) {
-+            mCSDSupportLevel = CSD_SUPPORT_FULL;
-+        } else if (strcmp(currentDesktop, "X-Cinnamon") == 0) {
-+            mCSDSupportLevel = CSD_SUPPORT_FULL;
-+        } else if (strcmp(currentDesktop, "KDE") == 0) {
-+            mCSDSupportLevel = CSD_SUPPORT_FLAT;
-+        } else if (strcmp(currentDesktop, "LXDE") == 0) {
-+            mCSDSupportLevel = CSD_SUPPORT_FLAT;
-+        } else if (strcmp(currentDesktop, "openbox") == 0) {
-+            mCSDSupportLevel = CSD_SUPPORT_FLAT;
-+        } else if (strcmp(currentDesktop, "i3") == 0) {
-+            mCSDSupportLevel = CSD_SUPPORT_NONE;
-+        } else {
-+            mCSDSupportLevel = CSD_SUPPORT_NONE;
-+        }
-+    }
-+    return mCSDSupportLevel;
-+}
-+
-+void
-+nsWindow::UpdateClientDecorations()
-+{
-+  // When the CSD is not fully supported by window manager (ie. WM is not
-+  // expecting that application is going to draw window shadows) we can't
-+  // add shadows widths to the window margin. That would lead to completely
-+  // opaque black border of the window.
-+  if (!mDrawWindowDecoration || GetCSDSupportLevel() != CSD_SUPPORT_FULL)
-+      return;
-+
-+  gint top = 0, right = 0, bottom = 0, left = 0;
-+  if (mSizeState == nsSizeMode_Normal) {
-+      moz_gtk_get_window_border(&top, &right, &bottom, &left);
-+  }
-+
-+  static auto sGdkWindowSetShadowWidth =
-+     (void (*)(GdkWindow*, gint, gint, gint, gint))
-+     dlsym(RTLD_DEFAULT, "gdk_window_set_shadow_width");
-+  sGdkWindowSetShadowWidth(gtk_widget_get_window(mShell),
-+                           left, right, top, bottom);
-+
-+  mDecorationSize.left = left;
-+  mDecorationSize.right = right;
-+  mDecorationSize.top = top;
-+  mDecorationSize.bottom = bottom;
-+
-+  // Gtk+ doesn't like when we set mContainer margin bigger than actual
-+  // mContainer window size. That happens when we're called early and the
-+  // mShell/mContainer is not allocated/resized yet and has default 1x1 size.
-+  // Just resize to some minimal value which will be changed
-+  // by Gecko soon.
-+  GtkAllocation allocation;
-+  gtk_widget_get_allocation(GTK_WIDGET(mContainer), &allocation);
-+  if (allocation.width < left + right || allocation.height < top + bottom) {
-+      gtk_widget_get_preferred_width(GTK_WIDGET(mContainer), nullptr,
-+                                     &allocation.width);
-+      gtk_widget_get_preferred_height(GTK_WIDGET(mContainer), nullptr,
-+                                      &allocation.height);
-+      allocation.width += left + right + 1;
-+      allocation.height += top + bottom + 1;
-+      gtk_widget_size_allocate(GTK_WIDGET(mContainer), &allocation);
-+  }
-+
-+  gtk_widget_set_margin_left(GTK_WIDGET(mContainer), mDecorationSize.left);
-+  gtk_widget_set_margin_right(GTK_WIDGET(mContainer), mDecorationSize.right);
-+  gtk_widget_set_margin_top(GTK_WIDGET(mContainer), mDecorationSize.top);
-+  gtk_widget_set_margin_bottom(GTK_WIDGET(mContainer), mDecorationSize.bottom);
-+}
-+
-+void
-+nsWindow::ApplyCSDClipping()
-+{
-+  if (IsClientDecorated()) {
-+      gint top, right, bottom, left;
-+      moz_gtk_get_header_bar_border(&top, &right, &bottom, &left);
-+      cairo_rectangle_int_t rect = { 0, top, mBounds.width, mBounds.height};
-+      cairo_region_t *region = cairo_region_create_rectangle(&rect);
-+      gdk_window_shape_combine_region(mGdkWindow, region, 0, 0);
-+      cairo_region_destroy(region);
-+  } else {
-+      gdk_window_shape_combine_region(mGdkWindow, nullptr, 0, 0);
-+  }
-+}
-+
-+bool
-+nsWindow::CheckResizerEdge(LayoutDeviceIntPoint aPoint, GdkWindowEdge& aOutEdge)
-+{
-+  gint scale = GdkScaleFactor();
-+  gint left = scale * mDecorationSize.left;
-+  gint top = scale * mDecorationSize.top;
-+  gint right = scale * mDecorationSize.right;
-+  gint bottom = scale * mDecorationSize.bottom;
-+
-+  int resizerSize = GetClientResizerSize();
-+  int topDist = aPoint.y;
-+  int leftDist = aPoint.x;
-+  int rightDist = mBounds.width - aPoint.x;
-+  int bottomDist = mBounds.height - aPoint.y;
-+
-+  //TODO -> wrong sizes
-+
-+  if (leftDist <= resizerSize && topDist <= resizerSize) {
-+    aOutEdge = GDK_WINDOW_EDGE_NORTH_WEST;
-+  } else if (rightDist <= resizerSize && topDist <= resizerSize) {
-+    aOutEdge = GDK_WINDOW_EDGE_NORTH_EAST;
-+  } else if (leftDist <= resizerSize && bottomDist <= resizerSize) {
-+    aOutEdge = GDK_WINDOW_EDGE_SOUTH_WEST;
-+  } else if (rightDist <= resizerSize && bottomDist <= resizerSize) {
-+    aOutEdge = GDK_WINDOW_EDGE_SOUTH_EAST;
-+  } else if (topDist <= top) {
-+    aOutEdge = GDK_WINDOW_EDGE_NORTH;
-+  } else if (leftDist <= left) {
-+    aOutEdge = GDK_WINDOW_EDGE_WEST;
-+  } else if (rightDist <= right) {
-+    aOutEdge = GDK_WINDOW_EDGE_EAST;
-+  } else if (bottomDist <= bottom) {
-+    aOutEdge = GDK_WINDOW_EDGE_SOUTH;
-+  } else {
-+    return false;
-+  }
-+  return true;
-+}
-+
- int32_t
- nsWindow::RoundsWidgetCoordinatesTo()
- {
-diff -up firefox-57.0b8/widget/gtk/nsWindow.h.1399611 firefox-57.0b8/widget/gtk/nsWindow.h
---- firefox-57.0b8/widget/gtk/nsWindow.h.1399611	2017-09-15 06:15:40.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/nsWindow.h	2017-10-16 12:11:45.369240636 +0200
-@@ -123,6 +123,7 @@ public:
-                                          double aHeight,
-                                          bool   aRepaint) override;
-     virtual bool       IsEnabled() const override;
-+    bool               IsComposited() const;
- 
-     void               SetZIndex(int32_t aZIndex) override;
-     virtual void       SetSizeMode(nsSizeMode aMode) override;
-@@ -351,6 +352,9 @@ public:
- #endif
-     virtual void GetCompositorWidgetInitData(mozilla::widget::CompositorWidgetInitData* aInitData) override;
- 
-+    NS_IMETHOD SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
-+    void SetDrawsInTitlebar(bool aState) override;
-+
-     // HiDPI scale conversion
-     gint GdkScaleFactor();
- 
-@@ -367,6 +371,9 @@ public:
-     LayoutDeviceIntRect GdkRectToDevicePixels(GdkRectangle rect);
- 
-     virtual bool WidgetTypeSupportsAcceleration() override;
-+
-+    // Decorations
-+    bool IsClientDecorated() const;
- protected:
-     virtual ~nsWindow();
- 
-@@ -384,6 +391,16 @@ protected:
- 
-     virtual void RegisterTouchWindow() override;
- 
-+    int GetClientResizerSize();
-+
-+    // Informs the window manager about the size of the shadows surrounding
-+    // a client-side decorated window.
-+    void UpdateClientDecorations();
-+
-+    // Returns true if the given point (in device pixels) is within a resizer
-+    // region of the window. Only used when drawing decorations client side.
-+    bool CheckResizerEdge(LayoutDeviceIntPoint aPoint, GdkWindowEdge& aOutEdge);
-+
-     nsCOMPtr<nsIWidget> mParent;
-     // Is this a toplevel window?
-     bool                mIsTopLevel;
-@@ -432,12 +449,12 @@ private:
-                                    gint* aRootX, gint* aRootY);
-     void               ClearCachedResources();
-     nsIWidgetListener* GetListener();
--    bool               IsComposited() const;
--
-+    void               ApplyCSDClipping();
- 
-     GtkWidget          *mShell;
-     MozContainer       *mContainer;
-     GdkWindow          *mGdkWindow;
-+    bool                mIsCSDEnabled;
-     PlatformCompositorWidgetDelegate* mCompositorWidgetDelegate;
- 
- 
-@@ -536,6 +553,10 @@ private:
-     // leaving fullscreen
-     nsSizeMode         mLastSizeMode;
- 
-+    // If true, draw our own window decorations (where supported).
-+    bool              mDrawWindowDecoration;
-+    GtkBorder         mDecorationSize;
-+
-     static bool DragInProgress(void);
- 
-     void DispatchMissedButtonReleases(GdkEventCrossing *aGdkEvent);
-@@ -567,6 +588,17 @@ private:
-     RefPtr<mozilla::widget::IMContextWrapper> mIMContext;
- 
-     mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
-+    typedef enum { CSD_SUPPORT_FULL,    // CSD including shadows
-+                   CSD_SUPPORT_FLAT,    // CSD without shadows
-+                   CSD_SUPPORT_NONE,    // WM does not support CSD at all
-+                   CSD_SUPPORT_UNKNOWN
-+    } CSDSupportLevel;
-+    /**
-+     * Get the support of Client Side Decoration by checking
-+     * the XDG_CURRENT_DESKTOP environment variable.
-+     */
-+    CSDSupportLevel GetCSDSupportLevel();
-+    CSDSupportLevel mCSDSupportLevel;
- };
- 
- #endif /* __nsWindow_h__ */
-diff -up firefox-57.0b8/widget/gtk/WidgetStyleCache.cpp.1399611 firefox-57.0b8/widget/gtk/WidgetStyleCache.cpp
---- firefox-57.0b8/widget/gtk/WidgetStyleCache.cpp.1399611	2017-09-15 06:15:40.000000000 +0200
-+++ firefox-57.0b8/widget/gtk/WidgetStyleCache.cpp	2017-10-16 12:11:45.369240636 +0200
-@@ -26,10 +26,14 @@ static GtkStyleContext*
- GetCssNodeStyleInternal(WidgetNodeType aNodeType);
- 
- static GtkWidget*
--CreateWindowWidget()
-+CreateWindowWidget(WidgetNodeType type)
- {
-   GtkWidget *widget = gtk_window_new(GTK_WINDOW_POPUP);
-   gtk_widget_set_name(widget, "MozillaGtkWidget");
-+  if (type == MOZ_GTK_WINDOW_CSD) {
-+      GtkStyleContext* style = gtk_widget_get_style_context(widget);
-+      gtk_style_context_add_class(style, "csd");
-+  }
-   return widget;
- }
- 
-@@ -101,7 +105,7 @@ CreateTooltipWidget()
- {
-   MOZ_ASSERT(gtk_check_version(3, 20, 0) != nullptr,
-              "CreateTooltipWidget should be used for Gtk < 3.20 only.");
--  GtkWidget* widget = CreateWindowWidget();
-+  GtkWidget* widget = CreateWindowWidget(MOZ_GTK_WINDOW);
-   GtkStyleContext* style = gtk_widget_get_style_context(widget);
-   gtk_style_context_add_class(style, GTK_STYLE_CLASS_TOOLTIP);
-   return widget;
-@@ -529,11 +533,82 @@ CreateNotebookWidget()
- }
- 
- static GtkWidget*
-+CreateHeaderBar(bool aMaximized)
-+{
-+  MOZ_ASSERT(gtk_check_version(3, 10, 0) == nullptr,
-+             "GtkHeaderBar is only available on GTK 3.10+.");
-+  if (gtk_check_version(3, 10, 0) != nullptr)
-+    return nullptr;
-+
-+  static auto sGtkHeaderBarNewPtr = (GtkWidget* (*)())
-+    dlsym(RTLD_DEFAULT, "gtk_header_bar_new");
-+  static const char* MOZ_GTK_STYLE_CLASS_TITLEBAR = "titlebar";
-+
-+  GtkWidget* headerbar = sGtkHeaderBarNewPtr();
-+  if (aMaximized) {
-+    GtkWidget *window = gtk_window_new(GTK_WINDOW_POPUP);
-+    gtk_widget_set_name(window, "MozillaMaximizedGtkWidget");
-+    GtkStyleContext* style = gtk_widget_get_style_context(window);
-+    gtk_style_context_add_class(style, "maximized");
-+    GtkWidget *fixed = gtk_fixed_new();
-+    gtk_container_add(GTK_CONTAINER(window), fixed);
-+    gtk_container_add(GTK_CONTAINER(fixed), headerbar);
-+    // Save the window container so we don't leak it.
-+    sWidgetStorage[MOZ_GTK_WINDOW_MAXIMIZED] = window;
-+  } else {
-+    AddToWindowContainer(headerbar);
-+  }
-+
-+  // Emulate what create_titlebar() at gtkwindow.c does.
-+  GtkStyleContext* style = gtk_widget_get_style_context(headerbar);
-+  gtk_style_context_add_class(style, MOZ_GTK_STYLE_CLASS_TITLEBAR);
-+  gtk_style_context_add_class(style, "default-decoration");
-+
-+  return headerbar;
-+}
-+
-+// TODO - Also return style for buttons located at Maximized toolbar.
-+static GtkWidget*
-+CreateHeaderBarButton(WidgetNodeType aWidgetType)
-+{
-+  MOZ_ASSERT(gtk_check_version(3, 10, 0) == nullptr,
-+             "GtkHeaderBar is only available on GTK 3.10+.");
-+
-+  if (gtk_check_version(3, 10, 0) != nullptr)
-+    return nullptr;
-+
-+  static const char* MOZ_GTK_STYLE_CLASS_TITLEBUTTON = "titlebutton";
-+
-+  GtkWidget* widget = gtk_button_new();
-+  gtk_container_add(GTK_CONTAINER(GetWidget(MOZ_GTK_HEADER_BAR)), widget);
-+
-+  GtkStyleContext* style = gtk_widget_get_style_context(widget);
-+  gtk_style_context_add_class(style, MOZ_GTK_STYLE_CLASS_TITLEBUTTON);
-+
-+  switch (aWidgetType) {
-+    case MOZ_GTK_HEADER_BAR_BUTTON_CLOSE:
-+      gtk_style_context_add_class(style, "close");
-+      break;
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MINIMIZE:
-+      gtk_style_context_add_class(style, "minimize");
-+      break;
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MAXIMIZE:
-+      gtk_style_context_add_class(style, "maximize");
-+      break;
-+    default:
-+      break;
-+  }
-+
-+  return widget;
-+}
-+
-+static GtkWidget*
- CreateWidget(WidgetNodeType aWidgetType)
- {
-   switch (aWidgetType) {
-     case MOZ_GTK_WINDOW:
--      return CreateWindowWidget();
-+    case MOZ_GTK_WINDOW_CSD:
-+      return CreateWindowWidget(aWidgetType);
-     case MOZ_GTK_WINDOW_CONTAINER:
-       return CreateWindowContainerWidget();
-     case MOZ_GTK_CHECKBUTTON_CONTAINER:
-@@ -610,6 +685,13 @@ CreateWidget(WidgetNodeType aWidgetType)
-       return CreateComboBoxEntryButtonWidget();
-     case MOZ_GTK_COMBOBOX_ENTRY_ARROW:
-       return CreateComboBoxEntryArrowWidget();
-+    case MOZ_GTK_HEADER_BAR:
-+    case MOZ_GTK_HEADER_BAR_MAXIMIZED:
-+      return CreateHeaderBar(aWidgetType == MOZ_GTK_HEADER_BAR_MAXIMIZED);
-+    case MOZ_GTK_HEADER_BAR_BUTTON_CLOSE:
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MINIMIZE:
-+    case MOZ_GTK_HEADER_BAR_BUTTON_MAXIMIZE:
-+      return CreateHeaderBarButton(aWidgetType);
-     default:
-       /* Not implemented */
-       return nullptr;
-@@ -1049,6 +1131,10 @@ GetCssNodeStyleInternal(WidgetNodeType a
-       GtkWidget* widget = GetWidget(MOZ_GTK_NOTEBOOK);
-       return gtk_widget_get_style_context(widget);
-     }
-+    case MOZ_GTK_WINDOW_DECORATION:
-+      style = CreateChildCSSNode("decoration",
-+                                 MOZ_GTK_WINDOW_CSD);
-+      break;
-     default:
-       return GetWidgetRootStyle(aNodeType);
-   }
-@@ -1214,6 +1300,8 @@ ResetWidgetCache(void)
-   /* This will destroy all of our widgets */
-   if (sWidgetStorage[MOZ_GTK_WINDOW])
-     gtk_widget_destroy(sWidgetStorage[MOZ_GTK_WINDOW]);
-+  if (sWidgetStorage[MOZ_GTK_WINDOW_MAXIMIZED])
-+    gtk_widget_destroy(sWidgetStorage[MOZ_GTK_WINDOW_MAXIMIZED]);
- 
-   /* Clear already freed arrays */
-   mozilla::PodArrayZero(sWidgetStorage);
-diff -up firefox-57.0b8/widget/LookAndFeel.h.1399611 firefox-57.0b8/widget/LookAndFeel.h
---- firefox-57.0b8/widget/LookAndFeel.h.1399611	2017-09-16 18:22:54.000000000 +0200
-+++ firefox-57.0b8/widget/LookAndFeel.h	2017-10-16 12:11:45.369240636 +0200
-@@ -405,6 +405,30 @@ public:
-      eIntID_PhysicalHomeButton,
- 
-      /*
-+      * A boolean value indicating whether client-side decorations are
-+      * supported by the user's GTK version.
-+      */
-+     eIntID_GTKCSDAvailable,
-+
-+     /*
-+      * A boolean value indicating whether client-side decorations should
-+      * contain a minimize button.
-+      */
-+     eIntID_GTKCSDMinimizeButton,
-+
-+     /*
-+      * A boolean value indicating whether client-side decorations should
-+      * contain a maximize button.
-+      */
-+     eIntID_GTKCSDMaximizeButton,
-+
-+     /*
-+      * A boolean value indicating whether client-side decorations should
-+      * contain a close button.
-+      */
-+     eIntID_GTKCSDCloseButton,
-+
-+     /*
-       * Controls whether overlay scrollbars display when the user moves
-       * the mouse in a scrollable frame.
-       */
diff --git a/mozilla-bmo256180.patch b/mozilla-bmo256180.patch
new file mode 100644
index 0000000..4795b9c
--- /dev/null
+++ b/mozilla-bmo256180.patch
@@ -0,0 +1,11 @@
+--- a/layout/generic/nsIFrame.h.old	2016-07-11 13:41:39.688276559 +0200
++++ b/layout/generic/nsIFrame.h	2016-07-11 13:42:12.791406976 +0200
+@@ -13,7 +13,7 @@
+ #error This header/class should only be used within Mozilla code. It should not be used by extensions.
+ #endif
+ 
+-#define MAX_REFLOW_DEPTH 200
++#define MAX_REFLOW_DEPTH 1000
+ 
+ /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is eventually
+    going to be eliminated, and all callers will use nsFrame instead.  At the moment
diff --git a/mozilla-enable-csd.patch b/mozilla-enable-csd.patch
new file mode 100644
index 0000000..25869ad
--- /dev/null
+++ b/mozilla-enable-csd.patch
@@ -0,0 +1,1312 @@
+diff -up firefox-58.0/browser/base/moz.build.1399611 firefox-58.0/browser/base/moz.build
+--- firefox-58.0/browser/base/moz.build.1399611	2017-11-02 17:16:30.000000000 +0100
++++ firefox-58.0/browser/base/moz.build	2018-01-24 10:57:03.717031953 +0100
+@@ -57,7 +57,7 @@ DEFINES['APP_LICENSE_BLOCK'] = '%s/conte
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
+     DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
+ 
+-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
++if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):
+     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
+ 
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+diff -up firefox-58.0/browser/themes/linux/browser.css.1399611 firefox-58.0/browser/themes/linux/browser.css
+--- firefox-58.0/browser/themes/linux/browser.css.1399611	2018-01-11 21:16:54.000000000 +0100
++++ firefox-58.0/browser/themes/linux/browser.css	2018-01-24 10:57:03.718031950 +0100
+@@ -717,7 +717,7 @@ html|span.ac-emphasize-text-url {
+   :root[tabsintitlebar] > #titlebar:-moz-lwtheme {
+     visibility: hidden;
+   }
+-  :root[tabsintitlebar] > #titlebar-content:-moz-lwtheme {
++  :root[tabsintitlebar] #titlebar-content:-moz-lwtheme {
+     visibility: visible;
+   }
+ 
+diff -up firefox-58.0/layout/style/nsMediaFeatures.cpp.1399611 firefox-58.0/layout/style/nsMediaFeatures.cpp
+--- firefox-58.0/layout/style/nsMediaFeatures.cpp.1399611	2018-01-11 21:17:01.000000000 +0100
++++ firefox-58.0/layout/style/nsMediaFeatures.cpp	2018-01-24 10:57:03.718031950 +0100
+@@ -831,6 +831,42 @@ nsMediaFeatures::features[] = {
+     GetSystemMetric
+   },
+ 
++  {
++    &nsGkAtoms::_moz_gtk_csd_available,
++    nsMediaFeature::eMinMaxNotAllowed,
++    nsMediaFeature::eBoolInteger,
++    nsMediaFeature::eNoRequirements,
++    { &nsGkAtoms::gtk_csd_available },
++    GetSystemMetric
++  },
++
++  {
++    &nsGkAtoms::_moz_gtk_csd_minimize_button,
++    nsMediaFeature::eMinMaxNotAllowed,
++    nsMediaFeature::eBoolInteger,
++    nsMediaFeature::eNoRequirements,
++    { &nsGkAtoms::gtk_csd_minimize_button },
++    GetSystemMetric
++  },
++
++  {
++    &nsGkAtoms::_moz_gtk_csd_maximize_button,
++    nsMediaFeature::eMinMaxNotAllowed,
++    nsMediaFeature::eBoolInteger,
++    nsMediaFeature::eNoRequirements,
++    { &nsGkAtoms::gtk_csd_maximize_button },
++    GetSystemMetric
++  },
++
++  {
++    &nsGkAtoms::_moz_gtk_csd_close_button,
++    nsMediaFeature::eMinMaxNotAllowed,
++    nsMediaFeature::eBoolInteger,
++    nsMediaFeature::eNoRequirements,
++    { &nsGkAtoms::gtk_csd_close_button },
++    GetSystemMetric
++  },
++
+   // Internal -moz-is-glyph media feature: applies only inside SVG glyphs.
+   // Internal because it is really only useful in the user agent anyway
+   //  and therefore not worth standardizing.
+diff -up firefox-58.0/toolkit/modules/moz.build.1399611 firefox-58.0/toolkit/modules/moz.build
+--- firefox-58.0/toolkit/modules/moz.build.1399611	2018-01-11 21:17:05.000000000 +0100
++++ firefox-58.0/toolkit/modules/moz.build	2018-01-24 10:57:03.718031950 +0100
+@@ -259,7 +259,7 @@ EXTRA_JS_MODULES.sessionstore += [
+ ]
+ 
+ DEFINES['INSTALL_COMPACT_THEMES'] = 1
+-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
++if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):
+     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
+ 
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+diff -up firefox-58.0/widget/gtk/mozgtk/mozgtk.c.1399611 firefox-58.0/widget/gtk/mozgtk/mozgtk.c
+--- firefox-58.0/widget/gtk/mozgtk/mozgtk.c.1399611	2018-01-11 21:17:06.000000000 +0100
++++ firefox-58.0/widget/gtk/mozgtk/mozgtk.c	2018-01-24 10:11:58.638648276 +0100
+@@ -391,6 +391,7 @@ STUB(gtk_separator_menu_item_new)
+ STUB(gtk_separator_tool_item_new)
+ STUB(gtk_settings_get_default)
+ STUB(gtk_settings_get_for_screen)
++STUB(gtk_show_uri)
+ STUB(gtk_socket_add_id)
+ STUB(gtk_socket_get_id)
+ STUB(gtk_socket_get_type)
+@@ -407,6 +408,7 @@ STUB(gtk_target_list_add_image_targets)
+ STUB(gtk_target_list_new)
+ STUB(gtk_target_list_unref)
+ STUB(gtk_targets_include_image)
++STUB(gtk_targets_include_text)
+ STUB(gtk_target_table_free)
+ STUB(gtk_target_table_new_from_list)
+ STUB(gtk_text_view_new)
+@@ -479,6 +481,7 @@ STUB(gtk_widget_show_all)
+ STUB(gtk_widget_size_allocate)
+ STUB(gtk_widget_style_get)
+ STUB(gtk_widget_unparent)
++STUB(gtk_widget_unrealize)
+ STUB(gtk_window_deiconify)
+ STUB(gtk_window_fullscreen)
+ STUB(gtk_window_get_group)
+@@ -582,6 +585,8 @@ STUB(gtk_style_context_set_state)
+ STUB(gtk_style_properties_lookup_property)
+ STUB(gtk_tree_view_column_get_button)
+ STUB(gtk_widget_get_preferred_size)
++STUB(gtk_widget_get_preferred_width)
++STUB(gtk_widget_get_preferred_height)
+ STUB(gtk_widget_get_state_flags)
+ STUB(gtk_widget_get_style_context)
+ STUB(gtk_widget_path_append_type)
+diff -up firefox-58.0/widget/gtk/nsLookAndFeel.cpp.1399611 firefox-58.0/widget/gtk/nsLookAndFeel.cpp
+--- firefox-58.0/widget/gtk/nsLookAndFeel.cpp.1399611	2018-01-11 21:17:06.000000000 +0100
++++ firefox-58.0/widget/gtk/nsLookAndFeel.cpp	2018-01-24 10:57:03.718031950 +0100
+@@ -24,6 +24,7 @@
+ #include "nsStyleConsts.h"
+ #include "gfxFontConstants.h"
+ #include "WidgetUtils.h"
++#include "nsWindow.h"
+ 
+ #include <dlfcn.h>
+ 
+@@ -740,7 +741,7 @@ GetSystemFontInfo(GtkStyleContext *aStyl
+     // Scale fonts up on HiDPI displays.
+     // This would be done automatically with cairo, but we manually manage
+     // the display scale for platform consistency.
+-    size *= ScreenHelperGTK::GetGTKMonitorScaleFactor();
++    size *= mozilla::widget::ScreenHelperGTK::GetGTKMonitorScaleFactor();
+ 
+     // |size| is now pixels
+ 
+@@ -1076,17 +1077,13 @@ nsLookAndFeel::EnsureInit()
+     gtk_widget_destroy(window);
+     g_object_unref(labelWidget);
+ 
+-    // Require GTK 3.20 for client-side decoration support.
+-    mCSDAvailable = gtk_check_version(3, 20, 0) == nullptr;
+-    if (mCSDAvailable) {
+-        mCSDAvailable =
+-            mozilla::Preferences::GetBool("widget.allow-client-side-decoration",
+-                                          false);
+-    }
++    // Require GTK 3.10 for GtkHeaderBar support and compatible window manager.
++    mCSDAvailable = (gtk_check_version(3, 10, 0) == nullptr &&
++        nsWindow::GetCSDSupportLevel() != nsWindow::CSD_SUPPORT_NONE);
+ 
+     // We need to initialize whole CSD config explicitly because it's queried
+     // as -moz-gtk* media features.
+-    mCSDCloseButton = false;
++    mCSDCloseButton = true;
+     mCSDMaximizeButton = false;
+     mCSDMinimizeButton = false;
+ 
+@@ -1095,18 +1092,24 @@ nsLookAndFeel::EnsureInit()
+           (const gchar* (*)(GtkWidget*))
+           dlsym(RTLD_DEFAULT, "gtk_header_bar_get_decoration_layout");
+ 
+-        GtkWidget* headerBar = GetWidget(MOZ_GTK_HEADER_BAR);
+-        const gchar* decorationLayout =
+-            sGtkHeaderBarGetDecorationLayoutPtr(headerBar);
+-        if (!decorationLayout) {
+-            g_object_get(settings, "gtk-decoration-layout", &decorationLayout,
+-                         nullptr);
+-        }
++        if (sGtkHeaderBarGetDecorationLayoutPtr) {
++            GtkWidget* headerBar = GetWidget(MOZ_GTK_HEADER_BAR);
++            const gchar* decorationLayout =
++                sGtkHeaderBarGetDecorationLayoutPtr(headerBar);
++            if (!decorationLayout) {
++                g_object_get(settings, "gtk-decoration-layout",
++                             &decorationLayout,
++                             nullptr);
++            }
+ 
+-        if (decorationLayout) {
+-            mCSDCloseButton = (strstr(decorationLayout, "close") != nullptr);
+-            mCSDMaximizeButton = (strstr(decorationLayout, "maximize") != nullptr);
+-            mCSDMinimizeButton = (strstr(decorationLayout, "minimize") != nullptr);
++            if (decorationLayout) {
++                mCSDCloseButton =
++                    (strstr(decorationLayout, "close") != nullptr);
++                mCSDMaximizeButton =
++                    (strstr(decorationLayout, "maximize") != nullptr);
++                mCSDMinimizeButton =
++                    (strstr(decorationLayout, "minimize") != nullptr);
++            }
+         }
+     }
+ }
+diff -up firefox-58.0/widget/gtk/nsNativeThemeGTK.cpp.1399611 firefox-58.0/widget/gtk/nsNativeThemeGTK.cpp
+--- firefox-58.0/widget/gtk/nsNativeThemeGTK.cpp.1399611	2018-01-11 21:17:06.000000000 +0100
++++ firefox-58.0/widget/gtk/nsNativeThemeGTK.cpp	2018-01-24 10:57:03.719031946 +0100
+@@ -29,6 +29,7 @@
+ 
+ #include <gdk/gdkprivate.h>
+ #include <gtk/gtk.h>
++#include <gtk/gtkx.h>
+ 
+ #include "gfxContext.h"
+ #include "gfxPlatformGtk.h"
+@@ -51,6 +52,7 @@
+ 
+ using namespace mozilla;
+ using namespace mozilla::gfx;
++using namespace mozilla::widget;
+ 
+ NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeGTK, nsNativeTheme, nsITheme,
+                                                              nsIObserver)
+@@ -1375,6 +1377,10 @@ nsNativeThemeGTK::GetWidgetPadding(nsDev
+   switch (aWidgetType) {
+     case NS_THEME_BUTTON_FOCUS:
+     case NS_THEME_TOOLBARBUTTON:
++    case NS_THEME_WINDOW_BUTTON_CLOSE:
++    case NS_THEME_WINDOW_BUTTON_MINIMIZE:
++    case NS_THEME_WINDOW_BUTTON_MAXIMIZE:
++    case NS_THEME_WINDOW_BUTTON_RESTORE:
+     case NS_THEME_DUALBUTTON:
+     case NS_THEME_TAB_SCROLL_ARROW_BACK:
+     case NS_THEME_TAB_SCROLL_ARROW_FORWARD:
+diff -up firefox-58.0/widget/gtk/nsWindow.cpp.1399611 firefox-58.0/widget/gtk/nsWindow.cpp
+--- firefox-58.0/widget/gtk/nsWindow.cpp.1399611	2018-01-24 10:57:03.714031963 +0100
++++ firefox-58.0/widget/gtk/nsWindow.cpp	2018-01-24 10:57:03.720031943 +0100
+@@ -178,13 +178,8 @@ static int    is_parent_ungrab_enter(Gdk
+ static int    is_parent_grab_leave(GdkEventCrossing *aEvent);
+ 
+ /* callbacks from widgets */
+-#if (MOZ_WIDGET_GTK == 2)
+-static gboolean expose_event_cb           (GtkWidget *widget,
+-                                           GdkEventExpose *event);
+-#else
+ static gboolean expose_event_cb           (GtkWidget *widget,
+                                            cairo_t *rect);
+-#endif
+ static gboolean configure_event_cb        (GtkWidget *widget,
+                                            GdkEventConfigure *event);
+ static void     container_unrealize_cb    (GtkWidget *widget);
+@@ -230,11 +225,9 @@ static void     screen_composited_change
+ static void     widget_composited_changed_cb     (GtkWidget* widget,
+                                                   gpointer user_data);
+ 
+-#if (MOZ_WIDGET_GTK == 3)
+ static void     scale_changed_cb          (GtkWidget* widget,
+                                            GParamSpec* aPSpec,
+                                            gpointer aPointer);
+-#endif
+ #if GTK_CHECK_VERSION(3,4,0)
+ static gboolean touch_event_cb            (GtkWidget* aWidget,
+                                            GdkEventTouch* aEvent);
+@@ -390,7 +383,7 @@ static guint gButtonState;
+ static inline int32_t
+ GetBitmapStride(int32_t width)
+ {
+-#if defined(MOZ_X11) || (MOZ_WIDGET_GTK == 2)
++#if defined(MOZ_X11)
+   return (width+7)/8;
+ #else
+   return cairo_format_stride_for_width(CAIRO_FORMAT_A1, width);
+@@ -458,11 +451,23 @@ nsWindow::nsWindow()
+     mXVisual  = nullptr;
+     mXDepth   = 0;
+ #endif /* MOZ_X11 */
++
+     if (!gGlobalsInitialized) {
+         gGlobalsInitialized = true;
+ 
+         // It's OK if either of these fail, but it may not be one day.
+         initialize_prefs();
++
++#ifdef MOZ_WAYLAND
++        // Wayland provides clipboard data to application on focus-in event
++        // so we need to init our clipboard hooks before we create window
++        // and get focus.
++        if (!mIsX11Display) {
++            nsCOMPtr<nsIClipboard> clipboard =
++                do_GetService("@mozilla.org/widget/clipboard;1");
++            NS_ASSERTION(clipboard, "Failed to init clipboard!");
++        }
++#endif
+     }
+ 
+     mLastMotionPressure = 0;
+@@ -1521,7 +1526,7 @@ nsWindow::UpdateClientOffset()
+ {
+     AUTO_PROFILER_LABEL("nsWindow::UpdateClientOffset", GRAPHICS);
+ 
+-    if (!mIsTopLevel || !mShell || !mGdkWindow || !mIsX11Display ||
++    if (!mIsTopLevel || !mShell || !mIsX11Display ||
+         gtk_window_get_window_type(GTK_WINDOW(mShell)) == GTK_WINDOW_POPUP) {
+         mClientOffset = nsIntPoint(0, 0);
+         return;
+@@ -1534,7 +1539,7 @@ nsWindow::UpdateClientOffset()
+     int length_returned;
+     long *frame_extents;
+ 
+-    if (!gdk_property_get(mGdkWindow,
++    if (!gdk_property_get(gtk_widget_get_window(mShell),
+                           gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE),
+                           cardinal_atom,
+                           0, // offset
+@@ -1710,16 +1715,22 @@ nsWindow::GetNativeData(uint32_t aDataTy
+ #ifdef MOZ_X11
+         GdkDisplay* gdkDisplay = gdk_display_get_default();
+         if (GDK_IS_X11_DISPLAY(gdkDisplay)) {
+-          return GDK_DISPLAY_XDISPLAY(gdkDisplay);
++            return GDK_DISPLAY_XDISPLAY(gdkDisplay);
+         }
+ #endif /* MOZ_X11 */
++        // Don't bother to return native display on Wayland as it's for
++        // X11 only NPAPI plugins.
+         return nullptr;
+     }
+     case NS_NATIVE_SHELLWIDGET:
+         return GetToplevelWidget();
+ 
+     case NS_NATIVE_SHAREABLE_WINDOW:
+-        return (void *) GDK_WINDOW_XID(gdk_window_get_toplevel(mGdkWindow));
++        if (mIsX11Display) {
++            return (void *) GDK_WINDOW_XID(gdk_window_get_toplevel(mGdkWindow));
++        }
++        NS_WARNING("nsWindow::GetNativeData(): NS_NATIVE_SHAREABLE_WINDOW is not handled on Wayland!");
++        return nullptr;
+     case NS_RAW_NATIVE_IME_CONTEXT: {
+         void* pseudoIMEContext = GetPseudoIMEContext();
+         if (pseudoIMEContext) {
+@@ -1800,18 +1811,18 @@ nsWindow::SetIcon(const nsAString& aIcon
+         // The last two entries (for the old XPM format) will be ignored unless
+         // no icons are found using other suffixes. XPM icons are deprecated.
+ 
+-        const char extensions[6][7] = { ".png", "16.png", "32.png", "48.png",
+-                                    ".xpm", "16.xpm" };
++        const char16_t extensions[9][8] = { u".png", u"16.png", u"32.png",
++                                            u"48.png", u"64.png", u"128.png",
++                                            u"256.png",
++                                            u".xpm", u"16.xpm" };
+ 
+         for (uint32_t i = 0; i < ArrayLength(extensions); i++) {
+             // Don't bother looking for XPM versions if we found a PNG.
+             if (i == ArrayLength(extensions) - 2 && foundIcon)
+                 break;
+ 
+-            nsAutoString extension;
+-            extension.AppendASCII(extensions[i]);
+-
+-            ResolveIconName(aIconSpec, extension, getter_AddRefs(iconFile));
++            ResolveIconName(aIconSpec, nsDependentString(extensions[i]),
++                            getter_AddRefs(iconFile));
+             if (iconFile) {
+                 iconFile->GetNativePath(path);
+                 GdkPixbuf *icon = gdk_pixbuf_new_from_file(path.get(), nullptr);
+@@ -2024,30 +2035,6 @@ gdk_window_flash(GdkWindow *    aGdkWind
+ #endif // DEBUG
+ #endif
+ 
+-#if (MOZ_WIDGET_GTK == 2)
+-static bool
+-ExtractExposeRegion(LayoutDeviceIntRegion& aRegion, GdkEventExpose* aEvent)
+-{
+-  GdkRectangle* rects;
+-  gint nrects;
+-  gdk_region_get_rectangles(aEvent->region, &rects, &nrects);
+-
+-  if (nrects > MAX_RECTS_IN_REGION) {
+-      // Just use the bounding box
+-      rects[0] = aEvent->area;
+-      nrects = 1;
+-  }
+-
+-  for (GdkRectangle* r = rects; r < rects + nrects; r++) {
+-      aRegion.Or(aRegion, LayoutDeviceIntRect(r->x, r->y, r->width, r->height));
+-      LOGDRAW(("\t%d %d %d %d\n", r->x, r->y, r->width, r->height));
+-  }
+-
+-  g_free(rects);
+-  return true;
+-}
+-
+-#else
+ # ifdef cairo_copy_clip_rectangle_list
+ #  error "Looks like we're including Mozilla's cairo instead of system cairo"
+ # endif
+@@ -2069,15 +2056,9 @@ ExtractExposeRegion(LayoutDeviceIntRegio
+   cairo_rectangle_list_destroy(rects);
+   return true;
+ }
+-#endif
+ 
+-#if (MOZ_WIDGET_GTK == 2)
+-gboolean
+-nsWindow::OnExposeEvent(GdkEventExpose *aEvent)
+-#else
+ gboolean
+ nsWindow::OnExposeEvent(cairo_t *cr)
+-#endif
+ {
+     // Send any pending resize events so that layout can update.
+     // May run event loop.
+@@ -2096,11 +2077,7 @@ nsWindow::OnExposeEvent(cairo_t *cr)
+         return FALSE;
+ 
+     LayoutDeviceIntRegion exposeRegion;
+-#if (MOZ_WIDGET_GTK == 2)
+-    if (!ExtractExposeRegion(exposeRegion, aEvent)) {
+-#else
+     if (!ExtractExposeRegion(exposeRegion, cr)) {
+-#endif
+         return FALSE;
+     }
+ 
+@@ -2141,7 +2118,7 @@ nsWindow::OnExposeEvent(cairo_t *cr)
+ 
+     LOGDRAW(("sending expose event [%p] %p 0x%lx (rects follow):\n",
+              (void *)this, (void *)mGdkWindow,
+-             gdk_x11_window_get_xid(mGdkWindow)));
++             mIsX11Display ? gdk_x11_window_get_xid(mGdkWindow) : 0));
+ 
+     // Our bounds may have changed after calling WillPaintWindow.  Clip
+     // to the new bounds here.  The region is relative to this
+@@ -2304,19 +2281,11 @@ nsWindow::OnExposeEvent(cairo_t *cr)
+     listener->DidPaintWindow();
+ 
+     // Synchronously flush any new dirty areas
+-#if (MOZ_WIDGET_GTK == 2)
+-    GdkRegion* dirtyArea = gdk_window_get_update_area(mGdkWindow);
+-#else
+     cairo_region_t* dirtyArea = gdk_window_get_update_area(mGdkWindow);
+-#endif
+ 
+     if (dirtyArea) {
+         gdk_window_invalidate_region(mGdkWindow, dirtyArea, false);
+-#if (MOZ_WIDGET_GTK == 2)
+-        gdk_region_destroy(dirtyArea);
+-#else
+         cairo_region_destroy(dirtyArea);
+-#endif
+         gdk_window_process_updates(mGdkWindow, false);
+     }
+ 
+@@ -2466,7 +2435,7 @@ nsWindow::OnSizeAllocate(GtkAllocation *
+     mBounds.SizeTo(size);
+ 
+ #ifdef MOZ_X11
+-    // Notify the X11CompositorWidget of a ClientSizeChange
++    // Notify the GtkCompositorWidget of a ClientSizeChange
+     if (mCompositorWidgetDelegate) {
+       mCompositorWidgetDelegate->NotifyClientSizeChanged(GetClientSize());
+     }
+@@ -3550,21 +3519,9 @@ CreateGdkWindow(GdkWindow *parent, GtkWi
+     attributes.visual = gtk_widget_get_visual(widget);
+     attributes.window_type = GDK_WINDOW_CHILD;
+ 
+-#if (MOZ_WIDGET_GTK == 2)
+-    attributes_mask |= GDK_WA_COLORMAP;
+-    attributes.colormap = gtk_widget_get_colormap(widget);
+-#endif
+-
+     GdkWindow *window = gdk_window_new(parent, &attributes, attributes_mask);
+     gdk_window_set_user_data(window, widget);
+ 
+-// GTK3 TODO?
+-#if (MOZ_WIDGET_GTK == 2)
+-    /* set the default pixmap to None so that you don't end up with the
+-       gtk default which is BlackPixel. */
+-    gdk_window_set_back_pixmap(window, nullptr, FALSE);
+-#endif
+-
+     return window;
+ }
+ 
+@@ -3653,10 +3610,14 @@ nsWindow::Create(nsIWidget* aParent,
+         // which will use a Window with the override-redirect attribute
+         // (for temporary windows).
+         // For long-lived windows, their stacking order is managed by the
+-        // window manager, as indicated by GTK_WINDOW_TOPLEVEL ...
+-        GtkWindowType type =
+-            mWindowType != eWindowType_popup || aInitData->mNoAutoHide ?
+-              GTK_WINDOW_TOPLEVEL : GTK_WINDOW_POPUP;
++        // window manager, as indicated by GTK_WINDOW_TOPLEVEL.
++        // For Wayland we have to always use GTK_WINDOW_POPUP to control
++        // popup window position.
++        GtkWindowType type = GTK_WINDOW_TOPLEVEL;
++        if (mWindowType == eWindowType_popup) {
++            type = (mIsX11Display && aInitData->mNoAutoHide) ?
++                GTK_WINDOW_TOPLEVEL : GTK_WINDOW_POPUP;
++        }
+         mShell = gtk_window_new(type);
+ 
+         bool useAlphaVisual = (mWindowType == eWindowType_popup &&
+@@ -3674,13 +3635,8 @@ nsWindow::Create(nsIWidget* aParent,
+         if (useAlphaVisual) {
+             GdkScreen *screen = gtk_widget_get_screen(mShell);
+             if (gdk_screen_is_composited(screen)) {
+-#if (MOZ_WIDGET_GTK == 2)
+-                GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
+-                gtk_widget_set_colormap(mShell, colormap);
+-#else
+                 GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
+                 gtk_widget_set_visual(mShell, visual);
+-#endif
+             }
+         }
+ 
+@@ -3728,9 +3684,11 @@ nsWindow::Create(nsIWidget* aParent,
+ #ifdef MOZ_X11
+                 // ... but when the window manager offers focus through
+                 // WM_TAKE_FOCUS, focus is requested on the parent window.
+-                gtk_widget_realize(mShell);
+-                gdk_window_add_filter(gtk_widget_get_window(mShell),
+-                                      popup_take_focus_filter, nullptr);
++                if (mIsX11Display) {
++                    gtk_widget_realize(mShell);
++                    gdk_window_add_filter(gtk_widget_get_window(mShell),
++                                          popup_take_focus_filter, nullptr);
++                }
+ #endif
+             }
+ 
+@@ -3742,7 +3700,11 @@ nsWindow::Create(nsIWidget* aParent,
+             else {
+                 switch (aInitData->mPopupHint) {
+                     case ePopupTypeMenu:
+-                        gtkTypeHint = GDK_WINDOW_TYPE_HINT_POPUP_MENU;
++                        // Use GDK_WINDOW_TYPE_HINT_UTILITY on Wayland which
++                        // guides Gtk to create the popup as subsurface
++                        // instead of xdg_shell popup (see Bug 1423598).
++                        gtkTypeHint = mIsX11Display ? GDK_WINDOW_TYPE_HINT_POPUP_MENU :
++                                                      GDK_WINDOW_TYPE_HINT_UTILITY;
+                         break;
+                     case ePopupTypeTooltip:
+                         gtkTypeHint = GDK_WINDOW_TYPE_HINT_TOOLTIP;
+@@ -3769,13 +3731,11 @@ nsWindow::Create(nsIWidget* aParent,
+             gtk_window_group_add_window(group, GTK_WINDOW(mShell));
+             g_object_unref(group);
+ 
+-            if (GetCSDSupportLevel() != CSD_SUPPORT_NONE) {
+-                int32_t isCSDAvailable = false;
+-                nsresult rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDAvailable,
+-                                                &isCSDAvailable);
+-                if (NS_SUCCEEDED(rv)) {
+-                   mIsCSDAvailable = isCSDAvailable;
+-                }
++            int32_t isCSDAvailable = false;
++            nsresult rv = LookAndFeel::GetInt(LookAndFeel::eIntID_GTKCSDAvailable,
++                                              &isCSDAvailable);
++            if (NS_SUCCEEDED(rv)) {
++               mIsCSDAvailable = isCSDAvailable;
+             }
+         }
+ 
+@@ -3783,7 +3743,6 @@ nsWindow::Create(nsIWidget* aParent,
+         GtkWidget *container = moz_container_new();
+         mContainer = MOZ_CONTAINER(container);
+ 
+-#if (MOZ_WIDGET_GTK == 3)
+         // "csd" style is set when widget is realized so we need to call
+         // it explicitly now.
+         gtk_widget_realize(mShell);
+@@ -3793,16 +3752,22 @@ nsWindow::Create(nsIWidget* aParent,
+          * 1) We're running on Gtk+ without client side decorations.
+          *    Content is rendered to mShell window and we listen
+          *    to the Gtk+ events on mShell
+-         * 2) We're running on Gtk+ > 3.20 and client side decorations
++         * 2) We're running on Gtk+ and client side decorations
+          *    are drawn by Gtk+ to mShell. Content is rendered to mContainer
+          *    and we listen to the Gtk+ events on mContainer.
++         * 3) We're running on Wayland. All gecko content is rendered
++         *    to mContainer and we listen to the Gtk+ events on mContainer.
+          */
+         GtkStyleContext* style = gtk_widget_get_style_context(mShell);
+-        drawToContainer = gtk_style_context_has_class(style, "csd");
+-#endif
++        drawToContainer =
++            !mIsX11Display ||
++            (mIsCSDAvailable && GetCSDSupportLevel() == CSD_SUPPORT_FLAT ) ||
++            gtk_style_context_has_class(style, "csd");
+         eventWidget = (drawToContainer) ? container : mShell;
+ 
+         gtk_widget_add_events(eventWidget, kEvents);
++        if (drawToContainer)
++            gtk_widget_add_events(mShell, GDK_PROPERTY_CHANGE_MASK);
+ 
+         // Prevent GtkWindow from painting a background to avoid flickering.
+         gtk_widget_set_app_paintable(eventWidget, TRUE);
+@@ -3839,19 +3804,11 @@ nsWindow::Create(nsIWidget* aParent,
+ 
+             // If the popup ignores mouse events, set an empty input shape.
+             if (aInitData->mMouseTransparent) {
+-#if (MOZ_WIDGET_GTK == 2)
+-              GdkRectangle rect = { 0, 0, 0, 0 };
+-              GdkRegion *region = gdk_region_rectangle(&rect);
+-
+-              gdk_window_input_shape_combine_region(mGdkWindow, region, 0, 0);
+-              gdk_region_destroy(region);
+-#else
+               cairo_rectangle_int_t rect = { 0, 0, 0, 0 };
+               cairo_region_t *region = cairo_region_create_rectangle(&rect);
+ 
+               gdk_window_input_shape_combine_region(mGdkWindow, region, 0, 0);
+               cairo_region_destroy(region);
+-#endif
+             }
+         }
+     }
+@@ -3893,6 +3850,12 @@ nsWindow::Create(nsIWidget* aParent,
+ 
+     // label the drawing window with this object so we can find our way home
+     g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", this);
++    if (drawToContainer) {
++        // Also label mShell toplevel window,
++        // property_notify_event_cb callback also needs to find its way home
++        g_object_set_data(G_OBJECT(gtk_widget_get_window(mShell)),
++                          "nsWindow", this);
++    }
+ 
+     if (mContainer)
+         g_object_set_data(G_OBJECT(mContainer), "nsWindow", this);
+@@ -3910,12 +3873,12 @@ nsWindow::Create(nsIWidget* aParent,
+                          G_CALLBACK(window_state_event_cb), nullptr);
+         g_signal_connect(mShell, "check-resize",
+                          G_CALLBACK(check_resize_cb), nullptr);
+-
+-        GdkScreen *screen = gtk_widget_get_screen(mShell);
+-
+         g_signal_connect(mShell, "composited-changed",
+                          G_CALLBACK(widget_composited_changed_cb), nullptr);
++        g_signal_connect(mShell, "property-notify-event",
++                         G_CALLBACK(property_notify_event_cb), nullptr);
+ 
++        GdkScreen *screen = gtk_widget_get_screen(mShell);
+         if (!g_signal_handler_find(screen, G_SIGNAL_MATCH_FUNC,
+                                    0, 0, nullptr,
+                                    FuncToGpointer(screen_composited_changed_cb), 0)) {
+@@ -3940,21 +3903,14 @@ nsWindow::Create(nsIWidget* aParent,
+                                G_CALLBACK(size_allocate_cb), nullptr);
+         g_signal_connect(mContainer, "hierarchy-changed",
+                          G_CALLBACK(hierarchy_changed_cb), nullptr);
+-#if (MOZ_WIDGET_GTK == 3)
+         g_signal_connect(mContainer, "notify::scale-factor",
+                          G_CALLBACK(scale_changed_cb), nullptr);
+-#endif
+         // Initialize mHasMappedToplevel.
+         hierarchy_changed_cb(GTK_WIDGET(mContainer), nullptr);
+         // Expose, focus, key, and drag events are sent even to GTK_NO_WINDOW
+         // widgets.
+-#if (MOZ_WIDGET_GTK == 2)
+-        g_signal_connect(mContainer, "expose_event",
+-                         G_CALLBACK(expose_event_cb), nullptr);
+-#else
+         g_signal_connect(G_OBJECT(mContainer), "draw",
+                          G_CALLBACK(expose_event_cb), nullptr);
+-#endif
+         g_signal_connect(mContainer, "focus_in_event",
+                          G_CALLBACK(focus_in_event_cb), nullptr);
+         g_signal_connect(mContainer, "focus_out_event",
+@@ -4006,10 +3962,6 @@ nsWindow::Create(nsIWidget* aParent,
+     }
+ 
+     if (eventWidget) {
+-#if (MOZ_WIDGET_GTK == 2)
+-        // Don't let GTK mess with the shapes of our GdkWindows
+-        GTK_PRIVATE_SET_FLAG(eventWidget, GTK_HAS_SHAPE_MASK);
+-#endif
+ 
+         // These events are sent to the owning widget of the relevant window
+         // and propagate up to the first widget that handles the events, so we
+@@ -4025,8 +3977,6 @@ nsWindow::Create(nsIWidget* aParent,
+                          G_CALLBACK(button_press_event_cb), nullptr);
+         g_signal_connect(eventWidget, "button-release-event",
+                          G_CALLBACK(button_release_event_cb), nullptr);
+-        g_signal_connect(eventWidget, "property-notify-event",
+-                         G_CALLBACK(property_notify_event_cb), nullptr);
+         g_signal_connect(eventWidget, "scroll-event",
+                          G_CALLBACK(scroll_event_cb), nullptr);
+ #if GTK_CHECK_VERSION(3,4,0)
+@@ -4039,7 +3989,7 @@ nsWindow::Create(nsIWidget* aParent,
+     if (mShell) {
+         LOG(("\tmShell %p mContainer %p mGdkWindow %p 0x%lx\n",
+              mShell, mContainer, mGdkWindow,
+-             gdk_x11_window_get_xid(mGdkWindow)));
++             mIsX11Display ? gdk_x11_window_get_xid(mGdkWindow) : 0));
+     } else if (mContainer) {
+         LOG(("\tmContainer %p mGdkWindow %p\n", mContainer, mGdkWindow));
+     }
+@@ -4063,8 +4013,12 @@ nsWindow::Create(nsIWidget* aParent,
+ 
+       mSurfaceProvider.Initialize(mXDisplay, mXWindow, mXVisual, mXDepth);
+     }
++#ifdef MOZ_WAYLAND
++    else if (!mIsX11Display) {
++      mSurfaceProvider.Initialize(this);
++    }
++#endif
+ #endif
+-
+     return NS_OK;
+ }
+ 
+@@ -4099,7 +4053,8 @@ nsWindow::SetWindowClass(const nsAString
+   res_name[0] = toupper(res_name[0]);
+   if (!role) role = res_name;
+ 
+-  gdk_window_set_role(mGdkWindow, role);
++  GdkWindow* gdkWindow = gtk_widget_get_window(mShell);
++  gdk_window_set_role(gdkWindow, role);
+ 
+ #ifdef MOZ_X11
+   if (mIsX11Display) {
+@@ -4115,7 +4070,7 @@ nsWindow::SetWindowClass(const nsAString
+       // a warning & refuses to make the change.
+       GdkDisplay *display = gdk_display_get_default();
+       XSetClassHint(GDK_DISPLAY_XDISPLAY(display),
+-                    gdk_x11_window_get_xid(mGdkWindow),
++                    gdk_x11_window_get_xid(gdkWindow),
+                     class_hint);
+       XFree(class_hint);
+   }
+@@ -4164,7 +4119,7 @@ nsWindow::NativeResize()
+     }
+ 
+ #ifdef MOZ_X11
+-    // Notify the X11CompositorWidget of a ClientSizeChange
++    // Notify the GtkCompositorWidget of a ClientSizeChange
+     // This is different than OnSizeAllocate to catch initial sizing
+     if (mCompositorWidgetDelegate) {
+       mCompositorWidgetDelegate->NotifyClientSizeChanged(GetClientSize());
+@@ -4220,7 +4175,7 @@ nsWindow::NativeMoveResize()
+     }
+ 
+ #ifdef MOZ_X11
+-    // Notify the X11CompositorWidget of a ClientSizeChange
++    // Notify the GtkCompositorWidget of a ClientSizeChange
+     // This is different than OnSizeAllocate to catch initial sizing
+     if (mCompositorWidgetDelegate) {
+       mCompositorWidgetDelegate->NotifyClientSizeChanged(GetClientSize());
+@@ -4529,17 +4484,6 @@ nsWindow::SetWindowClipRegion(const nsTA
+     if (!mGdkWindow)
+         return NS_OK;
+ 
+-#if (MOZ_WIDGET_GTK == 2)
+-    GdkRegion *region = gdk_region_new(); // aborts on OOM
+-    for (uint32_t i = 0; i < newRects->Length(); ++i) {
+-        const LayoutDeviceIntRect& r = newRects->ElementAt(i);
+-        GdkRectangle rect = { r.x, r.y, r.width, r.height };
+-        gdk_region_union_with_rect(region, &rect);
+-    }
+-
+-    gdk_window_shape_combine_region(mGdkWindow, region, 0, 0);
+-    gdk_region_destroy(region);
+-#else
+     cairo_region_t *region = cairo_region_create();
+     for (uint32_t i = 0; i < newRects->Length(); ++i) {
+         const LayoutDeviceIntRect& r = newRects->ElementAt(i);
+@@ -4549,7 +4493,6 @@ nsWindow::SetWindowClipRegion(const nsTA
+ 
+     gdk_window_shape_combine_region(mGdkWindow, region, 0, 0);
+     cairo_region_destroy(region);
+-#endif
+ 
+     return NS_OK;
+ }
+@@ -4658,17 +4601,6 @@ nsWindow::ApplyTransparencyBitmap()
+                       maskPixmap, ShapeSet);
+     XFreePixmap(xDisplay, maskPixmap);
+ #else
+-#if (MOZ_WIDGET_GTK == 2)
+-    gtk_widget_reset_shapes(mShell);
+-    GdkBitmap* maskBitmap = gdk_bitmap_create_from_data(mGdkWindow,
+-            mTransparencyBitmap,
+-            mTransparencyBitmapWidth, mTransparencyBitmapHeight);
+-    if (!maskBitmap)
+-        return;
+-
+-    gtk_widget_shape_combine_mask(mShell, maskBitmap, 0, 0);
+-    g_object_unref(maskBitmap);
+-#else
+     cairo_surface_t *maskBitmap;
+     maskBitmap = cairo_image_surface_create_for_data((unsigned char*)mTransparencyBitmap,
+                                                      CAIRO_FORMAT_A1,
+@@ -4682,7 +4614,6 @@ nsWindow::ApplyTransparencyBitmap()
+     gtk_widget_shape_combine_region(mShell, maskRegion);
+     cairo_region_destroy(maskRegion);
+     cairo_surface_destroy(maskBitmap);
+-#endif // MOZ_WIDGET_GTK == 2
+ #endif // MOZ_X11
+ }
+ 
+@@ -4779,6 +4710,12 @@ nsWindow::GrabPointer(guint32 aTime)
+     if (!mGdkWindow)
+         return;
+ 
++    if (!mIsX11Display) {
++        // Don't to the grab on Wayland as it causes a regression
++        // from Bug 1377084.
++        return;
++    }
++
+     gint retval;
+     retval = gdk_pointer_grab(mGdkWindow, TRUE,
+                               (GdkEventMask)(GDK_BUTTON_PRESS_MASK |
+@@ -4812,6 +4749,13 @@ nsWindow::ReleaseGrabs(void)
+     LOG(("ReleaseGrabs\n"));
+ 
+     mRetryPointerGrab = false;
++
++    if (!mIsX11Display) {
++        // Don't to the ungrab on Wayland as it causes a regression
++        // from Bug 1377084.
++        return;
++    }
++
+     gdk_pointer_ungrab(GDK_CURRENT_TIME);
+ }
+ 
+@@ -5058,7 +5002,7 @@ nsWindow::MakeFullScreen(bool aFullScree
+     LOG(("nsWindow::MakeFullScreen [%p] aFullScreen %d\n",
+          (void *)this, aFullScreen));
+ 
+-    if (!IsFullscreenSupported(mShell)) {
++    if (mIsX11Display && !IsFullscreenSupported(mShell)) {
+         return NS_ERROR_NOT_AVAILABLE;
+     }
+ 
+@@ -5080,7 +5024,7 @@ nsWindow::MakeFullScreen(bool aFullScree
+ }
+ 
+ void
+-nsWindow::HideWindowChrome(bool aShouldHide)
++nsWindow::SetWindowDecoration(nsBorderStyle aStyle)
+ {
+     if (!mShell) {
+         // Pass the request to the toplevel window
+@@ -5092,30 +5036,29 @@ nsWindow::HideWindowChrome(bool aShouldH
+         if (!topWindow)
+             return;
+ 
+-        topWindow->HideWindowChrome(aShouldHide);
++        topWindow->SetWindowDecoration(aStyle);
+         return;
+     }
+ 
++    // We can't use mGdkWindow directly here as it can be
++    // derived from mContainer which is not a top-level GdkWindow.
++    GdkWindow *window = gtk_widget_get_window(mShell);
++
+     // Sawfish, metacity, and presumably other window managers get
+     // confused if we change the window decorations while the window
+     // is visible.
+     bool wasVisible = false;
+-    if (gdk_window_is_visible(mGdkWindow)) {
+-        gdk_window_hide(mGdkWindow);
++    if (gdk_window_is_visible(window)) {
++        gdk_window_hide(window);
+         wasVisible = true;
+     }
+ 
+-    gint wmd;
+-    if (aShouldHide)
+-        wmd = 0;
+-    else
+-        wmd = ConvertBorderStyles(mBorderStyle);
+-
++    gint wmd = ConvertBorderStyles(aStyle);
+     if (wmd != -1)
+-      gdk_window_set_decorations(mGdkWindow, (GdkWMDecoration) wmd);
++      gdk_window_set_decorations(window, (GdkWMDecoration) wmd);
+ 
+     if (wasVisible)
+-        gdk_window_show(mGdkWindow);
++        gdk_window_show(window);
+ 
+     // For some window managers, adding or removing window decorations
+     // requires unmapping and remapping our toplevel window.  Go ahead
+@@ -5123,10 +5066,19 @@ nsWindow::HideWindowChrome(bool aShouldH
+     // error later when this happens (when the persistence timer fires
+     // and GetWindowPos is called)
+ #ifdef MOZ_X11
+-    XSync(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) , False);
+-#else
+-    gdk_flush ();
++    if (mIsX11Display) {
++        XSync(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) , False);
++    } else
+ #endif /* MOZ_X11 */
++    {
++        gdk_flush ();
++    }
++}
++
++void
++nsWindow::HideWindowChrome(bool aShouldHide)
++{
++    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
+ }
+ 
+ bool
+@@ -5237,12 +5189,8 @@ is_mouse_in_window (GdkWindow* aWindow,
+         window = gdk_window_get_parent(window);
+     }
+ 
+-#if (MOZ_WIDGET_GTK == 2)
+-    gdk_drawable_get_size(aWindow, &w, &h);
+-#else
+     w = gdk_window_get_width(aWindow);
+     h = gdk_window_get_height(aWindow);
+-#endif
+ 
+     if (aMouseX > x && aMouseX < x + w &&
+         aMouseY > y && aMouseY < y + h)
+@@ -5498,18 +5446,6 @@ get_gtk_cursor(nsCursor aCursor)
+ 
+ // gtk callbacks
+ 
+-#if (MOZ_WIDGET_GTK == 2)
+-static gboolean
+-expose_event_cb(GtkWidget *widget, GdkEventExpose *event)
+-{
+-    RefPtr<nsWindow> window = get_window_for_gdk_window(event->window);
+-    if (!window)
+-        return FALSE;
+-
+-    window->OnExposeEvent(event);
+-    return FALSE;
+-}
+-#else
+ void
+ draw_window_of_widget(GtkWidget *widget, GdkWindow *aWindow, cairo_t *cr)
+ {
+@@ -5561,7 +5497,6 @@ expose_event_cb(GtkWidget *widget, cairo
+ 
+     return FALSE;
+ }
+-#endif //MOZ_WIDGET_GTK == 2
+ 
+ static gboolean
+ configure_event_cb(GtkWidget *widget,
+@@ -5980,7 +5915,6 @@ widget_composited_changed_cb (GtkWidget*
+     window->OnCompositedChanged();
+ }
+ 
+-#if (MOZ_WIDGET_GTK == 3)
+ static void
+ scale_changed_cb (GtkWidget* widget, GParamSpec* aPSpec, gpointer aPointer)
+ {
+@@ -5996,7 +5930,6 @@ scale_changed_cb (GtkWidget* widget, GPa
+     gtk_widget_get_allocation(widget, &allocation);
+     window->OnSizeAllocate(&allocation);
+ }
+-#endif
+ 
+ #if GTK_CHECK_VERSION(3,4,0)
+ static gboolean
+@@ -6174,11 +6107,7 @@ get_inner_gdk_window (GdkWindow *aWindow
+          child = g_list_previous(child)) {
+         auto *childWindow = (GdkWindow *) child->data;
+         if (get_window_for_gdk_window(childWindow)) {
+-#if (MOZ_WIDGET_GTK == 2)
+-            gdk_window_get_geometry(childWindow, &cx, &cy, &cw, &ch, nullptr);
+-#else
+             gdk_window_get_geometry(childWindow, &cx, &cy, &cw, &ch);
+-#endif
+             if ((cx < x) && (x < (cx + cw)) &&
+                 (cy < y) && (y < (cy + ch)) &&
+                 gdk_window_is_visible(childWindow)) {
+@@ -6386,53 +6315,6 @@ nsWindow::GetEditCommands(NativeKeyBindi
+     keyBindings->GetEditCommands(aEvent, aCommands);
+ }
+ 
+-#if defined(MOZ_X11) && (MOZ_WIDGET_GTK == 2)
+-/* static */ already_AddRefed<DrawTarget>
+-nsWindow::GetDrawTargetForGdkDrawable(GdkDrawable* aDrawable,
+-                                      const IntSize& aSize)
+-{
+-    GdkVisual* visual = gdk_drawable_get_visual(aDrawable);
+-    Screen* xScreen =
+-        gdk_x11_screen_get_xscreen(gdk_drawable_get_screen(aDrawable));
+-    Display* xDisplay = DisplayOfScreen(xScreen);
+-    Drawable xDrawable = gdk_x11_drawable_get_xid(aDrawable);
+-
+-    RefPtr<gfxASurface> surface;
+-
+-    if (visual) {
+-        Visual* xVisual = gdk_x11_visual_get_xvisual(visual);
+-
+-        surface = new gfxXlibSurface(xDisplay, xDrawable, xVisual, aSize);
+-    } else {
+-        // no visual? we must be using an xrender format.  Find a format
+-        // for this depth.
+-        XRenderPictFormat *pf = nullptr;
+-        switch (gdk_drawable_get_depth(aDrawable)) {
+-            case 32:
+-                pf = XRenderFindStandardFormat(xDisplay, PictStandardARGB32);
+-                break;
+-            case 24:
+-                pf = XRenderFindStandardFormat(xDisplay, PictStandardRGB24);
+-                break;
+-            default:
+-                NS_ERROR("Don't know how to handle the given depth!");
+-                break;
+-        }
+-
+-        surface = new gfxXlibSurface(xScreen, xDrawable, pf, aSize);
+-    }
+-
+-    RefPtr<DrawTarget> dt =
+-        gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(surface, aSize);
+-
+-    if (!dt || !dt->IsValid()) {
+-        return nullptr;
+-    }
+-
+-    return dt.forget();
+-}
+-#endif
+-
+ already_AddRefed<DrawTarget>
+ nsWindow::StartRemoteDrawingInRegion(LayoutDeviceIntRegion& aInvalidRegion, BufferMode* aBufferMode)
+ {
+@@ -6649,9 +6531,66 @@ nsWindow::SetDrawsInTitlebar(bool aState
+       return;
+ 
+   if (mShell) {
+-      gint wmd = aState ? GDK_DECOR_BORDER : ConvertBorderStyles(mBorderStyle);
+-      gdk_window_set_decorations(gtk_widget_get_window(mShell),
+-                                 (GdkWMDecoration) wmd);
++      if (GetCSDSupportLevel() == CSD_SUPPORT_FULL) {
++          SetWindowDecoration(aState ? eBorderStyle_border : mBorderStyle);
++      }
++      else {
++          /* Window manager does not support GDK_DECOR_BORDER,
++           * emulate it by CSD.
++           *
++           * gtk_window_set_titlebar() works on unrealized widgets only,
++           * we need to handle mShell carefully here.
++           * When CSD is enabled mGdkWindow is owned by mContainer which is good
++           * as we can't delete our mGdkWindow. To make mShell unrealized while
++           * mContainer is preserved we temporary reparent mContainer to an
++           * invisible GtkWindow.
++           */
++          NativeShow(false);
++
++          // Using GTK_WINDOW_POPUP rather than
++          // GTK_WINDOW_TOPLEVEL in the hope that POPUP results in less
++          // initialization and window manager interaction.
++          GtkWidget* tmpWindow = gtk_window_new(GTK_WINDOW_POPUP);
++          gtk_widget_realize(tmpWindow);
++
++          gtk_widget_reparent(GTK_WIDGET(mContainer), tmpWindow);
++          gtk_widget_unrealize(GTK_WIDGET(mShell));
++
++          // Available as of GTK 3.10+
++          static auto sGtkWindowSetTitlebar = (void (*)(GtkWindow*, GtkWidget*))
++              dlsym(RTLD_DEFAULT, "gtk_window_set_titlebar");
++          MOZ_ASSERT(sGtkWindowSetTitlebar,
++              "Missing gtk_window_set_titlebar(), old Gtk+ library?");
++
++          if (aState) {
++              // Add a hidden titlebar widget to trigger CSD, but disable the default
++              // titlebar.  GtkFixed is a somewhat random choice for a simple unused
++              // widget. gtk_window_set_titlebar() takes ownership of the titlebar
++              // widget.
++              sGtkWindowSetTitlebar(GTK_WINDOW(mShell), gtk_fixed_new());
++          } else {
++              sGtkWindowSetTitlebar(GTK_WINDOW(mShell), nullptr);
++          }
++
++          /* A workaround for https://bugzilla.gnome.org/show_bug.cgi?id=791081
++           * gtk_widget_realize() throws:
++           * "In pixman_region32_init_rect: Invalid rectangle passed"
++           * when mShell has default 1x1 size.
++           */
++          GtkAllocation allocation = {0, 0, 0, 0};
++          gtk_widget_get_preferred_width(GTK_WIDGET(mShell), nullptr,
++                                         &allocation.width);
++          gtk_widget_get_preferred_height(GTK_WIDGET(mShell), nullptr,
++                                          &allocation.height);
++          gtk_widget_size_allocate(GTK_WIDGET(mShell), &allocation);
++
++          gtk_widget_realize(GTK_WIDGET(mShell));
++          gtk_widget_reparent(GTK_WIDGET(mContainer), GTK_WIDGET(mShell));
++          mNeedsShow = true;
++          NativeResize();
++
++          gtk_widget_destroy(tmpWindow);
++      }
+   }
+ 
+   mIsCSDEnabled = aState;
+@@ -6762,11 +6701,9 @@ nsWindow::SynthesizeNativeMouseEvent(Lay
+     event.button.window = mGdkWindow;
+     event.button.time = GDK_CURRENT_TIME;
+ 
+-#if (MOZ_WIDGET_GTK == 3)
+     // Get device for event source
+     GdkDeviceManager *device_manager = gdk_display_get_device_manager(display);
+     event.button.device = gdk_device_manager_get_client_pointer(device_manager);
+-#endif
+ 
+     event.button.x_root = DevicePixelsToGdkCoordRoundDown(aPoint.x);
+     event.button.y_root = DevicePixelsToGdkCoordRoundDown(aPoint.y);
+@@ -6809,12 +6746,10 @@ nsWindow::SynthesizeNativeMouseScrollEve
+   event.type = GDK_SCROLL;
+   event.scroll.window = mGdkWindow;
+   event.scroll.time = GDK_CURRENT_TIME;
+-#if (MOZ_WIDGET_GTK == 3)
+   // Get device for event source
+   GdkDisplay* display = gdk_window_get_display(mGdkWindow);
+   GdkDeviceManager *device_manager = gdk_display_get_device_manager(display);
+   event.scroll.device = gdk_device_manager_get_client_pointer(device_manager);
+-#endif
+   event.scroll.x_root = DevicePixelsToGdkCoordRoundDown(aPoint.x);
+   event.scroll.y_root = DevicePixelsToGdkCoordRoundDown(aPoint.y);
+ 
+@@ -6938,27 +6873,54 @@ nsWindow::GetCSDSupportLevel() {
+     if (sCSDSupportLevel != CSD_SUPPORT_UNKNOWN) {
+         return sCSDSupportLevel;
+     }
+-    // TODO: MATE
++
+     const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
+     if (currentDesktop) {
+-        if (strcmp(currentDesktop, "GNOME") == 0) {
+-            sCSDSupportLevel = CSD_SUPPORT_FULL;
+-        } else if (strcmp(currentDesktop, "XFCE") == 0) {
++        if (strstr(currentDesktop, "GNOME") != nullptr) {
+             sCSDSupportLevel = CSD_SUPPORT_FULL;
+-        } else if (strcmp(currentDesktop, "X-Cinnamon") == 0) {
++        } else if (strstr(currentDesktop, "XFCE") != nullptr) {
++            sCSDSupportLevel = CSD_SUPPORT_FLAT;
++        } else if (strstr(currentDesktop, "X-Cinnamon") != nullptr) {
+             sCSDSupportLevel = CSD_SUPPORT_FULL;
+-        } else if (strcmp(currentDesktop, "KDE") == 0) {
++        } else if (strstr(currentDesktop, "KDE") != nullptr) {
+             sCSDSupportLevel = CSD_SUPPORT_FLAT;
+-        } else if (strcmp(currentDesktop, "LXDE") == 0) {
++        } else if (strstr(currentDesktop, "LXDE") != nullptr) {
+             sCSDSupportLevel = CSD_SUPPORT_FLAT;
+-        } else if (strcmp(currentDesktop, "openbox") == 0) {
++        } else if (strstr(currentDesktop, "openbox") != nullptr) {
+             sCSDSupportLevel = CSD_SUPPORT_FLAT;
+-        } else if (strcmp(currentDesktop, "i3") == 0) {
++        } else if (strstr(currentDesktop, "i3") != nullptr) {
+             sCSDSupportLevel = CSD_SUPPORT_NONE;
++        } else if (strstr(currentDesktop, "MATE") != nullptr) {
++            sCSDSupportLevel = CSD_SUPPORT_FLAT;
++        } else if (strstr(currentDesktop, "Unity") != nullptr) {
++            sCSDSupportLevel = CSD_SUPPORT_FLAT;
++        } else if (strstr(currentDesktop, "Pantheon") != nullptr) {
++            sCSDSupportLevel = CSD_SUPPORT_FULL;
+         } else {
++            sCSDSupportLevel = CSD_SUPPORT_FLAT;
++        }
++    } else {
++        sCSDSupportLevel = CSD_SUPPORT_NONE;
++    }
++
++    // We don't support CSD_SUPPORT_FULL on Wayland
++    if (!GDK_IS_X11_DISPLAY(gdk_display_get_default()) &&
++        sCSDSupportLevel == CSD_SUPPORT_FULL) {
++        sCSDSupportLevel = CSD_SUPPORT_FLAT;
++    }
++
++    // Allow MOZ_GTK_TITLEBAR_DECORATION to override our heuristics
++    const char* decorationOverride = getenv("MOZ_GTK_TITLEBAR_DECORATION");
++    if (decorationOverride) {
++        if (strcmp(decorationOverride, "none") == 0) {
+             sCSDSupportLevel = CSD_SUPPORT_NONE;
++        } else if (strcmp(decorationOverride, "client") == 0) {
++            sCSDSupportLevel = CSD_SUPPORT_FLAT;
++        } else if (strcmp(decorationOverride, "system") == 0) {
++            sCSDSupportLevel = CSD_SUPPORT_FULL;
+         }
+     }
++
+     return sCSDSupportLevel;
+ }
+ 
+@@ -6991,3 +6953,24 @@ nsWindow::IsComposited() const
+          (gdk_window_get_visual(mGdkWindow)
+             == gdk_screen_get_rgba_visual(gdkScreen));
+ }
++
++#ifdef MOZ_WAYLAND
++wl_display*
++nsWindow::GetWaylandDisplay()
++{
++  // Available as of GTK 3.8+
++  static auto sGdkWaylandDisplayGetWlDisplay =
++      (wl_display *(*)(GdkDisplay *))
++      dlsym(RTLD_DEFAULT, "gdk_wayland_display_get_wl_display");
++
++  GdkDisplay* gdkDisplay = gdk_display_get_default();
++  return mIsX11Display ? nullptr :
++                         sGdkWaylandDisplayGetWlDisplay(gdkDisplay);
++}
++
++wl_surface*
++nsWindow::GetWaylandSurface()
++{
++  return moz_container_get_wl_surface(MOZ_CONTAINER(mContainer));
++}
++#endif
+diff -up firefox-58.0/widget/gtk/nsWindow.h.1399611 firefox-58.0/widget/gtk/nsWindow.h
+--- firefox-58.0/widget/gtk/nsWindow.h.1399611	2018-01-11 21:17:06.000000000 +0100
++++ firefox-58.0/widget/gtk/nsWindow.h	2018-01-24 10:57:03.720031943 +0100
+@@ -23,7 +23,11 @@
+ 
+ #ifdef MOZ_X11
+ #include <gdk/gdkx.h>
++#include "X11UndefineNone.h"
+ #endif /* MOZ_X11 */
++#ifdef MOZ_WAYLAND
++#include <gdk/gdkwayland.h>
++#endif
+ 
+ #include "mozilla/widget/WindowSurface.h"
+ #include "mozilla/widget/WindowSurfaceProvider.h"
+@@ -172,11 +176,7 @@ public:
+     GdkRectangle DevicePixelsToGdkRectRoundOut(LayoutDeviceIntRect aRect);
+ 
+     // event callbacks
+-#if (MOZ_WIDGET_GTK == 2)
+-    gboolean           OnExposeEvent(GdkEventExpose *aEvent);
+-#else
+     gboolean           OnExposeEvent(cairo_t *cr);
+-#endif
+     gboolean           OnConfigureEvent(GtkWidget *aWidget,
+                                         GdkEventConfigure *aEvent);
+     void               OnContainerUnrealize();
+@@ -315,10 +315,6 @@ public:
+    nsresult            UpdateTranslucentWindowAlphaInternal(const nsIntRect& aRect,
+                                                             uint8_t* aAlphas, int32_t aStride);
+ 
+-#if (MOZ_WIDGET_GTK == 2)
+-    static already_AddRefed<DrawTarget> GetDrawTargetForGdkDrawable(GdkDrawable* aDrawable,
+-                                                                    const mozilla::gfx::IntSize& aSize);
+-#endif
+     virtual void       ReparentNativeWidget(nsIWidget* aNewParent) override;
+ 
+     virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
+@@ -348,9 +344,14 @@ public:
+                                                 nsIObserver* aObserver) override;
+ #endif
+ 
++
+ #ifdef MOZ_X11
+     Display* XDisplay() { return mXDisplay; }
+ #endif
++#ifdef MOZ_WAYLAND
++    wl_display* GetWaylandDisplay();
++    wl_surface* GetWaylandSurface();
++#endif
+     virtual void GetCompositorWidgetInitData(mozilla::widget::CompositorWidgetInitData* aInitData) override;
+ 
+     virtual nsresult SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
+@@ -374,6 +375,18 @@ public:
+     virtual bool WidgetTypeSupportsAcceleration() override;
+ 
+     bool DoDrawTitlebar() const;
++
++    typedef enum { CSD_SUPPORT_FULL,    // CSD including shadows
++                   CSD_SUPPORT_FLAT,    // CSD without shadows
++                   CSD_SUPPORT_NONE,    // WM does not support CSD at all
++                   CSD_SUPPORT_UNKNOWN
++    } CSDSupportLevel;
++    /**
++     * Get the support of Client Side Decoration by checking
++     * the XDG_CURRENT_DESKTOP environment variable.
++     */
++    static CSDSupportLevel GetCSDSupportLevel();
++
+ protected:
+     virtual ~nsWindow();
+ 
+@@ -423,6 +436,7 @@ private:
+     nsWindow          *GetContainerWindow();
+     void               SetUrgencyHint(GtkWidget *top_window, bool state);
+     void               SetDefaultIcon(void);
++    void               SetWindowDecoration(nsBorderStyle aStyle);
+     void               InitButtonEvent(mozilla::WidgetMouseEvent& aEvent,
+                                        GdkEventButton* aGdkEvent);
+     bool               DispatchCommandEvent(nsAtom* aCommand);
+@@ -441,7 +455,6 @@ private:
+     nsIWidgetListener* GetListener();
+     bool               IsComposited() const;
+ 
+-
+     GtkWidget          *mShell;
+     MozContainer       *mContainer;
+     GdkWindow          *mGdkWindow;
+@@ -578,16 +591,6 @@ private:
+     RefPtr<mozilla::widget::IMContextWrapper> mIMContext;
+ 
+     mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
+-    typedef enum { CSD_SUPPORT_FULL,    // CSD including shadows
+-                   CSD_SUPPORT_FLAT,    // CSD without shadows
+-                   CSD_SUPPORT_NONE,    // WM does not support CSD at all
+-                   CSD_SUPPORT_UNKNOWN
+-    } CSDSupportLevel;
+-    /**
+-     * Get the support of Client Side Decoration by checking
+-     * the XDG_CURRENT_DESKTOP environment variable.
+-     */
+-    static CSDSupportLevel GetCSDSupportLevel();
+     static CSDSupportLevel sCSDSupportLevel;
+ };
+ 
diff --git a/mozilla-kde.patch b/mozilla-kde.patch
index 771fd0b..4421f4b 100644
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  2504512f9a9ba7b52dd99745d15f049f2a03f4f4
+# Parent  5be2231eadfb6de978e93c0ba95469e8a4d54cb0
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -9,32 +9,32 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
-@@ -37,16 +37,17 @@
- #include "nsIZipReader.h"
- #include "nsPrefBranch.h"
- #include "nsString.h"
- #include "nsCRT.h"
- #include "nsCOMArray.h"
+@@ -75,16 +75,17 @@
  #include "nsXPCOMCID.h"
- #include "nsAutoPtr.h"
- #include "nsPrintfCString.h"
+ #include "nsXPCOM.h"
+ #include "nsXULAppAPI.h"
+ #include "nsZipArchive.h"
+ #include "plbase64.h"
+ #include "PLDHashTable.h"
+ #include "plstr.h"
+ #include "prlink.h"
 +#include "nsKDEUtils.h"
  
- #include "nsQuickSort.h"
- #include "PLDHashTable.h"
+ #ifdef MOZ_CRASHREPORTER
+ #include "nsICrashReporter.h"
+ #endif
  
- #include "prefapi.h"
- #include "prefread.h"
- #include "prefapi_private_data.h"
- 
-@@ -1413,16 +1414,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
- 
- static nsresult pref_LoadPrefsInDirList(const char *listId)
+ #ifdef XP_WIN
+ #include "windows.h"
+ #endif
+@@ -4324,16 +4325,34 @@ pref_LoadPrefsInDirList(const char* aLis
  {
    nsresult rv;
-   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
-   if (NS_FAILED(rv))
+   nsCOMPtr<nsIProperties> dirSvc(
+     do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
+   if (NS_FAILED(rv)) {
      return rv;
+   }
  
 +  // make sure we load these special files after all the others
 +  static const char* specialFiles[] = {
@@ -55,34 +55,34 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 +  }
 +
    nsCOMPtr<nsISimpleEnumerator> list;
-   dirSvc->Get(listId,
-               NS_GET_IID(nsISimpleEnumerator),
-               getter_AddRefs(list));
-   if (!list)
+   dirSvc->Get(aListId, NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(list));
+   if (!list) {
      return NS_OK;
+   }
  
    bool hasMore;
-@@ -1438,17 +1457,17 @@ static nsresult pref_LoadPrefsInDirList(
+   while (NS_SUCCEEDED(list->HasMoreElements(&hasMore)) && hasMore) {
+@@ -4344,17 +4363,17 @@ pref_LoadPrefsInDirList(const char* aLis
+     }
  
-     nsAutoCString leaf;
-     path->GetNativeLeafName(leaf);
+     nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
+     if (!path) {
+       continue;
+     }
  
      // Do we care if a file provided by this process fails to load?
-     if (Substring(leaf, leaf.Length() - 4).EqualsLiteral(".xpi"))
-       ReadExtensionPrefs(path);
-     else
--      pref_LoadPrefsInDir(path, nullptr, 0);
-+      pref_LoadPrefsInDir(path, specialFiles, MOZ_ARRAY_LENGTH(specialFiles));
+-    pref_LoadPrefsInDir(path, nullptr, 0);
++    pref_LoadPrefsInDir(path, specialFiles, ArrayLength(specialFiles));
    }
+ 
    return NS_OK;
  }
  
- static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
+ static nsresult
+ pref_ReadPrefFromJar(nsZipArchive* aJarReader, const char* aName)
  {
-   nsCString manifest;
-   MOZ_TRY_VAR(manifest, URLPreloader::ReadZip(jarReader, nsDependentCString(name)));
-@@ -1544,24 +1563,36 @@ pref_InitInitialObjects()
-   /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
+@@ -4461,25 +4480,37 @@ pref_InitInitialObjects()
+   // application pref files for backwards compatibility.
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
      "macprefs.js"
@@ -92,7 +92,8 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
      "unix.js"
 +    , "" // placeholder for KDE  (empty is otherwise harmless)
  #if defined(_AIX)
-     , "aix.js"
+     ,
+     "aix.js"
  #endif
  #elif defined(XP_BEOS)
      "beos.js"
@@ -110,24 +111,24 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 +    }
 +  }
 +
-   rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles));
-   if (NS_FAILED(rv))
+   rv = pref_LoadPrefsInDir(
+     defaultPrefDir, specialFiles, ArrayLength(specialFiles));
+   if (NS_FAILED(rv)) {
      NS_WARNING("Error parsing application default preferences.");
+   }
  
    // Load jar:$app/omni.jar!/defaults/preferences/*.js
    // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-   RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
-   // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -31,16 +31,20 @@ EXPORTS.mozilla += [
+@@ -27,16 +27,20 @@ XPIDL_MODULE = 'pref'
+ EXPORTS.mozilla += [
+     'Preferences.h',
+ ]
+ 
  UNIFIED_SOURCES += [
-     'nsPrefBranch.cpp',
-     'nsPrefsFactory.cpp',
-     'prefapi.cpp',
      'Preferences.cpp',
-     'prefread.cpp',
  ]
  
 +LOCAL_INCLUDES += [
@@ -187,24 +188,20 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
-@@ -37,16 +37,17 @@ UNIFIED_SOURCES += [
+@@ -17,9 +17,13 @@ XPIDL_SOURCES += [
+ XPIDL_MODULE = 'downloads'
+ 
+ UNIFIED_SOURCES += [
      'nsDownloadManager.cpp'
  ]
  
  FINAL_LIBRARY = 'xul'
  
- LOCAL_INCLUDES += [
-     '../protobuf',
-     '/ipc/chromium/src',
-+    '/toolkit/xre',
-     'chromium'
- ]
- 
- DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
- DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
- 
++LOCAL_INCLUDES += [
++    '/toolkit/xre'
++]
++
  CXXFLAGS += CONFIG['TK_CFLAGS']
- 
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
@@ -246,7 +243,7 @@ diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/di
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,455 @@
+@@ -0,0 +1,459 @@
 +<?xml version="1.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
@@ -434,8 +431,12 @@ new file mode 100644
 +                       focusedElt.getAttribute("noinitialfocus") == "true") {
 +                  document.commandDispatcher.advanceFocusIntoSubtree(focusedElt);
 +                  focusedElt = document.commandDispatcher.focusedElement;
-+                  if (focusedElt == initialFocusedElt)
++                  if (focusedElt == initialFocusedElt) {
++                    if (focusedElt.getAttribute("noinitialfocus") == "true") {
++                      focusedElt.blur();
++                    }
 +                    break;
++                  }
 +                }
 +
 +                if (initialFocusedElt.localName == "tab") {
@@ -2119,7 +2120,7 @@ new file mode 100644
 diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
 --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
 +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
-@@ -628,17 +628,17 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -626,17 +626,17 @@ nsUnknownContentTypeDialog.prototype = {
        else
          typeString = mimeInfo.MIMEType;
      }
@@ -2138,7 +2139,7 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
    },
  
    // Returns true if opening the default application makes sense.
-@@ -802,17 +802,17 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -800,17 +800,17 @@ nsUnknownContentTypeDialog.prototype = {
        switch (this.dialogElement("openHandler").selectedIndex) {
        case 0:
          // No app need be specified in this case.
@@ -2157,7 +2158,7 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
      this.mDialog.document.documentElement.getButton("accept").disabled = !ok;
    },
  
-@@ -1067,30 +1067,57 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1065,30 +1065,57 @@ nsUnknownContentTypeDialog.prototype = {
  
        if (params.handlerApp &&
            params.handlerApp.executable &&
@@ -2548,7 +2549,7 @@ new file mode 100644
 +        if ( !rstr ) return false;
 +
 +        rstr->SetData( out[i] );
-+        result->AppendElement( rstr, false );
++        result->AppendElement( rstr );
 +        }
 +
 +    NS_ADDREF( *output = result);
@@ -2770,11 +2771,11 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
          'android/nsExternalSharingAppService.cpp',
          'android/nsExternalURLHandlerService.cpp',
          'android/nsMIMEInfoAndroid.cpp',
-@@ -125,16 +127,17 @@ include('/ipc/chromium/chromium-config.m
- 
+@@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
  FINAL_LIBRARY = 'xul'
  
  LOCAL_INCLUDES += [
+     '/docshell/base',
      '/dom/base',
      '/dom/ipc',
      '/netwerk/base',
@@ -3109,11 +3110,11 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
 diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
-@@ -10,17 +10,17 @@
- #if defined(MOZ_ENABLE_CONTENTACTION)
- #include <contentaction/contentaction.h>
- #include <QString>
- #endif
+@@ -5,17 +5,17 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
  
  #include "nsOSHelperAppService.h"
  #include "nsMIMEInfoUnix.h"
@@ -3128,20 +3129,29 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #include "nsIURL.h"
  #include "nsIFileStreams.h"
  #include "nsILineInputStream.h"
-@@ -1142,26 +1142,26 @@ nsresult nsOSHelperAppService::OSProtoco
-     ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
+@@ -1128,17 +1128,17 @@ nsOSHelperAppService::GetHandlerAndDescr
  
-   if (action.isValid())
-     *aHandlerExists = true;
- #endif
+ nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolScheme, bool * aHandlerExists)
+ {
+   nsresult rv = NS_OK;
  
+   if (!XRE_IsContentProcess()) {
  #ifdef MOZ_WIDGET_GTK
-   // Check the GNOME registry for a protocol handler
--  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
-+  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
+     // Check the GNOME registry for a protocol handler
+-    *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
++    *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
+ #else
+     *aHandlerExists = false;
  #endif
+   } else {
+     *aHandlerExists = false;
+     nsCOMPtr<nsIHandlerService> handlerSvc = do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
+     if (NS_SUCCEEDED(rv) && handlerSvc) {
+       rv = handlerSvc->ExistsForProtocol(nsCString(aProtocolScheme), aHandlerExists);
+@@ -1146,17 +1146,17 @@ nsresult nsOSHelperAppService::OSProtoco
+   }
  
-   return NS_OK;
+   return rv;
  }
  
  NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)
@@ -3157,7 +3167,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  
  nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
  {
-@@ -1248,17 +1248,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1243,17 +1243,17 @@ nsOSHelperAppService::GetFromExtension(c
                                           mime_types_description,
                                           true);
  
@@ -3176,7 +3186,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  
      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                    majorType,
-@@ -1369,17 +1369,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1364,17 +1364,17 @@ nsOSHelperAppService::GetFromType(const 
    nsAutoString extensions, mime_types_description;
    LookUpExtensionsAndDescription(majorType,
                                   minorType,
diff --git a/mozilla-rust-1.23.patch b/mozilla-rust-1.23.patch
deleted file mode 100644
index 7cafa9b..0000000
--- a/mozilla-rust-1.23.patch
+++ /dev/null
@@ -1,1083 +0,0 @@
-
-# HG changeset patch
-# User Simon Sapin <simon.sapin@exyr.org>
-# Date 1510231769 21600
-# Node ID 3242ac6fdb3879f723145e6b07fff04a5c960d1e
-# Parent  bf63b9d8f2410464d5f2526588e380f934e937cc
-servo: Merge #19162 - Allow unused imports for AsciiExt in style code (from emilio:ascii-ext); r=emilio
-
-See #19128, this part is cherry-picked so Gecko can build with rust nightly.
-
-Source-Repo: https://github.com/servo/servo
-Source-Revision: e7a654dd13f589e127193267bcb576ffd661c11d
-
-diff --git a/servo/components/gfx/font.rs b/servo/components/gfx/font.rs
---- a/servo/components/gfx/font.rs
-+++ b/servo/components/gfx/font.rs
-@@ -5,17 +5,17 @@
- use app_units::Au;
- use euclid::{Point2D, Rect, Size2D};
- use font_template::FontTemplateDescriptor;
- use ordered_float::NotNaN;
- use platform::font::{FontHandle, FontTable};
- use platform::font_context::FontContextHandle;
- use platform::font_template::FontTemplateData;
- use smallvec::SmallVec;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::ToOwned;
- use std::cell::RefCell;
- use std::collections::HashMap;
- use std::rc::Rc;
- use std::str;
- use std::sync::Arc;
- use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering};
- use style::computed_values::{font_stretch, font_variant_caps, font_weight};
-diff --git a/servo/components/net/fetch/cors_cache.rs b/servo/components/net/fetch/cors_cache.rs
---- a/servo/components/net/fetch/cors_cache.rs
-+++ b/servo/components/net/fetch/cors_cache.rs
-@@ -7,17 +7,17 @@
- //! For stuff involving `<img>`, `<iframe>`, `<form>`, etc please check what
- //! the request mode should be and compare with the fetch spec
- //! This library will eventually become the core of the Fetch crate
- //! with CORSRequest being expanded into FetchRequest (etc)
- 
- use hyper::method::Method;
- use net_traits::request::{CredentialsMode, Origin, Request};
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use time::{self, Timespec};
- 
- /// Union type for CORS cache entries
- ///
- /// Each entry might pertain to a header or method
- #[derive(Clone, Debug)]
- pub enum HeaderOrMethod {
-     HeaderData(String),
-diff --git a/servo/components/net/fetch/methods.rs b/servo/components/net/fetch/methods.rs
---- a/servo/components/net/fetch/methods.rs
-+++ b/servo/components/net/fetch/methods.rs
-@@ -16,17 +16,17 @@ use hyper::method::Method;
- use hyper::mime::{Mime, SubLevel, TopLevel};
- use hyper::status::StatusCode;
- use mime_guess::guess_mime_type;
- use net_traits::{FetchTaskTarget, NetworkError, ReferrerPolicy};
- use net_traits::request::{CredentialsMode, Referrer, Request, RequestMode, ResponseTainting};
- use net_traits::request::{Type, Origin, Window};
- use net_traits::response::{Response, ResponseBody, ResponseType};
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::Cow;
- use std::fmt;
- use std::fs::File;
- use std::io::Read;
- use std::mem;
- use std::str;
- use std::sync::Arc;
- use std::sync::mpsc::{Sender, Receiver};
-diff --git a/servo/components/net/http_loader.rs b/servo/components/net/http_loader.rs
---- a/servo/components/net/http_loader.rs
-+++ b/servo/components/net/http_loader.rs
-@@ -34,17 +34,17 @@ use log;
- use msg::constellation_msg::PipelineId;
- use net_traits::{CookieSource, FetchMetadata, NetworkError, ReferrerPolicy};
- use net_traits::request::{CacheMode, CredentialsMode, Destination, Origin};
- use net_traits::request::{RedirectMode, Referrer, Request, RequestMode};
- use net_traits::request::{ResponseTainting, ServiceWorkersMode, Type};
- use net_traits::response::{HttpsState, Response, ResponseBody, ResponseType};
- use resource_thread::AuthCache;
- use servo_url::{ImmutableOrigin, ServoUrl};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::collections::HashSet;
- use std::error::Error;
- use std::io::{self, Read, Write};
- use std::iter::FromIterator;
- use std::mem;
- use std::ops::Deref;
- use std::sync::RwLock;
- use std::sync::mpsc::{channel, Sender};
-diff --git a/servo/components/net/websocket_loader.rs b/servo/components/net/websocket_loader.rs
---- a/servo/components/net/websocket_loader.rs
-+++ b/servo/components/net/websocket_loader.rs
-@@ -14,17 +14,17 @@ use hyper::http::h1::{LINE_ENDING, parse
- use hyper::method::Method;
- use hyper::net::HttpStream;
- use hyper::status::StatusCode;
- use hyper::version::HttpVersion;
- use net_traits::{CookieSource, MessageData, NetworkError, WebSocketCommunicate, WebSocketConnectData};
- use net_traits::{WebSocketDomAction, WebSocketNetworkEvent};
- use net_traits::request::{Destination, Type};
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::io::{self, Write};
- use std::net::TcpStream;
- use std::sync::{Arc, Mutex};
- use std::sync::atomic::{AtomicBool, Ordering};
- use std::thread;
- use url::Position;
- use websocket::{Message, Receiver as WSReceiver, Sender as WSSender};
- use websocket::header::{Origin, WebSocketAccept, WebSocketKey, WebSocketProtocol, WebSocketVersion};
-diff --git a/servo/components/net_traits/response.rs b/servo/components/net_traits/response.rs
---- a/servo/components/net_traits/response.rs
-+++ b/servo/components/net_traits/response.rs
-@@ -4,17 +4,17 @@
- 
- //! The [Response](https://fetch.spec.whatwg.org/#responses) object
- //! resulting from a [fetch operation](https://fetch.spec.whatwg.org/#concept-fetch)
- use {FetchMetadata, FilteredMetadata, Metadata, NetworkError, ReferrerPolicy};
- use hyper::header::{AccessControlExposeHeaders, ContentType, Headers};
- use hyper::status::StatusCode;
- use hyper_serde::Serde;
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::sync::{Arc, Mutex};
- 
- /// [Response type](https://fetch.spec.whatwg.org/#concept-response-type)
- #[derive(Clone, Debug, Deserialize, HeapSizeOf, PartialEq, Serialize)]
- pub enum ResponseType {
-     Basic,
-     Cors,
-     Default,
-diff --git a/servo/components/script/dom/bindings/str.rs b/servo/components/script/dom/bindings/str.rs
---- a/servo/components/script/dom/bindings/str.rs
-+++ b/servo/components/script/dom/bindings/str.rs
-@@ -2,17 +2,17 @@
-  * 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/. */
- 
- //! The `ByteString` struct.
- 
- use cssparser::CowRcStr;
- use html5ever::{LocalName, Namespace};
- use servo_atoms::Atom;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::{Borrow, Cow, ToOwned};
- use std::fmt;
- use std::hash::{Hash, Hasher};
- use std::marker::PhantomData;
- use std::ops;
- use std::ops::{Deref, DerefMut};
- use std::str;
- use std::str::{Bytes, FromStr};
-diff --git a/servo/components/script/dom/blob.rs b/servo/components/script/dom/blob.rs
---- a/servo/components/script/dom/blob.rs
-+++ b/servo/components/script/dom/blob.rs
-@@ -11,17 +11,17 @@ use dom::bindings::js::{JS, Root};
- use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
- use dom::bindings::str::DOMString;
- use dom::globalscope::GlobalScope;
- use dom_struct::dom_struct;
- use ipc_channel::ipc;
- use net_traits::{CoreResourceMsg, IpcSend};
- use net_traits::blob_url_store::{BlobBuf, get_blob_origin};
- use net_traits::filemanager_thread::{FileManagerThreadMsg, ReadFileProgress, RelativePos};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::mem;
- use std::ops::Index;
- use std::path::PathBuf;
- use uuid::Uuid;
- 
- /// File-based blob
- #[derive(JSTraceable)]
- pub struct FileBlob {
-diff --git a/servo/components/script/dom/cssstyledeclaration.rs b/servo/components/script/dom/cssstyledeclaration.rs
---- a/servo/components/script/dom/cssstyledeclaration.rs
-+++ b/servo/components/script/dom/cssstyledeclaration.rs
-@@ -11,17 +11,17 @@ use dom::bindings::reflector::{DomObject
- use dom::bindings::str::DOMString;
- use dom::cssrule::CSSRule;
- use dom::element::Element;
- use dom::node::{Node, window_from_node, document_from_node};
- use dom::window::Window;
- use dom_struct::dom_struct;
- use servo_arc::Arc;
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use style::attr::AttrValue;
- use style::properties::{Importance, PropertyDeclarationBlock, PropertyId, LonghandId, ShorthandId};
- use style::properties::{parse_one_declaration_into, parse_style_attribute, SourcePropertyDeclaration};
- use style::selector_parser::PseudoElement;
- use style::shared_lock::Locked;
- use style_traits::{PARSING_MODE_DEFAULT, ToCss};
- 
- // http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
-diff --git a/servo/components/script/dom/document.rs b/servo/components/script/dom/document.rs
---- a/servo/components/script/dom/document.rs
-+++ b/servo/components/script/dom/document.rs
-@@ -118,17 +118,17 @@ use script_traits::{AnimationState, Comp
- use script_traits::{MouseButton, MouseEventType, MozBrowserEvent};
- use script_traits::{MsDuration, ScriptMsg, TouchpadPressurePhase};
- use script_traits::{TouchEventType, TouchId};
- use script_traits::UntrustedNodeAddress;
- use servo_arc::Arc;
- use servo_atoms::Atom;
- use servo_config::prefs::PREFS;
- use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::ToOwned;
- use std::cell::{Cell, Ref, RefMut};
- use std::collections::{HashMap, HashSet, VecDeque};
- use std::collections::hash_map::Entry::{Occupied, Vacant};
- use std::default::Default;
- use std::iter::once;
- use std::mem;
- use std::rc::Rc;
-diff --git a/servo/components/script/dom/element.rs b/servo/components/script/dom/element.rs
---- a/servo/components/script/dom/element.rs
-+++ b/servo/components/script/dom/element.rs
-@@ -90,17 +90,17 @@ use script_layout_interface::message::Re
- use script_thread::ScriptThread;
- use selectors::attr::{AttrSelectorOperation, NamespaceConstraint, CaseSensitivity};
- use selectors::matching::{ElementSelectorFlags, LocalMatchingContext, MatchingContext, MatchingMode};
- use selectors::matching::{HAS_EDGE_CHILD_SELECTOR, HAS_SLOW_SELECTOR, HAS_SLOW_SELECTOR_LATER_SIBLINGS};
- use selectors::matching::{RelevantLinkStatus, matches_selector_list};
- use selectors::sink::Push;
- use servo_arc::Arc;
- use servo_atoms::Atom;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::Cow;
- use std::cell::{Cell, Ref};
- use std::convert::TryFrom;
- use std::default::Default;
- use std::fmt;
- use std::mem;
- use std::rc::Rc;
- use style::CaseSensitivityExt;
-diff --git a/servo/components/script/dom/htmlelement.rs b/servo/components/script/dom/htmlelement.rs
---- a/servo/components/script/dom/htmlelement.rs
-+++ b/servo/components/script/dom/htmlelement.rs
-@@ -25,17 +25,17 @@ use dom::htmlhtmlelement::HTMLHtmlElemen
- use dom::htmlinputelement::HTMLInputElement;
- use dom::htmllabelelement::HTMLLabelElement;
- use dom::node::{Node, SEQUENTIALLY_FOCUSABLE};
- use dom::node::{document_from_node, window_from_node};
- use dom::nodelist::NodeList;
- use dom::virtualmethods::VirtualMethods;
- use dom_struct::dom_struct;
- use html5ever::{LocalName, Prefix};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::default::Default;
- use std::rc::Rc;
- use style::attr::AttrValue;
- use style::element_state::*;
- 
- #[dom_struct]
- pub struct HTMLElement {
-     element: Element,
-diff --git a/servo/components/script/dom/htmllinkelement.rs b/servo/components/script/dom/htmllinkelement.rs
---- a/servo/components/script/dom/htmllinkelement.rs
-+++ b/servo/components/script/dom/htmllinkelement.rs
-@@ -21,17 +21,17 @@ use dom::htmlelement::HTMLElement;
- use dom::node::{Node, UnbindContext, document_from_node, window_from_node};
- use dom::stylesheet::StyleSheet as DOMStyleSheet;
- use dom::virtualmethods::VirtualMethods;
- use dom_struct::dom_struct;
- use html5ever::{LocalName, Prefix};
- use net_traits::ReferrerPolicy;
- use script_traits::{MozBrowserEvent, ScriptMsg};
- use servo_arc::Arc;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::ToOwned;
- use std::cell::Cell;
- use std::default::Default;
- use style::attr::AttrValue;
- use style::media_queries::parse_media_query_list;
- use style::parser::ParserContext as CssParserContext;
- use style::str::HTML_SPACE_CHARACTERS;
- use style::stylesheets::{CssRuleType, Stylesheet};
-diff --git a/servo/components/script/dom/htmlmetaelement.rs b/servo/components/script/dom/htmlmetaelement.rs
---- a/servo/components/script/dom/htmlmetaelement.rs
-+++ b/servo/components/script/dom/htmlmetaelement.rs
-@@ -17,17 +17,17 @@ use dom::htmlelement::HTMLElement;
- use dom::htmlheadelement::HTMLHeadElement;
- use dom::node::{Node, UnbindContext, document_from_node, window_from_node};
- use dom::virtualmethods::VirtualMethods;
- use dom_struct::dom_struct;
- use html5ever::{LocalName, Prefix};
- use parking_lot::RwLock;
- use servo_arc::Arc;
- use servo_config::prefs::PREFS;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::sync::atomic::AtomicBool;
- use style::attr::AttrValue;
- use style::media_queries::MediaList;
- use style::str::HTML_SPACE_CHARACTERS;
- use style::stylesheets::{Stylesheet, StylesheetContents, CssRule, CssRules, Origin, ViewportRule};
- 
- #[dom_struct]
- pub struct HTMLMetaElement {
-diff --git a/servo/components/script/dom/htmlscriptelement.rs b/servo/components/script/dom/htmlscriptelement.rs
---- a/servo/components/script/dom/htmlscriptelement.rs
-+++ b/servo/components/script/dom/htmlscriptelement.rs
-@@ -31,17 +31,17 @@ use ipc_channel::ipc;
- use ipc_channel::router::ROUTER;
- use js::jsval::UndefinedValue;
- use net_traits::{FetchMetadata, FetchResponseListener, Metadata, NetworkError};
- use net_traits::request::{CorsSettings, CredentialsMode, Destination, RequestInit, RequestMode, Type as RequestType};
- use network_listener::{NetworkListener, PreInvoke};
- use servo_atoms::Atom;
- use servo_config::opts;
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::cell::Cell;
- use std::fs::File;
- use std::io::{Read, Write};
- use std::path::PathBuf;
- use std::process::{Command, Stdio};
- use std::sync::{Arc, Mutex};
- use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec};
- use uuid::Uuid;
-diff --git a/servo/components/script/dom/macros.rs b/servo/components/script/dom/macros.rs
---- a/servo/components/script/dom/macros.rs
-+++ b/servo/components/script/dom/macros.rs
-@@ -144,17 +144,17 @@ macro_rules! make_string_or_document_url
- );
- 
- #[macro_export]
- macro_rules! make_enumerated_getter(
-     ( $attr:ident, $htmlname:tt, $default:expr, $($choices: pat)|+) => (
-         fn $attr(&self) -> DOMString {
-             use dom::bindings::inheritance::Castable;
-             use dom::element::Element;
--            use std::ascii::AsciiExt;
-+            #[allow(unused_imports)] use std::ascii::AsciiExt;
-             let element = self.upcast::<Element>();
-             let mut val = element.get_string_attribute(&local_name!($htmlname));
-             val.make_ascii_lowercase();
-             // https://html.spec.whatwg.org/multipage/#attr-fs-method
-             match &*val {
-                 $($choices)|+ => val,
-                 _ => DOMString::from($default)
-             }
-diff --git a/servo/components/script/dom/namednodemap.rs b/servo/components/script/dom/namednodemap.rs
---- a/servo/components/script/dom/namednodemap.rs
-+++ b/servo/components/script/dom/namednodemap.rs
-@@ -10,17 +10,17 @@ use dom::bindings::error::{Error, Fallib
- use dom::bindings::js::{JS, Root};
- use dom::bindings::reflector::{Reflector, reflect_dom_object};
- use dom::bindings::str::DOMString;
- use dom::bindings::xmlname::namespace_from_domstring;
- use dom::element::Element;
- use dom::window::Window;
- use dom_struct::dom_struct;
- use html5ever::LocalName;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- 
- #[dom_struct]
- pub struct NamedNodeMap {
-     reflector_: Reflector,
-     owner: JS<Element>,
- }
- 
- impl NamedNodeMap {
-diff --git a/servo/components/script/dom/serviceworkercontainer.rs b/servo/components/script/dom/serviceworkercontainer.rs
---- a/servo/components/script/dom/serviceworkercontainer.rs
-+++ b/servo/components/script/dom/serviceworkercontainer.rs
-@@ -11,17 +11,17 @@ use dom::bindings::str::USVString;
- use dom::client::Client;
- use dom::eventtarget::EventTarget;
- use dom::globalscope::GlobalScope;
- use dom::promise::Promise;
- use dom::serviceworker::ServiceWorker;
- use dom_struct::dom_struct;
- use script_thread::ScriptThread;
- use serviceworkerjob::{Job, JobType};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::default::Default;
- use std::rc::Rc;
- 
- #[dom_struct]
- pub struct ServiceWorkerContainer {
-     eventtarget: EventTarget,
-     controller: MutNullableJS<ServiceWorker>,
-     client: JS<Client>
-diff --git a/servo/components/script/dom/servoparser/async_html.rs b/servo/components/script/dom/servoparser/async_html.rs
---- a/servo/components/script/dom/servoparser/async_html.rs
-+++ b/servo/components/script/dom/servoparser/async_html.rs
-@@ -22,17 +22,17 @@ use dom::virtualmethods::vtable_for;
- use html5ever::{Attribute as HtmlAttribute, ExpandedName, LocalName, QualName};
- use html5ever::buffer_queue::BufferQueue;
- use html5ever::tendril::{SendTendril, StrTendril, Tendril};
- use html5ever::tendril::fmt::UTF8;
- use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts, TokenizerResult};
- use html5ever::tree_builder::{ElementFlags, NodeOrText as HtmlNodeOrText, NextParserState, QuirksMode, TreeSink};
- use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts};
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::Cow;
- use std::cell::Cell;
- use std::collections::HashMap;
- use std::collections::vec_deque::VecDeque;
- use std::sync::mpsc::{channel, Receiver, Sender};
- use std::thread;
- use style::context::QuirksMode as ServoQuirksMode;
- 
-diff --git a/servo/components/script/dom/servoparser/mod.rs b/servo/components/script/dom/servoparser/mod.rs
---- a/servo/components/script/dom/servoparser/mod.rs
-+++ b/servo/components/script/dom/servoparser/mod.rs
-@@ -41,17 +41,17 @@ use net_traits::{FetchMetadata, FetchRes
- use network_listener::PreInvoke;
- use profile_traits::time::{TimerMetadata, TimerMetadataFrameType};
- use profile_traits::time::{TimerMetadataReflowType, ProfilerCategory, profile};
- use script_thread::ScriptThread;
- use script_traits::DocumentActivity;
- use servo_config::prefs::PREFS;
- use servo_config::resource_files::read_resource_file;
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::Cow;
- use std::cell::Cell;
- use std::mem;
- use style::context::QuirksMode as ServoQuirksMode;
- 
- mod async_html;
- mod html;
- mod xml;
-diff --git a/servo/components/script/dom/websocket.rs b/servo/components/script/dom/websocket.rs
---- a/servo/components/script/dom/websocket.rs
-+++ b/servo/components/script/dom/websocket.rs
-@@ -27,17 +27,17 @@ use js::jsapi::JSAutoCompartment;
- use js::jsval::UndefinedValue;
- use js::typedarray::{ArrayBuffer, CreateWith};
- use net_traits::{WebSocketCommunicate, WebSocketConnectData, WebSocketDomAction, WebSocketNetworkEvent};
- use net_traits::CoreResourceMsg::WebsocketConnect;
- use net_traits::MessageData;
- use script_runtime::CommonScriptMsg;
- use script_runtime::ScriptThreadEventCategory::WebSocketEvent;
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::ToOwned;
- use std::cell::Cell;
- use std::ptr;
- use std::thread;
- use task::{TaskOnce, TaskCanceller};
- use task_source::TaskSource;
- use task_source::networking::NetworkingTaskSource;
- 
-diff --git a/servo/components/script/dom/window.rs b/servo/components/script/dom/window.rs
---- a/servo/components/script/dom/window.rs
-+++ b/servo/components/script/dom/window.rs
-@@ -82,17 +82,17 @@ use script_traits::{ConstellationControl
- use script_traits::{ScriptToConstellationChan, ScriptMsg, ScrollState, TimerEvent, TimerEventId};
- use script_traits::{TimerSchedulerMsg, UntrustedNodeAddress, WindowSizeData, WindowSizeType};
- use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult};
- use selectors::attr::CaseSensitivity;
- use servo_config::opts;
- use servo_config::prefs::PREFS;
- use servo_geometry::{f32_rect_to_au_rect, max_rect};
- use servo_url::{Host, MutableOrigin, ImmutableOrigin, ServoUrl};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::ToOwned;
- use std::cell::Cell;
- use std::collections::{HashMap, HashSet};
- use std::collections::hash_map::Entry;
- use std::default::Default;
- use std::env;
- use std::fs;
- use std::io::{Write, stderr, stdout};
-diff --git a/servo/components/script/dom/xmlhttprequest.rs b/servo/components/script/dom/xmlhttprequest.rs
---- a/servo/components/script/dom/xmlhttprequest.rs
-+++ b/servo/components/script/dom/xmlhttprequest.rs
-@@ -57,17 +57,17 @@ use net_traits::{FetchResponseListener, 
- use net_traits::CoreResourceMsg::Fetch;
- use net_traits::request::{CredentialsMode, Destination, RequestInit, RequestMode};
- use net_traits::trim_http_whitespace;
- use network_listener::{NetworkListener, PreInvoke};
- use script_traits::DocumentActivity;
- use servo_atoms::Atom;
- use servo_config::prefs::PREFS;
- use servo_url::ServoUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::ToOwned;
- use std::cell::Cell;
- use std::default::Default;
- use std::str;
- use std::sync::{Arc, Mutex};
- use task_source::networking::NetworkingTaskSource;
- use time;
- use timers::{OneshotTimerCallback, OneshotTimerHandle};
-diff --git a/servo/components/selectors/attr.rs b/servo/components/selectors/attr.rs
---- a/servo/components/selectors/attr.rs
-+++ b/servo/components/selectors/attr.rs
-@@ -1,15 +1,15 @@
- /* 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/. */
- 
- use cssparser::ToCss;
- use parser::SelectorImpl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] #[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- 
- #[derive(Clone, Eq, PartialEq)]
- pub struct AttrSelectorWithNamespace<Impl: SelectorImpl> {
-     pub namespace: NamespaceConstraint<(Impl::NamespacePrefix, Impl::NamespaceUrl)>,
-     pub local_name: Impl::LocalName,
-     pub local_name_lower: Impl::LocalName,
-     pub operation: ParsedAttrSelectorOperation<Impl::AttrValue>,
-diff --git a/servo/components/selectors/parser.rs b/servo/components/selectors/parser.rs
---- a/servo/components/selectors/parser.rs
-+++ b/servo/components/selectors/parser.rs
-@@ -8,17 +8,17 @@ use bloom::BLOOM_HASH_MASK;
- use builder::{SelectorBuilder, SpecificityAndFlags};
- use context::QuirksMode;
- use cssparser::{ParseError, BasicParseError, CowRcStr, Delimiter};
- use cssparser::{Token, Parser as CssParser, parse_nth, ToCss, serialize_identifier, CssStringWriter};
- use precomputed_hash::PrecomputedHash;
- use servo_arc::ThinArc;
- use sink::Push;
- use smallvec::SmallVec;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::{Borrow, Cow};
- use std::fmt::{self, Display, Debug, Write};
- use std::iter::Rev;
- use std::slice;
- use visitor::SelectorVisitor;
- 
- /// A trait that represents a pseudo-element.
- pub trait PseudoElement : Sized + ToCss {
-diff --git a/servo/components/style/attr.rs b/servo/components/style/attr.rs
---- a/servo/components/style/attr.rs
-+++ b/servo/components/style/attr.rs
-@@ -11,17 +11,17 @@ use app_units::Au;
- use cssparser::{self, Color, RGBA};
- use euclid::num::Zero;
- use num_traits::ToPrimitive;
- use properties::PropertyDeclarationBlock;
- use selectors::attr::AttrSelectorOperation;
- use servo_arc::Arc;
- use servo_url::ServoUrl;
- use shared_lock::Locked;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] #[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::str::FromStr;
- use str::{HTML_SPACE_CHARACTERS, read_exponent, read_fraction};
- use str::{read_numbers, split_commas, split_html_space_chars};
- use str::str_join;
- use values::specified::Length;
- 
- // Duplicated from script::dom::values.
- const UNSIGNED_LONG_MAX: u32 = 2147483647;
-diff --git a/servo/components/style/counter_style/mod.rs b/servo/components/style/counter_style/mod.rs
---- a/servo/components/style/counter_style/mod.rs
-+++ b/servo/components/style/counter_style/mod.rs
-@@ -10,17 +10,17 @@ use Atom;
- use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser};
- use cssparser::{Parser, Token, serialize_identifier, BasicParseError, CowRcStr};
- use error_reporting::{ContextualParseError, ParseErrorReporter};
- #[cfg(feature = "gecko")] use gecko::rules::CounterStyleDescriptors;
- #[cfg(feature = "gecko")] use gecko_bindings::structs::nsCSSCounterDesc;
- use parser::{ParserContext, ParserErrorContext, Parse};
- use selectors::parser::SelectorParseError;
- use shared_lock::{SharedRwLockReadGuard, ToCssWithGuard};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::Cow;
- use std::fmt;
- use std::ops::Range;
- use style_traits::{Comma, OneOrMoreSeparated, ParseError, StyleParseError, ToCss};
- use values::CustomIdent;
- 
- /// Parse the prelude of an @counter-style rule
- pub fn parse_counter_style_name<'i, 't>(input: &mut Parser<'i, 't>) -> Result<CustomIdent, ParseError<'i>> {
-diff --git a/servo/components/style/custom_properties.rs b/servo/components/style/custom_properties.rs
---- a/servo/components/style/custom_properties.rs
-+++ b/servo/components/style/custom_properties.rs
-@@ -9,17 +9,17 @@
- use Atom;
- use cssparser::{Delimiter, Parser, ParserInput, SourcePosition, Token, TokenSerializationType};
- use parser::ParserContext;
- use precomputed_hash::PrecomputedHash;
- use properties::{CSSWideKeyword, DeclaredValue};
- use selector_map::{PrecomputedHashSet, PrecomputedHashMap};
- use selectors::parser::SelectorParseError;
- use servo_arc::Arc;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::{Borrow, Cow};
- use std::fmt;
- use std::hash::Hash;
- use style_traits::{ToCss, StyleParseError, ParseError};
- 
- /// A custom property name is just an `Atom`.
- ///
- /// Note that this does not include the `--` prefix
-diff --git a/servo/components/style/gecko/generated/pseudo_element_definition.rs b/servo/components/style/gecko/generated/pseudo_element_definition.rs
---- a/servo/components/style/gecko/generated/pseudo_element_definition.rs
-+++ b/servo/components/style/gecko/generated/pseudo_element_definition.rs
-@@ -1262,17 +1262,17 @@ None
-     /// user-agent stylesheet.
-     ///
-     /// If we're not in a user-agent stylesheet, we will never parse anonymous
-     /// box pseudo-elements.
-     ///
-     /// Returns `None` if the pseudo-element is not recognised.
-     #[inline]
-     pub fn from_slice(s: &str, in_ua_stylesheet: bool) -> Option<Self> {
--        use std::ascii::AsciiExt;
-+        #[allow(unused_imports)] #[allow(unused_imports)] use std::ascii::AsciiExt;
- 
-         // We don't need to support tree pseudos because functional
-         // pseudo-elements needs arguments, and thus should be created
-         // via other methods.
-             if in_ua_stylesheet || PseudoElement::After.exposed_in_non_ua_sheets() {
-                 if s.eq_ignore_ascii_case("after") {
-                     return Some(PseudoElement::After);
-                 }
-@@ -1632,17 +1632,17 @@ None
-     }
- 
-     /// Constructs a tree pseudo-element from the given name and arguments.
-     /// "name" must start with "-moz-tree-".
-     ///
-     /// Returns `None` if the pseudo-element is not recognized.
-     #[inline]
-     pub fn tree_pseudo_element(name: &str, args: Box<[String]>) -> Option<Self> {
--        use std::ascii::AsciiExt;
-+        #[allow(unused_imports)] use std::ascii::AsciiExt;
-         debug_assert!(name.starts_with("-moz-tree-"));
-         let tree_part = &name[10..];
-             if tree_part.eq_ignore_ascii_case("column") {
-                 return Some(PseudoElement::MozTreeColumn(args));
-             }
-             if tree_part.eq_ignore_ascii_case("row") {
-                 return Some(PseudoElement::MozTreeRow(args));
-             }
-diff --git a/servo/components/style/gecko/pseudo_element_definition.mako.rs b/servo/components/style/gecko/pseudo_element_definition.mako.rs
---- a/servo/components/style/gecko/pseudo_element_definition.mako.rs
-+++ b/servo/components/style/gecko/pseudo_element_definition.mako.rs
-@@ -181,17 +181,17 @@ impl PseudoElement {
-     /// user-agent stylesheet.
-     ///
-     /// If we're not in a user-agent stylesheet, we will never parse anonymous
-     /// box pseudo-elements.
-     ///
-     /// Returns `None` if the pseudo-element is not recognised.
-     #[inline]
-     pub fn from_slice(s: &str, in_ua_stylesheet: bool) -> Option<Self> {
--        use std::ascii::AsciiExt;
-+        #[allow(unused_imports)] #[allow(unused_imports)] use std::ascii::AsciiExt;
- 
-         // We don't need to support tree pseudos because functional
-         // pseudo-elements needs arguments, and thus should be created
-         // via other methods.
-         % for pseudo in SIMPLE_PSEUDOS:
-             if in_ua_stylesheet || ${pseudo_element_variant(pseudo)}.exposed_in_non_ua_sheets() {
-                 if s.eq_ignore_ascii_case("${pseudo.value[1:]}") {
-                     return Some(${pseudo_element_variant(pseudo)});
-@@ -203,17 +203,17 @@ impl PseudoElement {
-     }
- 
-     /// Constructs a tree pseudo-element from the given name and arguments.
-     /// "name" must start with "-moz-tree-".
-     ///
-     /// Returns `None` if the pseudo-element is not recognized.
-     #[inline]
-     pub fn tree_pseudo_element(name: &str, args: Box<[String]>) -> Option<Self> {
--        use std::ascii::AsciiExt;
-+        #[allow(unused_imports)] use std::ascii::AsciiExt;
-         debug_assert!(name.starts_with("-moz-tree-"));
-         let tree_part = &name[10..];
-         % for pseudo in TREE_PSEUDOS:
-             if tree_part.eq_ignore_ascii_case("${pseudo.value[11:]}") {
-                 return Some(${pseudo_element_variant(pseudo, "args")});
-             }
-         % endfor
-         None
-diff --git a/servo/components/style/gecko_string_cache/mod.rs b/servo/components/style/gecko_string_cache/mod.rs
---- a/servo/components/style/gecko_string_cache/mod.rs
-+++ b/servo/components/style/gecko_string_cache/mod.rs
-@@ -8,17 +8,17 @@
- 
- use gecko_bindings::bindings::Gecko_AddRefAtom;
- use gecko_bindings::bindings::Gecko_Atomize;
- use gecko_bindings::bindings::Gecko_Atomize16;
- use gecko_bindings::bindings::Gecko_ReleaseAtom;
- use gecko_bindings::structs::{nsIAtom, nsIAtom_AtomKind};
- use nsstring::{nsAString, nsString};
- use precomputed_hash::PrecomputedHash;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::{Cow, Borrow};
- use std::char::{self, DecodeUtf16};
- use std::fmt::{self, Write};
- use std::hash::{Hash, Hasher};
- use std::iter::Cloned;
- use std::mem;
- use std::ops::Deref;
- use std::slice;
-diff --git a/servo/components/style/properties/longhand/font.mako.rs b/servo/components/style/properties/longhand/font.mako.rs
---- a/servo/components/style/properties/longhand/font.mako.rs
-+++ b/servo/components/style/properties/longhand/font.mako.rs
-@@ -2137,17 +2137,17 @@ https://drafts.csswg.org/css-fonts-4/#lo
-         SpecifiedValue::Normal
-     }
- 
-     impl ToComputedValue for SpecifiedValue {
-         type ComputedValue = computed_value::T;
- 
-         #[inline]
-         fn to_computed_value(&self, _context: &Context) -> computed_value::T {
--            use std::ascii::AsciiExt;
-+            #[allow(unused_imports)] #[allow(unused_imports)] use std::ascii::AsciiExt;
-             match *self {
-                 SpecifiedValue::Normal => computed_value::T(0),
-                 SpecifiedValue::Override(ref lang) => {
-                     if lang.is_empty() || lang.len() > 4 || !lang.is_ascii() {
-                         return computed_value::T(0)
-                     }
-                     let mut computed_lang = lang.clone();
-                     while computed_lang.len() < 4 {
-diff --git a/servo/components/style/properties/longhand/pointing.mako.rs b/servo/components/style/properties/longhand/pointing.mako.rs
---- a/servo/components/style/properties/longhand/pointing.mako.rs
-+++ b/servo/components/style/properties/longhand/pointing.mako.rs
-@@ -85,17 +85,17 @@
-             images: vec![],
-             keyword: computed_value::Keyword::Auto
-         }
-     }
- 
-     impl Parse for computed_value::Keyword {
-         fn parse<'i, 't>(_context: &ParserContext, input: &mut Parser<'i, 't>)
-                          -> Result<computed_value::Keyword, ParseError<'i>> {
--            use std::ascii::AsciiExt;
-+            #[allow(unused_imports)] use std::ascii::AsciiExt;
-             use style_traits::cursor::Cursor;
-             let ident = input.expect_ident()?;
-             if ident.eq_ignore_ascii_case("auto") {
-                 Ok(computed_value::Keyword::Auto)
-             } else {
-                 Cursor::from_css_keyword(&ident)
-                     .map(computed_value::Keyword::Cursor)
-                     .map_err(|()| SelectorParseError::UnexpectedIdent(ident.clone()).into())
-diff --git a/servo/components/style/servo/selector_parser.rs b/servo/components/style/servo/selector_parser.rs
---- a/servo/components/style/servo/selector_parser.rs
-+++ b/servo/components/style/servo/selector_parser.rs
-@@ -16,17 +16,17 @@ use invalidation::element::element_wrapp
- use properties::ComputedValues;
- use properties::PropertyFlags;
- use properties::longhands::display::computed_value as display;
- use selector_parser::{AttrValue as SelectorAttrValue, ElementExt, PseudoElementCascadeType, SelectorParser};
- use selectors::Element;
- use selectors::attr::{AttrSelectorOperation, NamespaceConstraint, CaseSensitivity};
- use selectors::parser::{SelectorMethods, SelectorParseError};
- use selectors::visitor::SelectorVisitor;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- use std::fmt::Debug;
- use std::mem;
- use std::ops::{Deref, DerefMut};
- use style_traits::{ParseError, StyleParseError};
- 
- /// A pseudo-element, both public and private.
- ///
-diff --git a/servo/components/style/str.rs b/servo/components/style/str.rs
---- a/servo/components/style/str.rs
-+++ b/servo/components/style/str.rs
-@@ -2,17 +2,17 @@
-  * 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/. */
- 
- //! String utils for attributes and similar stuff.
- 
- #![deny(missing_docs)]
- 
- use num_traits::ToPrimitive;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] #[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::Cow;
- use std::convert::AsRef;
- use std::iter::{Filter, Peekable};
- use std::str::Split;
- 
- /// A static slice of characters.
- pub type StaticCharVec = &'static [char];
- 
-diff --git a/servo/components/style/stylesheets/viewport_rule.rs b/servo/components/style/stylesheets/viewport_rule.rs
---- a/servo/components/style/stylesheets/viewport_rule.rs
-+++ b/servo/components/style/stylesheets/viewport_rule.rs
-@@ -15,17 +15,17 @@ use error_reporting::{ContextualParseErr
- use euclid::TypedSize2D;
- use font_metrics::get_metrics_provider_for_product;
- use media_queries::Device;
- use parser::{ParserContext, ParserErrorContext};
- use properties::StyleBuilder;
- use rule_cache::RuleCacheConditions;
- use selectors::parser::SelectorParseError;
- use shared_lock::{SharedRwLockReadGuard, StylesheetGuards, ToCssWithGuard};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::borrow::Cow;
- use std::cell::RefCell;
- use std::fmt;
- use std::iter::Enumerate;
- use std::str::Chars;
- use style_traits::{PinchZoomFactor, ToCss, ParseError, StyleParseError};
- use style_traits::viewport::{Orientation, UserZoom, ViewportConstraints, Zoom};
- use stylesheets::{StylesheetInDocument, Origin};
-diff --git a/servo/components/style/values/mod.rs b/servo/components/style/values/mod.rs
---- a/servo/components/style/values/mod.rs
-+++ b/servo/components/style/values/mod.rs
-@@ -7,17 +7,17 @@
- //! [values]: https://drafts.csswg.org/css-values/
- 
- #![deny(missing_docs)]
- 
- use Atom;
- pub use cssparser::{RGBA, Token, Parser, serialize_identifier, BasicParseError, CowRcStr};
- use parser::{Parse, ParserContext};
- use selectors::parser::SelectorParseError;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt::{self, Debug};
- use std::hash;
- use style_traits::{ToCss, ParseError, StyleParseError};
- 
- pub mod animated;
- pub mod computed;
- pub mod distance;
- pub mod generics;
-diff --git a/servo/components/style/values/specified/align.rs b/servo/components/style/values/specified/align.rs
---- a/servo/components/style/values/specified/align.rs
-+++ b/servo/components/style/values/specified/align.rs
-@@ -5,17 +5,17 @@
- //! Values for CSS Box Alignment properties
- //!
- //! https://drafts.csswg.org/css-align/
- 
- use cssparser::Parser;
- use gecko_bindings::structs;
- use parser::{Parse, ParserContext};
- use selectors::parser::SelectorParseError;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- use style_traits::{ToCss, ParseError, StyleParseError};
- 
- bitflags! {
-     /// Constants shared by multiple CSS Box Alignment properties
-     ///
-     /// These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
-     #[cfg_attr(feature = "gecko", derive(MallocSizeOf))]
-diff --git a/servo/components/style/values/specified/angle.rs b/servo/components/style/values/specified/angle.rs
---- a/servo/components/style/values/specified/angle.rs
-+++ b/servo/components/style/values/specified/angle.rs
-@@ -1,17 +1,17 @@
- /* 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/. */
- 
- //! Specified angles.
- 
- use cssparser::{Parser, Token, BasicParseError};
- use parser::{ParserContext, Parse};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- use style_traits::{ToCss, ParseError};
- use values::CSSFloat;
- use values::computed::{Context, ToComputedValue};
- use values::computed::angle::Angle as ComputedAngle;
- use values::specified::calc::CalcNode;
- 
- /// A specified angle.
-diff --git a/servo/components/style/values/specified/calc.rs b/servo/components/style/values/specified/calc.rs
---- a/servo/components/style/values/specified/calc.rs
-+++ b/servo/components/style/values/specified/calc.rs
-@@ -3,17 +3,17 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- //! [Calc expressions][calc].
- //!
- //! [calc]: https://drafts.csswg.org/css-values/#calc-notation
- 
- use cssparser::{Parser, Token, BasicParseError};
- use parser::ParserContext;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- use style_traits::{ToCss, ParseError, StyleParseError};
- use style_traits::values::specified::AllowedNumericType;
- use values::{CSSInteger, CSSFloat};
- use values::computed;
- use values::specified::{Angle, Time};
- use values::specified::length::{AbsoluteLength, FontRelativeLength, NoCalcLength};
- use values::specified::length::ViewportPercentageLength;
-diff --git a/servo/components/style/values/specified/grid.rs b/servo/components/style/values/specified/grid.rs
---- a/servo/components/style/values/specified/grid.rs
-+++ b/servo/components/style/values/specified/grid.rs
-@@ -2,17 +2,17 @@
-  * 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/. */
- 
- //! CSS handling for the computed value of
- //! [grids](https://drafts.csswg.org/css-grid/)
- 
- use cssparser::{Parser, Token, BasicParseError};
- use parser::{Parse, ParserContext};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::mem;
- use style_traits::{ParseError, StyleParseError};
- use values::{CSSFloat, CustomIdent};
- use values::computed::{self, Context, ToComputedValue};
- use values::generics::grid::{GridTemplateComponent, RepeatCount, TrackBreadth, TrackKeyword, TrackRepeat};
- use values::generics::grid::{LineNameList, TrackSize, TrackList, TrackListType, TrackListValue};
- use values::specified::{LengthOrPercentage, Integer};
- 
-diff --git a/servo/components/style/values/specified/length.rs b/servo/components/style/values/specified/length.rs
---- a/servo/components/style/values/specified/length.rs
-+++ b/servo/components/style/values/specified/length.rs
-@@ -7,17 +7,17 @@
- //! [length]: https://drafts.csswg.org/css-values/#lengths
- 
- use app_units::Au;
- use cssparser::{Parser, Token, BasicParseError};
- use euclid::Size2D;
- use font_metrics::FontMetricsQueryResult;
- use parser::{Parse, ParserContext};
- use std::{cmp, fmt, mem};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::ops::{Add, Mul};
- use style_traits::{ToCss, ParseError, StyleParseError};
- use style_traits::values::specified::AllowedNumericType;
- use stylesheets::CssRuleType;
- use super::{AllowQuirks, Number, ToComputedValue, Percentage};
- use values::{Auto, CSSFloat, Either, FONT_MEDIUM_PX, None_, Normal};
- use values::{ExtremumLength, serialize_dimension};
- use values::computed::{self, CSSPixelLength, Context};
-diff --git a/servo/components/style/values/specified/mod.rs b/servo/components/style/values/specified/mod.rs
---- a/servo/components/style/values/specified/mod.rs
-+++ b/servo/components/style/values/specified/mod.rs
-@@ -6,17 +6,17 @@
- //!
- //! TODO(emilio): Enhance docs.
- 
- use Namespace;
- use context::QuirksMode;
- use cssparser::{Parser, Token, serialize_identifier, BasicParseError};
- use parser::{ParserContext, Parse};
- use self::url::SpecifiedUrl;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::f32;
- use std::fmt;
- use style_traits::{ToCss, ParseError, StyleParseError};
- use style_traits::values::specified::AllowedNumericType;
- use super::{Auto, CSSFloat, CSSInteger, Either, None_};
- use super::computed::{Context, ToComputedValue};
- use super::generics::{GreaterThanOrEqualToOne, NonNegative};
- use super::generics::grid::{GridLine as GenericGridLine, TrackBreadth as GenericTrackBreadth};
-diff --git a/servo/components/style/values/specified/percentage.rs b/servo/components/style/values/specified/percentage.rs
---- a/servo/components/style/values/specified/percentage.rs
-+++ b/servo/components/style/values/specified/percentage.rs
-@@ -1,17 +1,17 @@
- /* 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/. */
- 
- //! Specified percentages.
- 
- use cssparser::{BasicParseError, Parser, Token};
- use parser::{Parse, ParserContext};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- use style_traits::{ParseError, ToCss};
- use style_traits::values::specified::AllowedNumericType;
- use values::{CSSFloat, serialize_percentage};
- use values::computed::{Context, ToComputedValue};
- use values::computed::percentage::Percentage as ComputedPercentage;
- use values::specified::calc::CalcNode;
- 
-diff --git a/servo/components/style/values/specified/text.rs b/servo/components/style/values/specified/text.rs
---- a/servo/components/style/values/specified/text.rs
-+++ b/servo/components/style/values/specified/text.rs
-@@ -2,17 +2,17 @@
-  * 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/. */
- 
- //! Specified types for text properties.
- 
- use cssparser::Parser;
- use parser::{Parse, ParserContext};
- use selectors::parser::SelectorParseError;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use style_traits::ParseError;
- use values::computed::{Context, ToComputedValue};
- use values::computed::text::LineHeight as ComputedLineHeight;
- use values::generics::text::InitialLetter as GenericInitialLetter;
- use values::generics::text::LineHeight as GenericLineHeight;
- use values::generics::text::Spacing;
- use values::specified::{AllowQuirks, Integer, NonNegativeNumber, Number};
- use values::specified::length::{FontRelativeLength, Length, LengthOrPercentage, NoCalcLength};
-diff --git a/servo/components/style/values/specified/time.rs b/servo/components/style/values/specified/time.rs
---- a/servo/components/style/values/specified/time.rs
-+++ b/servo/components/style/values/specified/time.rs
-@@ -1,17 +1,17 @@
- /* 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/. */
- 
- //! Specified time values.
- 
- use cssparser::{Parser, Token, BasicParseError};
- use parser::{ParserContext, Parse};
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- use style_traits::{ToCss, ParseError, StyleParseError};
- use style_traits::values::specified::AllowedNumericType;
- use values::CSSFloat;
- use values::computed::{Context, ToComputedValue};
- use values::computed::time::Time as ComputedTime;
- use values::specified::calc::CalcNode;
- 
-diff --git a/servo/components/style_traits/viewport.rs b/servo/components/style_traits/viewport.rs
---- a/servo/components/style_traits/viewport.rs
-+++ b/servo/components/style_traits/viewport.rs
-@@ -2,17 +2,17 @@
-  * 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/. */
- 
- //! Helper types for the `@viewport` rule.
- 
- use {CSSPixel, PinchZoomFactor, ParseError};
- use cssparser::{Parser, ToCss, ParseError as CssParseError, BasicParseError};
- use euclid::TypedSize2D;
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- 
- define_css_keyword_enum!(UserZoom:
-                          "zoom" => Zoom,
-                          "fixed" => Fixed);
- 
- define_css_keyword_enum!(Orientation:
-                          "auto" => Auto,
diff --git a/source-stamp.txt b/source-stamp.txt
index f9db87a..4d1bf77 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=afa87f9be3a8
+REV=c2db4a50dc5c
 REPO=http://hg.mozilla.org/releases/mozilla-release