Title: [155334] releases/WebKitGTK/webkit-2.2/Source/WebKit2
- Revision
- 155334
- Author
- [email protected]
- Date
- 2013-09-09 02:07:41 -0700 (Mon, 09 Sep 2013)
Log Message
Merge r155125 - [WK2] [GTK] Remove the test to disable AC under Wayland from WebKitWebViewGroup
https://bugs.webkit.org/show_bug.cgi?id=120762
Reviewed by Gustavo Noronha Silva.
The code to disable AC under Wayland is not run if we're using
WebKitTestRunner, so it would be better to move it to
WebKitWebViewBase.
However it's not really necessary to do that, instead it's much
simpler to disable accelerated compositing in all cases unless we
know we can support it.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseUpdatePreferences):
* UIProcess/API/gtk/WebKitWebViewGroup.cpp:
(webkitWebViewGroupAttachSettingsToPageGroup):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (155333 => 155334)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-09-09 09:03:21 UTC (rev 155333)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-09-09 09:07:41 UTC (rev 155334)
@@ -1,3 +1,23 @@
+2013-09-05 Alberto Garcia <[email protected]>
+
+ [WK2] [GTK] Remove the test to disable AC under Wayland from WebKitWebViewGroup
+ https://bugs.webkit.org/show_bug.cgi?id=120762
+
+ Reviewed by Gustavo Noronha Silva.
+
+ The code to disable AC under Wayland is not run if we're using
+ WebKitTestRunner, so it would be better to move it to
+ WebKitWebViewBase.
+
+ However it's not really necessary to do that, instead it's much
+ simpler to disable accelerated compositing in all cases unless we
+ know we can support it.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseUpdatePreferences):
+ * UIProcess/API/gtk/WebKitWebViewGroup.cpp:
+ (webkitWebViewGroupAttachSettingsToPageGroup):
+
2013-08-28 Zan Dobersek <[email protected]>
[GTK][WK2] Disable accelerated compositing under Wayland
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (155333 => 155334)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-09-09 09:03:21 UTC (rev 155333)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-09-09 09:07:41 UTC (rev 155334)
@@ -896,12 +896,14 @@
void webkitWebViewBaseUpdatePreferences(WebKitWebViewBase* webkitWebViewBase)
{
-#if USE(TEXTURE_MAPPER_GL)
WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
- if (!priv->redirectedWindow)
- priv->pageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(false);
+#if USE(TEXTURE_MAPPER_GL)
+ if (priv->redirectedWindow)
+ return;
#endif
+
+ priv->pageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(false);
}
void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebContext* context, WebPageGroup* pageGroup)
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp (155333 => 155334)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-09-09 09:03:21 UTC (rev 155333)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-09-09 09:07:41 UTC (rev 155334)
@@ -28,10 +28,6 @@
#include <wtf/gobject/GRefPtr.h>
#include <wtf/text/CString.h>
-#ifdef GDK_WINDOWING_WAYLAND
-#include <gdk/gdkwayland.h>
-#endif
-
using namespace WebKit;
/**
@@ -130,12 +126,6 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
