Title: [242453] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 242453
- Author
- carlo...@webkit.org
- Date
- 2019-03-05 04:41:26 -0800 (Tue, 05 Mar 2019)
Log Message
Merge r242042 - [WPE][GTK] Clean up handling of WEBKIT_FORCE_COMPLEX_TEXT
https://bugs.webkit.org/show_bug.cgi?id=194614
Reviewed by Carlos Garcia Campos.
This environment variable is now enabled for WPE, not just for GTK.
It is now possible to use this environment variable to enable complex text, not just to
disable it.
WebProcessPool::setAlwaysUsesComplexTextCodePath is fixed to be respected even when this
environment variable is set, although WPE and GTK will never do so.
* UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitialize):
(WebKit::WebProcessPool::platformInitializeWebProcess):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (242452 => 242453)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-03-05 12:41:23 UTC (rev 242452)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-03-05 12:41:26 UTC (rev 242453)
@@ -1,3 +1,22 @@
+2019-02-25 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE][GTK] Clean up handling of WEBKIT_FORCE_COMPLEX_TEXT
+ https://bugs.webkit.org/show_bug.cgi?id=194614
+
+ Reviewed by Carlos Garcia Campos.
+
+ This environment variable is now enabled for WPE, not just for GTK.
+
+ It is now possible to use this environment variable to enable complex text, not just to
+ disable it.
+
+ WebProcessPool::setAlwaysUsesComplexTextCodePath is fixed to be respected even when this
+ environment variable is set, although WPE and GTK will never do so.
+
+ * UIProcess/glib/WebProcessPoolGLib.cpp:
+ (WebKit::WebProcessPool::platformInitialize):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+
2019-02-24 Michael Catanzaro <mcatanz...@igalia.com>
[WPE] Install MemoryPressureHandler in UIProcess
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (242452 => 242453)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-03-05 12:41:23 UTC (rev 242452)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-03-05 12:41:26 UTC (rev 242453)
@@ -73,6 +73,12 @@
void WebProcessPool::platformInitialize()
{
+#if PLATFORM(GTK)
+ m_alwaysUsesComplexTextCodePath = true;
+#endif
+ if (const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT"))
+ m_alwaysUsesComplexTextCodePath = !strcmp(forceComplexText, "1");
+
#if ENABLE(REMOTE_INSPECTOR)
if (const char* address = g_getenv("WEBKIT_INSPECTOR_SERVER"))
initializeRemoteInspectorServer(address);
@@ -94,14 +100,6 @@
parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModel::DocumentViewer;
parameters.proxySettings = m_networkProxySettings;
-#if PLATFORM(GTK)
- // This is misnamed. It can only be used to disable complex text.
- parameters.shouldAlwaysUseComplexTextCodePath = true;
- const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT");
- if (forceComplexText && !strcmp(forceComplexText, "0"))
- parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath;
-#endif
-
if (memoryPressureMonitorDisabled())
parameters.shouldSuppressMemoryPressureHandler = true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
