Title: [186835] trunk/Source/WebKit2
- Revision
- 186835
- Author
- changseok...@collabora.com
- Date
- 2015-07-15 06:34:19 -0700 (Wed, 15 Jul 2015)
Log Message
[GTK] Accelerated compositing is enabled by MiniBrowser in Wayland
https://bugs.webkit.org/show_bug.cgi?id=146827
Reviewed by Žan Doberšek.
WebKit2Gtk+ does not currently support accelerated compositing. For the reason,
we forcedly disable it in webkitWebViewBaseCreateWebPage. However, when we launch
MiniBrowser in wayland, the unsupported feature is re-enabled since the existing
setting is overwritten by a newly created one. Here the default value for
accelerated compositing is true. We can fix this by moving the code disabling
accelerated composition to WebPreferences::platformInitializeStore() so that
we make sure the accelerated compositing is always disabled for wayland.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseCreateWebPage): Deleted.
* UIProcess/gtk/WebPreferencesGtk.cpp:
(WebKit::WebPreferences::platformInitializeStore):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186834 => 186835)
--- trunk/Source/WebKit2/ChangeLog 2015-07-15 08:33:31 UTC (rev 186834)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-15 13:34:19 UTC (rev 186835)
@@ -1,3 +1,23 @@
+2015-07-15 ChangSeok Oh <changseok...@collabora.com>
+
+ [GTK] Accelerated compositing is enabled by MiniBrowser in Wayland
+ https://bugs.webkit.org/show_bug.cgi?id=146827
+
+ Reviewed by Žan Doberšek.
+
+ WebKit2Gtk+ does not currently support accelerated compositing. For the reason,
+ we forcedly disable it in webkitWebViewBaseCreateWebPage. However, when we launch
+ MiniBrowser in wayland, the unsupported feature is re-enabled since the existing
+ setting is overwritten by a newly created one. Here the default value for
+ accelerated compositing is true. We can fix this by moving the code disabling
+ accelerated composition to WebPreferences::platformInitializeStore() so that
+ we make sure the accelerated compositing is always disabled for wayland.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseCreateWebPage): Deleted.
+ * UIProcess/gtk/WebPreferencesGtk.cpp:
+ (WebKit::WebPreferences::platformInitializeStore):
+
2015-07-15 Dan Bernstein <m...@apple.com>
Fixed build fix.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (186834 => 186835)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-07-15 08:33:31 UTC (rev 186834)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-07-15 13:34:19 UTC (rev 186835)
@@ -1073,14 +1073,6 @@
void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, WebProcessPool* context, WebPageConfiguration&& configuration)
{
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
- if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland)
- configuration.preferences->setAcceleratedCompositingEnabled(false);
-#endif
-
priv->pageProxy = context->createWebPage(*priv->pageClient, WTF::move(configuration));
priv->pageProxy->initializeWebPage();
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (186834 => 186835)
--- trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2015-07-15 08:33:31 UTC (rev 186834)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2015-07-15 13:34:19 UTC (rev 186835)
@@ -28,12 +28,18 @@
#include "WebPreferences.h"
#include <WebCore/NotImplemented.h>
+#include <WebCore/PlatformDisplay.h>
namespace WebKit {
void WebPreferences::platformInitializeStore()
{
- notImplemented();
+#if PLATFORM(WAYLAND)
+ // FIXME: Accelerated compositing under Wayland is not yet supported.
+ // https://bugs.webkit.org/show_bug.cgi?id=115803
+ if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland)
+ setAcceleratedCompositingEnabled(false);
+#endif
}
void WebPreferences::platformUpdateStringValueForKey(const String&, const String&)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
