<!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>[183670] trunk</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/183670">183670</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-05-01 04:40:11 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove network process load serialization code
https://bugs.webkit.org/show_bug.cgi?id=144448
Reviewed by Alexey Proskuryakov.
Source/WebKit2:
TestRunner.setSerializeHTTPLoads is used by a few tests but it is unnecessary
with network process. We don't reorder loads anyway so test results are consistent.
There or no other clients for this code.
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::NetworkConnectionToWebProcess):
(WebKit::NetworkConnectionToWebProcess::setSerialLoadingEnabled): Deleted.
* NetworkProcess/NetworkConnectionToWebProcess.h:
(WebKit::NetworkConnectionToWebProcess::isSerialLoadingEnabled): Deleted.
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::getNetworkProcessStatistics):
* NetworkProcess/NetworkResourceLoadScheduler.cpp:
(WebKit::NetworkResourceLoadScheduler::scheduleLoader):
(WebKit::NetworkResourceLoadScheduler::removeLoader):
(WebKit::NetworkResourceLoadScheduler::loadsPendingCount): Deleted.
* NetworkProcess/NetworkResourceLoadScheduler.h:
* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
(WKBundleSetTabKeyCyclesThroughElements):
(WKBundleSetSerialLoadingEnabled): Deleted.
(WKBundleDispatchPendingLoadRequests): Deleted.
* WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::setSerialLoadingEnabled): Deleted.
(WebKit::InjectedBundle::dispatchPendingLoadRequests): Deleted.
Remove also this as it does nothing.
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::WebResourceLoadScheduler):
(WebKit::WebResourceLoadScheduler::suspendPendingRequests):
(WebKit::WebResourceLoadScheduler::resumePendingRequests):
Remove implementation, it does nothing.
(WebKit::WebResourceLoadScheduler::setSerialLoadingEnabled):
* WebProcess/Network/WebResourceLoadScheduler.h:
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::beginTesting):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::setSerializeHTTPLoads):
(WTR::TestRunner::dispatchPendingLoadRequests):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadSchedulercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadSchedulerh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-05-01 Antti Koivisto <antti@apple.com>
+
+ Remove network process load serialization code
+ https://bugs.webkit.org/show_bug.cgi?id=144448
+
+ Reviewed by Alexey Proskuryakov.
+
+ TestRunner.setSerializeHTTPLoads is used by a few tests but it is unnecessary
+ with network process. We don't reorder loads anyway so test results are consistent.
+ There or no other clients for this code.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::NetworkConnectionToWebProcess):
+ (WebKit::NetworkConnectionToWebProcess::setSerialLoadingEnabled): Deleted.
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ (WebKit::NetworkConnectionToWebProcess::isSerialLoadingEnabled): Deleted.
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::getNetworkProcessStatistics):
+ * NetworkProcess/NetworkResourceLoadScheduler.cpp:
+ (WebKit::NetworkResourceLoadScheduler::scheduleLoader):
+ (WebKit::NetworkResourceLoadScheduler::removeLoader):
+ (WebKit::NetworkResourceLoadScheduler::loadsPendingCount): Deleted.
+ * NetworkProcess/NetworkResourceLoadScheduler.h:
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetTabKeyCyclesThroughElements):
+ (WKBundleSetSerialLoadingEnabled): Deleted.
+ (WKBundleDispatchPendingLoadRequests): Deleted.
+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setSerialLoadingEnabled): Deleted.
+ (WebKit::InjectedBundle::dispatchPendingLoadRequests): Deleted.
+
+ Remove also this as it does nothing.
+
+ * WebProcess/Network/WebResourceLoadScheduler.cpp:
+ (WebKit::WebResourceLoadScheduler::WebResourceLoadScheduler):
+ (WebKit::WebResourceLoadScheduler::suspendPendingRequests):
+ (WebKit::WebResourceLoadScheduler::resumePendingRequests):
+
+ Remove implementation, it does nothing.
+
+ (WebKit::WebResourceLoadScheduler::setSerialLoadingEnabled):
+ * WebProcess/Network/WebResourceLoadScheduler.h:
+
</ins><span class="cx"> 2015-04-30 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove long-deprecated unused WKView minimumLayoutWidth properties
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkConnectionToWebProcess::NetworkConnectionToWebProcess(IPC::Connection::Identifier connectionIdentifier)
</span><del>- : m_serialLoadingEnabled(false)
</del><span class="cx"> {
</span><span class="cx"> m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this, RunLoop::main());
</span><span class="cx"> m_connection->open();
</span><span class="lines">@@ -151,11 +150,6 @@
</span><span class="cx"> loader->setDefersLoading(defers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkConnectionToWebProcess::setSerialLoadingEnabled(bool enabled)
-{
- m_serialLoadingEnabled = enabled;
-}
-
</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 (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx">
</span><span class="cx"> IPC::Connection* connection() const { return m_connection.get(); }
</span><span class="cx">
</span><del>- bool isSerialLoadingEnabled() const { return m_serialLoadingEnabled; }
-
</del><span class="cx"> void didCleanupResourceLoader(NetworkResourceLoader&);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -78,7 +76,6 @@
</span><span class="cx"> void removeLoadIdentifier(ResourceLoadIdentifier);
</span><span class="cx"> void setDefersLoading(ResourceLoadIdentifier, bool);
</span><span class="cx"> void crossOriginRedirectReceived(ResourceLoadIdentifier, const WebCore::URL& redirectURL);
</span><del>- void setSerialLoadingEnabled(bool);
</del><span class="cx"> void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
</span><span class="cx"> void convertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><span class="cx">
</span><span class="lines">@@ -99,8 +96,6 @@
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><span class="cx">
</span><span class="cx"> HashMap<ResourceLoadIdentifier, RefPtr<NetworkResourceLoader>> m_networkResourceLoaders;
</span><del>-
- bool m_serialLoadingEnabled;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> PerformSynchronousLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters) -> (WebCore::ResourceError error, WebCore::ResourceResponse response, Vector<char> data) Delayed
</span><span class="cx"> RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
</span><span class="cx"> SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
</span><del>- SetSerialLoadingEnabled(bool enabled) -> ()
</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="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -480,7 +480,6 @@
</span><span class="cx"> StatisticsData data;
</span><span class="cx">
</span><span class="cx"> auto& networkProcess = NetworkProcess::singleton();
</span><del>- data.statisticsNumbers.set("LoadsPendingCount", scheduler.loadsPendingCount());
</del><span class="cx"> data.statisticsNumbers.set("LoadsActiveCount", scheduler.loadsActiveCount());
</span><span class="cx"> data.statisticsNumbers.set("DownloadsActiveCount", networkProcess.downloadManager().activeDownloadCount());
</span><span class="cx"> data.statisticsNumbers.set("OutstandingAuthenticationChallengesCount", networkProcess.authenticationManager().outstandingAuthenticationChallengeCount());
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx"> if (!loader->connectionToWebProcess())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (loader->connectionToWebProcess()->isSerialLoadingEnabled() && !m_activeLoaders.isEmpty()) {
- m_pendingSerialLoaders.append(loader);
- return;
- }
</del><span class="cx"> m_activeLoaders.add(loader.get());
</span><span class="cx">
</span><span class="cx"> loader->start();
</span><span class="lines">@@ -47,16 +43,8 @@
</span><span class="cx"> LOG(NetworkScheduling, "(NetworkProcess) NetworkResourceLoadScheduler::removeLoader resource '%s'", loader->originalRequest().url().string().utf8().data());
</span><span class="cx">
</span><span class="cx"> m_activeLoaders.remove(loader);
</span><del>-
- while (!m_pendingSerialLoaders.isEmpty() && m_activeLoaders.isEmpty())
- scheduleLoader(m_pendingSerialLoaders.takeLast());
</del><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t NetworkResourceLoadScheduler::loadsPendingCount() const
-{
- return m_pendingSerialLoaders.size();
-}
-
</del><span class="cx"> uint64_t NetworkResourceLoadScheduler::loadsActiveCount() const
</span><span class="cx"> {
</span><span class="cx"> return m_activeLoaders.size();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -46,14 +46,12 @@
</span><span class="cx"> void removeLoader(NetworkResourceLoader*);
</span><span class="cx">
</span><span class="cx"> // For NetworkProcess statistics reporting.
</span><del>- uint64_t loadsPendingCount() const;
</del><span class="cx"> uint64_t loadsActiveCount() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void platformInitializeNetworkSettings();
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<NetworkResourceLoader>> m_activeLoaders;
</span><del>- Vector<RefPtr<NetworkResourceLoader>> m_pendingSerialLoaders;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -298,13 +298,3 @@
</span><span class="cx"> {
</span><span class="cx"> toImpl(bundleRef)->setTabKeyCyclesThroughElements(toImpl(pageRef), enabled);
</span><span class="cx"> }
</span><del>-
-void WKBundleSetSerialLoadingEnabled(WKBundleRef bundleRef, bool enabled)
-{
- toImpl(bundleRef)->setSerialLoadingEnabled(enabled);
-}
-
-void WKBundleDispatchPendingLoadRequests(WKBundleRef bundleRef)
-{
- toImpl(bundleRef)->dispatchPendingLoadRequests();
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -97,8 +97,6 @@
</span><span class="cx"> WK_EXPORT bool WKBundleIsProcessingUserGesture(WKBundleRef bundle);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKBundleSetTabKeyCyclesThroughElements(WKBundleRef bundle, WKBundlePageRef page, bool enabled);
</span><del>-WK_EXPORT void WKBundleSetSerialLoadingEnabled(WKBundleRef bundle, bool enabled);
-WK_EXPORT void WKBundleDispatchPendingLoadRequests(WKBundleRef bundle);
</del><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -603,11 +603,6 @@
</span><span class="cx"> page->corePage()->setTabKeyCyclesThroughElements(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundle::setSerialLoadingEnabled(bool enabled)
-{
- resourceLoadScheduler()->setSerialLoadingEnabled(enabled);
-}
-
</del><span class="cx"> void InjectedBundle::setCSSAnimationTriggersEnabled(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span><span class="lines">@@ -635,9 +630,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundle::dispatchPendingLoadRequests()
-{
- // FIXME: This should be removed along with the bundle API.
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx">
</span><span class="cx"> WebResourceLoadScheduler::WebResourceLoadScheduler()
</span><span class="cx"> : m_internallyFailedLoadTimer(RunLoop::main(), this, &WebResourceLoadScheduler::internallyFailedLoadTimerFired)
</span><del>- , m_suspendPendingRequestsCount(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -252,18 +251,17 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::suspendPendingRequests()
</span><span class="cx"> {
</span><del>- ++m_suspendPendingRequestsCount;
</del><ins>+ // Network process does keep requests in pending state.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::resumePendingRequests()
</span><span class="cx"> {
</span><del>- ASSERT(m_suspendPendingRequestsCount);
- --m_suspendPendingRequestsCount;
</del><ins>+ // Network process does keep requests in pending state.
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebResourceLoadScheduler::setSerialLoadingEnabled(bool enabled)
</del><ins>+void WebResourceLoadScheduler::setSerialLoadingEnabled(bool)
</ins><span class="cx"> {
</span><del>- WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::SetSerialLoadingEnabled(enabled), Messages::NetworkConnectionToWebProcess::SetSerialLoadingEnabled::Reply(), 0);
</del><ins>+ // Network process does not reorder loads.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::networkProcessCrashed()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -72,9 +72,6 @@
</span><span class="cx"> RunLoop::Timer<WebResourceLoadScheduler> m_internallyFailedLoadTimer;
</span><span class="cx">
</span><span class="cx"> HashMap<unsigned long, RefPtr<WebResourceLoader>> m_webResourceLoaders;
</span><del>-
- unsigned m_suspendPendingRequestsCount;
-
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Tools/ChangeLog 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-01 Antti Koivisto <antti@apple.com>
+
+ Remove network process load serialization code
+ https://bugs.webkit.org/show_bug.cgi?id=144448
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setSerializeHTTPLoads):
+ (WTR::TestRunner::dispatchPendingLoadRequests):
+
</ins><span class="cx"> 2015-05-01 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add libhyphen-dev to the build dependencies
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -260,7 +260,6 @@
</span><span class="cx"> WKBundleSetAllowFileAccessFromFileURLs(m_bundle, m_pageGroup, true);
</span><span class="cx"> WKBundleSetPluginsEnabled(m_bundle, m_pageGroup, true);
</span><span class="cx"> WKBundleSetPopupBlockingEnabled(m_bundle, m_pageGroup, false);
</span><del>- WKBundleSetSerialLoadingEnabled(m_bundle, false);
</del><span class="cx">
</span><span class="cx"> WKBundleRemoveAllUserContent(m_bundle, m_pageGroup);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (183669 => 183670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2015-05-01 09:04:12 UTC (rev 183669)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2015-05-01 11:40:11 UTC (rev 183670)
</span><span class="lines">@@ -645,12 +645,12 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setSerializeHTTPLoads()
</span><span class="cx"> {
</span><del>- WKBundleSetSerialLoadingEnabled(InjectedBundle::singleton().bundle(), true);
</del><ins>+ // WK2 doesn't reorder loads.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::dispatchPendingLoadRequests()
</span><span class="cx"> {
</span><del>- WKBundleDispatchPendingLoadRequests(InjectedBundle::singleton().bundle());
</del><ins>+ // WK2 doesn't keep pending requests.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setCacheModel(int model)
</span></span></pre>
</div>
</div>
</body>
</html>