Changeset 252980 in webkit

Timestamp:

Dec 2, 2019 1:40:33 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK][PSON] Crash in NetworkProcessProxy::openNetworkProcessConnection
​https://bugs.webkit.org/show_bug.cgi?id=204703

Reviewed by Michael Catanzaro.

Stop sending a message to all web process to prefetch DNS for a hostname. All web processes then send a messaage
to their network process to prefetch the DNS. Instead, send a message directly to the network process.

• NetworkProcess/NetworkProcess.messages.in:
• UIProcess/API/glib/WebKitWebContext.cpp:

(webkit_web_context_prefetch_dns):

• WebProcess/InjectedBundle/API/glib/WebKitWebExtension.cpp:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• UIProcess/API/glib/WebKitWebContext.cpp (modified) (6 diffs)
• WebProcess/InjectedBundle/API/glib/WebKitWebExtension.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-12-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][PSON] Crash in NetworkProcessProxy::openNetworkProcessConnection
+        https://bugs.webkit.org/show_bug.cgi?id=204703
+
+        Reviewed by Michael Catanzaro.
+
+        Stop sending a message to all web process to prefetch DNS for a hostname. All web processes then send a messaage
+        to their network process to prefetch the DNS. Instead, send a message directly to the network process.
+
+        * NetworkProcess/NetworkProcess.messages.in:
+        * UIProcess/API/glib/WebKitWebContext.cpp:
+        (webkit_web_context_prefetch_dns):
+        * WebProcess/InjectedBundle/API/glib/WebKitWebExtension.cpp:
+
 2019-12-01  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

@@ -32 +32 @@
     UserPreferredLanguagesChanged(Vector<String> languages)
     SetNetworkProxySettings(struct WebCore::SoupNetworkProxySettings settings)
+    PrefetchDNS(String hostname)
 #endif
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp

@@ -28 +28 @@
 #include "APIString.h"
 #include "LegacyGlobalSettings.h"
+#include "NetworkProcessMessages.h"
 #include "TextChecker.h"
 #include "TextCheckerState.h"
 #include "WebAutomationSession.h"
 #include "WebCertificateInfo.h"
+#include "WebKit2Initialize.h"
 #include "WebKitAutomationSessionPrivate.h"
 #include "WebKitDownloadClient.h"
@@ -60 +62 @@
 #include <libintl.h>
 #include <memory>
+#include <pal/HysteresisActivity.h>
 #include <wtf/FileSystem.h>
 #include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
 #include <wtf/Language.h>
 #include <wtf/NeverDestroyed.h>
@@ -192 +196 @@
 
 struct _WebKitWebContextPrivate {
+    _WebKitWebContextPrivate()
+        : dnsPrefetchHystereris([this](PAL::HysteresisState state) { if (state == PAL::HysteresisState::Stopped) dnsPrefetchedHosts.clear(); })
+    {
+    }
+
     RefPtr<WebProcessPool> processPool;
     bool clientsDetached;
@@ -223 +232 @@
 #endif
     std::unique_ptr<WebKitProtocolHandler> webkitProtocolHandler;
+
+    HashSet<String> dnsPrefetchedHosts;
+    PAL::HysteresisActivity dnsPrefetchHystereris;
 };
 
@@ -439 +451 @@
     bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+
+    InitializeWebKit2();
 
     gObjectClass->get_property = webkitWebContextGetProperty;
@@ -1553 +1567 @@
     g_return_if_fail(hostname);
 
-    API::Dictionary::MapType message;
-    message.set(String::fromUTF8("Hostname"), API::String::create(String::fromUTF8(hostname)));
-    context->priv->processPool->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), API::Dictionary::create(WTFMove(message)).ptr());
+    if (context->priv->dnsPrefetchedHosts.add(hostname).isNewEntry)
+        context->priv->processPool->sendToNetworkingProcess(Messages::NetworkProcess::PrefetchDNS(String::fromUTF8(hostname)));
+    context->priv->dnsPrefetchHystereris.impulse();
 }
 

trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebExtension.cpp

@@ -199 +199 @@
     }
 
-    void didReceiveMessage(InjectedBundle&, const String& messageName, API::Object* messageBody) override
-    {
-        ASSERT(messageBody->type() == API::Object::Type::Dictionary);
-        API::Dictionary& message = *static_cast<API::Dictionary*>(messageBody);
-        if (messageName == String::fromUTF8("PrefetchDNS")) {
-            API::String* hostname = static_cast<API::String*>(message.get(String::fromUTF8("Hostname")));
-            WebProcess::singleton().prefetchDNS(hostname->string());
-        } else
-            ASSERT_NOT_REACHED();
-    }
-
     void didReceiveMessageToPage(InjectedBundle&, WebPage& page, const String& messageName, API::Object* messageBody) override
     {