Changeset 263094 in webkit

Timestamp:

Jun 16, 2020, 8:30:03 AM (6 years ago)

Author:

Chris Dumez

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:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Language.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (modified) (1 diff)
• WebKit/UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• WebKit/UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• WebKit/UIProcess/WebProcessProxy.h (modified) (1 diff)
• WebKit/WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebKit/WebProcess/WebProcess.h (modified) (1 diff)
• WebKit/WebProcess/WebProcess.messages.in (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-06-16  Chris Dumez  <cdumez@apple.com>
+
+        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  <mark.lam@apple.com>
 

trunk/Source/WTF/wtf/Language.h

@@ -43 +43 @@
 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.

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-16  Chris Dumez  <cdumez@apple.com>
+
+        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  <tsavell@apple.com>
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -80 +80 @@
     encoder << fontWhitelist;
     encoder << terminationTimeout;
-    encoder << languages;
+    encoder << overrideLanguages;
 #if USE(GSTREAMER)
     encoder << gstreamerOptions;
@@ -285 +285 @@
     if (!decoder.decode(parameters.terminationTimeout))
         return false;
-    if (!decoder.decode(parameters.languages))
+    if (!decoder.decode(parameters.overrideLanguages))
         return false;
 #if USE(GSTREAMER)

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -108 +108 @@
 
     Vector<String> fontWhitelist;
-    Vector<String> languages;
+    Vector<String> overrideLanguages;
 #if USE(GSTREAMER)
     Vector<String> gstreamerOptions;

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm

@@ -248 +248 @@
 #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();
+}
+
+}

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -445 +445 @@
 void WebProcessPool::languageChanged()
 {
-    sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged(userPreferredLanguages()));
+    sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged());
 #if USE(SOUP)
     if (m_networkProcess)
@@ -1030 +1030 @@
 
     parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
-    parameters.languages = configuration().overrideLanguages().isEmpty() ? userPreferredLanguages() : configuration().overrideLanguages();
+    parameters.overrideLanguages = configuration().overrideLanguages();
 
     parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument);

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -318 +318 @@
 
     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) {
@@ -649 +651 @@
     return false;
 }
+
+Vector<String> WebProcessProxy::platformOverrideLanguages() const
+{
+    return { };
+}
 #endif
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.h

@@ -478 +478 @@
     
     void updateRegistrationWithDataStore();
+    Vector<String> platformOverrideLanguages() const;
 
     void maybeShutDown();

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -392 +392 @@
     setCacheModel(parameters.cacheModel);
 
-    if (!parameters.languages.isEmpty())
-        overrideUserPreferredLanguages(parameters.languages);
+    if (!parameters.overrideLanguages.isEmpty())
+        overrideUserPreferredLanguages(parameters.overrideLanguages);
 
     m_textCheckerState = parameters.textCheckerState;
@@ -646 +646 @@
 }
 
-void WebProcess::userPreferredLanguagesChanged(const Vector<String>& languages) const
-{
-    overrideUserPreferredLanguages(languages);
+void WebProcess::userPreferredLanguagesChanged() const
+{
+    WTF::languageDidChange();
 }
 

trunk/Source/WebKit/WebProcess/WebProcess.h

@@ -378 +378 @@
     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);
 

trunk/Source/WebKit/WebProcess/WebProcess.messages.in

@@ -50 +50 @@
     SetResourceLoadStatisticsEnabled(bool resourceLoadStatisticsEnabled);
     ClearResourceLoadStatistics();
-    UserPreferredLanguagesChanged(Vector<String> languages)
+    UserPreferredLanguagesChanged()
     FullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)