From 5f5997630b7c54c52469e15a8a6b2d6e230559a1 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 24 Feb 2021 12:39:29 +0100 Subject: Updated to 86.0 --- mozilla-1678247.patch | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 mozilla-1678247.patch (limited to 'mozilla-1678247.patch') diff --git a/mozilla-1678247.patch b/mozilla-1678247.patch deleted file mode 100644 index 5effad4..0000000 --- a/mozilla-1678247.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp ---- a/widget/gtk/MozContainerWayland.cpp -+++ b/widget/gtk/MozContainerWayland.cpp -@@ -22,6 +22,7 @@ - # include "mozilla/Logging.h" - # include "nsTArray.h" - # include "Units.h" -+# include "nsWindow.h" - extern mozilla::LazyLogModule gWidgetWaylandLog; - # define LOGWAYLAND(args) \ - MOZ_LOG(gWidgetWaylandLog, mozilla::LogLevel::Debug, args) -@@ -343,21 +344,19 @@ - moz_container_wayland_set_opaque_region_locked(container); - } - --static int moz_gtk_widget_get_scale_factor(MozContainer* container) { -- static auto sGtkWidgetGetScaleFactor = -- (gint(*)(GtkWidget*))dlsym(RTLD_DEFAULT, "gtk_widget_get_scale_factor"); -- return sGtkWidgetGetScaleFactor -- ? sGtkWidgetGetScaleFactor(GTK_WIDGET(container)) -- : 1; --} -- - static void moz_container_wayland_set_scale_factor_locked( - MozContainer* container) { - if (!container->wl_container.surface) { - return; - } -- wl_surface_set_buffer_scale(container->wl_container.surface, -- moz_gtk_widget_get_scale_factor(container)); -+ gpointer user_data = g_object_get_data(G_OBJECT(container), "nsWindow"); -+ nsWindow* wnd = static_cast(user_data); -+ -+ int scale = 1; -+ if (wnd) { -+ scale = wnd->GdkScaleFactor(); -+ } -+ wl_surface_set_buffer_scale(container->wl_container.surface, scale); - } - - void moz_container_wayland_set_scale_factor(MozContainer* container) { - -- cgit