<!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>[206903] trunk/Source/WebCore</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/206903">206903</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-07 00:02:02 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor CachedResourceClient::notifyFinished
https://bugs.webkit.org/show_bug.cgi?id=162060
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-07
Reviewed by Darin Adler.
No change of behavior.
Making CachedResourceClient and CachedRawResourceClient callbacks take CachedResource references and not pointers.
In most cases, the CachedResource parameter is only used for assertions.
Removing that parameter might be contemplated in the future.
The only real case is in RenderImage.
Removed the CachedResource parameter from ContentFilter methods as code was calling these methods with null values.
* dom/LoadableClassicScript.cpp:
(WebCore::LoadableClassicScript::notifyFinished):
* dom/LoadableClassicScript.h:
* html/HTMLImageLoader.cpp:
(WebCore::HTMLImageLoader::notifyFinished):
* html/HTMLImageLoader.h:
* loader/ContentFilter.cpp:
(WebCore::ContentFilter::continueAfterResponseReceived):
(WebCore::ContentFilter::continueAfterDataReceived):
(WebCore::ContentFilter::continueAfterNotifyFinished):
(WebCore::ContentFilter::deliverResourceData):
* loader/ContentFilter.h:
* loader/CrossOriginPreflightChecker.cpp:
(WebCore::CrossOriginPreflightChecker::notifyFinished):
* loader/CrossOriginPreflightChecker.h:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::notifyFinished):
(WebCore::DocumentLoader::handleSubstituteDataLoadNow):
(WebCore::DocumentLoader::redirectReceived):
(WebCore::DocumentLoader::responseReceived):
(WebCore::DocumentLoader::continueAfterContentPolicy):
(WebCore::DocumentLoader::dataReceived):
* loader/DocumentLoader.h:
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::redirectReceived):
(WebCore::DocumentThreadableLoader::dataSent):
(WebCore::DocumentThreadableLoader::responseReceived):
(WebCore::DocumentThreadableLoader::dataReceived):
(WebCore::DocumentThreadableLoader::notifyFinished):
* loader/DocumentThreadableLoader.h:
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::notifyFinished):
* loader/ImageLoader.h:
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::triggerEvents):
(WebCore::LinkLoader::notifyFinished):
* loader/LinkLoader.h:
* loader/LinkPreloadResourceClients.cpp:
(WebCore::LinkPreloadResourceClient::triggerEvents):
* loader/LinkPreloadResourceClients.h:
* loader/MediaResourceLoader.cpp:
(WebCore::MediaResource::responseReceived):
(WebCore::MediaResource::shouldCacheResponse):
(WebCore::MediaResource::redirectReceived):
(WebCore::MediaResource::dataSent):
(WebCore::MediaResource::dataReceived):
(WebCore::MediaResource::notifyFinished):
(WebCore::MediaResource::getOrCreateReadBuffer):
* loader/MediaResourceLoader.h:
* loader/TextTrackLoader.cpp:
(WebCore::TextTrackLoader::processNewCueData):
(WebCore::TextTrackLoader::deprecatedDidReceiveCachedResource):
(WebCore::TextTrackLoader::notifyFinished):
* loader/TextTrackLoader.h:
* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::notifyClientsDataWasReceived):
(WebCore::CachedRawResource::didAddClient):
(WebCore::CachedRawResource::redirectReceived):
(WebCore::CachedRawResource::responseReceived):
(WebCore::CachedRawResource::shouldCacheResponse):
(WebCore::CachedRawResource::didSendData):
* loader/cache/CachedRawResourceClient.h:
(WebCore::CachedRawResourceClient::dataSent):
(WebCore::CachedRawResourceClient::responseReceived):
(WebCore::CachedRawResourceClient::shouldCacheResponse):
(WebCore::CachedRawResourceClient::dataReceived):
(WebCore::CachedRawResourceClient::redirectReceived):
(WebCore::CachedRawResourceClient::getOrCreateReadBuffer):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::checkNotify):
(WebCore::CachedResource::didAddClient):
* loader/cache/CachedResourceClient.h:
(WebCore::CachedResourceClient::notifyFinished):
(WebCore::CachedResourceClient::deprecatedDidReceiveCachedResource):
* loader/cache/CachedTextTrack.cpp:
(WebCore::CachedTextTrack::updateData):
* loader/icon/IconLoader.cpp:
(WebCore::IconLoader::notifyFinished):
* loader/icon/IconLoader.h:
* loader/soup/CachedRawResourceSoup.cpp:
* platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
(WebCore::WebCoreAVCFResourceLoader::responseReceived):
(WebCore::WebCoreAVCFResourceLoader::dataReceived):
(WebCore::WebCoreAVCFResourceLoader::notifyFinished):
(WebCore::WebCoreAVCFResourceLoader::fulfillRequestWithResource):
* platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.h:
* platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h:
* platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
(WebCore::WebCoreAVFResourceLoader::responseReceived):
(WebCore::WebCoreAVFResourceLoader::dataReceived):
(WebCore::WebCoreAVFResourceLoader::notifyFinished):
(WebCore::WebCoreAVFResourceLoader::fulfillRequestWithResource):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::notifyFinished):
* rendering/RenderImage.h:
* rendering/RenderLayerFilterInfo.cpp:
(WebCore::RenderLayer::FilterInfo::setRenderer):
(WebCore::RenderLayer::FilterInfo::notifyFinished):
* rendering/RenderLayerFilterInfo.h:
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::notifyFinished):
* svg/SVGFEImageElement.h:
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::notifyFinished):
* svg/SVGUseElement.h:
* xml/parser/XMLDocumentParser.cpp:
(WebCore::XMLDocumentParser::notifyFinished):
* xml/parser/XMLDocumentParser.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomLoadableClassicScriptcpp">trunk/Source/WebCore/dom/LoadableClassicScript.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLoadableClassicScripth">trunk/Source/WebCore/dom/LoadableClassicScript.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageLoadercpp">trunk/Source/WebCore/html/HTMLImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageLoaderh">trunk/Source/WebCore/html/HTMLImageLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderContentFiltercpp">trunk/Source/WebCore/loader/ContentFilter.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderContentFilterh">trunk/Source/WebCore/loader/ContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp">trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightCheckerh">trunk/Source/WebCore/loader/CrossOriginPreflightChecker.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="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoaderh">trunk/Source/WebCore/loader/DocumentThreadableLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoaderh">trunk/Source/WebCore/loader/ImageLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoadercpp">trunk/Source/WebCore/loader/LinkLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoaderh">trunk/Source/WebCore/loader/LinkLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkPreloadResourceClientscpp">trunk/Source/WebCore/loader/LinkPreloadResourceClients.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkPreloadResourceClientsh">trunk/Source/WebCore/loader/LinkPreloadResourceClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderMediaResourceLoadercpp">trunk/Source/WebCore/loader/MediaResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderMediaResourceLoaderh">trunk/Source/WebCore/loader/MediaResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoaderh">trunk/Source/WebCore/loader/TextTrackLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourcecpp">trunk/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourceClienth">trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceClienth">trunk/Source/WebCore/loader/cache/CachedResourceClient.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedTextTrackcpp">trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconLoadercpp">trunk/Source/WebCore/loader/icon/IconLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconLoaderh">trunk/Source/WebCore/loader/icon/IconLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadersoupCachedRawResourceSoupcpp">trunk/Source/WebCore/loader/soup/CachedRawResourceSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfWebCoreAVCFResourceLoadercpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfWebCoreAVCFResourceLoaderh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoaderh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageh">trunk/Source/WebCore/rendering/RenderImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfocpp">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfoh">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEImageElementcpp">trunk/Source/WebCore/svg/SVGFEImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEImageElementh">trunk/Source/WebCore/svg/SVGFEImageElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementh">trunk/Source/WebCore/svg/SVGUseElement.h</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParsercpp">trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserh">trunk/Source/WebCore/xml/parser/XMLDocumentParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/ChangeLog 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -1,3 +1,128 @@
</span><ins>+2016-10-07 Youenn Fablet <youenn@apple.com>
+
+ Refactor CachedResourceClient::notifyFinished
+ https://bugs.webkit.org/show_bug.cgi?id=162060
+
+ Reviewed by Darin Adler.
+
+ No change of behavior.
+
+ Making CachedResourceClient and CachedRawResourceClient callbacks take CachedResource references and not pointers.
+ In most cases, the CachedResource parameter is only used for assertions.
+ Removing that parameter might be contemplated in the future.
+ The only real case is in RenderImage.
+
+ Removed the CachedResource parameter from ContentFilter methods as code was calling these methods with null values.
+
+ * dom/LoadableClassicScript.cpp:
+ (WebCore::LoadableClassicScript::notifyFinished):
+ * dom/LoadableClassicScript.h:
+ * html/HTMLImageLoader.cpp:
+ (WebCore::HTMLImageLoader::notifyFinished):
+ * html/HTMLImageLoader.h:
+ * loader/ContentFilter.cpp:
+ (WebCore::ContentFilter::continueAfterResponseReceived):
+ (WebCore::ContentFilter::continueAfterDataReceived):
+ (WebCore::ContentFilter::continueAfterNotifyFinished):
+ (WebCore::ContentFilter::deliverResourceData):
+ * loader/ContentFilter.h:
+ * loader/CrossOriginPreflightChecker.cpp:
+ (WebCore::CrossOriginPreflightChecker::notifyFinished):
+ * loader/CrossOriginPreflightChecker.h:
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::notifyFinished):
+ (WebCore::DocumentLoader::handleSubstituteDataLoadNow):
+ (WebCore::DocumentLoader::redirectReceived):
+ (WebCore::DocumentLoader::responseReceived):
+ (WebCore::DocumentLoader::continueAfterContentPolicy):
+ (WebCore::DocumentLoader::dataReceived):
+ * loader/DocumentLoader.h:
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::redirectReceived):
+ (WebCore::DocumentThreadableLoader::dataSent):
+ (WebCore::DocumentThreadableLoader::responseReceived):
+ (WebCore::DocumentThreadableLoader::dataReceived):
+ (WebCore::DocumentThreadableLoader::notifyFinished):
+ * loader/DocumentThreadableLoader.h:
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::notifyFinished):
+ * loader/ImageLoader.h:
+ * loader/LinkLoader.cpp:
+ (WebCore::LinkLoader::triggerEvents):
+ (WebCore::LinkLoader::notifyFinished):
+ * loader/LinkLoader.h:
+ * loader/LinkPreloadResourceClients.cpp:
+ (WebCore::LinkPreloadResourceClient::triggerEvents):
+ * loader/LinkPreloadResourceClients.h:
+ * loader/MediaResourceLoader.cpp:
+ (WebCore::MediaResource::responseReceived):
+ (WebCore::MediaResource::shouldCacheResponse):
+ (WebCore::MediaResource::redirectReceived):
+ (WebCore::MediaResource::dataSent):
+ (WebCore::MediaResource::dataReceived):
+ (WebCore::MediaResource::notifyFinished):
+ (WebCore::MediaResource::getOrCreateReadBuffer):
+ * loader/MediaResourceLoader.h:
+ * loader/TextTrackLoader.cpp:
+ (WebCore::TextTrackLoader::processNewCueData):
+ (WebCore::TextTrackLoader::deprecatedDidReceiveCachedResource):
+ (WebCore::TextTrackLoader::notifyFinished):
+ * loader/TextTrackLoader.h:
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::notifyClientsDataWasReceived):
+ (WebCore::CachedRawResource::didAddClient):
+ (WebCore::CachedRawResource::redirectReceived):
+ (WebCore::CachedRawResource::responseReceived):
+ (WebCore::CachedRawResource::shouldCacheResponse):
+ (WebCore::CachedRawResource::didSendData):
+ * loader/cache/CachedRawResourceClient.h:
+ (WebCore::CachedRawResourceClient::dataSent):
+ (WebCore::CachedRawResourceClient::responseReceived):
+ (WebCore::CachedRawResourceClient::shouldCacheResponse):
+ (WebCore::CachedRawResourceClient::dataReceived):
+ (WebCore::CachedRawResourceClient::redirectReceived):
+ (WebCore::CachedRawResourceClient::getOrCreateReadBuffer):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::checkNotify):
+ (WebCore::CachedResource::didAddClient):
+ * loader/cache/CachedResourceClient.h:
+ (WebCore::CachedResourceClient::notifyFinished):
+ (WebCore::CachedResourceClient::deprecatedDidReceiveCachedResource):
+ * loader/cache/CachedTextTrack.cpp:
+ (WebCore::CachedTextTrack::updateData):
+ * loader/icon/IconLoader.cpp:
+ (WebCore::IconLoader::notifyFinished):
+ * loader/icon/IconLoader.h:
+ * loader/soup/CachedRawResourceSoup.cpp:
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::responseReceived):
+ (WebCore::WebCoreAVCFResourceLoader::dataReceived):
+ (WebCore::WebCoreAVCFResourceLoader::notifyFinished):
+ (WebCore::WebCoreAVCFResourceLoader::fulfillRequestWithResource):
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.h:
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h:
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+ (WebCore::WebCoreAVFResourceLoader::responseReceived):
+ (WebCore::WebCoreAVFResourceLoader::dataReceived):
+ (WebCore::WebCoreAVFResourceLoader::notifyFinished):
+ (WebCore::WebCoreAVFResourceLoader::fulfillRequestWithResource):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::notifyFinished):
+ * rendering/RenderImage.h:
+ * rendering/RenderLayerFilterInfo.cpp:
+ (WebCore::RenderLayer::FilterInfo::setRenderer):
+ (WebCore::RenderLayer::FilterInfo::notifyFinished):
+ * rendering/RenderLayerFilterInfo.h:
+ * svg/SVGFEImageElement.cpp:
+ (WebCore::SVGFEImageElement::notifyFinished):
+ * svg/SVGFEImageElement.h:
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::notifyFinished):
+ * svg/SVGUseElement.h:
+ * xml/parser/XMLDocumentParser.cpp:
+ (WebCore::XMLDocumentParser::notifyFinished):
+ * xml/parser/XMLDocumentParser.h:
+
</ins><span class="cx"> 2016-10-06 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> CachedXSLStylesheet does not need to be updated according Origin/Fetch mode
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableClassicScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableClassicScript.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableClassicScript.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/dom/LoadableClassicScript.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -67,10 +67,9 @@
</span><span class="cx"> return m_cachedScript->wasCanceled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LoadableClassicScript::notifyFinished(CachedResource* resource)
</del><ins>+void LoadableClassicScript::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(resource);
- if (resource->resourceError().isAccessControl()) {
</del><ins>+ if (resource.resourceError().isAccessControl()) {
</ins><span class="cx"> static NeverDestroyed<String> consoleMessage(ASCIILiteral("Cross-origin script load denied by Cross-Origin Resource Sharing policy."));
</span><span class="cx"> m_error = Error {
</span><span class="cx"> ErrorType::CrossOriginLoad,
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableClassicScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableClassicScript.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableClassicScript.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/dom/LoadableClassicScript.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> private:
</span><span class="cx"> LoadableClassicScript(CachedResourceHandle<CachedScript>&& cachedScript) : m_cachedScript(WTFMove(cachedScript)) { }
</span><span class="cx">
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedScript> m_cachedScript;
</span><span class="cx"> Optional<Error> m_error { Nullopt };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/html/HTMLImageLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -73,14 +73,15 @@
</span><span class="cx"> return stripLeadingAndTrailingHTMLSpaces(attr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLImageLoader::notifyFinished(CachedResource*)
</del><ins>+void HTMLImageLoader::notifyFinished(CachedResource&)
</ins><span class="cx"> {
</span><del>- CachedImage* cachedImage = image();
</del><ins>+ ASSERT(image());
+ CachedImage& cachedImage = *image();
</ins><span class="cx">
</span><span class="cx"> Ref<Element> protect(element());
</span><span class="cx"> ImageLoader::notifyFinished(cachedImage);
</span><span class="cx">
</span><del>- bool loadError = cachedImage->errorOccurred() || cachedImage->response().httpStatusCode() >= 400;
</del><ins>+ bool loadError = cachedImage.errorOccurred() || cachedImage.response().httpStatusCode() >= 400;
</ins><span class="cx"> if (!loadError) {
</span><span class="cx"> if (!element().inDocument()) {
</span><span class="cx"> JSC::VM& vm = JSDOMWindowBase::commonVM();
</span><span class="lines">@@ -87,7 +88,7 @@
</span><span class="cx"> JSC::JSLockHolder lock(vm);
</span><span class="cx"> // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=142595
</span><del>- vm.heap.deprecatedReportExtraMemory(cachedImage->encodedSize());
</del><ins>+ vm.heap.deprecatedReportExtraMemory(cachedImage.encodedSize());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/html/HTMLImageLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef HTMLImageLoader_h
-#define HTMLImageLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "ImageLoader.h"
</span><span class="cx">
</span><span class="lines">@@ -35,9 +34,7 @@
</span><span class="cx"> void dispatchLoadEvent() override;
</span><span class="cx"> String sourceURI(const AtomicString&) const override;
</span><span class="cx">
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderContentFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ContentFilter.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ContentFilter.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/ContentFilter.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -133,9 +133,8 @@
</span><span class="cx"> m_mainResource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ContentFilter::continueAfterResponseReceived(CachedResource* resource, const ResourceResponse& response)
</del><ins>+bool ContentFilter::continueAfterResponseReceived(const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_mainResource);
</del><span class="cx"> Ref<DocumentLoader> protectedDocumentLoader { m_documentLoader };
</span><span class="cx">
</span><span class="cx"> if (m_state == State::Filtering) {
</span><span class="lines">@@ -148,19 +147,18 @@
</span><span class="cx"> return m_state != State::Blocked;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ContentFilter::continueAfterDataReceived(CachedResource* resource, const char* data, int length)
</del><ins>+bool ContentFilter::continueAfterDataReceived(const char* data, int length)
</ins><span class="cx"> {
</span><del>- ASSERT(resource == m_mainResource);
</del><span class="cx"> Ref<DocumentLoader> protectedDocumentLoader { m_documentLoader };
</span><span class="cx">
</span><span class="cx"> if (m_state == State::Filtering) {
</span><del>- LOG(ContentFiltering, "ContentFilter received %d bytes of data from <%s>.\n", length, resource->url().string().ascii().data());
</del><ins>+ LOG(ContentFiltering, "ContentFilter received %d bytes of data from <%s>.\n", length, m_mainResource->url().string().ascii().data());
</ins><span class="cx"> forEachContentFilterUntilBlocked([data, length](PlatformContentFilter& contentFilter) {
</span><span class="cx"> contentFilter.addData(data, length);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (m_state == State::Allowed)
</span><del>- deliverResourceData(*resource);
</del><ins>+ deliverResourceData(*m_mainResource);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -167,16 +165,16 @@
</span><span class="cx"> return m_state != State::Blocked;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ContentFilter::continueAfterNotifyFinished(CachedResource* resource)
</del><ins>+bool ContentFilter::continueAfterNotifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(resource == m_mainResource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_mainResource);
</ins><span class="cx"> Ref<DocumentLoader> protectedDocumentLoader { m_documentLoader };
</span><span class="cx">
</span><del>- if (resource->errorOccurred())
</del><ins>+ if (m_mainResource->errorOccurred())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (m_state == State::Filtering) {
</span><del>- LOG(ContentFiltering, "ContentFilter will finish filtering main resource at <%s>.\n", resource->url().string().ascii().data());
</del><ins>+ LOG(ContentFiltering, "ContentFilter will finish filtering main resource at <%s>.\n", m_mainResource->url().string().ascii().data());
</ins><span class="cx"> forEachContentFilterUntilBlocked([](PlatformContentFilter& contentFilter) {
</span><span class="cx"> contentFilter.finishedAddingData();
</span><span class="cx"> });
</span><span class="lines">@@ -183,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_state != State::Blocked) {
</span><span class="cx"> m_state = State::Allowed;
</span><del>- deliverResourceData(*resource);
</del><ins>+ deliverResourceData(*m_mainResource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_state == State::Stopped)
</span><span class="lines">@@ -250,7 +248,7 @@
</span><span class="cx"> ASSERT(m_state == State::Allowed);
</span><span class="cx"> ASSERT(resource.dataBufferingPolicy() == BufferData);
</span><span class="cx"> if (auto* resourceBuffer = resource.resourceBuffer())
</span><del>- m_documentLoader.dataReceived(&resource, resourceBuffer->data(), resourceBuffer->size());
</del><ins>+ m_documentLoader.dataReceived(resource, resourceBuffer->data(), resourceBuffer->size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const URL& blockedPageURL()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ContentFilter.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ContentFilter.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/ContentFilter.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> void stopFilteringMainResource();
</span><span class="cx">
</span><span class="cx"> bool continueAfterWillSendRequest(ResourceRequest&, const ResourceResponse&);
</span><del>- bool continueAfterResponseReceived(CachedResource*, const ResourceResponse&);
- bool continueAfterDataReceived(CachedResource*, const char* data, int length);
- bool continueAfterNotifyFinished(CachedResource*);
</del><ins>+ bool continueAfterResponseReceived(const ResourceResponse&);
+ bool continueAfterDataReceived(const char* data, int length);
+ bool continueAfterNotifyFinished(CachedResource&);
</ins><span class="cx">
</span><span class="cx"> static bool continueAfterSubstituteDataRequest(const DocumentLoader& activeLoader, const SubstituteData&);
</span><span class="cx"> void handleProvisionalLoadFailure(const ResourceError&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -86,9 +86,9 @@
</span><span class="cx"> loader.preflightSuccess(WTFMove(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CrossOriginPreflightChecker::notifyFinished(CachedResource* resource)
</del><ins>+void CrossOriginPreflightChecker::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx"> if (m_resource->loadFailedOrCanceled()) {
</span><span class="cx"> ResourceError preflightError = m_resource->resourceError();
</span><span class="cx"> // If the preflight was cancelled by underlying code, it probably means the request was blocked due to some access control policy.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> void setDefersLoading(bool);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void notifyFinished(CachedResource*) final;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx">
</span><span class="cx"> static void handleLoadingFailure(DocumentThreadableLoader&, unsigned long, const ResourceError&);
</span><span class="cx"> static void validatePreflightResponse(DocumentThreadableLoader&, ResourceRequest&&, unsigned long, const ResourceResponse&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> return isLoadingMainResource() || !m_subresourceLoaders.isEmpty() || !m_plugInStreamLoaders.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::notifyFinished(CachedResource* resource)
</del><ins>+void DocumentLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx"> if (m_contentFilter && !m_contentFilter->continueAfterNotifyFinished(resource))
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ASSERT_UNUSED(resource, m_mainResource == resource);
</del><ins>+ ASSERT_UNUSED(resource, m_mainResource == &resource);
</ins><span class="cx"> ASSERT(m_mainResource);
</span><span class="cx"> if (!m_mainResource->errorOccurred() && !m_mainResource->wasCanceled()) {
</span><span class="cx"> finishedLoading(m_mainResource->loadFinishTime());
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> if (response.url().isEmpty())
</span><span class="cx"> response = ResourceResponse(m_request.url(), m_substituteData.mimeType(), m_substituteData.content()->size(), m_substituteData.textEncoding());
</span><span class="cx">
</span><del>- responseReceived(0, response);
</del><ins>+ responseReceived(response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::startDataLoadTimer()
</span><span class="lines">@@ -492,9 +492,9 @@
</span><span class="cx"> startDataLoadTimer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::redirectReceived(CachedResource* resource, ResourceRequest& request, const ResourceResponse& redirectResponse)
</del><ins>+void DocumentLoader::redirectReceived(CachedResource& resource, ResourceRequest& request, const ResourceResponse& redirectResponse)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_mainResource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_mainResource);
</ins><span class="cx"> willSendRequest(request, redirectResponse);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -632,14 +632,19 @@
</span><span class="cx"> cancelMainResourceLoad(frameLoader->cancelledError(m_request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::responseReceived(CachedResource* resource, const ResourceResponse& response)
</del><ins>+void DocumentLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(resource, m_mainResource == &resource);
+ responseReceived(response);
+}
+
+void DocumentLoader::responseReceived(const ResourceResponse& response)
+{
</ins><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- if (m_contentFilter && !m_contentFilter->continueAfterResponseReceived(resource, response))
</del><ins>+ if (m_contentFilter && !m_contentFilter->continueAfterResponseReceived(response))
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ASSERT_UNUSED(resource, m_mainResource == resource);
</del><span class="cx"> Ref<DocumentLoader> protectedThis(*this);
</span><span class="cx"> bool willLoadFallback = m_applicationCacheHost->maybeLoadFallbackForMainResponse(request(), response);
</span><span class="cx">
</span><span class="lines">@@ -821,7 +826,7 @@
</span><span class="cx"> if (!isStopping() && m_substituteData.isValid() && isLoadingMainResource()) {
</span><span class="cx"> auto content = m_substituteData.content();
</span><span class="cx"> if (content && content->size())
</span><del>- dataReceived(nullptr, content->data(), content->size());
</del><ins>+ dataReceived(content->data(), content->size());
</ins><span class="cx"> if (isLoadingMainResource())
</span><span class="cx"> finishedLoading(0);
</span><span class="cx"> }
</span><span class="lines">@@ -929,16 +934,21 @@
</span><span class="cx"> m_writer.addData(bytes, length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::dataReceived(CachedResource* resource, const char* data, int length)
</del><ins>+void DocumentLoader::dataReceived(CachedResource& resource, const char* data, int length)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(resource, &resource == m_mainResource);
+ dataReceived(data, length);
+}
+
+void DocumentLoader::dataReceived(const char* data, int length)
+{
</ins><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- if (m_contentFilter && !m_contentFilter->continueAfterDataReceived(resource, data, length))
</del><ins>+ if (m_contentFilter && !m_contentFilter->continueAfterDataReceived(data, length))
</ins><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ASSERT(data);
</span><span class="cx"> ASSERT(length);
</span><del>- ASSERT_UNUSED(resource, resource == m_mainResource);
</del><span class="cx"> ASSERT(!m_response.isNull());
</span><span class="cx">
</span><span class="cx"> // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -316,11 +316,14 @@
</span><span class="cx"> void willSendRequest(ResourceRequest&, const ResourceResponse&);
</span><span class="cx"> void finishedLoading(double finishTime);
</span><span class="cx"> void mainReceivedError(const ResourceError&);
</span><del>- WEBCORE_EXPORT void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) override;
- WEBCORE_EXPORT void responseReceived(CachedResource*, const ResourceResponse&) override;
- WEBCORE_EXPORT void dataReceived(CachedResource*, const char* data, int length) override;
- WEBCORE_EXPORT void notifyFinished(CachedResource*) override;
</del><ins>+ WEBCORE_EXPORT void redirectReceived(CachedResource&, ResourceRequest&, const ResourceResponse&) override;
+ WEBCORE_EXPORT void responseReceived(CachedResource&, const ResourceResponse&) override;
+ WEBCORE_EXPORT void dataReceived(CachedResource&, const char* data, int length) override;
+ WEBCORE_EXPORT void notifyFinished(CachedResource&) override;
</ins><span class="cx">
</span><ins>+ void responseReceived(const ResourceResponse&);
+ void dataReceived(const char* data, int length);
+
</ins><span class="cx"> bool maybeLoadEmpty();
</span><span class="cx">
</span><span class="cx"> bool isMultipartReplacingLoad() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -221,10 +221,10 @@
</span><span class="cx"> client.didFail(ResourceError(errorDomainWebKitInternal, 0, url, "Redirection to URL with a scheme that is not HTTP(S).", ResourceError::Type::AccessControl));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::redirectReceived(CachedResource* resource, ResourceRequest& request, const ResourceResponse& redirectResponse)
</del><ins>+void DocumentThreadableLoader::redirectReceived(CachedResource& resource, ResourceRequest& request, const ResourceResponse& redirectResponse)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_client);
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> Ref<DocumentThreadableLoader> protectedThis(*this);
</span><span class="cx">
</span><span class="lines">@@ -276,16 +276,16 @@
</span><span class="cx"> makeCrossOriginAccessRequest(ResourceRequest(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::dataSent(CachedResource* resource, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</del><ins>+void DocumentThreadableLoader::dataSent(CachedResource& resource, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_client);
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx"> m_client->didSendData(bytesSent, totalBytesToBeSent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::responseReceived(CachedResource* resource, const ResourceResponse& response)
</del><ins>+void DocumentThreadableLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx"> didReceiveResponse(m_resource->identifier(), response, m_resource->responseTainting());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -307,9 +307,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::dataReceived(CachedResource* resource, const char* data, int dataLength)
</del><ins>+void DocumentThreadableLoader::dataReceived(CachedResource& resource, const char* data, int dataLength)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx"> didReceiveData(m_resource->identifier(), data, dataLength);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -320,10 +320,10 @@
</span><span class="cx"> m_client->didReceiveData(data, dataLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentThreadableLoader::notifyFinished(CachedResource* resource)
</del><ins>+void DocumentThreadableLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_client);
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> if (m_resource->errorOccurred())
</span><span class="cx"> didFail(m_resource->identifier(), m_resource->resourceError());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -77,11 +77,11 @@
</span><span class="cx"> void clearResource();
</span><span class="cx">
</span><span class="cx"> // CachedRawResourceClient
</span><del>- void dataSent(CachedResource*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
- void responseReceived(CachedResource*, const ResourceResponse&) override;
- void dataReceived(CachedResource*, const char* data, int dataLength) override;
- void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) override;
- void notifyFinished(CachedResource*) override;
</del><ins>+ void dataSent(CachedResource&, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
+ void responseReceived(CachedResource&, const ResourceResponse&) override;
+ void dataReceived(CachedResource&, const char* data, int dataLength) override;
+ void redirectReceived(CachedResource&, ResourceRequest&, const ResourceResponse&) override;
+ void notifyFinished(CachedResource&) override;
</ins><span class="cx">
</span><span class="cx"> void didReceiveResponse(unsigned long identifier, const ResourceResponse&, ResourceResponse::Tainting);
</span><span class="cx"> void didReceiveData(unsigned long identifier, const char* data, int dataLength);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -270,10 +270,10 @@
</span><span class="cx"> updateFromElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageLoader::notifyFinished(CachedResource* resource)
</del><ins>+void ImageLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_failedLoadURL.isEmpty());
</span><del>- ASSERT(resource == m_image.get());
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_image.get());
</ins><span class="cx">
</span><span class="cx"> m_imageComplete = true;
</span><span class="cx"> if (!hasPendingBeforeLoadEvent())
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> if (!m_hasPendingLoadEvent)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (resource->resourceError().isAccessControl()) {
</del><ins>+ if (m_image->resourceError().isAccessControl()) {
</ins><span class="cx"> clearImageWithoutConsideringPendingLoadEvent();
</span><span class="cx">
</span><span class="cx"> m_hasPendingErrorEvent = true;
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (resource->wasCanceled()) {
</del><ins>+ if (m_image->wasCanceled()) {
</ins><span class="cx"> m_hasPendingLoadEvent = false;
</span><span class="cx"> // Only consider updating the protection ref-count of the Element immediately before returning
</span><span class="cx"> // from this function as doing so might result in the destruction of this ImageLoader.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/ImageLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ImageLoader_h
-#define ImageLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CachedImageClient.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit ImageLoader(Element&);
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void dispatchLoadEvent() = 0;
</span><span class="lines">@@ -107,5 +106,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -65,19 +65,19 @@
</span><span class="cx"> m_preloadResourceClient->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LinkLoader::triggerEvents(const CachedResource* resource)
</del><ins>+void LinkLoader::triggerEvents(const CachedResource& resource)
</ins><span class="cx"> {
</span><del>- if (resource->errorOccurred())
</del><ins>+ if (resource.errorOccurred())
</ins><span class="cx"> m_client.linkLoadingErrored();
</span><span class="cx"> else
</span><span class="cx"> m_client.linkLoaded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LinkLoader::notifyFinished(CachedResource* resource)
</del><ins>+void LinkLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, m_cachedLinkResource.get() == resource);
</del><ins>+ ASSERT_UNUSED(resource, m_cachedLinkResource.get() == &resource);
</ins><span class="cx">
</span><del>- triggerEvents(m_cachedLinkResource.get());
</del><ins>+ triggerEvents(*m_cachedLinkResource);
</ins><span class="cx">
</span><span class="cx"> m_cachedLinkResource->removeClient(*this);
</span><span class="cx"> m_cachedLinkResource = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/LinkLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -29,8 +29,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef LinkLoader_h
-#define LinkLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CachedResource.h"
</span><span class="cx"> #include "CachedResourceClient.h"
</span><span class="lines">@@ -56,10 +55,10 @@
</span><span class="cx"> static Optional<CachedResource::Type> resourceTypeFromAsAttribute(const String& as);
</span><span class="cx">
</span><span class="cx"> WeakPtr<LinkLoader> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
</span><del>- void triggerEvents(const CachedResource*);
</del><ins>+ void triggerEvents(const CachedResource&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) override;
</ins><span class="cx"> void preloadIfNeeded(const LinkRelAttribute&, const URL& href, Document&, const String& as, const String& crossOriginMode);
</span><span class="cx">
</span><span class="cx"> LinkLoaderClient& m_client;
</span><span class="lines">@@ -67,7 +66,5 @@
</span><span class="cx"> std::unique_ptr<LinkPreloadResourceClient> m_preloadResourceClient;
</span><span class="cx"> WeakPtrFactory<LinkLoader> m_weakPtrFactory;
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkPreloadResourceClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkPreloadResourceClients.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkPreloadResourceClients.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/LinkPreloadResourceClients.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> m_resource = &resource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LinkPreloadResourceClient::triggerEvents(const CachedResource* resource)
</del><ins>+void LinkPreloadResourceClient::triggerEvents(const CachedResource& resource)
</ins><span class="cx"> {
</span><span class="cx"> if (m_loader)
</span><span class="cx"> m_loader->triggerEvents(resource);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkPreloadResourceClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkPreloadResourceClients.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkPreloadResourceClients.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/LinkPreloadResourceClients.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~LinkPreloadResourceClient() { }
</span><span class="cx">
</span><del>- void triggerEvents(const CachedResource*);
</del><ins>+ void triggerEvents(const CachedResource&);
</ins><span class="cx">
</span><span class="cx"> virtual void clear() = 0;
</span><span class="cx">
</span><span class="lines">@@ -83,11 +83,7 @@
</span><span class="cx"> virtual ~LinkPreloadScriptResourceClient() { }
</span><span class="cx">
</span><span class="cx">
</span><del>- void notifyFinished(CachedResource* resource) override
- {
- ASSERT(ownedResource() == resource);
- triggerEvents(resource);
- }
</del><ins>+ void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
</ins><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><span class="cx">
</span><span class="lines">@@ -110,8 +106,9 @@
</span><span class="cx">
</span><span class="cx"> void setCSSStyleSheet(const String&, const URL&, const String&, const CachedCSSStyleSheet* resource) override
</span><span class="cx"> {
</span><ins>+ ASSERT(resource);
</ins><span class="cx"> ASSERT(ownedResource() == resource);
</span><del>- triggerEvents(resource);
</del><ins>+ triggerEvents(*resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><span class="lines">@@ -133,11 +130,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~LinkPreloadImageResourceClient() { }
</span><span class="cx">
</span><del>- void notifyFinished(CachedResource* resource) override
- {
- ASSERT(ownedResource() == resource);
- triggerEvents(resource);
- }
</del><ins>+ void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
</ins><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><span class="cx">
</span><span class="lines">@@ -161,7 +154,7 @@
</span><span class="cx"> void fontLoaded(CachedFont& resource) override
</span><span class="cx"> {
</span><span class="cx"> ASSERT(ownedResource() == &resource);
</span><del>- triggerEvents(&resource);
</del><ins>+ triggerEvents(resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><span class="lines">@@ -183,11 +176,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~LinkPreloadRawResourceClient() { }
</span><span class="cx">
</span><del>- void notifyFinished(CachedResource* resource) override
- {
- ASSERT(ownedResource() == resource);
- triggerEvents(resource);
- }
</del><ins>+ void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
</ins><span class="cx">
</span><span class="cx"> void clear() override { clearResource(*this); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -129,15 +129,15 @@
</span><span class="cx"> m_resource->setDefersLoading(defersLoading);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaResource::responseReceived(CachedResource* resource, const ResourceResponse& response)
</del><ins>+void MediaResource::responseReceived(CachedResource& resource, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> if (!m_loader->document())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaResource> protectedThis(this);
</span><del>- if (!m_loader->crossOriginMode().isNull() && !resource->passesSameOriginPolicyCheck(*m_loader->document()->securityOrigin())) {
</del><ins>+ if (!m_loader->crossOriginMode().isNull() && !m_resource->passesSameOriginPolicyCheck(*m_loader->document()->securityOrigin())) {
</ins><span class="cx"> static NeverDestroyed<const String> consoleMessage("Cross-origin media resource load denied by Cross-Origin Resource Sharing policy.");
</span><span class="cx"> m_loader->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get());
</span><span class="cx"> m_didPassAccessControlCheck = false;
</span><span class="lines">@@ -152,9 +152,9 @@
</span><span class="cx"> m_client->responseReceived(*this, response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaResource::shouldCacheResponse(CachedResource* resource, const ResourceResponse& response)
</del><ins>+bool MediaResource::shouldCacheResponse(CachedResource& resource, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaResource> protectedThis(this);
</span><span class="cx"> if (m_client)
</span><span class="lines">@@ -162,9 +162,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaResource::redirectReceived(CachedResource* resource, ResourceRequest& request, const ResourceResponse& response)
</del><ins>+void MediaResource::redirectReceived(CachedResource& resource, ResourceRequest& request, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaResource> protectedThis(this);
</span><span class="cx"> if (m_client)
</span><span class="lines">@@ -171,9 +171,9 @@
</span><span class="cx"> m_client->redirectReceived(*this, request, response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaResource::dataSent(CachedResource* resource, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</del><ins>+void MediaResource::dataSent(CachedResource& resource, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaResource> protectedThis(this);
</span><span class="cx"> if (m_client)
</span><span class="lines">@@ -180,9 +180,9 @@
</span><span class="cx"> m_client->dataSent(*this, bytesSent, totalBytesToBeSent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaResource::dataReceived(CachedResource* resource, const char* data, int dataLength)
</del><ins>+void MediaResource::dataReceived(CachedResource& resource, const char* data, int dataLength)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaResource> protectedThis(this);
</span><span class="cx"> if (m_client)
</span><span class="lines">@@ -189,14 +189,14 @@
</span><span class="cx"> m_client->dataReceived(*this, data, dataLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaResource::notifyFinished(CachedResource* resource)
</del><ins>+void MediaResource::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> RefPtr<MediaResource> protectedThis(this);
</span><span class="cx"> if (m_client) {
</span><del>- if (resource->loadFailedOrCanceled())
- m_client->loadFailed(*this, resource->resourceError());
</del><ins>+ if (m_resource->loadFailedOrCanceled())
+ m_client->loadFailed(*this, m_resource->resourceError());
</ins><span class="cx"> else
</span><span class="cx"> m_client->loadFinished(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -204,9 +204,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><del>-char* MediaResource::getOrCreateReadBuffer(CachedResource* resource, size_t requestedSize, size_t& actualSize)
</del><ins>+char* MediaResource::getOrCreateReadBuffer(CachedResource& resource, size_t requestedSize, size_t& actualSize)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(resource, resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx"> return m_client ? m_client->getOrCreateReadBuffer(*this, requestedSize, actualSize) : nullptr;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -70,15 +70,15 @@
</span><span class="cx"> void setDefersLoading(bool) override;
</span><span class="cx"> bool didPassAccessControlCheck() const override { return m_didPassAccessControlCheck; }
</span><span class="cx">
</span><del>- // CachedResourceClient
- void responseReceived(CachedResource*, const ResourceResponse&) override;
- void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) override;
- bool shouldCacheResponse(CachedResource*, const ResourceResponse&) override;
- void dataSent(CachedResource*, unsigned long long, unsigned long long) override;
- void dataReceived(CachedResource*, const char*, int) override;
- void notifyFinished(CachedResource*) override;
</del><ins>+ // CachedRawResourceClient
+ void responseReceived(CachedResource&, const ResourceResponse&) override;
+ void redirectReceived(CachedResource&, ResourceRequest&, const ResourceResponse&) override;
+ bool shouldCacheResponse(CachedResource&, const ResourceResponse&) override;
+ void dataSent(CachedResource&, unsigned long long, unsigned long long) override;
+ void dataReceived(CachedResource&, const char*, int) override;
+ void notifyFinished(CachedResource&) override;
</ins><span class="cx"> #if USE(SOUP)
</span><del>- char* getOrCreateReadBuffer(CachedResource*, size_t /*requestedSize*/, size_t& /*actualSize*/) override;
</del><ins>+ char* getOrCreateReadBuffer(CachedResource&, size_t /*requestedSize*/, size_t& /*actualSize*/) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -78,14 +78,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextTrackLoader::processNewCueData(CachedResource* resource)
</del><ins>+void TextTrackLoader::processNewCueData(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(m_resource == resource);
-
- if (m_state == Failed || !resource->resourceBuffer())
</del><ins>+ ASSERT_UNUSED(resource, m_resource == &resource);
+
+ if (m_state == Failed || !m_resource->resourceBuffer())
</ins><span class="cx"> return;
</span><del>-
- auto* buffer = resource->resourceBuffer();
</del><ins>+
+ auto* buffer = m_resource->resourceBuffer();
</ins><span class="cx"> if (m_parseOffset == buffer->size())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -102,14 +102,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: This is a very unusual pattern, no other CachedResourceClient does this. Refactor to use notifyFinished() instead.
</span><del>-void TextTrackLoader::deprecatedDidReceiveCachedResource(CachedResource* resource)
</del><ins>+void TextTrackLoader::deprecatedDidReceiveCachedResource(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(m_resource == resource);
-
- if (!resource->resourceBuffer())
</del><ins>+ ASSERT_UNUSED(resource, m_resource == &resource);
+
+ if (!m_resource->resourceBuffer())
</ins><span class="cx"> return;
</span><del>-
- processNewCueData(resource);
</del><ins>+
+ processNewCueData(*m_resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackLoader::corsPolicyPreventedLoad()
</span><span class="lines">@@ -120,19 +120,19 @@
</span><span class="cx"> m_state = Failed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextTrackLoader::notifyFinished(CachedResource* resource)
</del><ins>+void TextTrackLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(m_resource == resource);
</del><ins>+ ASSERT_UNUSED(resource, m_resource == &resource);
</ins><span class="cx">
</span><del>- if (resource->resourceError().isAccessControl())
</del><ins>+ if (m_resource->resourceError().isAccessControl())
</ins><span class="cx"> corsPolicyPreventedLoad();
</span><span class="cx">
</span><span class="cx"> if (m_state != Failed) {
</span><del>- processNewCueData(resource);
</del><ins>+ processNewCueData(*m_resource);
</ins><span class="cx"> if (m_cueParser)
</span><span class="cx"> m_cueParser->fileFinished();
</span><span class="cx"> if (m_state != Failed)
</span><del>- m_state = resource->errorOccurred() ? Failed : Finished;
</del><ins>+ m_state = m_resource->errorOccurred() ? Failed : Finished;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_state == Finished && m_cueParser)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/TextTrackLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -64,20 +64,20 @@
</span><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> // CachedResourceClient
</span><del>- void notifyFinished(CachedResource*) override;
- void deprecatedDidReceiveCachedResource(CachedResource*) override;
-
</del><ins>+ void notifyFinished(CachedResource&) override;
+ void deprecatedDidReceiveCachedResource(CachedResource&) override;
+
</ins><span class="cx"> // WebVTTParserClient
</span><span class="cx"> void newCuesParsed() override;
</span><span class="cx"> void newRegionsParsed() override;
</span><span class="cx"> void fileFailedToParse() override;
</span><del>-
- void processNewCueData(CachedResource*);
</del><ins>+
+ void processNewCueData(CachedResource&);
</ins><span class="cx"> void cueLoadTimerFired();
</span><span class="cx"> void corsPolicyPreventedLoad();
</span><span class="cx">
</span><span class="cx"> enum State { Idle, Loading, Finished, Failed };
</span><del>-
</del><ins>+
</ins><span class="cx"> TextTrackLoaderClient& m_client;
</span><span class="cx"> std::unique_ptr<WebVTTParser> m_cueParser;
</span><span class="cx"> CachedResourceHandle<CachedTextTrack> m_resource;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> CachedResourceHandle<CachedRawResource> protectedThis(this);
</span><span class="cx"> CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
</span><span class="cx"> while (CachedRawResourceClient* c = w.next())
</span><del>- c->dataReceived(this, data, length);
</del><ins>+ c->dataReceived(*this, data, length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedRawResource::didAddClient(CachedResourceClient& c)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> for (size_t i = 0; i < redirectCount; i++) {
</span><span class="cx"> RedirectPair redirect = m_redirectChain[i];
</span><span class="cx"> ResourceRequest request(redirect.m_request);
</span><del>- client.redirectReceived(this, request, redirect.m_redirectResponse);
</del><ins>+ client.redirectReceived(*this, request, redirect.m_redirectResponse);
</ins><span class="cx"> if (!hasClient(c))
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -145,12 +145,12 @@
</span><span class="cx"> ASSERT(!validationInProgress());
</span><span class="cx"> response.setSource(ResourceResponse::Source::MemoryCache);
</span><span class="cx"> }
</span><del>- client.responseReceived(this, response);
</del><ins>+ client.responseReceived(*this, response);
</ins><span class="cx"> }
</span><span class="cx"> if (!hasClient(c))
</span><span class="cx"> return;
</span><span class="cx"> if (m_data)
</span><del>- client.dataReceived(this, m_data->data(), m_data->size());
</del><ins>+ client.dataReceived(*this, m_data->data(), m_data->size());
</ins><span class="cx"> if (!hasClient(c))
</span><span class="cx"> return;
</span><span class="cx"> CachedResource::didAddClient(client);
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if (!response.isNull()) {
</span><span class="cx"> CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
</span><span class="cx"> while (CachedRawResourceClient* c = w.next())
</span><del>- c->redirectReceived(this, request, response);
</del><ins>+ c->redirectReceived(*this, request, response);
</ins><span class="cx"> m_redirectChain.append(RedirectPair(request, response));
</span><span class="cx"> }
</span><span class="cx"> CachedResource::redirectReceived(request, response);
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> CachedResource::responseReceived(response);
</span><span class="cx"> CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
</span><span class="cx"> while (CachedRawResourceClient* c = w.next())
</span><del>- c->responseReceived(this, m_response);
</del><ins>+ c->responseReceived(*this, m_response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CachedRawResource::shouldCacheResponse(const ResourceResponse& response)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> {
</span><span class="cx"> CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
</span><span class="cx"> while (CachedRawResourceClient* c = w.next()) {
</span><del>- if (!c->shouldCacheResponse(this, response))
</del><ins>+ if (!c->shouldCacheResponse(*this, response))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> {
</span><span class="cx"> CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
</span><span class="cx"> while (CachedRawResourceClient* c = w.next())
</span><del>- c->dataSent(this, bytesSent, totalBytesToBeSent);
</del><ins>+ c->dataSent(*this, bytesSent, totalBytesToBeSent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedRawResource::switchClientsToRevalidatedResource()
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourceClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> static CachedResourceClientType expectedType() { return RawResourceType; }
</span><span class="cx"> CachedResourceClientType resourceClientType() const override { return expectedType(); }
</span><span class="cx">
</span><del>- virtual void dataSent(CachedResource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
- virtual void responseReceived(CachedResource*, const ResourceResponse&) { }
- virtual bool shouldCacheResponse(CachedResource*, const ResourceResponse&) { return true; }
- virtual void dataReceived(CachedResource*, const char* /* data */, int /* length */) { }
- virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) { }
</del><ins>+ virtual void dataSent(CachedResource&, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
+ virtual void responseReceived(CachedResource&, const ResourceResponse&) { }
+ virtual bool shouldCacheResponse(CachedResource&, const ResourceResponse&) { return true; }
+ virtual void dataReceived(CachedResource&, const char* /* data */, int /* length */) { }
+ virtual void redirectReceived(CachedResource&, ResourceRequest&, const ResourceResponse&) { }
</ins><span class="cx"> #if USE(SOUP)
</span><del>- virtual char* getOrCreateReadBuffer(CachedResource*, size_t /* requestedSize */, size_t& /* actualSize */) { return nullptr; }
</del><ins>+ virtual char* getOrCreateReadBuffer(CachedResource&, size_t /* requestedSize */, size_t& /* actualSize */) { return nullptr; }
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceClientWalker<CachedResourceClient> walker(m_clients);
</span><span class="cx"> while (CachedResourceClient* client = walker.next())
</span><del>- client->notifyFinished(this);
</del><ins>+ client->notifyFinished(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResource::addDataBuffer(SharedBuffer&)
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> if (m_clientsAwaitingCallback.remove(&client))
</span><span class="cx"> m_clients.add(&client);
</span><span class="cx"> if (!isLoading() && !stillNeedsLoad())
</span><del>- client.notifyFinished(this);
</del><ins>+ client.notifyFinished(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CachedResource::addClientToSet(CachedResourceClient& client)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceClient.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceClient.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/cache/CachedResourceClient.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -21,10 +21,8 @@
</span><span class="cx"> This class provides all functionality needed for loading images, style sheets and html
</span><span class="cx"> pages from the web. It has a memory cache for these objects.
</span><span class="cx"> */
</span><ins>+#pragma once
</ins><span class="cx">
</span><del>-#ifndef CachedResourceClient_h
-#define CachedResourceClient_h
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CachedResource;
</span><span class="lines">@@ -41,8 +39,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual ~CachedResourceClient() { }
</span><del>- virtual void notifyFinished(CachedResource*) { }
- virtual void deprecatedDidReceiveCachedResource(CachedResource*) { }
</del><ins>+ virtual void notifyFinished(CachedResource&) { }
+ virtual void deprecatedDidReceiveCachedResource(CachedResource&) { }
</ins><span class="cx"> virtual bool isXMLHttpRequest() const { return false; }
</span><span class="cx">
</span><span class="cx"> static CachedResourceClientType expectedType() { return BaseResourceType; }
</span><span class="lines">@@ -53,5 +51,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceClientWalker<CachedResourceClient> walker(m_clients);
</span><span class="cx"> while (CachedResourceClient* client = walker.next())
</span><del>- client->deprecatedDidReceiveCachedResource(this);
</del><ins>+ client->deprecatedDidReceiveCachedResource(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedTextTrack::addDataBuffer(SharedBuffer& data)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -79,14 +79,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IconLoader::notifyFinished(CachedResource* resource)
</del><ins>+void IconLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> // If we got a status code indicating an invalid response, then lets
</span><span class="cx"> // ignore the data and not try to decode the error page as an icon.
</span><del>- auto* data = resource->resourceBuffer();
- int status = resource->response().httpStatusCode();
</del><ins>+ auto* data = m_resource->resourceBuffer();
+ int status = m_resource->response().httpStatusCode();
</ins><span class="cx"> if (status && (status < 200 || status > 299))
</span><span class="cx"> data = nullptr;
</span><span class="cx">
</span><span class="lines">@@ -93,16 +93,16 @@
</span><span class="cx"> static const char pdfMagicNumber[] = "%PDF";
</span><span class="cx"> static unsigned pdfMagicNumberLength = sizeof(pdfMagicNumber) - 1;
</span><span class="cx"> if (data && data->size() >= pdfMagicNumberLength && !memcmp(data->data(), pdfMagicNumber, pdfMagicNumberLength)) {
</span><del>- LOG(IconDatabase, "IconLoader::finishLoading() - Ignoring icon at %s because it appears to be a PDF", resource->url().string().ascii().data());
</del><ins>+ LOG(IconDatabase, "IconLoader::finishLoading() - Ignoring icon at %s because it appears to be a PDF", m_resource->url().string().ascii().data());
</ins><span class="cx"> data = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOG(IconDatabase, "IconLoader::finishLoading() - Committing iconURL %s to database", resource->url().string().ascii().data());
- m_frame.loader().icon().commitToDatabase(resource->url());
</del><ins>+ LOG(IconDatabase, "IconLoader::finishLoading() - Committing iconURL %s to database", m_resource->url().string().ascii().data());
+ m_frame.loader().icon().commitToDatabase(m_resource->url());
</ins><span class="cx"> // Setting the icon data only after committing to the database ensures that the data is
</span><span class="cx"> // kept in memory (so it does not have to be read from the database asynchronously), since
</span><span class="cx"> // there is a page URL referencing it.
</span><del>- iconDatabase().setIconDataForIconURL(data, resource->url().string());
</del><ins>+ iconDatabase().setIconDataForIconURL(data, m_resource->url().string());
</ins><span class="cx"> m_frame.loader().client().dispatchDidReceiveIcon();
</span><span class="cx"> stopLoading();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/icon/IconLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -20,11 +20,10 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef IconLoader_h
-#define IconLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CachedRawResourceClient.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="lines">@@ -46,7 +45,7 @@
</span><span class="cx"> void stopLoading();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx">
</span><span class="cx"> Frame& m_frame;
</span><span class="cx"> CachedResourceHandle<CachedRawResource> m_resource;
</span><span class="lines">@@ -53,5 +52,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreloadersoupCachedRawResourceSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/soup/CachedRawResourceSoup.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/soup/CachedRawResourceSoup.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/loader/soup/CachedRawResourceSoup.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> {
</span><span class="cx"> CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
</span><span class="cx"> while (CachedRawResourceClient* c = w.next()) {
</span><del>- if (char* bufferPtr = c->getOrCreateReadBuffer(this, requestedSize, actualSize))
</del><ins>+ if (char* bufferPtr = c->getOrCreateReadBuffer(*this, requestedSize, actualSize))
</ins><span class="cx"> return bufferPtr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfWebCoreAVCFResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -109,10 +109,9 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVCFResourceLoader::responseReceived(CachedResource* resource, const ResourceResponse& response)
</del><ins>+void WebCoreAVCFResourceLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT(resource == m_resource);
- UNUSED_PARAM(resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> int status = response.httpStatusCode();
</span><span class="cx"> if (status && (status < 200 || status > 299)) {
</span><span class="lines">@@ -124,14 +123,14 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVCFResourceLoader::dataReceived(CachedResource* resource, const char*, int)
</del><ins>+void WebCoreAVCFResourceLoader::dataReceived(CachedResource& resource, const char*, int)
</ins><span class="cx"> {
</span><span class="cx"> fulfillRequestWithResource(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVCFResourceLoader::notifyFinished(CachedResource* resource)
</del><ins>+void WebCoreAVCFResourceLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- if (resource->loadFailedOrCanceled()) {
</del><ins>+ if (resource.loadFailedOrCanceled()) {
</ins><span class="cx"> // <rdar://problem/13987417> Set the contentType of the contentInformationRequest to an empty
</span><span class="cx"> // string to trigger AVAsset's playable value to complete loading.
</span><span class="cx"> // FIXME: if ([m_avRequest.get() contentInformationRequest] && ![[m_avRequest.get() contentInformationRequest] contentType])
</span><span class="lines">@@ -148,9 +147,9 @@
</span><span class="cx"> stopLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVCFResourceLoader::fulfillRequestWithResource(CachedResource* resource)
</del><ins>+void WebCoreAVCFResourceLoader::fulfillRequestWithResource(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfWebCoreAVCFResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebCoreAVCFResourceLoader_h
-#define WebCoreAVCFResourceLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(AVFOUNDATION_LOADER_DELEGATE)
</span><span class="cx">
</span><span class="lines">@@ -56,12 +55,12 @@
</span><span class="cx"> CachedRawResource* resource();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- // CachedResourceClient
- void responseReceived(CachedResource*, const ResourceResponse&) override;
- void dataReceived(CachedResource*, const char*, int) override;
- void notifyFinished(CachedResource*) override;
</del><ins>+ // CachedRawResourceClient
+ void responseReceived(CachedResource&, const ResourceResponse&) override;
+ void dataReceived(CachedResource&, const char*, int) override;
+ void notifyFinished(CachedResource&) override;
</ins><span class="cx">
</span><del>- void fulfillRequestWithResource(CachedResource*);
</del><ins>+ void fulfillRequestWithResource(CachedResource&);
</ins><span class="cx">
</span><span class="cx"> WebCoreAVCFResourceLoader(MediaPlayerPrivateAVFoundationCF* parent, AVCFAssetResourceLoadingRequestRef);
</span><span class="cx"> MediaPlayerPrivateAVFoundationCF* m_parent;
</span><span class="lines">@@ -71,6 +70,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(VIDEO) && USE(AVFOUNDATION)
-
-#endif // WebCoreAVFResourceLoader_h
</del><ins>+#endif // ENABLE(VIDEO) && USE(AVFOUNDATION)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebCoreAVFResourceLoader_h
-#define WebCoreAVFResourceLoader_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(AVFOUNDATION_LOADER_DELEGATE)
</span><span class="cx">
</span><span class="lines">@@ -57,11 +56,11 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // CachedResourceClient
</span><del>- void responseReceived(CachedResource*, const ResourceResponse&) override;
- void dataReceived(CachedResource*, const char*, int) override;
- void notifyFinished(CachedResource*) override;
</del><ins>+ void responseReceived(CachedResource&, const ResourceResponse&) override;
+ void dataReceived(CachedResource&, const char*, int) override;
+ void notifyFinished(CachedResource&) override;
</ins><span class="cx">
</span><del>- void fulfillRequestWithResource(CachedResource*);
</del><ins>+ void fulfillRequestWithResource(CachedResource&);
</ins><span class="cx">
</span><span class="cx"> WebCoreAVFResourceLoader(MediaPlayerPrivateAVFoundationObjC* parent, AVAssetResourceLoadingRequest *);
</span><span class="cx"> MediaPlayerPrivateAVFoundationObjC* m_parent;
</span><span class="lines">@@ -71,6 +70,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(VIDEO) && USE(AVFOUNDATION)
-
-#endif // WebCoreAVFResourceLoader_h
</del><ins>+#endif // ENABLE(VIDEO) && USE(AVFOUNDATION)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -106,10 +106,9 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVFResourceLoader::responseReceived(CachedResource* resource, const ResourceResponse& response)
</del><ins>+void WebCoreAVFResourceLoader::responseReceived(CachedResource& resource, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- ASSERT(resource);
- ASSERT(resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx">
</span><span class="cx"> int status = response.httpStatusCode();
</span><span class="cx"> if (status && (status < 200 || status > 299)) {
</span><span class="lines">@@ -122,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> [contentInfo setContentType:uti];
</span><span class="cx">
</span><del>- ParsedContentRange& contentRange = resource->response().contentRange();
</del><ins>+ ParsedContentRange& contentRange = m_resource->response().contentRange();
</ins><span class="cx"> [contentInfo setContentLength:contentRange.isValid() ? contentRange.instanceLength() : response.expectedContentLength()];
</span><span class="cx"> [contentInfo setByteRangeAccessSupported:YES];
</span><span class="cx">
</span><span class="lines">@@ -133,20 +132,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVFResourceLoader::dataReceived(CachedResource* resource, const char*, int)
</del><ins>+void WebCoreAVFResourceLoader::dataReceived(CachedResource& resource, const char*, int)
</ins><span class="cx"> {
</span><span class="cx"> fulfillRequestWithResource(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVFResourceLoader::notifyFinished(CachedResource* resource)
</del><ins>+void WebCoreAVFResourceLoader::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- if (resource->loadFailedOrCanceled()) {
</del><ins>+ if (resource.loadFailedOrCanceled()) {
</ins><span class="cx"> // <rdar://problem/13987417> Set the contentType of the contentInformationRequest to an empty
</span><span class="cx"> // string to trigger AVAsset's playable value to complete loading.
</span><span class="cx"> if ([m_avRequest.get() contentInformationRequest] && ![[m_avRequest.get() contentInformationRequest] contentType])
</span><span class="cx"> [[m_avRequest.get() contentInformationRequest] setContentType:@""];
</span><span class="cx">
</span><del>- NSError* error = resource->errorOccurred() ? resource->resourceError().nsError() : nil;
</del><ins>+ NSError* error = resource.errorOccurred() ? resource.resourceError().nsError() : nil;
</ins><span class="cx"> [m_avRequest.get() finishLoadingWithError:error];
</span><span class="cx"> } else {
</span><span class="cx"> fulfillRequestWithResource(resource);
</span><span class="lines">@@ -155,20 +154,19 @@
</span><span class="cx"> stopLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreAVFResourceLoader::fulfillRequestWithResource(CachedResource* resource)
</del><ins>+void WebCoreAVFResourceLoader::fulfillRequestWithResource(CachedResource& resource)
</ins><span class="cx"> {
</span><del>- ASSERT(resource);
- ASSERT(resource == m_resource);
</del><ins>+ ASSERT_UNUSED(resource, &resource == m_resource);
</ins><span class="cx"> AVAssetResourceLoadingDataRequest* dataRequest = [m_avRequest dataRequest];
</span><span class="cx"> if (!dataRequest)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- SharedBuffer* data = resource->resourceBuffer();
</del><ins>+ SharedBuffer* data = m_resource->resourceBuffer();
</ins><span class="cx"> if (!data)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSUInteger responseOffset = 0;
</span><del>- ParsedContentRange contentRange = resource->response().contentRange();
</del><ins>+ ParsedContentRange contentRange = m_resource->response().contentRange();
</ins><span class="cx"> if (contentRange.isValid())
</span><span class="cx"> responseOffset = static_cast<NSUInteger>(contentRange.firstBytePosition());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> contentChanged(ImageChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderImage::notifyFinished(CachedResource* newImage)
</del><ins>+void RenderImage::notifyFinished(CachedResource& newImage)
</ins><span class="cx"> {
</span><span class="cx"> if (documentBeingDestroyed())
</span><span class="cx"> return;
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> invalidateBackgroundObscurationStatus();
</span><span class="cx">
</span><del>- if (newImage == imageResource().cachedImage()) {
</del><ins>+ if (&newImage == imageResource().cachedImage()) {
</ins><span class="cx"> // tell any potential compositing layers
</span><span class="cx"> // that the image is done and they can reference it directly.
</span><span class="cx"> contentChanged(ImageChanged);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/rendering/RenderImage.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -22,8 +22,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderImage_h
-#define RenderImage_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "RenderImageResource.h"
</span><span class="cx"> #include "RenderReplaced.h"
</span><span class="lines">@@ -105,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit minimumReplacedHeight() const override;
</span><span class="cx">
</span><del>- void notifyFinished(CachedResource*) final;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx"> bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final;
</span><span class="cx">
</span><span class="cx"> bool boxShadowShouldBeAppliedToBackground(const LayoutPoint& paintOffset, BackgroundBleedAvoidance, InlineFlowBox*) const final;
</span><span class="lines">@@ -137,5 +136,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderImage, isRenderImage())
</span><del>-
-#endif // RenderImage_h
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -83,11 +83,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::FilterInfo::setRenderer(RefPtr<FilterEffectRenderer>&& renderer)
</span><del>-{
- m_renderer = renderer;
</del><ins>+{
+ m_renderer = renderer;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::FilterInfo::notifyFinished(CachedResource*)
</del><ins>+void RenderLayer::FilterInfo::notifyFinished(CachedResource&)
</ins><span class="cx"> {
</span><span class="cx"> m_layer.filterNeedsRepaint();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -28,8 +28,7 @@
</span><span class="cx"> * SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef RenderLayerFilterInfo_h
-#define RenderLayerFilterInfo_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "CachedSVGDocumentClient.h"
</span><span class="lines">@@ -55,15 +54,15 @@
</span><span class="cx"> const LayoutRect& dirtySourceRect() const { return m_dirtySourceRect; }
</span><span class="cx"> void expandDirtySourceRect(const LayoutRect& rect) { m_dirtySourceRect.unite(rect); }
</span><span class="cx"> void resetDirtySourceRect() { m_dirtySourceRect = LayoutRect(); }
</span><del>-
</del><ins>+
</ins><span class="cx"> FilterEffectRenderer* renderer() const { return m_renderer.get(); }
</span><span class="cx"> void setRenderer(RefPtr<FilterEffectRenderer>&&);
</span><del>-
</del><ins>+
</ins><span class="cx"> void updateReferenceFilterClients(const FilterOperations&);
</span><span class="cx"> void removeReferenceFilterClients();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx">
</span><span class="cx"> static HashMap<const RenderLayer*, std::unique_ptr<FilterInfo>>& map();
</span><span class="cx">
</span><span class="lines">@@ -77,5 +76,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // RenderLayerFilterInfo_h
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> clearResourceReferences();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGFEImageElement::notifyFinished(CachedResource*)
</del><ins>+void SVGFEImageElement::notifyFinished(CachedResource&)
</ins><span class="cx"> {
</span><span class="cx"> if (!inDocument())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -18,8 +18,7 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef SVGFEImageElement_h
-#define SVGFEImageElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CachedImageClient.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="lines">@@ -51,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx"> void svgAttributeChanged(const QualifiedName&) override;
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx">
</span><span class="cx"> void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;
</span><span class="cx"> RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) override;
</span><span class="lines">@@ -73,5 +72,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -535,12 +535,12 @@
</span><span class="cx"> return targetClone && targetClone->hasRelativeLengths();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGUseElement::notifyFinished(CachedResource* resource)
</del><ins>+void SVGUseElement::notifyFinished(CachedResource& resource)
</ins><span class="cx"> {
</span><span class="cx"> invalidateShadowTree();
</span><del>- if (resource->errorOccurred())
</del><ins>+ if (resource.errorOccurred())
</ins><span class="cx"> dispatchEvent(Event::create(eventNames().errorEvent, false, false));
</span><del>- else if (!resource->wasCanceled())
</del><ins>+ else if (!resource.wasCanceled())
</ins><span class="cx"> SVGExternalResourcesRequired::dispatchLoadEvent(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/svg/SVGUseElement.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -19,8 +19,7 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef SVGUseElement_h
-#define SVGUseElement_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "CachedSVGDocumentClient.h"
</span><span class="lines">@@ -72,7 +71,7 @@
</span><span class="cx"> void setHaveFiredLoadEvent(bool) override;
</span><span class="cx"> bool haveFiredLoadEvent() const override;
</span><span class="cx"> Timer* svgLoadEventTimer() override;
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx">
</span><span class="cx"> Document* externalDocument() const;
</span><span class="cx"> void updateExternalDocument();
</span><span class="lines">@@ -98,5 +97,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -228,9 +228,9 @@
</span><span class="cx"> m_xmlErrors->insertErrorMessageBlock();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void XMLDocumentParser::notifyFinished(CachedResource* unusedResource)
</del><ins>+void XMLDocumentParser::notifyFinished(CachedResource& unusedResource)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(unusedResource, unusedResource == m_pendingScript);
</del><ins>+ ASSERT_UNUSED(unusedResource, &unusedResource == m_pendingScript);
</ins><span class="cx"> ASSERT(m_pendingScript->accessCount() > 0);
</span><span class="cx">
</span><span class="cx"> ScriptSourceCode sourceCode(m_pendingScript.get());
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.h (206902 => 206903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2016-10-07 06:18:37 UTC (rev 206902)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2016-10-07 07:02:02 UTC (rev 206903)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> bool shouldAssociateConsoleMessagesWithTextPosition() const override;
</span><span class="cx">
</span><span class="cx"> // from CachedResourceClient
</span><del>- void notifyFinished(CachedResource*) override;
</del><ins>+ void notifyFinished(CachedResource&) final;
</ins><span class="cx">
</span><span class="cx"> void end();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>