WebKit Bugzilla
Attachment 361945 Details for
Bug 194614
: [WPE][GTK] Clean up handling of WEBKIT_FORCE_COMPLEX_TEXT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194614-20190213171842.patch (text/plain), 3.50 KB, created by
Michael Catanzaro
on 2019-02-13 15:18:43 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Michael Catanzaro
Created:
2019-02-13 15:18:43 PST
Size:
3.50 KB
patch
obsolete
>Subversion Revision: 241474 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 0dc98140a786115c7784619f3a5d321de5e3a6e3..8e2ec0af64833e64439385e1e12b80a00ce89cf2 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,25 @@ >+2019-02-13 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!). >+ >+ It's now possible to use this environment variable to enable complex text, not just to >+ disable it. WEBKIT_FORCE_COMPLEX_TEXT=0 will disable and any other value will enable. >+ >+ The environment variable will now be respected for WPE, not just GTK. >+ >+ If not defined, complex text is still forced for GTK only, not for WPE. >+ >+ Also, move this code up to WebKitWebContext and use setAlwaysUsesComplexTextCodePath; >+ otherwise, setAlwaysUsesComplexTextCodePath doesn't work as intended. >+ >+ * UIProcess/API/glib/WebKitWebContext.cpp: >+ (webkitWebContextConstructed): >+ * UIProcess/glib/WebProcessPoolGLib.cpp: >+ (WebKit::WebProcessPool::platformInitializeWebProcess): >+ > 2019-02-13 Michael Catanzaro <mcatanzaro@igalia.com> > > [WPE][GTK] Merge WebProcessPoolWPE.cpp and WebProcessPoolGtk.cpp >diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp >index 724c5fbf5e847ced1f30fb08cfd58d8d1f569f0b..39708270437cdb5b3538c0081e9ff4e7e6713c81 100644 >--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp >+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp >@@ -54,6 +54,7 @@ > #include "WebNotificationManagerProxy.h" > #include "WebsiteDataType.h" > #include <JavaScriptCore/RemoteInspector.h> >+#include <cstdlib> > #include <glib/gi18n-lib.h> > #include <libintl.h> > #include <memory> >@@ -363,6 +364,13 @@ static void webkitWebContextConstructed(GObject* object) > priv->processPool->startMemorySampler(0); > #endif > >+ if (const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT")) >+ priv->processPool->setAlwaysUsesComplexTextCodePath(strcmp(forceComplexText, "0")); >+#if PLATFORM(GTK) >+ else >+ priv->processPool->setAlwaysUsesComplexTextCodePath(true); >+#endif >+ > attachInjectedBundleClientToContext(webContext); > attachDownloadClientToContext(webContext); > attachCustomProtocolManagerClientToContext(webContext); >diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp >index a2a160be6864abddd46d78994bae00c6dcd50287..95703ab4afd0f93caadf518b416175835e998c22 100644 >--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp >+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp >@@ -86,14 +86,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; >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194614
:
361945
|
362833
|
362898