Changeset 155125 in webkit

Timestamp:

Sep 5, 2013 10:10:13 AM (11 years ago)

Author:

berto@igalia.com

Message:

[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):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-09-05  Alberto Garcia  <berto@igalia.com>
+
+        [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-09-04  Alberto Garcia  <berto@igalia.com>
 

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

@@ -897 +897 @@
 void webkitWebViewBaseUpdatePreferences(WebKitWebViewBase* webkitWebViewBase)
 {
+    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+
 #if USE(TEXTURE_MAPPER_GL)
-    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
-
-    if (!priv->redirectedWindow)
-        priv->pageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(false);
-#endif
+    if (priv->redirectedWindow)
+        return;
+#endif
+
+    priv->pageProxy->pageGroup()->preferences()->setAcceleratedCompositingEnabled(false);
 }
 

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;
@@ -131 +127 @@
 {
     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
 }