Changeset 188331 in webkit

Timestamp:

Aug 12, 2015, 12:13:01 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

NetworkProcess: DNS prefetch happens in the Web Process
​https://bugs.webkit.org/show_bug.cgi?id=147824

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Use FrameLoaderClient to do the DNS prefetch.

• html/HTMLAnchorElement.cpp:

(WebCore::HTMLAnchorElement::parseAttribute):

• loader/FrameLoaderClient.h:
• loader/LinkLoader.cpp:

(WebCore::LinkLoader::loadLink):

• page/Chrome.cpp:

(WebCore::Chrome::mouseDidMoveOverElement):

Source/WebKit2:

DNS prefetch requests started in the WebProcess should be sent to
the network process when it's enabled.

• NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::prefetchDNS): Do the
actual DNS prefetch.

• NetworkProcess/NetworkConnectionToWebProcess.h:
• NetworkProcess/NetworkConnectionToWebProcess.messages.in: Add

PrefetchDNS message.

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

(webkitWebExtensionDidReceiveMessage): Use WebProcess::prefetchDNS().

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::prefetchDNS): Ditto.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::sendTapHighlightForNodeIfNecessary): Use
FrameLoaderClient to do the DNS prefetch.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::prefetchDNS): Send the request to the network
process if it's enabled, otherwise do the actual DNS prefetch.

• WebProcess/WebProcess.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLAnchorElement.cpp (modified) (2 diffs)
• WebCore/loader/FrameLoaderClient.h (modified) (2 diffs)
• WebCore/loader/LinkLoader.cpp (modified) (2 diffs)
• WebCore/page/Chrome.cpp (modified) (3 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (modified) (2 diffs)
• WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (modified) (1 diff)
• WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (3 diffs)
• WebKit2/WebProcess/WebProcess.cpp (modified) (3 diffs)
• WebKit2/WebProcess/WebProcess.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        NetworkProcess: DNS prefetch happens in the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=147824
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use FrameLoaderClient to do the DNS prefetch.
+
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::parseAttribute):
+        * loader/FrameLoaderClient.h:
+        * loader/LinkLoader.cpp:
+        (WebCore::LinkLoader::loadLink):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::mouseDidMoveOverElement):
+
 2015-08-11  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/html/HTMLAnchorElement.cpp

@@ -25 +25 @@
 #include "HTMLAnchorElement.h"
 
-#include "DNS.h"
 #include "ElementIterator.h"
 #include "EventHandler.h"
@@ -254 +253 @@
         if (isLink()) {
             String parsedURL = stripLeadingAndTrailingHTMLSpaces(value);
-            if (document().isDNSPrefetchEnabled()) {
+            if (document().isDNSPrefetchEnabled() && document().frame()) {
                 if (protocolIsInHTTPFamily(parsedURL) || parsedURL.startsWith("//"))
-                    prefetchDNS(document().completeURL(parsedURL).host());
+                    document().frame()->loader().client().prefetchDNS(document().completeURL(parsedURL).host());
             }
         }

trunk/Source/WebCore/loader/FrameLoaderClient.h

@@ -31 +31 @@
 #define FrameLoaderClient_h
 
+#include "DNS.h"
 #include "FrameLoaderTypes.h"
 #include "IconURL.h"
@@ -348 +349 @@
         virtual void contentFilterDidBlockLoad(ContentFilterUnblockHandler) { }
 #endif
+        virtual void prefetchDNS(const String& hostname) { WebCore::prefetchDNS(hostname); }
     };
 

trunk/Source/WebCore/loader/LinkLoader.cpp

@@ -38 +38 @@
 #include "CachedResourceRequest.h"
 #include "ContainerNode.h"
-#include "DNS.h"
 #include "Document.h"
 #include "Frame.h"
@@ -99 +98 @@
         // FIXME: The href attribute of the link element can be in "//hostname" form, and we shouldn't attempt
         // to complete that as URL <https://bugs.webkit.org/show_bug.cgi?id=48857>.
-        if (settings && settings->dnsPrefetchingEnabled() && href.isValid() && !href.isEmpty())
-            prefetchDNS(href.host());
+        if (settings && settings->dnsPrefetchingEnabled() && href.isValid() && !href.isEmpty() && document.frame())
+            document.frame()->loader().client().prefetchDNS(href.host());
     }
 

trunk/Source/WebCore/page/Chrome.cpp

@@ -24 +24 @@
 
 #include "ChromeClient.h"
-#include "DNS.h"
 #include "Document.h"
 #include "DocumentType.h"
@@ -31 +30 @@
 #include "FileList.h"
 #include "FloatRect.h"
+#include "FrameLoaderClient.h"
 #include "FrameTree.h"
 #include "Geolocation.h"
@@ -351 +351 @@
 {
     if (result.innerNode() && result.innerNode()->document().isDNSPrefetchEnabled())
-        prefetchDNS(result.absoluteLinkURL().host());
+        m_page.mainFrame().loader().client().prefetchDNS(result.absoluteLinkURL().host());
     m_client.mouseDidMoveOverElement(result, modifierFlags);
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-08-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        NetworkProcess: DNS prefetch happens in the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=147824
+
+        Reviewed by Alexey Proskuryakov.
+
+        DNS prefetch requests started in the WebProcess should be sent to
+        the network process when it's enabled.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::prefetchDNS): Do the
+        actual DNS prefetch.
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in: Add
+        PrefetchDNS message.
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+        (webkitWebExtensionDidReceiveMessage): Use WebProcess::prefetchDNS().
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::prefetchDNS): Ditto.
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::sendTapHighlightForNodeIfNecessary): Use
+        FrameLoaderClient to do the DNS prefetch.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::prefetchDNS): Send the request to the network
+        process if it's enabled, otherwise do the actual DNS prefetch.
+        * WebProcess/WebProcess.h:
+
 2015-08-11  Hunseop Jeong  <hs85.jeong@samsung.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

@@ -37 +37 @@
 #include "RemoteNetworkingContext.h"
 #include "SessionTracker.h"
+#include <WebCore/DNS.h>
 #include <WebCore/PingHandle.h>
 #include <WebCore/PlatformCookieJar.h>
@@ -158 +159 @@
 
     loader->setDefersLoading(defers);
+}
+
+void NetworkConnectionToWebProcess::prefetchDNS(const String& hostname)
+{
+    WebCore::prefetchDNS(hostname);
 }
 

trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h

@@ -74 +74 @@
     void performSynchronousLoad(const NetworkResourceLoadParameters&, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
     void loadPing(const NetworkResourceLoadParameters&);
+    void prefetchDNS(const String&);
 
     void removeLoadIdentifier(ResourceLoadIdentifier);

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

@@ -30 +30 @@
     RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
     SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
+    PrefetchDNS(String hostname)
 
     StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp

@@ -28 +28 @@
 #include "WebKitWebExtensionPrivate.h"
 #include "WebKitWebPagePrivate.h"
-#include <WebCore/DNS.h>
+#include "WebProcess.h"
 #include <wtf/HashMap.h>
 #include <wtf/glib/GRefPtr.h>
@@ -162 +162 @@
     if (messageName == String::fromUTF8("PrefetchDNS")) {
         API::String* hostname = static_cast<API::String*>(message.get(String::fromUTF8("Hostname")));
-        WebCore::prefetchDNS(hostname->string());
+        WebProcess::singleton().prefetchDNS(hostname->string());
     } else
         ASSERT_NOT_REACHED();

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1712 +1712 @@
 #endif
 
+void WebFrameLoaderClient::prefetchDNS(const String& hostname)
+{
+    WebProcess::singleton().prefetchDNS(hostname);
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

@@ -242 +242 @@
 #endif
 
+    void prefetchDNS(const String&) override;
+
     WebFrame* m_frame;
     RefPtr<PluginView> m_pluginView;

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -51 +51 @@
 #import <CoreText/CTFont.h>
 #import <WebCore/Chrome.h>
-#import <WebCore/DNS.h>
 #import <WebCore/DiagnosticLoggingClient.h>
 #import <WebCore/DiagnosticLoggingKeys.h>
@@ -60 +59 @@
 #import <WebCore/FocusController.h>
 #import <WebCore/Frame.h>
+#import <WebCore/FrameLoaderClient.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/GeometryUtilities.h>
@@ -630 +630 @@
 
     if (is<Element>(*node))
-        prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
+        m_page->mainFrame().loader().client().prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
 
     Vector<FloatQuad> quads;

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -37 +37 @@
 #include "InjectedBundle.h"
 #include "Logging.h"
+#include "NetworkConnectionToWebProcessMessages.h"
 #include "PluginProcessConnectionManager.h"
 #include "SessionTracker.h"
@@ -68 +69 @@
 #include <WebCore/AuthenticationChallenge.h>
 #include <WebCore/CrossOriginPreflightResultCache.h>
+#include <WebCore/DNS.h>
 #include <WebCore/FontCache.h>
 #include <WebCore/FontCascade.h>
@@ -1452 +1454 @@
 #endif
 
+void WebProcess::prefetchDNS(const String& hostname)
+{
+    if (!usesNetworkProcess()) {
+        WebCore::prefetchDNS(hostname);
+        return;
+    }
+
+#if ENABLE(NETWORK_PROCESS)
+    networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
+#endif
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -215 +215 @@
 #endif
 
+    void prefetchDNS(const String&);
+
 private:
     WebProcess();