Changeset 154728 in webkit

Timestamp:

Aug 28, 2013 2:34:50 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK][WK2] Disable accelerated compositing under Wayland
​https://bugs.webkit.org/show_bug.cgi?id=120347

Reviewed by Martin Robinson.

Accelerated compositing is not yet supported under the Wayland display protocol,
so it should be disabled. Since it is enabled by default and the GTK WK2 API does
not provide any way to change that, it's enough to disable it when attaching the
WebKitSettings object to the WebPageGroup if running under Wayland.

• UIProcess/API/gtk/WebKitWebViewGroup.cpp:

(webkitWebViewGroupAttachSettingsToPageGroup):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewGroup.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-08-28  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][WK2] Disable accelerated compositing under Wayland
+        https://bugs.webkit.org/show_bug.cgi?id=120347
+
+        Reviewed by Martin Robinson.
+
+        Accelerated compositing is not yet supported under the Wayland display protocol,
+        so it should be disabled. Since it is enabled by default and the GTK WK2 API does
+        not provide any way to change that, it's enough to disable it when attaching the
+        WebKitSettings object to the WebPageGroup if running under Wayland.
+
+        * UIProcess/API/gtk/WebKitWebViewGroup.cpp:
+        (webkitWebViewGroupAttachSettingsToPageGroup):
+
 2013-08-28  Alexandre Abreu  <alexandre.abreu@canonical.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp

@@ -28 +28 @@
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
+
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
 
 using namespace WebKit;
@@ -127 +131 @@
 {
     group->priv->pageGroup->setPreferences(webkitSettingsGetPreferences(group->priv->settings.get()));
+
+#ifdef GDK_WINDOWING_WAYLAND
+    GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+    if (GDK_IS_WAYLAND_DISPLAY(display))
+        group->priv->pageGroup->preferences()->setAcceleratedCompositingEnabled(false);
+#endif
 }