<!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>[201596] 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/201596">201596</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-06-02 01:45:14 -0700 (Thu, 02 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
Use more references in ResourceLoader related code
https://bugs.webkit.org/show_bug.cgi?id=158222
Reviewed by Darin Adler.
No change of behavior.
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::load):
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::clearDocument):
(WebCore::CSSFontSelector::beginLoadingFontSoon):
(WebCore::CSSFontSelector::beginLoadTimerFired):
* css/CSSFontSelector.h:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::scheduleArchiveLoad):
* loader/DocumentLoader.h:
* loader/LoaderStrategy.h:
* loader/NetscapePlugInStreamLoader.cpp:
(WebCore::NetscapePlugInStreamLoader::NetscapePlugInStreamLoader):
(WebCore::NetscapePlugInStreamLoader::create):
* loader/NetscapePlugInStreamLoader.h:
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::ResourceLoader):
(WebCore::ResourceLoader::start):
* loader/ResourceLoader.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::RequestCountTracker::RequestCountTracker):
(WebCore::SubresourceLoader::SubresourceLoader):
(WebCore::SubresourceLoader::create):
(WebCore::SubresourceLoader::didReceiveResponse):
(WebCore::SubresourceLoader::notifyDone):
* loader/SubresourceLoader.h:
* loader/appcache/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::maybeLoadResource):
* loader/appcache/ApplicationCacheHost.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::load):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::incrementRequestCount):
(WebCore::CachedResourceLoader::decrementRequestCount):
* loader/cache/CachedResourceLoader.h:
Source/WebKit:
Use more references in ResourceLoader related code
https://bugs.webkit.org/show_bug.cgi?id=158222
Reviewed by Darin Adler.
* WebCoreSupport/WebResourceLoadScheduler.cpp:
(WebResourceLoadScheduler::loadResource):
* WebCoreSupport/WebResourceLoadScheduler.h:
Source/WebKit/mac:
Add WebIDL special operation support: serializer
https://bugs.webkit.org/show_bug.cgi?id=156293
Reviewed by Darin Adler.
* Plugins/Hosted/HostedNetscapePluginStream.mm:
(WebKit::HostedNetscapePluginStream::start):
* Plugins/WebNetscapePluginStream.mm:
(WebNetscapePluginStream::start):
Source/WebKit/win:
Use more references in ResourceLoader related code
https://bugs.webkit.org/show_bug.cgi?id=158222
Reviewed by Darin Adler.
* Plugins/PluginStream.cpp:
(WebCore::PluginStream::start):
Source/WebKit2:
Use more references in ResourceLoader related code
https://bugs.webkit.org/show_bug.cgi?id=158222
Reviewed by Darin Adler.
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::loadResource):
(WebKit::WebLoaderStrategy::schedulePluginStreamLoad):
(WebKit::WebLoaderStrategy::scheduleLoad):
(WebKit::WebLoaderStrategy::scheduleInternallyFailedLoad):
(WebKit::WebLoaderStrategy::startLocalLoad):
(WebKit::WebLoaderStrategy::networkProcessCrashed):
* WebProcess/Network/WebLoaderStrategy.h:
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::create):
(WebKit::WebResourceLoader::WebResourceLoader):
* WebProcess/Network/WebResourceLoader.h:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::Stream::start):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourcecpp">trunk/Source/WebCore/css/CSSFontFaceSource.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorh">trunk/Source/WebCore/css/CSSFontSelector.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLoaderStrategyh">trunk/Source/WebCore/loader/LoaderStrategy.h</a></li>
<li><a href="#trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNetscapePlugInStreamLoaderh">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoaderh">trunk/Source/WebCore/loader/SubresourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheHosth">trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulercpp">trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulerh">trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedHostedNetscapePluginStreammm">trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginStreammm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginStreamcpp">trunk/Source/WebKit/win/Plugins/PluginStream.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/ChangeLog 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-06-02 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Use more references in ResourceLoader related code
+ https://bugs.webkit.org/show_bug.cgi?id=158222
+
+ Reviewed by Darin Adler.
+
+ No change of behavior.
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::load):
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::clearDocument):
+ (WebCore::CSSFontSelector::beginLoadingFontSoon):
+ (WebCore::CSSFontSelector::beginLoadTimerFired):
+ * css/CSSFontSelector.h:
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::scheduleArchiveLoad):
+ * loader/DocumentLoader.h:
+ * loader/LoaderStrategy.h:
+ * loader/NetscapePlugInStreamLoader.cpp:
+ (WebCore::NetscapePlugInStreamLoader::NetscapePlugInStreamLoader):
+ (WebCore::NetscapePlugInStreamLoader::create):
+ * loader/NetscapePlugInStreamLoader.h:
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::ResourceLoader):
+ (WebCore::ResourceLoader::start):
+ * loader/ResourceLoader.h:
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::RequestCountTracker::RequestCountTracker):
+ (WebCore::SubresourceLoader::SubresourceLoader):
+ (WebCore::SubresourceLoader::create):
+ (WebCore::SubresourceLoader::didReceiveResponse):
+ (WebCore::SubresourceLoader::notifyDone):
+ * loader/SubresourceLoader.h:
+ * loader/appcache/ApplicationCacheHost.cpp:
+ (WebCore::ApplicationCacheHost::maybeLoadResource):
+ * loader/appcache/ApplicationCacheHost.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::load):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::incrementRequestCount):
+ (WebCore::CachedResourceLoader::decrementRequestCount):
+ * loader/cache/CachedResourceLoader.h:
+
</ins><span class="cx"> 2016-06-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Wayland] PlatformDisplayWayland destructor is super crashy
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -124,7 +124,8 @@
</span><span class="cx"> {
</span><span class="cx"> setStatus(Status::Loading);
</span><span class="cx">
</span><del>- fontSelector.beginLoadingFontSoon(m_font.get());
</del><ins>+ ASSERT(m_font);
+ fontSelector.beginLoadingFontSoon(*m_font);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Font> CSSFontFaceSource::font(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> CachedResourceLoader& cachedResourceLoader = m_document->cachedResourceLoader();
</span><span class="cx"> for (auto& fontHandle : m_fontsToBeginLoading) {
</span><span class="cx"> // Balances incrementRequestCount() in beginLoadingFontSoon().
</span><del>- cachedResourceLoader.decrementRequestCount(fontHandle.get());
</del><ins>+ cachedResourceLoader.decrementRequestCount(*fontHandle);
</ins><span class="cx"> }
</span><span class="cx"> m_fontsToBeginLoading.clear();
</span><span class="cx">
</span><span class="lines">@@ -273,12 +273,12 @@
</span><span class="cx"> m_clients.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSFontSelector::beginLoadingFontSoon(CachedFont* font)
</del><ins>+void CSSFontSelector::beginLoadingFontSoon(CachedFont& font)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_document)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_fontsToBeginLoading.append(font);
</del><ins>+ m_fontsToBeginLoading.append(&font);
</ins><span class="cx"> // Increment the request count now, in order to prevent didFinishLoad from being dispatched
</span><span class="cx"> // after this font has been requested but before it began loading. Balanced by
</span><span class="cx"> // decrementRequestCount() in beginLoadTimerFired() and in clearDocument().
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> for (auto& fontHandle : fontsToBeginLoading) {
</span><span class="cx"> fontHandle->beginLoadIfNeeded(cachedResourceLoader);
</span><span class="cx"> // Balances incrementRequestCount() in beginLoadingFontSoon().
</span><del>- cachedResourceLoader.decrementRequestCount(fontHandle.get());
</del><ins>+ cachedResourceLoader.decrementRequestCount(*fontHandle);
</ins><span class="cx"> }
</span><span class="cx"> // Ensure that if the request count reaches zero, the frame loader will know about it.
</span><span class="cx"> cachedResourceLoader.loadDone(nullptr);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/css/CSSFontSelector.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> Document* document() const { return m_document; }
</span><span class="cx">
</span><del>- void beginLoadingFontSoon(CachedFont*);
</del><ins>+ void beginLoadingFontSoon(CachedFont&);
</ins><span class="cx">
</span><span class="cx"> FontFaceSet& fontFaceSet();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -1232,10 +1232,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><del>-bool DocumentLoader::scheduleArchiveLoad(ResourceLoader* loader, const ResourceRequest& request)
</del><ins>+bool DocumentLoader::scheduleArchiveLoad(ResourceLoader& loader, const ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> if (ArchiveResource* resource = archiveResourceForURL(request.url())) {
</span><del>- scheduleSubstituteResourceLoad(*loader, *resource);
</del><ins>+ scheduleSubstituteResourceLoad(loader, *resource);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> PassRefPtr<Archive> popArchiveForSubframe(const String& frameName, const URL&);
</span><span class="cx"> WEBCORE_EXPORT SharedBuffer* parsedArchiveData() const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT bool scheduleArchiveLoad(ResourceLoader*, const ResourceRequest&);
</del><ins>+ WEBCORE_EXPORT bool scheduleArchiveLoad(ResourceLoader&, const ResourceRequest&);
</ins><span class="cx"> #endif
</span><span class="cx"> void scheduleSubstituteResourceLoad(ResourceLoader&, SubstituteResource&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LoaderStrategy.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LoaderStrategy.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/LoaderStrategy.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class WEBCORE_EXPORT LoaderStrategy {
</span><span class="cx"> public:
</span><del>- virtual RefPtr<SubresourceLoader> loadResource(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&) = 0;
</del><ins>+ virtual RefPtr<SubresourceLoader> loadResource(Frame&, CachedResource&, const ResourceRequest&, const ResourceLoaderOptions&) = 0;
</ins><span class="cx"> virtual void loadResourceSynchronously(NetworkingContext*, unsigned long identifier, const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, Vector<char>& data) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void remove(ResourceLoader*) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Skip Content Security Policy check when associated plugin element is in a user agent shadow tree.
</span><span class="cx"> // See <https://bugs.webkit.org/show_bug.cgi?id=146663>.
</span><del>-NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame* frame, NetscapePlugInStreamLoaderClient* client)
</del><ins>+NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame& frame, NetscapePlugInStreamLoaderClient& client)
</ins><span class="cx"> : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, DoNotBufferData, AllowStoredCredentials, AskClientForAllCredentials, ClientRequestedCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching))
</span><del>- , m_client(client)
</del><ins>+ , m_client(&client)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx"> m_resourceType = ResourceType::PlugInStream;
</span><span class="lines">@@ -55,13 +55,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<NetscapePlugInStreamLoader> NetscapePlugInStreamLoader::create(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
</del><ins>+RefPtr<NetscapePlugInStreamLoader> NetscapePlugInStreamLoader::create(Frame& frame, NetscapePlugInStreamLoaderClient& client, const ResourceRequest& request)
</ins><span class="cx"> {
</span><del>- RefPtr<NetscapePlugInStreamLoader> loader(adoptRef(new NetscapePlugInStreamLoader(frame, client)));
</del><ins>+ auto loader(adoptRef(new NetscapePlugInStreamLoader(frame, client)));
</ins><span class="cx"> if (!loader->init(request))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return loader.release();
</del><ins>+ return loader;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool NetscapePlugInStreamLoader::isDone() const
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> class NetscapePlugInStreamLoader final : public ResourceLoader {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static PassRefPtr<NetscapePlugInStreamLoader> create(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
</del><ins>+ WEBCORE_EXPORT static RefPtr<NetscapePlugInStreamLoader> create(Frame&, NetscapePlugInStreamLoaderClient&, const ResourceRequest&);
</ins><span class="cx"> virtual ~NetscapePlugInStreamLoader();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isDone() const;
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> void releaseResources() override;
</span><span class="cx">
</span><del>- NetscapePlugInStreamLoader(Frame*, NetscapePlugInStreamLoaderClient*);
</del><ins>+ NetscapePlugInStreamLoader(Frame&, NetscapePlugInStreamLoaderClient&);
</ins><span class="cx">
</span><span class="cx"> void willCancel(const ResourceError&) override;
</span><span class="cx"> void didCancel(const ResourceError&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -53,25 +53,16 @@
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>-#include "ResourceLoadInfo.h"
</del><span class="cx"> #include "UserContentController.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ResourceLoader::ResourceLoader(Frame* frame, ResourceLoaderOptions options)
- : m_frame(frame)
- , m_documentLoader(frame->loader().activeDocumentLoader())
- , m_identifier(0)
- , m_reachedTerminalState(false)
- , m_notifiedLoadComplete(false)
- , m_cancellationStatus(NotCancelled)
- , m_defersLoading(options.defersLoadingPolicy() == DefersLoadingPolicy::AllowDefersLoading && frame->page()->defersLoading())
</del><ins>+ResourceLoader::ResourceLoader(Frame& frame, ResourceLoaderOptions options)
+ : m_frame(&frame)
+ , m_documentLoader(frame.loader().activeDocumentLoader())
+ , m_defersLoading(options.defersLoadingPolicy() == DefersLoadingPolicy::AllowDefersLoading && frame.page()->defersLoading())
</ins><span class="cx"> , m_options(options)
</span><del>- , m_isQuickLookResource(false)
-#if ENABLE(CONTENT_EXTENSIONS)
- , m_resourceType(ResourceType::Invalid)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -195,11 +186,11 @@
</span><span class="cx"> ASSERT(frameLoader());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><del>- if (m_documentLoader->scheduleArchiveLoad(this, m_request))
</del><ins>+ if (m_documentLoader->scheduleArchiveLoad(*this, m_request))
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, m_request, m_request.url()))
</del><ins>+ if (m_documentLoader->applicationCacheHost()->maybeLoadResource(*this, m_request, m_request.url()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_defersLoading) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -36,6 +36,10 @@
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+#include "ResourceLoadInfo.h"
+#endif
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx"> class SchedulePair;
</span><span class="cx"> }
</span><span class="lines">@@ -52,10 +56,6 @@
</span><span class="cx"> class QuickLookHandle;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_EXTENSIONS)
-enum class ResourceType : uint16_t;
-#endif
-
</del><span class="cx"> class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ResourceLoader() = 0;
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> unsigned long identifier() const { return m_identifier; }
</span><span class="cx">
</span><span class="cx"> virtual void releaseResources();
</span><del>- const ResourceResponse& response() const;
</del><ins>+ const ResourceResponse& response() const { return m_response; }
</ins><span class="cx">
</span><span class="cx"> SharedBuffer* resourceData() const { return m_resourceData.get(); }
</span><span class="cx"> void clearResourceData();
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool isAlwaysOnLoggingAllowed() const;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- ResourceLoader(Frame*, ResourceLoaderOptions);
</del><ins>+ ResourceLoader(Frame&, ResourceLoaderOptions);
</ins><span class="cx">
</span><span class="cx"> void didFinishLoadingOnePart(double finishTime);
</span><span class="cx"> void cleanupForError(const ResourceError&);
</span><span class="lines">@@ -214,10 +214,10 @@
</span><span class="cx"> ResourceRequest m_originalRequest; // Before redirects.
</span><span class="cx"> RefPtr<SharedBuffer> m_resourceData;
</span><span class="cx">
</span><del>- unsigned long m_identifier;
</del><ins>+ unsigned long m_identifier { 0 };
</ins><span class="cx">
</span><del>- bool m_reachedTerminalState;
- bool m_notifiedLoadComplete;
</del><ins>+ bool m_reachedTerminalState { false };
+ bool m_notifiedLoadComplete { false };
</ins><span class="cx">
</span><span class="cx"> enum CancellationStatus {
</span><span class="cx"> NotCancelled,
</span><span class="lines">@@ -225,24 +225,19 @@
</span><span class="cx"> Cancelled,
</span><span class="cx"> FinishedCancel
</span><span class="cx"> };
</span><del>- CancellationStatus m_cancellationStatus;
</del><ins>+ CancellationStatus m_cancellationStatus { NotCancelled };
</ins><span class="cx">
</span><span class="cx"> bool m_defersLoading;
</span><span class="cx"> ResourceRequest m_deferredRequest;
</span><span class="cx"> ResourceLoaderOptions m_options;
</span><del>- bool m_isQuickLookResource;
</del><ins>+ bool m_isQuickLookResource { false };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx"> protected:
</span><del>- ResourceType m_resourceType;
</del><ins>+ ResourceType m_resourceType { ResourceType::Invalid };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline const ResourceResponse& ResourceLoader::response() const
-{
- return m_response;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, subresourceLoaderCounter, ("SubresourceLoader"));
</span><span class="cx">
</span><del>-SubresourceLoader::RequestCountTracker::RequestCountTracker(CachedResourceLoader& cachedResourceLoader, CachedResource* resource)
</del><ins>+SubresourceLoader::RequestCountTracker::RequestCountTracker(CachedResourceLoader& cachedResourceLoader, const CachedResource& resource)
</ins><span class="cx"> : m_cachedResourceLoader(cachedResourceLoader)
</span><span class="cx"> , m_resource(resource)
</span><span class="cx"> {
</span><span class="lines">@@ -73,18 +73,18 @@
</span><span class="cx"> m_cachedResourceLoader.decrementRequestCount(m_resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SubresourceLoader::SubresourceLoader(Frame* frame, CachedResource* resource, const ResourceLoaderOptions& options)
</del><ins>+SubresourceLoader::SubresourceLoader(Frame& frame, CachedResource& resource, const ResourceLoaderOptions& options)
</ins><span class="cx"> : ResourceLoader(frame, options)
</span><del>- , m_resource(resource)
</del><ins>+ , m_resource(&resource)
</ins><span class="cx"> , m_loadingMultipartContent(false)
</span><span class="cx"> , m_state(Uninitialized)
</span><del>- , m_requestCountTracker(InPlace, frame->document()->cachedResourceLoader(), resource)
</del><ins>+ , m_requestCountTracker(InPlace, frame.document()->cachedResourceLoader(), resource)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> subresourceLoaderCounter.increment();
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- m_resourceType = toResourceType(resource->type());
</del><ins>+ m_resourceType = toResourceType(resource.type());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
</del><ins>+RefPtr<SubresourceLoader> SubresourceLoader::create(Frame& frame, CachedResource& resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<SubresourceLoader> subloader(adoptRef(new SubresourceLoader(frame, resource, options)));
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class SubresourceLoader final : public ResourceLoader {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static RefPtr<SubresourceLoader> create(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
</del><ins>+ WEBCORE_EXPORT static RefPtr<SubresourceLoader> create(Frame&, CachedResource&, const ResourceRequest&, const ResourceLoaderOptions&);
</ins><span class="cx">
</span><span class="cx"> virtual ~SubresourceLoader();
</span><span class="cx">
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SubresourceLoader(Frame*, CachedResource*, const ResourceLoaderOptions&);
</del><ins>+ SubresourceLoader(Frame&, CachedResource&, const ResourceLoaderOptions&);
</ins><span class="cx">
</span><span class="cx"> bool init(const ResourceRequest&) override;
</span><span class="cx">
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> #endif
</span><span class="cx"> public:
</span><del>- RequestCountTracker(CachedResourceLoader&, CachedResource*);
</del><ins>+ RequestCountTracker(CachedResourceLoader&, const CachedResource&);
</ins><span class="cx"> ~RequestCountTracker();
</span><span class="cx"> private:
</span><span class="cx"> CachedResourceLoader& m_cachedResourceLoader;
</span><del>- CachedResource* m_resource;
</del><ins>+ const CachedResource& m_resource;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> group->finishedLoadingMainResource(&m_documentLoader);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ApplicationCacheHost::maybeLoadResource(ResourceLoader* loader, const ResourceRequest& request, const URL& originalURL)
</del><ins>+bool ApplicationCacheHost::maybeLoadResource(ResourceLoader& loader, const ResourceRequest& request, const URL& originalURL)
</ins><span class="cx"> {
</span><span class="cx"> if (!isApplicationCacheEnabled() && !isApplicationCacheBlockedForRequest(request))
</span><span class="cx"> return false;
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> if (!shouldLoadResourceFromApplicationCache(request, resource))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_documentLoader.scheduleSubstituteResourceLoad(*loader, *resource);
</del><ins>+ m_documentLoader.scheduleSubstituteResourceLoad(loader, *resource);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> void finishedLoadingMainResource();
</span><span class="cx"> void failedLoadingMainResource();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT bool maybeLoadResource(ResourceLoader*, const ResourceRequest&, const URL& originalURL);
</del><ins>+ WEBCORE_EXPORT bool maybeLoadResource(ResourceLoader&, const ResourceRequest&, const URL& originalURL);
</ins><span class="cx"> WEBCORE_EXPORT bool maybeLoadFallbackForRedirect(ResourceLoader*, ResourceRequest&, const ResourceResponse&);
</span><span class="cx"> WEBCORE_EXPORT bool maybeLoadFallbackForResponse(ResourceLoader*, const ResourceResponse&);
</span><span class="cx"> WEBCORE_EXPORT bool maybeLoadFallbackForError(ResourceLoader*, const ResourceError&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -215,14 +215,15 @@
</span><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ Frame& frame = *cachedResourceLoader.frame();
</ins><span class="cx">
</span><span class="cx"> // Prevent new loads if we are in the PageCache or being added to the PageCache.
</span><del>- if (cachedResourceLoader.frame()->page() && cachedResourceLoader.frame()->page()->inPageCache()) {
</del><ins>+ if (frame.page() && frame.page()->inPageCache()) {
</ins><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FrameLoader& frameLoader = cachedResourceLoader.frame()->loader();
</del><ins>+ FrameLoader& frameLoader = frame.loader();
</ins><span class="cx"> if (options.securityCheck() == DoSecurityCheck && (frameLoader.state() == FrameStateProvisional || !frameLoader.activeDocumentLoader() || frameLoader.activeDocumentLoader()->isStopping())) {
</span><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span><span class="lines">@@ -236,7 +237,7 @@
</span><span class="cx"> // When QuickLook is invoked to convert a document, it returns a unique URL in the
</span><span class="cx"> // NSURLReponse for the main document. To make safeQLURLForDocumentURLAndResourceURL()
</span><span class="cx"> // work, we need to use the QL URL not the original URL.
</span><del>- const URL& documentURL = cachedResourceLoader.frame() ? cachedResourceLoader.frame()->loader().documentLoader()->response().url() : cachedResourceLoader.document()->url();
</del><ins>+ const URL& documentURL = frameLoader.documentLoader()->response().url();
</ins><span class="cx"> m_resourceRequest.setURL(safeQLURLForDocumentURLAndResourceURL(documentURL, url()));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -280,7 +281,7 @@
</span><span class="cx"> m_fragmentIdentifierForRequest = String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_loader = platformStrategies()->loaderStrategy()->loadResource(cachedResourceLoader.frame(), this, request, options);
</del><ins>+ m_loader = platformStrategies()->loaderStrategy()->loadResource(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="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -1012,17 +1012,17 @@
</span><span class="cx"> platformStrategies()->loaderStrategy()->servePendingRequests();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResourceLoader::incrementRequestCount(const CachedResource* res)
</del><ins>+void CachedResourceLoader::incrementRequestCount(const CachedResource& resource)
</ins><span class="cx"> {
</span><del>- if (res->ignoreForRequestCount())
</del><ins>+ if (resource.ignoreForRequestCount())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ++m_requestCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResourceLoader::decrementRequestCount(const CachedResource* res)
</del><ins>+void CachedResourceLoader::decrementRequestCount(const CachedResource& resource)
</ins><span class="cx"> {
</span><del>- if (res->ignoreForRequestCount())
</del><ins>+ if (resource.ignoreForRequestCount())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> --m_requestCount;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void garbageCollectDocumentResources();
</span><span class="cx">
</span><del>- void incrementRequestCount(const CachedResource*);
- void decrementRequestCount(const CachedResource*);
</del><ins>+ void incrementRequestCount(const CachedResource&);
+ void decrementRequestCount(const CachedResource&);
</ins><span class="cx"> int requestCount() const { return m_requestCount; }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isPreloaded(const String& urlString) const;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/ChangeLog 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-02 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Use more references in ResourceLoader related code
+ https://bugs.webkit.org/show_bug.cgi?id=158222
+
+ Reviewed by Darin Adler.
+
+ * WebCoreSupport/WebResourceLoadScheduler.cpp:
+ (WebResourceLoadScheduler::loadResource):
+ * WebCoreSupport/WebResourceLoadScheduler.h:
+
</ins><span class="cx"> 2016-05-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Templatize NoncopyableFunction class similarly to std::function
</span></span></pre></div>
<a id="trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<SubresourceLoader> WebResourceLoadScheduler::loadResource(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
</del><ins>+RefPtr<SubresourceLoader> WebResourceLoadScheduler::loadResource(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><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> ResourceHandle::loadResourceSynchronously(context, request, storedCredentials, error, response, data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<NetscapePlugInStreamLoader> WebResourceLoadScheduler::schedulePluginStreamLoad(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
</del><ins>+RefPtr<NetscapePlugInStreamLoader> WebResourceLoadScheduler::schedulePluginStreamLoad(Frame& frame, NetscapePlugInStreamLoaderClient& client, const ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<NetscapePlugInStreamLoader> loader = NetscapePlugInStreamLoader::create(frame, client, request);
</span><span class="cx"> if (loader)
</span></span></pre></div>
<a id="trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WebResourceLoadScheduler();
</span><span class="cx">
</span><del>- RefPtr<WebCore::SubresourceLoader> loadResource(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
</del><ins>+ RefPtr<WebCore::SubresourceLoader> loadResource(WebCore::Frame&, WebCore::CachedResource&, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
</ins><span class="cx"> void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>&) override;
</span><span class="cx"> void remove(WebCore::ResourceLoader*) override;
</span><span class="cx"> void setDefersLoading(WebCore::ResourceLoader*, bool) override;
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> bool isSerialLoadingEnabled() const { return m_isSerialLoadingEnabled; }
</span><span class="cx"> void setSerialLoadingEnabled(bool b) { m_isSerialLoadingEnabled = b; }
</span><span class="cx">
</span><del>- RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame*, WebCore::NetscapePlugInStreamLoaderClient*, const WebCore::ResourceRequest&);
</del><ins>+ RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame&, WebCore::NetscapePlugInStreamLoaderClient&, const WebCore::ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~WebResourceLoadScheduler();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-02 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Add WebIDL special operation support: serializer
+ https://bugs.webkit.org/show_bug.cgi?id=156293
+
+ Reviewed by Darin Adler.
+
+ * Plugins/Hosted/HostedNetscapePluginStream.mm:
+ (WebKit::HostedNetscapePluginStream::start):
+ * Plugins/WebNetscapePluginStream.mm:
+ (WebNetscapePluginStream::start):
+
</ins><span class="cx"> 2016-05-31 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Audit RenderObject casts and fix problems and style issues found
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedHostedNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> ASSERT(!m_frameLoader);
</span><span class="cx"> ASSERT(!m_loader);
</span><span class="cx">
</span><del>- m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(core([m_instance->pluginView() webFrame]), this, m_request.get());
</del><ins>+ m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(*core([m_instance->pluginView() webFrame]), *this, m_request.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HostedNetscapePluginStream::stop()
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> ASSERT(!m_frameLoader);
</span><span class="cx"> ASSERT(!m_loader);
</span><span class="cx">
</span><del>- m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(core([m_pluginView.get() webFrame]), this, m_request.get());
</del><ins>+ m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(*core([m_pluginView.get() webFrame]), *this, m_request.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNetscapePluginStream::stop()
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/win/ChangeLog 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-02 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Use more references in ResourceLoader related code
+ https://bugs.webkit.org/show_bug.cgi?id=158222
+
+ Reviewed by Darin Adler.
+
+ * Plugins/PluginStream.cpp:
+ (WebCore::PluginStream::start):
+
</ins><span class="cx"> 2016-06-01 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Potential null pointer crash when setting cursor.
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginStream.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginStream.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit/win/Plugins/PluginStream.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -96,7 +96,8 @@
</span><span class="cx"> void PluginStream::start()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_loadManually);
</span><del>- m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(m_frame, this, m_resourceRequest);
</del><ins>+ ASSERT(m_frame);
+ m_loader = webResourceLoadScheduler().schedulePluginStreamLoad(*m_frame, *this, m_resourceRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginStream::stop()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-02 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Use more references in ResourceLoader related code
+ https://bugs.webkit.org/show_bug.cgi?id=158222
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::loadResource):
+ (WebKit::WebLoaderStrategy::schedulePluginStreamLoad):
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ (WebKit::WebLoaderStrategy::scheduleInternallyFailedLoad):
+ (WebKit::WebLoaderStrategy::startLocalLoad):
+ (WebKit::WebLoaderStrategy::networkProcessCrashed):
+ * WebProcess/Network/WebLoaderStrategy.h:
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::create):
+ (WebKit::WebResourceLoader::WebResourceLoader):
+ * WebProcess/Network/WebResourceLoader.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::Stream::start):
+
</ins><span class="cx"> 2016-06-01 Yongjun Zhang <yongjun_zhang@apple.com>
</span><span class="cx">
</span><span class="cx"> Notify client immediately if network session doesn't exist for a synchronous XHR load.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -71,19 +71,19 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<SubresourceLoader> WebLoaderStrategy::loadResource(Frame* frame, CachedResource* resource, const ResourceRequest& request, const ResourceLoaderOptions& options)
</del><ins>+RefPtr<SubresourceLoader> WebLoaderStrategy::loadResource(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, frame->document()->referrerPolicy() == ReferrerPolicy::Default);
</del><ins>+ scheduleLoad(*loader, &resource, frame.document()->referrerPolicy() == ReferrerPolicy::Default);
</ins><span class="cx"> return loader;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<NetscapePlugInStreamLoader> WebLoaderStrategy::schedulePluginStreamLoad(Frame* frame, NetscapePlugInStreamLoaderClient* client, const ResourceRequest& request)
</del><ins>+RefPtr<NetscapePlugInStreamLoader> WebLoaderStrategy::schedulePluginStreamLoad(Frame& frame, NetscapePlugInStreamLoaderClient& client, const ResourceRequest& request)
</ins><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, frame->document()->referrerPolicy() == ReferrerPolicy::Default);
</del><ins>+ scheduleLoad(*loader, 0, frame.document()->referrerPolicy() == ReferrerPolicy::Default);
</ins><span class="cx"> return loader;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,39 +128,37 @@
</span><span class="cx"> return 0ms;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebLoaderStrategy::scheduleLoad(ResourceLoader* resourceLoader, CachedResource* resource, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
</del><ins>+void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResource* resource, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
</ins><span class="cx"> {
</span><del>- ASSERT(resourceLoader);
-
- ResourceLoadIdentifier identifier = resourceLoader->identifier();
</del><ins>+ ResourceLoadIdentifier identifier = resourceLoader.identifier();
</ins><span class="cx"> ASSERT(identifier);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span><span class="cx"> // If the DocumentLoader schedules this as an archive resource load,
</span><span class="cx"> // then we should remember the ResourceLoader in our records but not schedule it in the NetworkProcess.
</span><del>- if (resourceLoader->documentLoader()->scheduleArchiveLoad(resourceLoader, resourceLoader->request())) {
- LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as an archive resource.", resourceLoader->url().string().utf8().data());
</del><ins>+ if (resourceLoader.documentLoader()->scheduleArchiveLoad(resourceLoader, resourceLoader.request())) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as an archive resource.", resourceLoader.url().string().utf8().data());
</ins><span class="cx"> m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (resourceLoader->documentLoader()->applicationCacheHost()->maybeLoadResource(resourceLoader, resourceLoader->request(), resourceLoader->request().url())) {
- LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded from application cache.", resourceLoader->url().string().utf8().data());
</del><ins>+ if (resourceLoader.documentLoader()->applicationCacheHost()->maybeLoadResource(resourceLoader, resourceLoader.request(), resourceLoader.request().url())) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded from application cache.", resourceLoader.url().string().utf8().data());
</ins><span class="cx"> m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (resourceLoader->request().url().protocolIsData()) {
- LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded as data.", resourceLoader->url().string().utf8().data());
- startLocalLoad(*resourceLoader);
</del><ins>+ if (resourceLoader.request().url().protocolIsData()) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be loaded as data.", resourceLoader.url().string().utf8().data());
+ startLocalLoad(resourceLoader);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><del>- if (resourceLoader->request().url().protocolIs(QLPreviewProtocol())) {
- LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a QuickLook resource.", resourceLoader->url().string().utf8().data());
- startLocalLoad(*resourceLoader);
</del><ins>+ if (resourceLoader.request().url().protocolIs(QLPreviewProtocol())) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a QuickLook resource.", resourceLoader.url().string().utf8().data());
+ startLocalLoad(resourceLoader);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -168,22 +166,22 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> // For apps that call g_resource_load in a web extension.
</span><span class="cx"> // https://blogs.gnome.org/alexl/2012/01/26/resources-in-glib/
</span><del>- if (resourceLoader->request().url().protocolIs("resource")) {
- LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a GResource.", resourceLoader->url().string().utf8().data());
- startLocalLoad(*resourceLoader);
</del><ins>+ if (resourceLoader.request().url().protocolIs("resource")) {
+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be handled as a GResource.", resourceLoader.url().string().utf8().data());
+ startLocalLoad(resourceLoader);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d", resourceLoader->url().string().latin1().data(), static_cast<int>(resourceLoader->request().priority()));
</del><ins>+ LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d", resourceLoader.url().string().latin1().data(), static_cast<int>(resourceLoader.request().priority()));
</ins><span class="cx">
</span><del>- ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
- StoredCredentials allowStoredCredentials = resourceLoader->shouldUseCredentialStorage() ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</del><ins>+ ContentSniffingPolicy contentSniffingPolicy = resourceLoader.shouldSniffContent() ? SniffContent : DoNotSniffContent;
+ StoredCredentials allowStoredCredentials = resourceLoader.shouldUseCredentialStorage() ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
</span><span class="cx"> // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
</span><span class="cx"> // but in the meantime we have to make sure not to mis-cast.
</span><del>- WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(resourceLoader->frameLoader()->client());
</del><ins>+ WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(resourceLoader.frameLoader()->client());
</ins><span class="cx"> WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
</span><span class="cx"> WebPage* webPage = webFrame ? webFrame->page() : 0;
</span><span class="cx">
</span><span class="lines">@@ -192,20 +190,20 @@
</span><span class="cx"> loadParameters.webPageID = webPage ? webPage->pageID() : 0;
</span><span class="cx"> loadParameters.webFrameID = webFrame ? webFrame->frameID() : 0;
</span><span class="cx"> loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
</span><del>- loadParameters.request = resourceLoader->request();
</del><ins>+ loadParameters.request = resourceLoader.request();
</ins><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><del>- loadParameters.clientCredentialPolicy = (webFrame && webPage && resourceLoader->isAllowedToAskUserForCredentials()) ? AskClientForAllCredentials : DoNotAskClientForAnyCredentials;
</del><ins>+ loadParameters.clientCredentialPolicy = (webFrame && webPage && resourceLoader.isAllowedToAskUserForCredentials()) ? AskClientForAllCredentials : DoNotAskClientForAnyCredentials;
</ins><span class="cx"> loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect;
</span><del>- loadParameters.defersLoading = resourceLoader->defersLoading();
- loadParameters.needsCertificateInfo = resourceLoader->shouldIncludeCertificateInfo();
</del><ins>+ loadParameters.defersLoading = resourceLoader.defersLoading();
+ loadParameters.needsCertificateInfo = resourceLoader.shouldIncludeCertificateInfo();
</ins><span class="cx"> loadParameters.maximumBufferingTime = maximumBufferingTime(resource);
</span><span class="cx">
</span><span class="cx"> ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
</span><span class="cx">
</span><span class="cx"> if (!WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
</span><del>- WEBLOADERSTRATEGY_LOG_ALWAYS_ERROR("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader->request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
</del><ins>+ WEBLOADERSTRATEGY_LOG_ALWAYS_ERROR("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
</ins><span class="cx"> // We probably failed to schedule this load with the NetworkProcess because it had crashed.
</span><span class="cx"> // This load will never succeed so we will schedule it to fail asynchronously.
</span><span class="cx"> scheduleInternallyFailedLoad(resourceLoader);
</span><span class="lines">@@ -213,13 +211,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto webResourceLoader = WebResourceLoader::create(resourceLoader);
</span><del>- WEBLOADERSTRATEGY_LOG_ALWAYS("WebLoaderStrategy::scheduleLoad: Resource will be scheduled with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p", static_cast<int>(resourceLoader->request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID), webResourceLoader.ptr());
</del><ins>+ WEBLOADERSTRATEGY_LOG_ALWAYS("WebLoaderStrategy::scheduleLoad: Resource will be scheduled with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID), webResourceLoader.ptr());
</ins><span class="cx"> m_webResourceLoaders.set(identifier, WTFMove(webResourceLoader));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader* resourceLoader)
</del><ins>+void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader)
</ins><span class="cx"> {
</span><del>- m_internallyFailedResourceLoaders.add(resourceLoader);
</del><ins>+ m_internallyFailedResourceLoaders.add(&resourceLoader);
</ins><span class="cx"> m_internallyFailedLoadTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,7 +233,7 @@
</span><span class="cx"> void WebLoaderStrategy::startLocalLoad(WebCore::ResourceLoader& resourceLoader)
</span><span class="cx"> {
</span><span class="cx"> resourceLoader.start();
</span><del>- m_webResourceLoaders.set(resourceLoader.identifier(), WebResourceLoader::create(&resourceLoader));
</del><ins>+ m_webResourceLoaders.set(resourceLoader.identifier(), WebResourceLoader::create(resourceLoader));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebLoaderStrategy::remove(ResourceLoader* resourceLoader)
</span><span class="lines">@@ -296,9 +294,8 @@
</span><span class="cx">
</span><span class="cx"> void WebLoaderStrategy::networkProcessCrashed()
</span><span class="cx"> {
</span><del>- HashMap<unsigned long, RefPtr<WebResourceLoader>>::iterator end = m_webResourceLoaders.end();
- for (HashMap<unsigned long, RefPtr<WebResourceLoader>>::iterator i = m_webResourceLoaders.begin(); i != end; ++i)
- scheduleInternallyFailedLoad(i->value.get()->resourceLoader());
</del><ins>+ for (auto& loader : m_webResourceLoaders)
+ scheduleInternallyFailedLoad(*loader.value->resourceLoader());
</ins><span class="cx">
</span><span class="cx"> m_webResourceLoaders.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> WebLoaderStrategy();
</span><span class="cx"> ~WebLoaderStrategy() override;
</span><span class="cx">
</span><del>- RefPtr<WebCore::SubresourceLoader> loadResource(WebCore::Frame*, WebCore::CachedResource*, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
</del><ins>+ RefPtr<WebCore::SubresourceLoader> loadResource(WebCore::Frame&, WebCore::CachedResource&, const WebCore::ResourceRequest&, const WebCore::ResourceLoaderOptions&) override;
</ins><span class="cx"> void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
</span><span class="cx">
</span><span class="cx"> void remove(WebCore::ResourceLoader*) override;
</span><span class="lines">@@ -58,13 +58,13 @@
</span><span class="cx"> void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
</span><span class="cx">
</span><span class="cx"> WebResourceLoader* webResourceLoaderForIdentifier(ResourceLoadIdentifier identifier) const { return m_webResourceLoaders.get(identifier); }
</span><del>- RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame*, WebCore::NetscapePlugInStreamLoaderClient*, const WebCore::ResourceRequest&);
</del><ins>+ RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame&, WebCore::NetscapePlugInStreamLoaderClient&, const WebCore::ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> void networkProcessCrashed();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void scheduleLoad(WebCore::ResourceLoader*, WebCore::CachedResource*, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
- void scheduleInternallyFailedLoad(WebCore::ResourceLoader*);
</del><ins>+ void scheduleLoad(WebCore::ResourceLoader&, WebCore::CachedResource*, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
+ void scheduleInternallyFailedLoad(WebCore::ResourceLoader&);
</ins><span class="cx"> void internallyFailedLoadTimerFired();
</span><span class="cx"> void startLocalLoad(WebCore::ResourceLoader&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -46,13 +46,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-Ref<WebResourceLoader> WebResourceLoader::create(PassRefPtr<ResourceLoader> coreLoader)
</del><ins>+Ref<WebResourceLoader> WebResourceLoader::create(Ref<ResourceLoader>&& coreLoader)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebResourceLoader(coreLoader));
</del><ins>+ return adoptRef(*new WebResourceLoader(WTFMove(coreLoader)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebResourceLoader::WebResourceLoader(PassRefPtr<WebCore::ResourceLoader> coreLoader)
- : m_coreLoader(coreLoader)
</del><ins>+WebResourceLoader::WebResourceLoader(Ref<WebCore::ResourceLoader>&& coreLoader)
+ : m_coreLoader(WTFMove(coreLoader))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> class WebResourceLoader : public RefCounted<WebResourceLoader>, public IPC::MessageSender {
</span><span class="cx"> public:
</span><del>- static Ref<WebResourceLoader> create(PassRefPtr<WebCore::ResourceLoader>);
</del><ins>+ static Ref<WebResourceLoader> create(Ref<WebCore::ResourceLoader>&&);
</ins><span class="cx">
</span><span class="cx"> ~WebResourceLoader();
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> bool isAlwaysOnLoggingAllowed() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebResourceLoader(PassRefPtr<WebCore::ResourceLoader>);
</del><ins>+ WebResourceLoader(Ref<WebCore::ResourceLoader>&&);
</ins><span class="cx">
</span><span class="cx"> // IPC::MessageSender
</span><span class="cx"> IPC::Connection* messageSenderConnection() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (201595 => 201596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-06-02 07:36:21 UTC (rev 201595)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-06-02 08:45:14 UTC (rev 201596)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> Frame* frame = m_pluginView->m_pluginElement->document().frame();
</span><span class="cx"> ASSERT(frame);
</span><span class="cx">
</span><del>- m_loader = WebProcess::singleton().webLoaderStrategy().schedulePluginStreamLoad(frame, this, m_request);
</del><ins>+ m_loader = WebProcess::singleton().webLoaderStrategy().schedulePluginStreamLoad(*frame, *this, m_request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::Stream::cancel()
</span></span></pre>
</div>
</div>
</body>
</html>