Title: [210178] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 210178
- Author
- [email protected]
- Date
- 2016-12-27 09:03:57 -0800 (Tue, 27 Dec 2016)
Log Message
Merge r209534 - [GTK] Process accelerated compositing env variables only if they are really enabled
https://bugs.webkit.org/show_bug.cgi?id=165300
Don't process the WEBKIT_FORCE_COMPOSITING_MODE and
WEBKIT_DISABLE_COMPOSITING_MODE env variables if they are disabled
(eg. WEBKIT_DISABLE_COMPOSITING_MODE=0).
Reviewed by Michael Catanzaro.
* UIProcess/gtk/WebPreferencesGtk.cpp:
(WebKit::WebPreferences::platformInitializeStore):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (210177 => 210178)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-12-27 17:02:13 UTC (rev 210177)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-12-27 17:03:57 UTC (rev 210178)
@@ -1,3 +1,17 @@
+2016-12-08 Tomas Popela <[email protected]>
+
+ [GTK] Process accelerated compositing env variables only if they are really enabled
+ https://bugs.webkit.org/show_bug.cgi?id=165300
+
+ Don't process the WEBKIT_FORCE_COMPOSITING_MODE and
+ WEBKIT_DISABLE_COMPOSITING_MODE env variables if they are disabled
+ (eg. WEBKIT_DISABLE_COMPOSITING_MODE=0).
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/gtk/WebPreferencesGtk.cpp:
+ (WebKit::WebPreferences::platformInitializeStore):
+
2016-11-30 Carlos Garcia Campos <[email protected]>
[GTK] UI process crash in WebKit::WaylandCompositor::Surface::prepareTextureForPainting
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (210177 => 210178)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2016-12-27 17:02:13 UTC (rev 210177)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2016-12-27 17:03:57 UTC (rev 210178)
@@ -47,11 +47,13 @@
#if USE(COORDINATED_GRAPHICS_THREADED)
setForceCompositingMode(true);
#else
- if (getenv("WEBKIT_FORCE_COMPOSITING_MODE"))
+ const char* force_compositing = getenv("WEBKIT_FORCE_COMPOSITING_MODE");
+ if (force_compositing && strcmp(force_compositing, "0"))
setForceCompositingMode(true);
#endif
- if (getenv("WEBKIT_DISABLE_COMPOSITING_MODE")) {
+ const char* disable_compositing = getenv("WEBKIT_DISABLE_COMPOSITING_MODE");
+ if (disable_compositing && strcmp(disable_compositing, "0")) {
setAcceleratedCompositingEnabled(false);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
