Title: [263094] trunk/Source
Revision
263094
Author
[email protected]
Date
2020-06-16 08:30:03 -0700 (Tue, 16 Jun 2020)

Log Message

Stop calling userPreferredLanguages() in the UIProcess
https://bugs.webkit.org/show_bug.cgi?id=213214
<rdar://problem/64317593>

Reviewed by Per Arne Vollan.

Source/WebKit:

Stop calling userPreferredLanguages() in the UIProcess since this can be slow and may keep
the main thread busy. Nowadays, the WebProcess is able to call it by itself anyway. The
sandbox is allowing it.

* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::languageChanged):
(WebKit::WebProcessPool::initializeNewWebProcess):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::userPreferredLanguagesChanged const):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:

Source/WTF:

Export WTF::languageDidChange() so we can call it from WebKit2.

* wtf/Language.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (263093 => 263094)


--- trunk/Source/WTF/ChangeLog	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WTF/ChangeLog	2020-06-16 15:30:03 UTC (rev 263094)
@@ -1,3 +1,15 @@
+2020-06-16  Chris Dumez  <[email protected]>
+
+        Stop calling userPreferredLanguages() in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=213214
+        <rdar://problem/64317593>
+
+        Reviewed by Per Arne Vollan.
+
+        Export WTF::languageDidChange() so we can call it from WebKit2.
+
+        * wtf/Language.h:
+
 2020-06-16  Mark Lam  <[email protected]>
 
         Add SIGABRT handler for non OS(DARWIN) builds to the jsc shell with the -s option.

Modified: trunk/Source/WTF/wtf/Language.h (263093 => 263094)


--- trunk/Source/WTF/wtf/Language.h	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WTF/wtf/Language.h	2020-06-16 15:30:03 UTC (rev 263094)
@@ -42,7 +42,7 @@
 WTF_EXPORT_PRIVATE size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<String>& languageList, bool& exactMatch);
 WTF_EXPORT_PRIVATE Vector<String> platformUserPreferredLanguages();
 // Called from platform specific code when the user's preferred language(s) change.
-void languageDidChange();
+WTF_EXPORT_PRIVATE void languageDidChange();
 
 // The observer function will be called when system language changes.
 typedef void (*LanguageChangeObserverFunction)(void* context);

Modified: trunk/Source/WebKit/ChangeLog (263093 => 263094)


--- trunk/Source/WebKit/ChangeLog	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/ChangeLog	2020-06-16 15:30:03 UTC (rev 263094)
@@ -1,3 +1,28 @@
+2020-06-16  Chris Dumez  <[email protected]>
+
+        Stop calling userPreferredLanguages() in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=213214
+        <rdar://problem/64317593>
+
+        Reviewed by Per Arne Vollan.
+
+        Stop calling userPreferredLanguages() in the UIProcess since this can be slow and may keep
+        the main thread busy. Nowadays, the WebProcess is able to call it by itself anyway. The
+        sandbox is allowing it.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::languageChanged):
+        (WebKit::WebProcessPool::initializeNewWebProcess):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::userPreferredLanguagesChanged const):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+
 2020-06-16  Truitt Savell  <[email protected]>
 
         Unreviewed, reverting r263079.

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (263093 => 263094)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2020-06-16 15:30:03 UTC (rev 263094)
@@ -79,7 +79,7 @@
     encoder << shouldUseFontSmoothing;
     encoder << fontWhitelist;
     encoder << terminationTimeout;
-    encoder << languages;
+    encoder << overrideLanguages;
 #if USE(GSTREAMER)
     encoder << gstreamerOptions;
 #endif
@@ -284,7 +284,7 @@
         return false;
     if (!decoder.decode(parameters.terminationTimeout))
         return false;
-    if (!decoder.decode(parameters.languages))
+    if (!decoder.decode(parameters.overrideLanguages))
         return false;
 #if USE(GSTREAMER)
     if (!decoder.decode(parameters.gstreamerOptions))

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (263093 => 263094)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2020-06-16 15:30:03 UTC (rev 263094)
@@ -107,7 +107,7 @@
     Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
 
     Vector<String> fontWhitelist;
-    Vector<String> languages;
+    Vector<String> overrideLanguages;
 #if USE(GSTREAMER)
     Vector<String> gstreamerOptions;
 #endif

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (263093 => 263094)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm	2020-06-16 15:30:03 UTC (rev 263094)
@@ -247,4 +247,20 @@
 }
 #endif
 
+Vector<String> WebProcessProxy::platformOverrideLanguages() const
+{
+    NeverDestroyed<Vector<String>> overrideLanguages = []() {
+        NSArray *languages = [[NSUserDefaults standardUserDefaults] valueForKey:@"AppleLanguages"];
+        if (!languages)
+            return Vector<WTF::String> { };
+
+        Vector<String> overrideLanguages;
+        overrideLanguages.reserveInitialCapacity([languages count]);
+        for (NSString *language in languages)
+            overrideLanguages.uncheckedAppend(language);
+        return overrideLanguages;
+    }();
+    return overrideLanguages.get();
 }
+
+}

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (263093 => 263094)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2020-06-16 15:30:03 UTC (rev 263094)
@@ -444,7 +444,7 @@
 
 void WebProcessPool::languageChanged()
 {
-    sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged(userPreferredLanguages()));
+    sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged());
 #if USE(SOUP)
     if (m_networkProcess)
         m_networkProcess->send(Messages::NetworkProcess::UserPreferredLanguagesChanged(userPreferredLanguages()), 0);
@@ -1029,7 +1029,7 @@
 #endif
 
     parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
-    parameters.languages = configuration().overrideLanguages().isEmpty() ? userPreferredLanguages() : configuration().overrideLanguages();
+    parameters.overrideLanguages = configuration().overrideLanguages();
 
     parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument);
     parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure());

Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (263093 => 263094)


--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp	2020-06-16 15:30:03 UTC (rev 263094)
@@ -317,7 +317,9 @@
         launchOptions.extraInitializationData.add("inspector-process"_s, "1"_s);
 
     auto overrideLanguages = m_processPool->configuration().overrideLanguages();
-    if (overrideLanguages.size()) {
+    if (overrideLanguages.isEmpty())
+        overrideLanguages = platformOverrideLanguages();
+    if (!overrideLanguages.isEmpty()) {
         StringBuilder languageString;
         for (size_t i = 0; i < overrideLanguages.size(); ++i) {
             if (i)
@@ -648,6 +650,11 @@
 {
     return false;
 }
+
+Vector<String> WebProcessProxy::platformOverrideLanguages() const
+{
+    return { };
+}
 #endif
 
 bool WebProcessProxy::hasProvisionalPageWithID(WebPageProxyIdentifier pageID) const

Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.h (263093 => 263094)


--- trunk/Source/WebKit/UIProcess/WebProcessProxy.h	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.h	2020-06-16 15:30:03 UTC (rev 263094)
@@ -477,6 +477,7 @@
     void logDiagnosticMessageForResourceLimitTermination(const String& limitKey);
     
     void updateRegistrationWithDataStore();
+    Vector<String> platformOverrideLanguages() const;
 
     void maybeShutDown();
 

Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (263093 => 263094)


--- trunk/Source/WebKit/WebProcess/WebProcess.cpp	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp	2020-06-16 15:30:03 UTC (rev 263094)
@@ -391,8 +391,8 @@
 
     setCacheModel(parameters.cacheModel);
 
-    if (!parameters.languages.isEmpty())
-        overrideUserPreferredLanguages(parameters.languages);
+    if (!parameters.overrideLanguages.isEmpty())
+        overrideUserPreferredLanguages(parameters.overrideLanguages);
 
     m_textCheckerState = parameters.textCheckerState;
 
@@ -645,9 +645,9 @@
     WebCore::FontCascade::setShouldUseSmoothing(useFontSmoothing);
 }
 
-void WebProcess::userPreferredLanguagesChanged(const Vector<String>& languages) const
+void WebProcess::userPreferredLanguagesChanged() const
 {
-    overrideUserPreferredLanguages(languages);
+    WTF::languageDidChange();
 }
 
 void WebProcess::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)

Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (263093 => 263094)


--- trunk/Source/WebKit/WebProcess/WebProcess.h	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h	2020-06-16 15:30:03 UTC (rev 263094)
@@ -377,7 +377,7 @@
     void clearResourceLoadStatistics();
     void flushResourceLoadStatistics();
     void seedResourceLoadStatisticsForTesting(const WebCore::RegistrableDomain& firstPartyDomain, const WebCore::RegistrableDomain& thirdPartyDomain, bool shouldScheduleNotification, CompletionHandler<void()>&&);
-    void userPreferredLanguagesChanged(const Vector<String>&) const;
+    void userPreferredLanguagesChanged() const;
     void fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled);
 
     bool isPlugInAutoStartOriginHash(unsigned plugInOriginHash);

Modified: trunk/Source/WebKit/WebProcess/WebProcess.messages.in (263093 => 263094)


--- trunk/Source/WebKit/WebProcess/WebProcess.messages.in	2020-06-16 15:19:10 UTC (rev 263093)
+++ trunk/Source/WebKit/WebProcess/WebProcess.messages.in	2020-06-16 15:30:03 UTC (rev 263094)
@@ -49,7 +49,7 @@
     SetShouldUseFontSmoothing(bool useFontSmoothing)
     SetResourceLoadStatisticsEnabled(bool resourceLoadStatisticsEnabled);
     ClearResourceLoadStatistics();
-    UserPreferredLanguagesChanged(Vector<String> languages)
+    UserPreferredLanguagesChanged()
     FullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
 
     # Plug-ins.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to