Attachment 362833 Details for Bug 194614 – Patch

[patch] Patch

bug-194614-20190223153209.patch (text/plain), 3.68 KB, created by Michael Catanzaro on 2019-02-23 13:32:10 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-02-23 13:32:10 PST

Size: 3.68 KB

patch

obsolete

>Subversion Revision: 241995
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f15f2669e53cda130ad02b6f44dbc637274fd30a..ce22e043bbd3371a9dca1797736118854980c05d 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-02-23  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 NOBODY (OOPS!).
>+
>+        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/WebProcessPool.h:
>+        * UIProcess/glib/WebProcessPoolGLib.cpp:
>+        (WebKit::WebProcessPool::platformInitialize):
>+        (WebKit::WebProcessPool::platformInitializeWebProcess):
>+
> 2019-02-23  Keith Miller  <keith_miller@apple.com>
> 
>         Add new mac target numbers
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.h b/Source/WebKit/UIProcess/WebProcessPool.h
>index 7c11b7b69dc293db326e27ec27426723fab22523..71206cff77afeea1d90ec794fd3b747c602372df 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.h
>+++ b/Source/WebKit/UIProcess/WebProcessPool.h
>@@ -115,6 +115,12 @@ int webProcessLatencyQOS();
> int webProcessThroughputQOS();
> #endif
> 
>+#if PLATFORM(GTK)
>+const bool alwaysUsesComplexTextCodePathDefault = true;
>+#else
>+const bool alwaysUsesComplexTextCodePathDefault = false;
>+#endif
>+
> enum class ProcessSwapRequestedByClient;
> 
> class WebProcessPool final : public API::ObjectImpl<API::Object::Type::ProcessPool>, public CanMakeWeakPtr<WebProcessPool>, private IPC::MessageReceiver {
>@@ -623,7 +629,7 @@ private:
>     HashSet<String> m_schemesServiceWorkersCanHandle;
>     HashSet<String> m_schemesToRegisterAsCanDisplayOnlyIfCanRequest;
> 
>-    bool m_alwaysUsesComplexTextCodePath { false };
>+    bool m_alwaysUsesComplexTextCodePath { alwaysUsesComplexTextCodePathDefault };
>     bool m_shouldUseFontSmoothing { true };
> 
>     Vector<String> m_fontWhitelist;
>diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>index 67fe3db8a5a584e03a5e8b7a8cf1e447aa215254..851c937ea814c988cf57833ea8b2cc6a439ac55a 100644
>--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>@@ -73,6 +73,9 @@ static bool memoryPressureMonitorDisabled()
> 
> void WebProcessPool::platformInitialize()
> {
>+    if (const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT"))
>+        setAlwaysUsesComplexTextCodePath(strcmp(forceComplexText, "0"));
>+
> #if ENABLE(REMOTE_INSPECTOR)
>     if (const char* address = g_getenv("WEBKIT_INSPECTOR_SERVER"))
>         initializeRemoteInspectorServer(address);
>@@ -98,14 +101,6 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
>     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;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194614: 361945 | 362833 | 362898