Title: [191381] trunk/Source
Revision
191381
Author
carlo...@webkit.org
Date
2015-10-21 01:08:48 -0700 (Wed, 21 Oct 2015)

Log Message

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

Reviewed by Chris Dumez.

Source/WebCore:

Use FrameLoaderClient to do the DNS prefetch.

* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::parseAttribute):
* loader/EmptyClients.h:
* loader/FrameLoaderClient.h:
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::loadLink):
* page/Chrome.cpp:
(WebCore::Chrome::mouseDidMoveOverElement):

Source/WebKit/mac:

Implement FrameLoaderClient::prefetchDNS().

* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:

Source/WebKit/win:

Implement FrameLoaderClient::prefetchDNS().

* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::prefetchDNS):
* WebCoreSupport/WebFrameLoaderClient.h:

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): Use NetworkProcess::prefetchDNS().
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in: Add
PrefetchDNS message.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::prefetchDNS): Do the actual DNS prefetch.
* NetworkProcess/NetworkProcess.h:
* WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
(webkitWebExtensionDidReceiveMessage): Use WebProcess::prefetchDNS().
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::prefetchDNS): Use WebProcess::prefetchDNS().
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::sendTapHighlightForNodeIfNecessary): Use
FrameLoaderClient to do the DNS prefetch.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess): Initialize the DNS prefetched
hosts cleanup hysteresis activity. Clear the cache of DNS
prefetched when hysteresis activity stopped.
(WebKit::WebProcess::prefetchDNS): Send the request to the network
process if it's enabled, otherwise do the actual DNS prefetch.
* WebProcess/WebProcess.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (191380 => 191381)


--- trunk/Source/WebCore/ChangeLog	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebCore/ChangeLog	2015-10-21 08:08:48 UTC (rev 191381)
@@ -1,3 +1,21 @@
+2015-10-21  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        NetworkProcess: DNS prefetch happens in the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=147824
+
+        Reviewed by Chris Dumez.
+
+        Use FrameLoaderClient to do the DNS prefetch.
+
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::parseAttribute):
+        * loader/EmptyClients.h:
+        * loader/FrameLoaderClient.h:
+        * loader/LinkLoader.cpp:
+        (WebCore::LinkLoader::loadLink):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::mouseDidMoveOverElement):
+
 2015-10-21  Frederic Wang  <fred.w...@free.fr>
 
         [FreeType] Add support for the USE_TYPO_METRICS flag

Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (191380 => 191381)


--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -25,7 +25,6 @@
 #include "HTMLAnchorElement.h"
 
 #include "AttributeDOMTokenList.h"
-#include "DNS.h"
 #include "ElementIterator.h"
 #include "EventHandler.h"
 #include "EventNames.h"
@@ -252,9 +251,9 @@
             setNeedsStyleRecalc();
         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());
             }
         }
         invalidateCachedVisitedLinkHash();

Modified: trunk/Source/WebCore/loader/EmptyClients.h (191380 => 191381)


--- trunk/Source/WebCore/loader/EmptyClients.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebCore/loader/EmptyClients.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -400,6 +400,8 @@
 #endif
 
     virtual bool isEmptyFrameLoaderClient() override { return true; }
+
+    virtual void prefetchDNS(const String&) override { }
 };
 
 class EmptyTextCheckerClient : public TextCheckerClient {

Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (191380 => 191381)


--- trunk/Source/WebCore/loader/FrameLoaderClient.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -346,6 +346,8 @@
 #if ENABLE(CONTENT_FILTERING)
         virtual void contentFilterDidBlockLoad(ContentFilterUnblockHandler) { }
 #endif
+
+        virtual void prefetchDNS(const String&) = 0;
     };
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (191380 => 191381)


--- trunk/Source/WebCore/loader/LinkLoader.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -37,7 +37,6 @@
 #include "CachedResourceLoader.h"
 #include "CachedResourceRequest.h"
 #include "ContainerNode.h"
-#include "DNS.h"
 #include "Document.h"
 #include "Frame.h"
 #include "FrameLoaderClient.h"
@@ -98,8 +97,8 @@
         Settings* settings = document.settings();
         // 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());
     }
 
 #if ENABLE(LINK_PREFETCH)

Modified: trunk/Source/WebCore/page/Chrome.cpp (191380 => 191381)


--- trunk/Source/WebCore/page/Chrome.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebCore/page/Chrome.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -23,13 +23,13 @@
 #include "Chrome.h"
 
 #include "ChromeClient.h"
-#include "DNS.h"
 #include "Document.h"
 #include "DocumentType.h"
 #include "FileIconLoader.h"
 #include "FileChooser.h"
 #include "FileList.h"
 #include "FloatRect.h"
+#include "FrameLoaderClient.h"
 #include "FrameTree.h"
 #include "Geolocation.h"
 #include "HTMLFormElement.h"
@@ -350,7 +350,7 @@
 void Chrome::mouseDidMoveOverElement(const HitTestResult& result, unsigned modifierFlags)
 {
     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);
 
     InspectorInstrumentation::mouseDidMoveOverElement(m_page, result, modifierFlags);

Modified: trunk/Source/WebKit/mac/ChangeLog (191380 => 191381)


--- trunk/Source/WebKit/mac/ChangeLog	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-10-21 08:08:48 UTC (rev 191381)
@@ -1,3 +1,15 @@
+2015-10-21  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        NetworkProcess: DNS prefetch happens in the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=147824
+
+        Reviewed by Chris Dumez.
+
+        Implement FrameLoaderClient::prefetchDNS().
+
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+
 2015-10-20  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, rolling out r191370.

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (191380 => 191381)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -248,6 +248,8 @@
     void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
 #endif
 
+    void prefetchDNS(const String&) override;
+
     RetainPtr<WebFrame> m_webFrame;
 
     RetainPtr<WebFramePolicyListener> m_policyListener;

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (191380 => 191381)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm	2015-10-21 08:08:48 UTC (rev 191381)
@@ -79,6 +79,7 @@
 #import <WebCore/BlockExceptions.h>
 #import <WebCore/CachedFrame.h>
 #import <WebCore/Chrome.h>
+#import <WebCore/DNS.h>
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/EventHandler.h>
@@ -2288,6 +2289,11 @@
 }
 #endif
 
+void WebFrameLoaderClient::prefetchDNS(const String& hostname)
+{
+    WebCore::prefetchDNS(hostname);
+}
+
 @implementation WebFramePolicyListener
 
 + (void)initialize

Modified: trunk/Source/WebKit/win/ChangeLog (191380 => 191381)


--- trunk/Source/WebKit/win/ChangeLog	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit/win/ChangeLog	2015-10-21 08:08:48 UTC (rev 191381)
@@ -1,3 +1,16 @@
+2015-10-21  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        NetworkProcess: DNS prefetch happens in the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=147824
+
+        Reviewed by Chris Dumez.
+
+        Implement FrameLoaderClient::prefetchDNS().
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::prefetchDNS):
+        * WebCoreSupport/WebFrameLoaderClient.h:
+
 2015-10-14  Simon Fraser  <simon.fra...@apple.com>
 
         Change GraphicsContext image-drawing functions to take references

Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (191380 => 191381)


--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -60,6 +60,7 @@
 #include <_javascript_Core/APICast.h>
 #include <WebCore/BackForwardController.h>
 #include <WebCore/CachedFrame.h>
+#include <WebCore/DNS.h>
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/FormState.h>
 #include <WebCore/Frame.h>
@@ -1366,3 +1367,8 @@
 
     function(action);
 }
+
+void WebFrameLoaderClient::prefetchDNS(const String& hostname)
+{
+    WebCore::prefetchDNS(hostname);
+}

Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (191380 => 191381)


--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -203,6 +203,8 @@
 
     virtual void dispatchDidFailToStartPlugin(const WebCore::PluginView*) const;
 
+    void prefetchDNS(const String&) override;
+
 protected:
     class WebFramePolicyListenerPrivate;
     std::unique_ptr<WebFramePolicyListenerPrivate> m_policyListenerPrivate;

Modified: trunk/Source/WebKit2/ChangeLog (191380 => 191381)


--- trunk/Source/WebKit2/ChangeLog	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-21 08:08:48 UTC (rev 191381)
@@ -1,3 +1,37 @@
+2015-10-21  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        NetworkProcess: DNS prefetch happens in the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=147824
+
+        Reviewed by Chris Dumez.
+
+        DNS prefetch requests started in the WebProcess should be sent to
+        the network process when it's enabled.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::prefetchDNS): Use NetworkProcess::prefetchDNS().
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in: Add
+        PrefetchDNS message.
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::prefetchDNS): Do the actual DNS prefetch.
+        * NetworkProcess/NetworkProcess.h:
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+        (webkitWebExtensionDidReceiveMessage): Use WebProcess::prefetchDNS().
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::prefetchDNS): Use WebProcess::prefetchDNS().
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::sendTapHighlightForNodeIfNecessary): Use
+        FrameLoaderClient to do the DNS prefetch.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess): Initialize the DNS prefetched
+        hosts cleanup hysteresis activity. Clear the cache of DNS
+        prefetched when hysteresis activity stopped.
+        (WebKit::WebProcess::prefetchDNS): Send the request to the network
+        process if it's enabled, otherwise do the actual DNS prefetch.
+        * WebProcess/WebProcess.h:
+
 2015-10-20  Chris Dumez  <cdu...@apple.com>
 
         [WK2] Generalize NetworkCacheStorage API so it can store different types of metadata

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (191380 => 191381)


--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -159,6 +159,11 @@
     loader->setDefersLoading(defers);
 }
 
+void NetworkConnectionToWebProcess::prefetchDNS(const String& hostname)
+{
+    NetworkProcess::singleton().prefetchDNS(hostname);
+}
+
 static NetworkStorageSession& storageSession(SessionID sessionID)
 {
     if (sessionID.isEphemeral()) {

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (191380 => 191381)


--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -73,6 +73,7 @@
     void scheduleResourceLoad(const NetworkResourceLoadParameters&);
     void performSynchronousLoad(const NetworkResourceLoadParameters&, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
     void loadPing(const NetworkResourceLoadParameters&);
+    void prefetchDNS(const String&);
 
     void removeLoadIdentifier(ResourceLoadIdentifier);
     void setDefersLoading(ResourceLoadIdentifier, bool);

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (191380 => 191381)


--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in	2015-10-21 08:08:48 UTC (rev 191381)
@@ -29,6 +29,7 @@
     LoadPing(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
     RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
     SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
+    PrefetchDNS(String hostname)
 
     StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
     ConvertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (191380 => 191381)


--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -45,6 +45,7 @@
 #include "WebCookieManager.h"
 #include "WebProcessPoolMessages.h"
 #include "WebsiteData.h"
+#include <WebCore/DNS.h>
 #include <WebCore/DiagnosticLoggingClient.h>
 #include <WebCore/Logging.h>
 #include <WebCore/PlatformCookieJar.h>
@@ -529,6 +530,11 @@
 {
 }
 
+void NetworkProcess::prefetchDNS(const String& hostname)
+{
+    WebCore::prefetchDNS(hostname);
+}
+
 #if !PLATFORM(COCOA)
 void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
 {

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (191380 => 191381)


--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -100,6 +100,8 @@
     void clearHSTSCache(WebCore::NetworkStorageSession&, std::chrono::system_clock::time_point modifiedSince);
 #endif
 
+    void prefetchDNS(const String&);
+
 private:
     NetworkProcess();
     ~NetworkProcess();

Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (191380 => 191381)


--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -27,7 +27,7 @@
 #include "WebKitPrivate.h"
 #include "WebKitWebExtensionPrivate.h"
 #include "WebKitWebPagePrivate.h"
-#include <WebCore/DNS.h>
+#include "WebProcess.h"
 #include <wtf/HashMap.h>
 #include <wtf/glib/GRefPtr.h>
 
@@ -161,7 +161,7 @@
 {
     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();
 }

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (191380 => 191381)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -1716,4 +1716,9 @@
 }
 #endif
 
+void WebFrameLoaderClient::prefetchDNS(const String& hostname)
+{
+    WebProcess::singleton().prefetchDNS(hostname);
+}
+
 } // namespace WebKit

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (191380 => 191381)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -242,6 +242,8 @@
     void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
 #endif
 
+    void prefetchDNS(const String&) override;
+
     WebFrame* m_frame;
     RefPtr<PluginView> m_pluginView;
     bool m_hasSentResponseToPluginView;

Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (191380 => 191381)


--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2015-10-21 08:08:48 UTC (rev 191381)
@@ -50,7 +50,6 @@
 #import "WebProcess.h"
 #import <CoreText/CTFont.h>
 #import <WebCore/Chrome.h>
-#import <WebCore/DNS.h>
 #import <WebCore/DiagnosticLoggingClient.h>
 #import <WebCore/DiagnosticLoggingKeys.h>
 #import <WebCore/Element.h>
@@ -59,6 +58,7 @@
 #import <WebCore/FloatQuad.h>
 #import <WebCore/FocusController.h>
 #import <WebCore/Frame.h>
+#import <WebCore/FrameLoaderClient.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/GeometryUtilities.h>
 #import <WebCore/HTMLElementTypeHelpers.h>
@@ -628,8 +628,10 @@
     if (!node)
         return;
 
-    if (is<Element>(*node))
-        prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
+    if (is<Element>(*node)) {
+        ASSERT(m_page);
+        m_page->mainFrame().loader().client().prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
+    }
 
     Vector<FloatQuad> quads;
     if (RenderObject *renderer = node->renderer()) {

Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (191380 => 191381)


--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2015-10-21 08:08:48 UTC (rev 191381)
@@ -36,6 +36,7 @@
 #include "EventDispatcher.h"
 #include "InjectedBundle.h"
 #include "Logging.h"
+#include "NetworkConnectionToWebProcessMessages.h"
 #include "PluginProcessConnectionManager.h"
 #include "SessionTracker.h"
 #include "StatisticsData.h"
@@ -67,6 +68,7 @@
 #include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/AuthenticationChallenge.h>
 #include <WebCore/CrossOriginPreflightResultCache.h>
+#include <WebCore/DNS.h>
 #include <WebCore/FontCache.h>
 #include <WebCore/FontCascade.h>
 #include <WebCore/Frame.h>
@@ -162,6 +164,7 @@
 #if ENABLE(NETWORK_PROCESS)
     , m_usesNetworkProcess(false)
     , m_webResourceLoadScheduler(new WebResourceLoadScheduler)
+    , m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
 #endif
 #if ENABLE(NETSCAPE_PLUGIN_API)
     , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
@@ -1460,4 +1463,23 @@
 }
 #endif
 
+void WebProcess::prefetchDNS(const String& hostname)
+{
+    if (hostname.isEmpty())
+        return;
+
+#if ENABLE(NETWORK_PROCESS)
+    if (usesNetworkProcess()) {
+        if (m_dnsPrefetchedHosts.add(hostname).isNewEntry)
+            networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
+        // The DNS prefetched hosts cache is only to avoid asking for the same hosts too many times
+        // in a very short period of time, producing a lot of IPC traffic. So we clear this cache after
+        // some time of no DNS requests.
+        m_dnsPrefetchHystereris.impulse();
+        return;
+    }
+#endif
+    WebCore::prefetchDNS(hostname);
+}
+
 } // namespace WebKit

Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (191380 => 191381)


--- trunk/Source/WebKit2/WebProcess/WebProcess.h	2015-10-21 07:53:37 UTC (rev 191380)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h	2015-10-21 08:08:48 UTC (rev 191381)
@@ -37,6 +37,7 @@
 #include "TextCheckerState.h"
 #include "ViewUpdateDispatcher.h"
 #include "VisitedLinkTable.h"
+#include <WebCore/HysteresisActivity.h>
 #include <WebCore/SessionID.h>
 #include <WebCore/Timer.h>
 #include <wtf/Forward.h>
@@ -214,6 +215,8 @@
     bool hasRichContentServices() const { return m_hasRichContentServices; }
 #endif
 
+    void prefetchDNS(const String&);
+
 private:
     WebProcess();
     ~WebProcess();
@@ -360,6 +363,8 @@
     RefPtr<NetworkProcessConnection> m_networkProcessConnection;
     bool m_usesNetworkProcess;
     WebResourceLoadScheduler* m_webResourceLoadScheduler;
+    HashSet<String> m_dnsPrefetchedHosts;
+    WebCore::HysteresisActivity m_dnsPrefetchHystereris;
 #endif
 
 #if ENABLE(DATABASE_PROCESS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to