Commit fe4d213e authored by zandobersek@gmail.com's avatar zandobersek@gmail.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):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154728 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8e5df79d
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>
Add a 'isMainFrame' parameter to QWebNavigationRequest.
......
......@@ -28,6 +28,10 @@
#include <wtf/gobject/GRefPtr.h>
#include <wtf/text/CString.h>
#ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h>
#endif
using namespace WebKit;
/**
......@@ -126,6 +130,12 @@ static void webkit_web_view_group_class_init(WebKitWebViewGroupClass* hitTestRes
static void webkitWebViewGroupAttachSettingsToPageGroup(WebKitWebViewGroup* group)
{
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
}
WebKitWebViewGroup* webkitWebViewGroupCreate(WebPageGroup* pageGroup)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment