Changeset 246310 in webkit

Timestamp:

Jun 11, 2019, 5:52:21 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Replace gdk_screen_get_monitor_geometry and gdk_screen_get_monitor_workarea
​https://bugs.webkit.org/show_bug.cgi?id=198750

Patch by Ludovico de Nittis <​ludovico.denittis@collabora.com> on 2019-06-11
Reviewed by Carlos Garcia Campos.

Since GTK 3.22 gdk_screen_get_monitor_geometry and
gdk_screen_get_monitor_workarea has been deprecated.

No behavior change.

• platform/gtk/PlatformScreenGtk.cpp:

(WebCore::screenRect):
(WebCore::screenAvailableRect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/PlatformScreenGtk.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-11  Ludovico de Nittis  <ludovico.denittis@collabora.com>
+
+        [GTK] Replace gdk_screen_get_monitor_geometry and gdk_screen_get_monitor_workarea
+        https://bugs.webkit.org/show_bug.cgi?id=198750
+
+        Reviewed by Carlos Garcia Campos.
+
+        Since GTK 3.22 gdk_screen_get_monitor_geometry and
+        gdk_screen_get_monitor_workarea has been deprecated. 
+
+        No behavior change.
+
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+
 2019-06-11  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp

@@ -151 +151 @@
 }
 
+#if !GTK_CHECK_VERSION(3, 22, 0)
 static GdkScreen* getScreen(GtkWidget* widget)
 {
     return gtk_widget_has_screen(widget) ? gtk_widget_get_screen(widget) : gdk_screen_get_default();
 }
+#endif
 
 FloatRect screenRect(Widget* widget)
@@ -162 +164 @@
         container = getToplevel(container);
 
+    GdkRectangle geometry;
+#if GTK_CHECK_VERSION(3, 22, 0)
+    GdkDisplay* display = container ? gtk_widget_get_display(container) : gdk_display_get_default();
+    if (!display)
+        return FloatRect();
+
+    GdkMonitor* monitor = container ? gdk_display_get_monitor_at_window(display, gtk_widget_get_window(container)) : gdk_display_get_monitor(display, 0);
+
+    gdk_monitor_get_geometry(monitor, &geometry);
+#else
     GdkScreen* screen = container ? getScreen(container) : gdk_screen_get_default();
     if (!screen)
@@ -168 +180 @@
     gint monitor = container ? gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(container)) : 0;
 
-    GdkRectangle geometry;
     gdk_screen_get_monitor_geometry(screen, monitor, &geometry);
+#endif // !GTK_CHECK_VERSION(3, 22, 0)
 
     return FloatRect(geometry.x, geometry.y, geometry.width, geometry.height);
@@ -180 +192 @@
         return screenRect(widget);
 
+    GdkRectangle workArea;
+#if GTK_CHECK_VERSION(3, 22, 0)
+    GdkDisplay* display = container ? gtk_widget_get_display(container) : gdk_display_get_default();
+    if (!display)
+        return FloatRect();
+
+    GdkMonitor* monitor = container ? gdk_display_get_monitor_at_window(display, gtk_widget_get_window(container)) : gdk_display_get_monitor(display, 0);
+
+    gdk_monitor_get_workarea(monitor, &workArea);
+#else
     GdkScreen* screen = container ? getScreen(container) : gdk_screen_get_default();
     if (!screen)
@@ -186 +208 @@
     gint monitor = container ? gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(container)) : 0;
 
-    GdkRectangle workArea;
     gdk_screen_get_monitor_workarea(screen, monitor, &workArea);
+#endif // !GTK_CHECK_VERSION(3, 22, 0)
 
     return FloatRect(workArea.x, workArea.y, workArea.width, workArea.height);