<!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>[172946] 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/172946">172946</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-08-25 17:56:23 -0700 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't pass priority as parameter to ResourceLoadScheduler
https://bugs.webkit.org/show_bug.cgi?id=136232
Reviewed by Sam Weinig.
Source/WebCore:
It is part of the ResourceRequest which is also passed in.
* WebCore.exp.in:
* loader/ResourceLoadScheduler.cpp:
(WebCore::ResourceLoadScheduler::scheduleSubresourceLoad):
(WebCore::ResourceLoadScheduler::schedulePluginStreamLoad):
(WebCore::ResourceLoadScheduler::scheduleLoad):
* loader/ResourceLoadScheduler.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::load):
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
Restore the original request priority when a delegate modifies the request.
Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
* NetworkProcess/NetworkResourceLoader.h:
(WebKit::NetworkResourceLoader::priority): Deleted.
* Shared/Network/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
(WebKit::NetworkResourceLoadParameters::encode):
(WebKit::NetworkResourceLoadParameters::decode):
* Shared/Network/NetworkResourceLoadParameters.h:
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::scheduleSubresourceLoad):
(WebKit::WebResourceLoadScheduler::schedulePluginStreamLoad):
(WebKit::WebResourceLoadScheduler::scheduleLoad):
* WebProcess/Network/WebResourceLoadScheduler.h:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::loadResourceSynchronously):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulercpp">trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulerh">trunk/Source/WebCore/loader/ResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkResourceLoadParametersh">trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h</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="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebCore/ChangeLog 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-08-25 Antti Koivisto <antti@apple.com>
+
+ Don't pass priority as parameter to ResourceLoadScheduler
+ https://bugs.webkit.org/show_bug.cgi?id=136232
+
+ Reviewed by Sam Weinig.
+
+ It is part of the ResourceRequest which is also passed in.
+
+ * WebCore.exp.in:
+ * loader/ResourceLoadScheduler.cpp:
+ (WebCore::ResourceLoadScheduler::scheduleSubresourceLoad):
+ (WebCore::ResourceLoadScheduler::schedulePluginStreamLoad):
+ (WebCore::ResourceLoadScheduler::scheduleLoad):
+ * loader/ResourceLoadScheduler.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::load):
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties):
+
+ Restore the original request priority when a delegate modifies the request.
+
</ins><span class="cx"> 2014-08-25 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Rubber-banding in overflow:scroll regions does not work correctly with direction:rtl
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -830,6 +830,7 @@
</span><span class="cx"> __ZN7WebCore19ProtectionSpaceBaseC2ERKN3WTF6StringEiNS_25ProtectionSpaceServerTypeES4_NS_35ProtectionSpaceAuthenticationSchemeE
</span><span class="cx"> __ZN7WebCore19ProtectionSpaceBaseC2Ev
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
</span><ins>+__ZN7WebCore19ResourceRequestBase11setPriorityENS_20ResourceLoadPriorityE
</ins><span class="cx"> __ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase15setHTTPReferrerERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase18setHTTPContentTypeERKN3WTF6StringE
</span><span class="lines">@@ -915,7 +916,6 @@
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler20servePendingRequestsEPNS0_15HostInformationENS_20ResourceLoadPriorityE
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler21resumePendingRequestsEv
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler22suspendPendingRequestsEv
</span><del>-__ZN7WebCore21ResourceLoadScheduler23scheduleSubresourceLoadEPNS_5FrameEPNS_14CachedResourceERKNS_15ResourceRequestENS_20ResourceLoadPriorityERKNS_21ResourceLoaderOptionsE
</del><span class="cx"> __ZN7WebCore21ResourceLoadScheduler24schedulePluginStreamLoadEPNS_5FrameEPNS_32NetscapePlugInStreamLoaderClientERKNS_15ResourceRequestE
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler32notifyDidScheduleResourceRequestEPNS_14ResourceLoaderE
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler6removeEPNS_14ResourceLoaderE
</span><span class="lines">@@ -1819,6 +1819,7 @@
</span><span class="cx"> __ZNK7WebCore19ResourceRequestBase6isNullEv
</span><span class="cx"> __ZNK7WebCore19ResourceRequestBase7isEmptyEv
</span><span class="cx"> __ZNK7WebCore19ResourceRequestBase8httpBodyEv
</span><ins>+__ZNK7WebCore19ResourceRequestBase8priorityEv
</ins><span class="cx"> __ZNK7WebCore20CachedResourceLoader11isPreloadedERKN3WTF6StringE
</span><span class="cx"> __ZNK7WebCore20HTMLTableCellElement9cellAboveEv
</span><span class="cx"> __ZNK7WebCore20RenderEmbeddedObject21isReplacementObscuredEv
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SubresourceLoader> ResourceLoadScheduler::scheduleSubresourceLoad(Frame* frame, CachedResource* resource, const ResourceRequest& request, ResourceLoadPriority priority, const ResourceLoaderOptions& options)
</del><ins>+PassRefPtr<SubresourceLoader> ResourceLoadScheduler::scheduleSubresourceLoad(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, resource, request, options);
</span><span class="cx"> if (loader)
</span><del>- scheduleLoad(loader.get(), priority);
</del><ins>+ scheduleLoad(loader.get());
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Since we defer loader initialization until scheduling on iOS, the frame
</span><span class="cx"> // load delegate that would be called in SubresourceLoader::create() on
</span><span class="lines">@@ -133,14 +133,13 @@
</span><span class="cx"> {
</span><span class="cx"> PassRefPtr<NetscapePlugInStreamLoader> loader = NetscapePlugInStreamLoader::create(frame, client, request);
</span><span class="cx"> if (loader)
</span><del>- scheduleLoad(loader.get(), ResourceLoadPriorityLow);
</del><ins>+ scheduleLoad(loader.get());
</ins><span class="cx"> return loader;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader, ResourceLoadPriority priority)
</del><ins>+void ResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(resourceLoader);
</span><del>- ASSERT(priority != ResourceLoadPriorityUnresolved);
</del><span class="cx">
</span><span class="cx"> LOG(ResourceLoading, "ResourceLoadScheduler::load resource %p '%s'", resourceLoader, resourceLoader->url().string().latin1().data());
</span><span class="cx">
</span><span class="lines">@@ -163,6 +162,9 @@
</span><span class="cx"> HostInformation* host = hostForURL(resourceLoader->url(), CreateIfNotFound);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ ResourceLoadPriority priority = resourceLoader->request().priority();
+ ASSERT(priority != ResourceLoadPriorityUnresolved);
+
</ins><span class="cx"> bool hadRequests = host->hasRequests();
</span><span class="cx"> host->schedule(resourceLoader, priority);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.h (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.h 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.h 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> public:
</span><span class="cx"> friend ResourceLoadScheduler* resourceLoadScheduler();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT virtual PassRefPtr<SubresourceLoader> scheduleSubresourceLoad(Frame*, CachedResource*, const ResourceRequest&, ResourceLoadPriority, const ResourceLoaderOptions&);
</del><ins>+ WEBCORE_EXPORT virtual PassRefPtr<SubresourceLoader> scheduleSubresourceLoad(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
</ins><span class="cx"> WEBCORE_EXPORT virtual PassRefPtr<NetscapePlugInStreamLoader> schedulePluginStreamLoad(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
</span><span class="cx"> WEBCORE_EXPORT virtual void remove(ResourceLoader*);
</span><span class="cx"> virtual void setDefersLoading(ResourceLoader*, bool);
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void scheduleLoad(ResourceLoader*, ResourceLoadPriority);
</del><ins>+ void scheduleLoad(ResourceLoader*);
</ins><span class="cx"> void scheduleServePendingRequests();
</span><span class="cx"> void requestTimerFired(Timer<ResourceLoadScheduler>&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> m_fragmentIdentifierForRequest = String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_loader = platformStrategies()->loaderStrategy()->resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->frame(), this, request, request.priority(), options);
</del><ins>+ m_loader = platformStrategies()->loaderStrategy()->resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->frame(), this, request, options);
</ins><span class="cx"> if (!m_loader) {
</span><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -229,6 +229,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::updateFromDelegatePreservingOldProperties(const ResourceRequest& delegateProvidedRequest)
</span><span class="cx"> {
</span><ins>+ ResourceLoadPriority oldPriority = priority();
</ins><span class="cx"> RefPtr<FormData> oldHTTPBody = httpBody();
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> bool isHiddenFromInspector = hiddenFromInspector();
</span><span class="lines">@@ -236,6 +237,7 @@
</span><span class="cx">
</span><span class="cx"> *this = delegateProvidedRequest;
</span><span class="cx">
</span><ins>+ setPriority(oldPriority);
</ins><span class="cx"> setHTTPBody(oldHTTPBody.release());
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> setHiddenFromInspector(isHiddenFromInspector);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -216,6 +216,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::updateFromDelegatePreservingOldProperties(const ResourceRequest& delegateProvidedRequest)
</span><span class="cx"> {
</span><ins>+ ResourceLoadPriority oldPriority = priority();
</ins><span class="cx"> RefPtr<FormData> oldHTTPBody = httpBody();
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> bool isHiddenFromInspector = hiddenFromInspector();
</span><span class="lines">@@ -223,6 +224,7 @@
</span><span class="cx">
</span><span class="cx"> *this = delegateProvidedRequest;
</span><span class="cx">
</span><ins>+ setPriority(oldPriority);
</ins><span class="cx"> setHTTPBody(oldHTTPBody.release());
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> setHiddenFromInspector(isHiddenFromInspector);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -346,6 +346,7 @@
</span><span class="cx">
</span><span class="cx"> NSURLRequest *currentURLRequest = request.nsURLRequest(UpdateHTTPBody);
</span><span class="cx"> NSURLRequest *newURLRequest = currentURLRequest;
</span><ins>+ ResourceLoadPriority priority = request.priority();
</ins><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> bool isHiddenFromInspector = request.hiddenFromInspector();
</span><span class="cx"> #endif
</span><span class="lines">@@ -366,6 +367,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> request.deprecatedSetMainResourceRequest(isMainResourceRequest);
</span><span class="cx"> #endif
</span><ins>+ request.setPriority(priority);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader* loader, unsigned long identifier)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-08-25 Antti Koivisto <antti@apple.com>
+
+ Don't pass priority as parameter to ResourceLoadScheduler
+ https://bugs.webkit.org/show_bug.cgi?id=136232
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::NetworkResourceLoader):
+ * NetworkProcess/NetworkResourceLoader.h:
+ (WebKit::NetworkResourceLoader::priority): Deleted.
+ * Shared/Network/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
+ (WebKit::NetworkResourceLoadParameters::encode):
+ (WebKit::NetworkResourceLoadParameters::decode):
+ * Shared/Network/NetworkResourceLoadParameters.h:
+ * WebProcess/Network/WebResourceLoadScheduler.cpp:
+ (WebKit::WebResourceLoadScheduler::scheduleSubresourceLoad):
+ (WebKit::WebResourceLoadScheduler::schedulePluginStreamLoad):
+ (WebKit::WebResourceLoadScheduler::scheduleLoad):
+ * WebProcess/Network/WebResourceLoadScheduler.h:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::loadResourceSynchronously):
+
</ins><span class="cx"> 2014-08-25 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't crash when the DataDetectors framework is unavailable.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> , m_webFrameID(parameters.webFrameID)
</span><span class="cx"> , m_sessionID(parameters.sessionID)
</span><span class="cx"> , m_request(parameters.request)
</span><del>- , m_priority(parameters.priority)
</del><span class="cx"> , m_contentSniffingPolicy(parameters.contentSniffingPolicy)
</span><span class="cx"> , m_allowStoredCredentials(parameters.allowStoredCredentials)
</span><span class="cx"> , m_clientCredentialPolicy(parameters.clientCredentialPolicy)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx">
</span><span class="cx"> NetworkConnectionToWebProcess* connectionToWebProcess() const { return m_connection.get(); }
</span><span class="cx">
</span><del>- WebCore::ResourceLoadPriority priority() { return m_priority; }
</del><span class="cx"> WebCore::ResourceRequest& request() { return m_request; }
</span><span class="cx"> WebCore::SessionID sessionID() const { return m_sessionID; }
</span><span class="cx">
</span><span class="lines">@@ -179,7 +178,6 @@
</span><span class="cx"> WebCore::SessionID m_sessionID;
</span><span class="cx"> WebCore::ResourceRequest m_request;
</span><span class="cx"> WebCore::ResourceRequest m_deferredRequest;
</span><del>- WebCore::ResourceLoadPriority m_priority;
</del><span class="cx"> WebCore::ContentSniffingPolicy m_contentSniffingPolicy;
</span><span class="cx"> WebCore::StoredCredentials m_allowStoredCredentials;
</span><span class="cx"> WebCore::ClientCredentialPolicy m_clientCredentialPolicy;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> , webPageID(0)
</span><span class="cx"> , webFrameID(0)
</span><span class="cx"> , sessionID(SessionID::emptySessionID())
</span><del>- , priority(ResourceLoadPriorityVeryLow)
</del><span class="cx"> , contentSniffingPolicy(SniffContent)
</span><span class="cx"> , allowStoredCredentials(DoNotAllowStoredCredentials)
</span><span class="cx"> , clientCredentialPolicy(DoNotAskClientForAnyCredentials)
</span><span class="lines">@@ -90,7 +89,6 @@
</span><span class="cx"> encoder << requestSandboxExtension;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- encoder.encodeEnum(priority);
</del><span class="cx"> encoder.encodeEnum(contentSniffingPolicy);
</span><span class="cx"> encoder.encodeEnum(allowStoredCredentials);
</span><span class="cx"> encoder.encodeEnum(clientCredentialPolicy);
</span><span class="lines">@@ -136,8 +134,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!decoder.decodeEnum(result.priority))
- return false;
</del><span class="cx"> if (!decoder.decodeEnum(result.contentSniffingPolicy))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decodeEnum(result.allowStoredCredentials))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkResourceLoadParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> WebCore::ResourceRequest request;
</span><span class="cx"> SandboxExtension::HandleArray requestBodySandboxExtensions; // Created automatically for the sender.
</span><span class="cx"> SandboxExtension::Handle resourceSandboxExtension; // Created automatically for the sender.
</span><del>- WebCore::ResourceLoadPriority priority;
</del><span class="cx"> WebCore::ContentSniffingPolicy contentSniffingPolicy;
</span><span class="cx"> WebCore::StoredCredentials allowStoredCredentials;
</span><span class="cx"> WebCore::ClientCredentialPolicy clientCredentialPolicy;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -69,11 +69,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SubresourceLoader> WebResourceLoadScheduler::scheduleSubresourceLoad(Frame* frame, CachedResource* resource, const ResourceRequest& request, ResourceLoadPriority priority, const ResourceLoaderOptions& options)
</del><ins>+PassRefPtr<SubresourceLoader> WebResourceLoadScheduler::scheduleSubresourceLoad(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, resource, request, options);
</span><span class="cx"> if (loader)
</span><del>- scheduleLoad(loader.get(), resource, priority, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
</del><ins>+ scheduleLoad(loader.get(), resource, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
</ins><span class="cx"> return loader.release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -81,15 +81,13 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<NetscapePlugInStreamLoader> loader = NetscapePlugInStreamLoader::create(frame, client, request);
</span><span class="cx"> if (loader)
</span><del>- scheduleLoad(loader.get(), 0, ResourceLoadPriorityLow, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
</del><ins>+ scheduleLoad(loader.get(), 0, frame->document()->referrerPolicy() == ReferrerPolicyDefault);
</ins><span class="cx"> return loader.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader, CachedResource* resource, ResourceLoadPriority priority, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
</del><ins>+void WebResourceLoadScheduler::scheduleLoad(ResourceLoader* resourceLoader, CachedResource* resource, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(resourceLoader);
</span><del>- ASSERT(priority != ResourceLoadPriorityUnresolved);
- priority = ResourceLoadPriorityHighest;
</del><span class="cx">
</span><span class="cx"> ResourceLoadIdentifier identifier = resourceLoader->identifier();
</span><span class="cx"> ASSERT(identifier);
</span><span class="lines">@@ -118,7 +116,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %i", resourceLoader->url().string().utf8().data(), priority);
</del><ins>+ LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %i", resourceLoader->url().string().utf8().data(), resourceLoader->request().priority());
</ins><span class="cx">
</span><span class="cx"> ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
</span><span class="cx"> StoredCredentials allowStoredCredentials = resourceLoader->shouldUseCredentialStorage() ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</span><span class="lines">@@ -136,7 +134,6 @@
</span><span class="cx"> loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
</span><span class="cx"> loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
</span><span class="cx"> loadParameters.request = resourceLoader->request();
</span><del>- loadParameters.priority = priority;
</del><span class="cx"> loadParameters.contentSniffingPolicy = contentSniffingPolicy;
</span><span class="cx"> loadParameters.allowStoredCredentials = allowStoredCredentials;
</span><span class="cx"> // If there is no WebFrame then this resource cannot be authenticated with the client.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> WebResourceLoadScheduler();
</span><span class="cx"> virtual ~WebResourceLoadScheduler();
</span><span class="cx">
</span><del>- virtual PassRefPtr<WebCore::SubresourceLoader> scheduleSubresourceLoad(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, WebCore::ResourceLoadPriority, const WebCore::ResourceLoaderOptions&) override;
</del><ins>+ virtual PassRefPtr<WebCore::SubresourceLoader> scheduleSubresourceLoad(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
</ins><span class="cx"> virtual PassRefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame*, WebCore::NetscapePlugInStreamLoaderClient*, const WebCore::ResourceRequest&) override;
</span><span class="cx">
</span><span class="cx"> virtual void remove(WebCore::ResourceLoader*) override;
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void networkProcessCrashed();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void scheduleLoad(WebCore::ResourceLoader*, WebCore::CachedResource*, WebCore::ResourceLoadPriority, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
</del><ins>+ void scheduleLoad(WebCore::ResourceLoader*, WebCore::CachedResource*, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
</ins><span class="cx"> void scheduleInternallyFailedLoad(WebCore::ResourceLoader*);
</span><span class="cx"> void internallyFailedLoadTimerFired();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (172945 => 172946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-08-26 00:12:26 UTC (rev 172945)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2014-08-26 00:56:23 UTC (rev 172946)
</span><span class="lines">@@ -262,7 +262,6 @@
</span><span class="cx"> loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
</span><span class="cx"> loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
</span><span class="cx"> loadParameters.request = request;
</span><del>- loadParameters.priority = ResourceLoadPriorityHighest;
</del><span class="cx"> loadParameters.contentSniffingPolicy = SniffContent;
</span><span class="cx"> loadParameters.allowStoredCredentials = storedCredentials;
</span><span class="cx"> loadParameters.clientCredentialPolicy = clientCredentialPolicy;
</span></span></pre>
</div>
</div>
</body>
</html>