Title: [156327] trunk/Source/WebKit/gtk
- Revision
- 156327
- Author
- [email protected]
- Date
- 2013-09-24 06:09:57 -0700 (Tue, 24 Sep 2013)
Log Message
[GTK] Fix accelerated compositing disabling under Wayland displays
https://bugs.webkit.org/show_bug.cgi?id=121788
Reviewed by Gustavo Noronha Silva.
* webkit/webkitwebview.cpp:
(updateAcceleratedCompositingSetting): Fix a ridiculous early return in the case of disabling the accelerated
compositing setting. There's no need to re-disable the setting if it was already disabled, but it should
definitely be disabled if the setting was previously enabled.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (156326 => 156327)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-09-24 13:08:29 UTC (rev 156326)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-09-24 13:09:57 UTC (rev 156327)
@@ -1,3 +1,15 @@
+2013-09-24 Zan Dobersek <[email protected]>
+
+ [GTK] Fix accelerated compositing disabling under Wayland displays
+ https://bugs.webkit.org/show_bug.cgi?id=121788
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * webkit/webkitwebview.cpp:
+ (updateAcceleratedCompositingSetting): Fix a ridiculous early return in the case of disabling the accelerated
+ compositing setting. There's no need to re-disable the setting if it was already disabled, but it should
+ definitely be disabled if the setting was previously enabled.
+
2013-09-22 Zan Dobersek <[email protected]>
Unreviewed, GTK build fix when building with GTK+ 2.0.
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (156326 => 156327)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-09-24 13:08:29 UTC (rev 156326)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2013-09-24 13:09:57 UTC (rev 156327)
@@ -3502,7 +3502,7 @@
#if PLATFORM(WAYLAND) && defined(GDK_WINDOWING_WAYLAND)
GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
if (GDK_IS_WAYLAND_DISPLAY(display)) {
- if (!value)
+ if (!settings.acceleratedCompositingEnabled() && !value)
return;
static bool unsupportedACWarningShown = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
