<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190364] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190364">190364</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-30 12:44:50 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, roll out <a href="http://trac.webkit.org/projects/webkit/changeset/188331">r188331</a>: "NetworkProcess: DNS prefetch happens in the Web Process"
<rdar://problem/22560715>
Speculative roll out of <a href="http://trac.webkit.org/projects/webkit/changeset/188331">r188331</a> as we had a ~2.5% PLT regression around
the time it landed and it seems the most likely culprit. I'll reland if
the perf bots do not recover after the roll out.
Source/WebCore:
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::parseAttribute):
* loader/FrameLoaderClient.h:
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::loadLink):
* page/Chrome.cpp:
(WebCore::Chrome::mouseDidMoveOverElement):
Source/WebKit2:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::storageSession): Deleted.
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
(webkitWebExtensionDidReceiveMessage):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::sendTapHighlightForNodeIfNecessary):
* WebProcess/WebProcess.cpp:
* WebProcess/WebProcess.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoadercpp">trunk/Source/WebCore/loader/LinkLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromecpp">trunk/Source/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebExtensioncpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebCore/ChangeLog 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-30 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, roll out r188331: "NetworkProcess: DNS prefetch happens in the Web Process"
+ <rdar://problem/22560715>
+
+ Speculative roll out of r188331 as we had a ~2.5% PLT regression around
+ the time it landed and it seems the most likely culprit. I'll reland if
+ the perf bots do not recover after the roll out.
+
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::parseAttribute):
+ * loader/FrameLoaderClient.h:
+ * loader/LinkLoader.cpp:
+ (WebCore::LinkLoader::loadLink):
+ * page/Chrome.cpp:
+ (WebCore::Chrome::mouseDidMoveOverElement):
+
</ins><span class="cx"> 2015-09-30 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Compute document marker rects at use time instead of paint time
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #include "HTMLAnchorElement.h"
</span><span class="cx">
</span><span class="cx"> #include "AttributeDOMTokenList.h"
</span><ins>+#include "DNS.h"
</ins><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="lines">@@ -252,9 +253,9 @@
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx"> if (isLink()) {
</span><span class="cx"> String parsedURL = stripLeadingAndTrailingHTMLSpaces(value);
</span><del>- if (document().isDNSPrefetchEnabled() && document().frame()) {
</del><ins>+ if (document().isDNSPrefetchEnabled()) {
</ins><span class="cx"> if (protocolIsInHTTPFamily(parsedURL) || parsedURL.startsWith("//"))
</span><del>- document().frame()->loader().client().prefetchDNS(document().completeURL(parsedURL).host());
</del><ins>+ prefetchDNS(document().completeURL(parsedURL).host());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> invalidateCachedVisitedLinkHash();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #ifndef FrameLoaderClient_h
</span><span class="cx"> #define FrameLoaderClient_h
</span><span class="cx">
</span><del>-#include "DNS.h"
</del><span class="cx"> #include "FrameLoaderTypes.h"
</span><span class="cx"> #include "IconURL.h"
</span><span class="cx"> #include "LayoutMilestones.h"
</span><span class="lines">@@ -346,7 +345,6 @@
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx"> virtual void contentFilterDidBlockLoad(ContentFilterUnblockHandler) { }
</span><span class="cx"> #endif
</span><del>- virtual void prefetchDNS(const String& hostname) { WebCore::prefetchDNS(hostname); }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.cpp 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CachedResourceRequest.h"
</span><span class="cx"> #include "ContainerNode.h"
</span><ins>+#include "DNS.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="lines">@@ -97,8 +98,8 @@
</span><span class="cx"> Settings* settings = document.settings();
</span><span class="cx"> // FIXME: The href attribute of the link element can be in "//hostname" form, and we shouldn't attempt
</span><span class="cx"> // to complete that as URL <https://bugs.webkit.org/show_bug.cgi?id=48857>.
</span><del>- if (settings && settings->dnsPrefetchingEnabled() && href.isValid() && !href.isEmpty() && document.frame())
- document.frame()->loader().client().prefetchDNS(href.host());
</del><ins>+ if (settings && settings->dnsPrefetchingEnabled() && href.isValid() && !href.isEmpty())
+ prefetchDNS(href.host());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LINK_PREFETCH)
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.cpp (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.cpp 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebCore/page/Chrome.cpp 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -23,13 +23,13 @@
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx">
</span><span class="cx"> #include "ChromeClient.h"
</span><ins>+#include "DNS.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentType.h"
</span><span class="cx"> #include "FileIconLoader.h"
</span><span class="cx"> #include "FileChooser.h"
</span><span class="cx"> #include "FileList.h"
</span><span class="cx"> #include "FloatRect.h"
</span><del>-#include "FrameLoaderClient.h"
</del><span class="cx"> #include "FrameTree.h"
</span><span class="cx"> #include "Geolocation.h"
</span><span class="cx"> #include "HTMLFormElement.h"
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> void Chrome::mouseDidMoveOverElement(const HitTestResult& result, unsigned modifierFlags)
</span><span class="cx"> {
</span><span class="cx"> if (result.innerNode() && result.innerNode()->document().isDNSPrefetchEnabled())
</span><del>- m_page.mainFrame().loader().client().prefetchDNS(result.absoluteLinkURL().host());
</del><ins>+ prefetchDNS(result.absoluteLinkURL().host());
</ins><span class="cx"> m_client.mouseDidMoveOverElement(result, modifierFlags);
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::mouseDidMoveOverElement(m_page, result, modifierFlags);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-09-30 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, roll out r188331: "NetworkProcess: DNS prefetch happens in the Web Process"
+ <rdar://problem/22560715>
+
+ Speculative roll out of r188331 as we had a ~2.5% PLT regression around
+ the time it landed and it seems the most likely culprit. I'll reland if
+ the perf bots do not recover after the roll out.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::storageSession): Deleted.
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+ (webkitWebExtensionDidReceiveMessage):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::sendTapHighlightForNodeIfNecessary):
+ * WebProcess/WebProcess.cpp:
+ * WebProcess/WebProcess.h:
+
</ins><span class="cx"> 2015-09-30 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Compute document marker rects at use time instead of paint time
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "NetworkResourceLoaderMessages.h"
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><del>-#include <WebCore/DNS.h>
</del><span class="cx"> #include <WebCore/PingHandle.h>
</span><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="lines">@@ -160,11 +159,6 @@
</span><span class="cx"> loader->setDefersLoading(defers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkConnectionToWebProcess::prefetchDNS(const String& hostname)
-{
- WebCore::prefetchDNS(hostname);
-}
-
</del><span class="cx"> static NetworkStorageSession& storageSession(SessionID sessionID)
</span><span class="cx"> {
</span><span class="cx"> if (sessionID.isEphemeral()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx"> void scheduleResourceLoad(const NetworkResourceLoadParameters&);
</span><span class="cx"> void performSynchronousLoad(const NetworkResourceLoadParameters&, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
</span><span class="cx"> void loadPing(const NetworkResourceLoadParameters&);
</span><del>- void prefetchDNS(const String&);
</del><span class="cx">
</span><span class="cx"> void removeLoadIdentifier(ResourceLoadIdentifier);
</span><span class="cx"> void setDefersLoading(ResourceLoadIdentifier, bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> LoadPing(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
</span><span class="cx"> RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
</span><span class="cx"> SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
</span><del>- PrefetchDNS(String hostname)
</del><span class="cx">
</span><span class="cx"> StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
</span><span class="cx"> ConvertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitWebExtensionPrivate.h"
</span><span class="cx"> #include "WebKitWebPagePrivate.h"
</span><del>-#include "WebProcess.h"
</del><ins>+#include <WebCore/DNS.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (messageName == String::fromUTF8("PrefetchDNS")) {
</span><span class="cx"> API::String* hostname = static_cast<API::String*>(message.get(String::fromUTF8("Hostname")));
</span><del>- WebProcess::singleton().prefetchDNS(hostname->string());
</del><ins>+ WebCore::prefetchDNS(hostname->string());
</ins><span class="cx"> } else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -1715,9 +1715,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::prefetchDNS(const String& hostname)
-{
- WebProcess::singleton().prefetchDNS(hostname);
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -241,8 +241,6 @@
</span><span class="cx"> void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void prefetchDNS(const String&) override;
-
</del><span class="cx"> WebFrame* m_frame;
</span><span class="cx"> RefPtr<PluginView> m_pluginView;
</span><span class="cx"> bool m_hasSentResponseToPluginView;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #import "WebProcess.h"
</span><span class="cx"> #import <CoreText/CTFont.h>
</span><span class="cx"> #import <WebCore/Chrome.h>
</span><ins>+#import <WebCore/DNS.h>
</ins><span class="cx"> #import <WebCore/DiagnosticLoggingClient.h>
</span><span class="cx"> #import <WebCore/DiagnosticLoggingKeys.h>
</span><span class="cx"> #import <WebCore/Element.h>
</span><span class="lines">@@ -58,7 +59,6 @@
</span><span class="cx"> #import <WebCore/FloatQuad.h>
</span><span class="cx"> #import <WebCore/FocusController.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><del>-#import <WebCore/FrameLoaderClient.h>
</del><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/GeometryUtilities.h>
</span><span class="cx"> #import <WebCore/HTMLElementTypeHelpers.h>
</span><span class="lines">@@ -629,7 +629,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (is<Element>(*node))
</span><del>- m_page->mainFrame().loader().client().prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
</del><ins>+ prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
</ins><span class="cx">
</span><span class="cx"> Vector<FloatQuad> quads;
</span><span class="cx"> if (RenderObject *renderer = node->renderer()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "EventDispatcher.h"
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "NetworkConnectionToWebProcessMessages.h"
</del><span class="cx"> #include "PluginProcessConnectionManager.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="lines">@@ -68,7 +67,6 @@
</span><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><span class="cx"> #include <WebCore/CrossOriginPreflightResultCache.h>
</span><del>-#include <WebCore/DNS.h>
</del><span class="cx"> #include <WebCore/FontCache.h>
</span><span class="cx"> #include <WebCore/FontCascade.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="lines">@@ -1453,16 +1451,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-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
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (190363 => 190364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-09-30 19:36:37 UTC (rev 190363)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-09-30 19:44:50 UTC (rev 190364)
</span><span class="lines">@@ -214,8 +214,6 @@
</span><span class="cx"> bool hasRichContentServices() const { return m_hasRichContentServices; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void prefetchDNS(const String&);
-
</del><span class="cx"> private:
</span><span class="cx"> WebProcess();
</span><span class="cx"> ~WebProcess();
</span></span></pre>
</div>
</div>
</body>
</html>