Changeset 161976 in webkit

Timestamp:

Jan 14, 2014 9:30:21 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Test /webkit2/WebKitWebContext/languages crashes with network process enabled
​https://bugs.webkit.org/show_bug.cgi?id=126130

Reviewed by Anders Carlsson.

We need to notify the network process when the user preferred
languages have changed to update the SoupSession accordingly.

• NetworkProcess/NetworkProcess.h: Add

userPreferredLanguagesChanged when using soup network backend.

• NetworkProcess/NetworkProcess.messages.in: Add

UserPreferredLanguagesChanged message when using soup network
backend.

• NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::NetworkProcess::userPreferredLanguagesChanged): Update
the SoupSession to use the given languages.
(WebKit::NetworkProcess::platformInitializeNetworkProcess): Call
userPreferredLanguagesChanged() when initialization parameters
contain languages.
(WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):
Remove unnedded WebCore prefix.
(WebKit::NetworkProcess::clearCacheForAllOrigins): Simplify using
a single line.

• Shared/Network/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode): Encode the
languages vector.
(WebKit::NetworkProcessCreationParameters::decode): Decode the
languages vector.

• Shared/Network/NetworkProcessCreationParameters.h:
• UIProcess/WebContext.cpp:

(WebKit::WebContext::languageChanged): Send a message also to the
network process.

• UIProcess/soup/WebContextSoup.cpp:

(WebKit::WebContext::platformInitializeNetworkProcess): Set
languages initial parameter.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• NetworkProcess/soup/NetworkProcessSoup.cpp (modified) (4 diffs)
• Shared/Network/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/Network/NetworkProcessCreationParameters.h (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (1 diff)
• UIProcess/soup/WebContextSoup.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-14  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Test /webkit2/WebKitWebContext/languages crashes with network process enabled
+        https://bugs.webkit.org/show_bug.cgi?id=126130
+
+        Reviewed by Anders Carlsson.
+
+        We need to notify the network process when the user preferred
+        languages have changed to update the SoupSession accordingly.
+
+        * NetworkProcess/NetworkProcess.h: Add
+        userPreferredLanguagesChanged when using soup network backend.
+        * NetworkProcess/NetworkProcess.messages.in: Add
+        UserPreferredLanguagesChanged message when using soup network
+        backend.
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::NetworkProcess::userPreferredLanguagesChanged): Update
+        the SoupSession to use the given languages.
+        (WebKit::NetworkProcess::platformInitializeNetworkProcess): Call
+        userPreferredLanguagesChanged() when initialization parameters
+        contain languages.
+        (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):
+        Remove unnedded WebCore prefix.
+        (WebKit::NetworkProcess::clearCacheForAllOrigins): Simplify using
+        a single line.
+        * Shared/Network/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode): Encode the
+        languages vector.
+        (WebKit::NetworkProcessCreationParameters::decode): Decode the
+        languages vector.
+        * Shared/Network/NetworkProcessCreationParameters.h:
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::languageChanged): Send a message also to the
+        network process.
+        * UIProcess/soup/WebContextSoup.cpp:
+        (WebKit::WebContext::platformInitializeNetworkProcess): Set
+        languages initial parameter.
+
 2014-01-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

@@ -116 +116 @@
 #if USE(SOUP)
     void setIgnoreTLSErrors(bool);
+    void userPreferredLanguagesChanged(const Vector<String>&);
 #endif
 

trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in

@@ -32 +32 @@
 #if USE(SOUP)
     SetIgnoreTLSErrors(bool ignoreTLSErrors)
+    UserPreferredLanguagesChanged(Vector<String> languages)
 #endif
 

trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp

@@ -29 +29 @@
 #include "NetworkProcess.h"
 
-#include "CertificateInfo.h"
 #include "NetworkProcessCreationParameters.h"
 #include "ResourceCachesToClear.h"
 #include "WebCookieManager.h"
+#include <WebCore/CertificateInfo.h>
 #include <WebCore/FileSystem.h>
 #include <WebCore/NotImplemented.h>
@@ -76 +76 @@
 }
 
+void NetworkProcess::userPreferredLanguagesChanged(const Vector<String>& languages)
+{
+    SoupNetworkSession::defaultSession().setAcceptLanguages(languages);
+}
+
 void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
 {
@@ -88 +93 @@
     }
     supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
+
+    if (!parameters.languages.isEmpty())
+        userPreferredLanguagesChanged(parameters.languages);
 
     setIgnoreTLSErrors(parameters.ignoreTLSErrors);
@@ -122 +130 @@
 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
 {
-    WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
+    ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
 }
 

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp

@@ -60 +60 @@
     encoder.encodeEnum(cookieAcceptPolicy);
     encoder << ignoreTLSErrors;
+    encoder << languages;
 #endif
 }
@@ -103 +104 @@
     if (!decoder.decode(result.ignoreTLSErrors))
         return false;
+    if (!decoder.decode(result.languages))
+        return false;
 #endif
 

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h

@@ -78 +78 @@
     HTTPCookieAcceptPolicy cookieAcceptPolicy;
     bool ignoreTLSErrors;
+    Vector<String> languages;
 #endif
 };

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -324 +324 @@
 {
     sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged(userPreferredLanguages()));
+#if USE(SOUP) && ENABLE(NETWORK_PROCESS)
+    if (m_usesNetworkProcess && m_networkProcess)
+        m_networkProcess->send(Messages::NetworkProcess::UserPreferredLanguagesChanged(userPreferredLanguages()), 0);
+#endif
 }
 

trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp

@@ -30 +30 @@
 #include "NetworkProcessCreationParameters.h"
 #include "WebCookieManagerProxy.h"
+#include <WebCore/Language.h>
 
 namespace WebKit {
@@ -38 +39 @@
     parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
     parameters.ignoreTLSErrors = m_ignoreTLSErrors;
+    parameters.languages = WebCore::userPreferredLanguages();
 }