Changeset 242042 in webkit

Timestamp:

Feb 25, 2019 8:10:31 AM (5 years ago)

Author:

Michael Catanzaro

Message:

[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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/glib/WebProcessPoolGLib.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-25  Michael Catanzaro  <mcatanzaro@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  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp

@@ -74 +74 @@
 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"))
@@ -95 +101 @@
     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;