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

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 += [

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) {