Title: [181799] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 181799
- Author
- [email protected]
- Date
- 2015-03-20 04:06:15 -0700 (Fri, 20 Mar 2015)
Log Message
Merge r181798 - [GTK] Disable accelerated compositing on Wayland
https://bugs.webkit.org/show_bug.cgi?id=142877
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseCreateWebPage): As was done in the past, we should disable
accelerated compositing on Wayland until the proper support for it lands.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181798 => 181799)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-20 10:38:19 UTC (rev 181798)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-20 11:06:15 UTC (rev 181799)
@@ -1,5 +1,16 @@
2015-03-20 Zan Dobersek <[email protected]>
+ [GTK] Disable accelerated compositing on Wayland
+ https://bugs.webkit.org/show_bug.cgi?id=142877
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseCreateWebPage): As was done in the past, we should disable
+ accelerated compositing on Wayland until the proper support for it lands.
+
+2015-03-20 Zan Dobersek <[email protected]>
+
[GTK] Properly guard X11-specific code in BackingStore::createBackend()
https://bugs.webkit.org/show_bug.cgi?id=142875
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (181798 => 181799)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-20 10:38:19 UTC (rev 181798)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-20 11:06:15 UTC (rev 181799)
@@ -58,9 +58,6 @@
#include <WebCore/Region.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#if defined(GDK_WINDOWING_X11)
-#include <gdk/gdkx.h>
-#endif
#include <memory>
#include <wtf/HashMap.h>
#include <wtf/gobject/GRefPtr.h>
@@ -70,6 +67,13 @@
#include "WebFullScreenManagerProxy.h"
#endif
+#if PLATFORM(X11)
+#include <gdk/gdkx.h>
+#endif
+#if PLATFORM(WAYLAND)
+#include <gdk/gdkwayland.h>
+#endif
+
// gtk_widget_get_scale_factor() appeared in GTK 3.10, but we also need
// to make sure we have cairo new enough to support cairo_surface_set_device_scale
#define HAVE_GTK_SCALE_FACTOR HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE && GTK_CHECK_VERSION(3, 10, 0)
@@ -1115,6 +1119,14 @@
{
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+#if PLATFORM(WAYLAND)
+ // FIXME: Accelerated compositing under Wayland is not yet supported.
+ // https://bugs.webkit.org/show_bug.cgi?id=115803
+ GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+ if (GDK_IS_WAYLAND_DISPLAY(display))
+ preferences->setAcceleratedCompositingEnabled(false);
+#endif
+
WebPageConfiguration webPageConfiguration;
webPageConfiguration.preferences = preferences;
webPageConfiguration.pageGroup = pageGroup;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
