Title: [191107] releases/WebKitGTK/webkit-2.10/Source/WebKit2
Revision
191107
Author
carlo...@webkit.org
Date
2015-10-15 02:17:29 -0700 (Thu, 15 Oct 2015)

Log Message

Merge r191102 - Unreviewed. Fix wrong #ifdef added in r190615.

This disabled accelerated compositing unconditionally.

* UIProcess/gtk/WebPreferencesGtk.cpp:
(WebKit::WebPreferences::platformInitializeStore):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (191106 => 191107)


--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-10-15 09:15:46 UTC (rev 191106)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-10-15 09:17:29 UTC (rev 191107)
@@ -1,3 +1,12 @@
+2015-10-15  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix wrong #ifdef added in r190615.
+
+        This disabled accelerated compositing unconditionally.
+
+        * UIProcess/gtk/WebPreferencesGtk.cpp:
+        (WebKit::WebPreferences::platformInitializeStore):
+
 2015-10-14  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.1 release.

Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (191106 => 191107)


--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp	2015-10-15 09:15:46 UTC (rev 191106)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp	2015-10-15 09:17:29 UTC (rev 191107)
@@ -43,7 +43,7 @@
         setPluginsEnabled(false);
     }
 #endif
-#if !ENABLE(OPEN_GL)
+#if !ENABLE(OPENGL)
     setAcceleratedCompositingEnabled(false);
 #endif
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to