Title: [259856] trunk/Source/WebKit
- Revision
- 259856
- Author
- csaave...@igalia.com
- Date
- 2020-04-10 03:31:56 -0700 (Fri, 10 Apr 2020)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (259855 => 259856)
--- trunk/Source/WebKit/ChangeLog 2020-04-10 10:31:01 UTC (rev 259855)
+++ trunk/Source/WebKit/ChangeLog 2020-04-10 10:31:56 UTC (rev 259856)
@@ -1,5 +1,19 @@
2020-04-10 Claudio Saavedra <csaave...@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 <csaave...@igalia.com>
+
[GTK] Drop deprecated Drag and Drop API use
https://bugs.webkit.org/show_bug.cgi?id=210327
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (259855 => 259856)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2020-04-10 10:31:01 UTC (rev 259855)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2020-04-10 10:31:56 UTC (rev 259856)
@@ -38,6 +38,7 @@
#include <WebCore/XUniquePtr.h>
#if PLATFORM(GTK)
+#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <gtk/gtkx.h>
#endif
@@ -61,7 +62,7 @@
#if PLATFORM(GTK)
// 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;
#endif
@@ -70,7 +71,7 @@
static inline int x11Screen()
{
#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;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
