Changeset 259856 in webkit

Timestamp:

Apr 10, 2020, 3:31:56 AM (6 years ago)

Author:

Claudio Saavedra

Message:

[GTK] Use X11-specific GDK API in Netscape plugin
​https://bugs.webkit.org/show_bug.cgi?id=210325

Reviewed by Adrian Perez de Castro.

Since the code is X11-specific we can do that and remove
deprecated API use.

• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:

(WebKit::getPluginDisplay):
(WebKit::x11Screen):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-10  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK] Use X11-specific GDK API in Netscape plugin
+        https://bugs.webkit.org/show_bug.cgi?id=210325
+
+        Reviewed by Adrian Perez de Castro.
+
+        Since the code is X11-specific we can do that and remove
+        deprecated API use.
+
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::getPluginDisplay):
+        (WebKit::x11Screen):
+
 2020-04-10  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

@@ -39 +39 @@
 
 #if PLATFORM(GTK)
+#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkx.h>
@@ -62 +63 @@
     // Since we're a gdk/gtk app, we'll (probably?) have the same X connection as any gdk-based
     // plugins, so we can return that. We might want to add other implementations here later.
-    return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+    return gdk_x11_get_default_xdisplay();
 #else
     return nullptr;
@@ -71 +72 @@
 {
 #if PLATFORM(GTK)
-    return gdk_screen_get_number(gdk_screen_get_default());
+    return gdk_x11_screen_get_screen_number(gdk_screen_get_default());
 #else
     return 0;