<!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>[206867] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206867">206867</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-06 09:53:58 -0700 (Thu, 06 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CachedResource client handling methods should take reference
https://bugs.webkit.org/show_bug.cgi?id=163014
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-06
Reviewed by Alex Christensen.
Source/WebCore:
No change of behavior.
* bindings/js/CachedScriptSourceProvider.h:
(WebCore::CachedScriptSourceProvider::~CachedScriptSourceProvider):
(WebCore::CachedScriptSourceProvider::CachedScriptSourceProvider):
* css/CSSCrossfadeValue.cpp:
(WebCore::CSSCrossfadeValue::~CSSCrossfadeValue):
(WebCore::CSSCrossfadeValue::loadSubimages):
* css/CSSFilterImageValue.cpp:
(WebCore::CSSFilterImageValue::~CSSFilterImageValue):
(WebCore::CSSFilterImageValue::loadSubimages):
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::CSSFontFaceSource):
(WebCore::CSSFontFaceSource::~CSSFontFaceSource):
* css/StyleRuleImport.cpp:
(WebCore::StyleRuleImport::~StyleRuleImport):
(WebCore::StyleRuleImport::requestStyleSheet):
* dom/DataTransfer.cpp:
(WebCore::DragImageLoader::startLoading):
(WebCore::DragImageLoader::stopLoading):
* dom/LoadableClassicScript.cpp:
(WebCore::LoadableClassicScript::create):
(WebCore::LoadableClassicScript::~LoadableClassicScript):
* dom/ProcessingInstruction.cpp:
(WebCore::ProcessingInstruction::~ProcessingInstruction):
(WebCore::ProcessingInstruction::checkStyleSheet):
(WebCore::ProcessingInstruction::parseStyleSheet):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::~HTMLLinkElement):
(WebCore::HTMLLinkElement::process):
* loader/CrossOriginPreflightChecker.cpp:
(WebCore::CrossOriginPreflightChecker::~CrossOriginPreflightChecker):
(WebCore::CrossOriginPreflightChecker::startPreflight):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::detachFromFrame):
(WebCore::DocumentLoader::clearMainResource):
(WebCore::DocumentLoader::becomeMainResourceClient):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::~DocumentThreadableLoader):
(WebCore::DocumentThreadableLoader::clearResource):
(WebCore::DocumentThreadableLoader::loadRequest):
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::~ImageLoader):
(WebCore::ImageLoader::clearImageWithoutConsideringPendingLoadEvent):
(WebCore::ImageLoader::updateFromElement):
(WebCore::ImageLoader::dispatchPendingBeforeLoadEvent):
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::~LinkLoader):
(WebCore::LinkLoader::notifyFinished):
(WebCore::LinkLoader::loadLink):
* loader/LinkPreloadResourceClients.h:
(WebCore::LinkPreloadResourceClient::addResource):
(WebCore::LinkPreloadResourceClient::clearResource):
* loader/MediaResourceLoader.cpp:
(WebCore::MediaResource::MediaResource):
(WebCore::MediaResource::stop):
* loader/TextTrackLoader.cpp:
(WebCore::TextTrackLoader::~TextTrackLoader):
(WebCore::TextTrackLoader::cancelLoad):
(WebCore::TextTrackLoader::load):
* loader/cache/CachedCSSStyleSheet.cpp:
(WebCore::CachedCSSStyleSheet::didAddClient):
* loader/cache/CachedCSSStyleSheet.h:
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::didAddClient):
* loader/cache/CachedFont.h:
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::didAddClient):
(WebCore::CachedImage::didRemoveClient):
* loader/cache/CachedImage.h:
* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::didAddClient):
* loader/cache/CachedRawResource.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::addClient):
(WebCore::CachedResource::didAddClient):
(WebCore::CachedResource::addClientToSet):
(WebCore::CachedResource::removeClient):
(WebCore::CachedResource::switchClientsToRevalidatedResource):
(WebCore::CachedResource::Callback::timerFired):
* loader/cache/CachedResource.h:
(WebCore::CachedResource::hasClient):
(WebCore::CachedResource::didRemoveClient):
* loader/cache/CachedSVGDocumentReference.cpp:
(WebCore::CachedSVGDocumentReference::~CachedSVGDocumentReference):
(WebCore::CachedSVGDocumentReference::load):
* loader/cache/CachedXSLStyleSheet.cpp:
(WebCore::CachedXSLStyleSheet::didAddClient):
* loader/cache/CachedXSLStyleSheet.h:
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::addImageToCache):
(WebCore::MemoryCache::removeImageFromCache):
* loader/icon/IconLoader.cpp:
(WebCore::IconLoader::startLoading):
(WebCore::IconLoader::stopLoading):
* platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
(WebCore::WebCoreAVCFResourceLoader::startLoading):
(WebCore::WebCoreAVCFResourceLoader::stopLoading):
* platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
(WebCore::WebCoreAVFResourceLoader::startLoading):
(WebCore::WebCoreAVFResourceLoader::stopLoading):
* rendering/RenderImageResource.cpp:
(WebCore::RenderImageResource::shutdown):
(WebCore::RenderImageResource::setCachedImage):
* rendering/RenderLayerFilterInfo.cpp:
(WebCore::RenderLayer::FilterInfo::updateReferenceFilterClients):
(WebCore::RenderLayer::FilterInfo::removeReferenceFilterClients):
* rendering/style/StyleCachedImage.cpp:
(WebCore::StyleCachedImage::addClient):
(WebCore::StyleCachedImage::removeClient):
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::clearResourceReferences):
(WebCore::SVGFEImageElement::requestImageResource):
* svg/SVGFontFaceUriElement.cpp:
(WebCore::SVGFontFaceUriElement::~SVGFontFaceUriElement):
(WebCore::SVGFontFaceUriElement::loadFont):
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::~SVGUseElement):
(WebCore::SVGUseElement::updateExternalDocument):
* xml/XSLImportRule.cpp:
(WebCore::XSLImportRule::~XSLImportRule):
(WebCore::XSLImportRule::setXSLStyleSheet):
(WebCore::XSLImportRule::loadSheet):
* xml/parser/XMLDocumentParser.cpp:
(WebCore::XMLDocumentParser::notifyFinished):
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::~XMLDocumentParser):
(WebCore::XMLDocumentParser::endElementNs):
Source/WebKit/mac:
* WebView/WebHTMLView.mm:
(promisedDataClient):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsCachedScriptSourceProviderh">trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSCrossfadeValuecpp">trunk/Source/WebCore/css/CSSCrossfadeValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourcecpp">trunk/Source/WebCore/css/CSSFontFaceSource.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleImportcpp">trunk/Source/WebCore/css/StyleRuleImport.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDataTransfercpp">trunk/Source/WebCore/dom/DataTransfer.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLoadableClassicScriptcpp">trunk/Source/WebCore/dom/LoadableClassicScript.cpp</a></li>
<li><a href="#trunkSourceWebCoredomProcessingInstructioncpp">trunk/Source/WebCore/dom/ProcessingInstruction.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp">trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoadercpp">trunk/Source/WebCore/loader/LinkLoader.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="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheeth">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFontcpp">trunk/Source/WebCore/loader/cache/CachedFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFonth">trunk/Source/WebCore/loader/cache/CachedFont.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourcecpp">trunk/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourceh">trunk/Source/WebCore/loader/cache/CachedRawResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp">trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedXSLStyleSheetcpp">trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedXSLStyleSheeth">trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconLoadercpp">trunk/Source/WebCore/loader/icon/IconLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfWebCoreAVCFResourceLoadercpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourcecpp">trunk/Source/WebCore/rendering/RenderImageResource.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfocpp">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImagecpp">trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEImageElementcpp">trunk/Source/WebCore/svg/SVGFEImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontFaceUriElementcpp">trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLImportRulecpp">trunk/Source/WebCore/xml/XSLImportRule.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParsercpp">trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/ChangeLog 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -1,3 +1,139 @@
</span><ins>+2016-10-06 Youenn Fablet <youenn@apple.com>
+
+ CachedResource client handling methods should take reference
+ https://bugs.webkit.org/show_bug.cgi?id=163014
+
+ Reviewed by Alex Christensen.
+
+ No change of behavior.
+
+ * bindings/js/CachedScriptSourceProvider.h:
+ (WebCore::CachedScriptSourceProvider::~CachedScriptSourceProvider):
+ (WebCore::CachedScriptSourceProvider::CachedScriptSourceProvider):
+ * css/CSSCrossfadeValue.cpp:
+ (WebCore::CSSCrossfadeValue::~CSSCrossfadeValue):
+ (WebCore::CSSCrossfadeValue::loadSubimages):
+ * css/CSSFilterImageValue.cpp:
+ (WebCore::CSSFilterImageValue::~CSSFilterImageValue):
+ (WebCore::CSSFilterImageValue::loadSubimages):
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::CSSFontFaceSource):
+ (WebCore::CSSFontFaceSource::~CSSFontFaceSource):
+ * css/StyleRuleImport.cpp:
+ (WebCore::StyleRuleImport::~StyleRuleImport):
+ (WebCore::StyleRuleImport::requestStyleSheet):
+ * dom/DataTransfer.cpp:
+ (WebCore::DragImageLoader::startLoading):
+ (WebCore::DragImageLoader::stopLoading):
+ * dom/LoadableClassicScript.cpp:
+ (WebCore::LoadableClassicScript::create):
+ (WebCore::LoadableClassicScript::~LoadableClassicScript):
+ * dom/ProcessingInstruction.cpp:
+ (WebCore::ProcessingInstruction::~ProcessingInstruction):
+ (WebCore::ProcessingInstruction::checkStyleSheet):
+ (WebCore::ProcessingInstruction::parseStyleSheet):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::~HTMLLinkElement):
+ (WebCore::HTMLLinkElement::process):
+ * loader/CrossOriginPreflightChecker.cpp:
+ (WebCore::CrossOriginPreflightChecker::~CrossOriginPreflightChecker):
+ (WebCore::CrossOriginPreflightChecker::startPreflight):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::detachFromFrame):
+ (WebCore::DocumentLoader::clearMainResource):
+ (WebCore::DocumentLoader::becomeMainResourceClient):
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::~DocumentThreadableLoader):
+ (WebCore::DocumentThreadableLoader::clearResource):
+ (WebCore::DocumentThreadableLoader::loadRequest):
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::~ImageLoader):
+ (WebCore::ImageLoader::clearImageWithoutConsideringPendingLoadEvent):
+ (WebCore::ImageLoader::updateFromElement):
+ (WebCore::ImageLoader::dispatchPendingBeforeLoadEvent):
+ * loader/LinkLoader.cpp:
+ (WebCore::LinkLoader::~LinkLoader):
+ (WebCore::LinkLoader::notifyFinished):
+ (WebCore::LinkLoader::loadLink):
+ * loader/LinkPreloadResourceClients.h:
+ (WebCore::LinkPreloadResourceClient::addResource):
+ (WebCore::LinkPreloadResourceClient::clearResource):
+ * loader/MediaResourceLoader.cpp:
+ (WebCore::MediaResource::MediaResource):
+ (WebCore::MediaResource::stop):
+ * loader/TextTrackLoader.cpp:
+ (WebCore::TextTrackLoader::~TextTrackLoader):
+ (WebCore::TextTrackLoader::cancelLoad):
+ (WebCore::TextTrackLoader::load):
+ * loader/cache/CachedCSSStyleSheet.cpp:
+ (WebCore::CachedCSSStyleSheet::didAddClient):
+ * loader/cache/CachedCSSStyleSheet.h:
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::didAddClient):
+ * loader/cache/CachedFont.h:
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::didAddClient):
+ (WebCore::CachedImage::didRemoveClient):
+ * loader/cache/CachedImage.h:
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::didAddClient):
+ * loader/cache/CachedRawResource.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::addClient):
+ (WebCore::CachedResource::didAddClient):
+ (WebCore::CachedResource::addClientToSet):
+ (WebCore::CachedResource::removeClient):
+ (WebCore::CachedResource::switchClientsToRevalidatedResource):
+ (WebCore::CachedResource::Callback::timerFired):
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::hasClient):
+ (WebCore::CachedResource::didRemoveClient):
+ * loader/cache/CachedSVGDocumentReference.cpp:
+ (WebCore::CachedSVGDocumentReference::~CachedSVGDocumentReference):
+ (WebCore::CachedSVGDocumentReference::load):
+ * loader/cache/CachedXSLStyleSheet.cpp:
+ (WebCore::CachedXSLStyleSheet::didAddClient):
+ * loader/cache/CachedXSLStyleSheet.h:
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::addImageToCache):
+ (WebCore::MemoryCache::removeImageFromCache):
+ * loader/icon/IconLoader.cpp:
+ (WebCore::IconLoader::startLoading):
+ (WebCore::IconLoader::stopLoading):
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::startLoading):
+ (WebCore::WebCoreAVCFResourceLoader::stopLoading):
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+ (WebCore::WebCoreAVFResourceLoader::startLoading):
+ (WebCore::WebCoreAVFResourceLoader::stopLoading):
+ * rendering/RenderImageResource.cpp:
+ (WebCore::RenderImageResource::shutdown):
+ (WebCore::RenderImageResource::setCachedImage):
+ * rendering/RenderLayerFilterInfo.cpp:
+ (WebCore::RenderLayer::FilterInfo::updateReferenceFilterClients):
+ (WebCore::RenderLayer::FilterInfo::removeReferenceFilterClients):
+ * rendering/style/StyleCachedImage.cpp:
+ (WebCore::StyleCachedImage::addClient):
+ (WebCore::StyleCachedImage::removeClient):
+ * svg/SVGFEImageElement.cpp:
+ (WebCore::SVGFEImageElement::clearResourceReferences):
+ (WebCore::SVGFEImageElement::requestImageResource):
+ * svg/SVGFontFaceUriElement.cpp:
+ (WebCore::SVGFontFaceUriElement::~SVGFontFaceUriElement):
+ (WebCore::SVGFontFaceUriElement::loadFont):
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::~SVGUseElement):
+ (WebCore::SVGUseElement::updateExternalDocument):
+ * xml/XSLImportRule.cpp:
+ (WebCore::XSLImportRule::~XSLImportRule):
+ (WebCore::XSLImportRule::setXSLStyleSheet):
+ (WebCore::XSLImportRule::loadSheet):
+ * xml/parser/XMLDocumentParser.cpp:
+ (WebCore::XMLDocumentParser::notifyFinished):
+ * xml/parser/XMLDocumentParserLibxml2.cpp:
+ (WebCore::XMLDocumentParser::~XMLDocumentParser):
+ (WebCore::XMLDocumentParser::endElementNs):
+
</ins><span class="cx"> 2016-10-05 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][OWR] GL rendering support
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsCachedScriptSourceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~CachedScriptSourceProvider()
</span><span class="cx"> {
</span><del>- m_cachedScript->removeClient(this);
</del><ins>+ m_cachedScript->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned hash() const override { return m_cachedScript->scriptHash(); }
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> : SourceProvider(cachedScript->response().url(), TextPosition::minimumPosition(), JSC::SourceProviderSourceType::Program)
</span><span class="cx"> , m_cachedScript(cachedScript)
</span><span class="cx"> {
</span><del>- m_cachedScript->addClient(this);
</del><ins>+ m_cachedScript->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedScript> m_cachedScript;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCrossfadeValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCrossfadeValue.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx"> CSSCrossfadeValue::~CSSCrossfadeValue()
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedFromImage)
</span><del>- m_cachedFromImage->removeClient(&m_crossfadeSubimageObserver);
</del><ins>+ m_cachedFromImage->removeClient(m_crossfadeSubimageObserver);
</ins><span class="cx"> if (m_cachedToImage)
</span><del>- m_cachedToImage->removeClient(&m_crossfadeSubimageObserver);
</del><ins>+ m_cachedToImage->removeClient(m_crossfadeSubimageObserver);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CSSCrossfadeValue::customCSSText() const
</span><span class="lines">@@ -131,16 +131,16 @@
</span><span class="cx">
</span><span class="cx"> if (m_cachedFromImage != oldCachedFromImage) {
</span><span class="cx"> if (oldCachedFromImage)
</span><del>- oldCachedFromImage->removeClient(&m_crossfadeSubimageObserver);
</del><ins>+ oldCachedFromImage->removeClient(m_crossfadeSubimageObserver);
</ins><span class="cx"> if (m_cachedFromImage)
</span><del>- m_cachedFromImage->addClient(&m_crossfadeSubimageObserver);
</del><ins>+ m_cachedFromImage->addClient(m_crossfadeSubimageObserver);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_cachedToImage != oldCachedToImage) {
</span><span class="cx"> if (oldCachedToImage)
</span><del>- oldCachedToImage->removeClient(&m_crossfadeSubimageObserver);
</del><ins>+ oldCachedToImage->removeClient(m_crossfadeSubimageObserver);
</ins><span class="cx"> if (m_cachedToImage)
</span><del>- m_cachedToImage->addClient(&m_crossfadeSubimageObserver);
</del><ins>+ m_cachedToImage->addClient(m_crossfadeSubimageObserver);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_crossfadeSubimageObserver.setReady(true);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> CSSFilterImageValue::~CSSFilterImageValue()
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedImage)
</span><del>- m_cachedImage->removeClient(&m_filterSubimageObserver);
</del><ins>+ m_cachedImage->removeClient(m_filterSubimageObserver);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CSSFilterImageValue::customCSSText() const
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx">
</span><span class="cx"> if (m_cachedImage != oldCachedImage) {
</span><span class="cx"> if (oldCachedImage)
</span><del>- oldCachedImage->removeClient(&m_filterSubimageObserver);
</del><ins>+ oldCachedImage->removeClient(m_filterSubimageObserver);
</ins><span class="cx"> if (m_cachedImage)
</span><del>- m_cachedImage->addClient(&m_filterSubimageObserver);
</del><ins>+ m_cachedImage->addClient(m_filterSubimageObserver);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& filterOperation : m_filterOperations.operations()) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> // This may synchronously call fontLoaded().
</span><span class="cx"> if (m_font)
</span><del>- m_font->addClient(this);
</del><ins>+ m_font->addClient(*this);
</ins><span class="cx">
</span><span class="cx"> if (status() == Status::Pending && (!m_font || m_font->isLoaded())) {
</span><span class="cx"> setStatus(Status::Loading);
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> CSSFontFaceSource::~CSSFontFaceSource()
</span><span class="cx"> {
</span><span class="cx"> if (m_font)
</span><del>- m_font->removeClient(this);
</del><ins>+ m_font->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSFontFaceSource::fontLoaded(CachedFont& loadedFont)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleImportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRuleImport.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRuleImport.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/css/StyleRuleImport.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> if (m_styleSheet)
</span><span class="cx"> m_styleSheet->clearOwnerRule();
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->removeClient(&m_styleSheetClient);
</del><ins>+ m_cachedSheet->removeClient(m_styleSheetClient);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleRuleImport::setCSSStyleSheet(const String& href, const URL& baseURL, const String& charset, const CachedCSSStyleSheet* cachedStyleSheet)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(absURL), m_parentStyleSheet->charset());
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->removeClient(&m_styleSheetClient);
</del><ins>+ m_cachedSheet->removeClient(m_styleSheetClient);
</ins><span class="cx"> if (m_parentStyleSheet->isUserStyleSheet()) {
</span><span class="cx"> request.setOptions(ResourceLoaderOptions(DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, SkipSecurityCheck, FetchOptions::Mode::NoCors, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::SkipPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching));
</span><span class="cx"> m_cachedSheet = document->cachedResourceLoader().requestUserCSSStyleSheet(WTFMove(request));
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootSheet == m_parentStyleSheet)
</span><span class="cx"> m_parentStyleSheet->startLoadingDynamicSheet();
</span><span class="cx"> m_loading = true;
</span><del>- m_cachedSheet->addClient(&m_styleSheetClient);
</del><ins>+ m_cachedSheet->addClient(m_styleSheetClient);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransfercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -311,12 +311,12 @@
</span><span class="cx"> void DragImageLoader::startLoading(CachedResourceHandle<WebCore::CachedImage>& image)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Does this really trigger a load? Does it need to?
</span><del>- image->addClient(this);
</del><ins>+ image->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragImageLoader::stopLoading(CachedResourceHandle<WebCore::CachedImage>& image)
</span><span class="cx"> {
</span><del>- image->removeClient(this);
</del><ins>+ image->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragImageLoader::imageChanged(CachedImage*, const IntRect*)
</span></span></pre></div>
<a id="trunkSourceWebCoredomLoadableClassicScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LoadableClassicScript.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LoadableClassicScript.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/dom/LoadableClassicScript.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -37,13 +37,13 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cachedScript);
</span><span class="cx"> auto script = adoptRef(*new LoadableClassicScript(WTFMove(cachedScript)));
</span><del>- cachedScript->addClient(script.ptr());
</del><ins>+ cachedScript->addClient(script.get());
</ins><span class="cx"> return script;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LoadableClassicScript::~LoadableClassicScript()
</span><span class="cx"> {
</span><del>- m_cachedScript->removeClient(this);
</del><ins>+ m_cachedScript->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool LoadableClassicScript::isLoaded() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomProcessingInstructioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> m_sheet->clearOwnerNode();
</span><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->removeClient(this);
</del><ins>+ m_cachedSheet->removeClient(*this);
</ins><span class="cx">
</span><span class="cx"> if (inDocument())
</span><span class="cx"> document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="cx"> if (m_cachedSheet) {
</span><del>- m_cachedSheet->removeClient(this);
</del><ins>+ m_cachedSheet->removeClient(*this);
</ins><span class="cx"> m_cachedSheet = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(WTFMove(request));
</span><span class="cx"> }
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->addClient(this);
</del><ins>+ m_cachedSheet->addClient(*this);
</ins><span class="cx"> else {
</span><span class="cx"> // The request may have been denied if (for example) the stylesheet is local and the document is remote.
</span><span class="cx"> m_loading = false;
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->removeClient(this);
</del><ins>+ m_cachedSheet->removeClient(*this);
</ins><span class="cx"> m_cachedSheet = nullptr;
</span><span class="cx">
</span><span class="cx"> m_loading = false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> m_sheet->clearOwnerNode();
</span><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->removeClient(this);
</del><ins>+ m_cachedSheet->removeClient(*this);
</ins><span class="cx">
</span><span class="cx"> if (inDocument())
</span><span class="cx"> document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
</span><span class="lines">@@ -231,10 +231,10 @@
</span><span class="cx"> AtomicString charset = attributeWithoutSynchronization(charsetAttr);
</span><span class="cx"> if (charset.isEmpty() && document().frame())
</span><span class="cx"> charset = document().charset();
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_cachedSheet) {
</span><span class="cx"> removePendingSheet();
</span><del>- m_cachedSheet->removeClient(this);
</del><ins>+ m_cachedSheet->removeClient(*this);
</ins><span class="cx"> m_cachedSheet = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(WTFMove(request));
</span><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->addClient(this);
</del><ins>+ m_cachedSheet->addClient(*this);
</ins><span class="cx"> else {
</span><span class="cx"> // The request may have been denied if (for example) the stylesheet is local and the document is remote.
</span><span class="cx"> m_loading = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> CrossOriginPreflightChecker::~CrossOriginPreflightChecker()
</span><span class="cx"> {
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CrossOriginPreflightChecker::validatePreflightResponse(DocumentThreadableLoader& loader, ResourceRequest&& request, unsigned long identifier, const ResourceResponse& response)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> ASSERT(!m_resource);
</span><span class="cx"> m_resource = m_loader.document().cachedResourceLoader().requestRawResource(WTFMove(preflightRequest));
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->addClient(this);
</del><ins>+ m_resource->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CrossOriginPreflightChecker::doPreflight(DocumentThreadableLoader& loader, ResourceRequest&& request)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -1020,8 +1020,8 @@
</span><span class="cx"> // It never makes sense to have a document loader that is detached from its
</span><span class="cx"> // frame have any loads active, so kill all the loads.
</span><span class="cx"> stopLoading();
</span><del>- if (m_mainResource && m_mainResource->hasClient(this))
- m_mainResource->removeClient(this);
</del><ins>+ if (m_mainResource && m_mainResource->hasClient(*this))
+ m_mainResource->removeClient(*this);
</ins><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx"> if (m_contentFilter)
</span><span class="cx"> m_contentFilter->stopFilteringMainResource();
</span><span class="lines">@@ -1595,8 +1595,8 @@
</span><span class="cx">
</span><span class="cx"> void DocumentLoader::clearMainResource()
</span><span class="cx"> {
</span><del>- if (m_mainResource && m_mainResource->hasClient(this))
- m_mainResource->removeClient(this);
</del><ins>+ if (m_mainResource && m_mainResource->hasClient(*this))
+ m_mainResource->removeClient(*this);
</ins><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx"> if (m_contentFilter)
</span><span class="cx"> m_contentFilter->stopFilteringMainResource();
</span><span class="lines">@@ -1699,7 +1699,7 @@
</span><span class="cx"> if (m_contentFilter)
</span><span class="cx"> m_contentFilter->startFilteringMainResource(*m_mainResource);
</span><span class="cx"> #endif
</span><del>- m_mainResource->addClient(this);
</del><ins>+ m_mainResource->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> DocumentThreadableLoader::~DocumentThreadableLoader()
</span><span class="cx"> {
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DocumentThreadableLoader::cancel()
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> // prevent the reentrancy.
</span><span class="cx"> if (CachedResourceHandle<CachedRawResource> resource = m_resource) {
</span><span class="cx"> m_resource = nullptr;
</span><del>- resource->removeClient(this);
</del><ins>+ resource->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx"> if (m_preflightChecker)
</span><span class="cx"> m_preflightChecker = Nullopt;
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> URL requestUrl = newRequest.resourceRequest().url();
</span><span class="cx"> m_resource = m_document.cachedResourceLoader().requestRawResource(WTFMove(newRequest));
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->addClient(this);
</del><ins>+ m_resource->addClient(*this);
</ins><span class="cx"> else {
</span><span class="cx"> // FIXME: Since we receive a synchronous error, this is probably due to some AccessControl checks. We should try to retrieve the actual error.
</span><span class="cx"> m_client->didFail(ResourceError(String(), 0, requestUrl, String(), ResourceError::Type::AccessControl));
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> ImageLoader::~ImageLoader()
</span><span class="cx"> {
</span><span class="cx"> if (m_image)
</span><del>- m_image->removeClient(this);
</del><ins>+ m_image->removeClient(*this);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_hasPendingBeforeLoadEvent || !beforeLoadEventSender().hasPendingEvents(*this));
</span><span class="cx"> if (m_hasPendingBeforeLoadEvent)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_imageComplete = true;
</span><span class="cx"> if (oldImage)
</span><del>- oldImage->removeClient(this);
</del><ins>+ oldImage->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (RenderImageResource* imageResource = renderImageResource())
</span><span class="lines">@@ -248,10 +248,10 @@
</span><span class="cx"> // If newImage is cached, addClient() will result in the load event
</span><span class="cx"> // being queued to fire. Ensure this happens after beforeload is
</span><span class="cx"> // dispatched.
</span><del>- newImage->addClient(this);
</del><ins>+ newImage->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx"> if (oldImage) {
</span><del>- oldImage->removeClient(this);
</del><ins>+ oldImage->removeClient(*this);
</ins><span class="cx"> updateRenderer();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (m_image) {
</span><del>- m_image->removeClient(this);
</del><ins>+ m_image->removeClient(*this);
</ins><span class="cx"> m_image = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> LinkLoader::~LinkLoader()
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedLinkResource)
</span><del>- m_cachedLinkResource->removeClient(this);
</del><ins>+ m_cachedLinkResource->removeClient(*this);
</ins><span class="cx"> if (m_preloadResourceClient)
</span><span class="cx"> m_preloadResourceClient->clear();
</span><span class="cx"> }
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> triggerEvents(m_cachedLinkResource.get());
</span><span class="cx">
</span><del>- m_cachedLinkResource->removeClient(this);
</del><ins>+ m_cachedLinkResource->removeClient(*this);
</ins><span class="cx"> m_cachedLinkResource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_cachedLinkResource) {
</span><del>- m_cachedLinkResource->removeClient(this);
</del><ins>+ m_cachedLinkResource->removeClient(*this);
</ins><span class="cx"> m_cachedLinkResource = nullptr;
</span><span class="cx"> }
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> options.contentSecurityPolicyImposition = ContentSecurityPolicyImposition::SkipPolicyCheck;
</span><span class="cx"> m_cachedLinkResource = document.cachedResourceLoader().requestLinkResource(type, CachedResourceRequest(ResourceRequest(document.completeURL(href)), options, priority));
</span><span class="cx"> if (m_cachedLinkResource)
</span><del>- m_cachedLinkResource->addClient(this);
</del><ins>+ m_cachedLinkResource->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkPreloadResourceClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkPreloadResourceClients.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkPreloadResourceClients.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/LinkPreloadResourceClients.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -54,12 +54,12 @@
</span><span class="cx">
</span><span class="cx"> LinkPreloadResourceClient(LinkLoader&, CachedResource&);
</span><span class="cx">
</span><del>- void addResource(CachedResourceClient* client)
</del><ins>+ void addResource(CachedResourceClient& client)
</ins><span class="cx"> {
</span><span class="cx"> m_resource->addClient(client);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void clearResource(CachedResourceClient* client)
</del><ins>+ void clearResource(CachedResourceClient& client)
</ins><span class="cx"> {
</span><span class="cx"> if (m_resource)
</span><span class="cx"> m_resource->removeClient(client);
</span><span class="lines">@@ -89,13 +89,13 @@
</span><span class="cx"> triggerEvents(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void clear() override { clearResource(this); }
</del><ins>+ void clear() override { clearResource(*this); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadScriptResourceClient(LinkLoader& loader, CachedScript& resource)
</span><span class="cx"> : LinkPreloadResourceClient(loader, resource)
</span><span class="cx"> {
</span><del>- addResource(this);
</del><ins>+ addResource(*this);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -114,13 +114,13 @@
</span><span class="cx"> triggerEvents(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void clear() override { clearResource(this); }
</del><ins>+ void clear() override { clearResource(*this); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadStyleResourceClient(LinkLoader& loader, CachedCSSStyleSheet& resource)
</span><span class="cx"> : LinkPreloadResourceClient(loader, resource)
</span><span class="cx"> {
</span><del>- addResource(this);
</del><ins>+ addResource(*this);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -139,13 +139,13 @@
</span><span class="cx"> triggerEvents(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void clear() override { clearResource(this); }
</del><ins>+ void clear() override { clearResource(*this); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadImageResourceClient(LinkLoader& loader, CachedImage& resource)
</span><span class="cx"> : LinkPreloadResourceClient(loader, dynamic_cast<CachedResource&>(resource))
</span><span class="cx"> {
</span><del>- addResource(this);
</del><ins>+ addResource(*this);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -164,13 +164,13 @@
</span><span class="cx"> triggerEvents(&resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void clear() override { clearResource(this); }
</del><ins>+ void clear() override { clearResource(*this); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadFontResourceClient(LinkLoader& loader, CachedFont& resource)
</span><span class="cx"> : LinkPreloadResourceClient(loader, resource)
</span><span class="cx"> {
</span><del>- addResource(this);
</del><ins>+ addResource(*this);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -189,13 +189,13 @@
</span><span class="cx"> triggerEvents(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void clear() override { clearResource(this); }
</del><ins>+ void clear() override { clearResource(*this); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LinkPreloadRawResourceClient(LinkLoader& loader, CachedRawResource& resource)
</span><span class="cx"> : LinkPreloadResourceClient(loader, resource)
</span><span class="cx"> {
</span><del>- addResource(this);
</del><ins>+ addResource(*this);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> , m_resource(resource)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(resource);
</span><del>- resource->addClient(this);
</del><ins>+ resource->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaResource::~MediaResource()
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> if (!m_resource)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> m_resource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> TextTrackLoader::~TextTrackLoader()
</span><span class="cx"> {
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextTrackLoader::cueLoadTimerFired()
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void TextTrackLoader::cancelLoad()
</span><span class="cx"> {
</span><span class="cx"> if (m_resource) {
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> m_resource = nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> if (!m_resource)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_resource->addClient(this);
</del><ins>+ m_resource->addClient(*this);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -53,16 +53,16 @@
</span><span class="cx"> m_parsedStyleSheetCache->removedFromMemoryCache();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedCSSStyleSheet::didAddClient(CachedResourceClient* c)
</del><ins>+void CachedCSSStyleSheet::didAddClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><del>- ASSERT(c->resourceClientType() == CachedStyleSheetClient::expectedType());
</del><ins>+ ASSERT(client.resourceClientType() == CachedStyleSheetClient::expectedType());
</ins><span class="cx"> // CachedResource::didAddClient() must be before setCSSStyleSheet(),
</span><span class="cx"> // because setCSSStyleSheet() may cause scripts to be executed, which could destroy 'c' if it is an instance of HTMLLinkElement.
</span><span class="cx"> // see the comment of HTMLLinkElement::setCSSStyleSheet.
</span><del>- CachedResource::didAddClient(c);
</del><ins>+ CachedResource::didAddClient(client);
</ins><span class="cx">
</span><span class="cx"> if (!isLoading())
</span><del>- static_cast<CachedStyleSheetClient*>(c)->setCSSStyleSheet(m_resourceRequest.url(), m_response.url(), m_decoder->encoding().name(), this);
</del><ins>+ static_cast<CachedStyleSheetClient&>(client).setCSSStyleSheet(m_resourceRequest.url(), m_response.url(), m_decoder->encoding().name(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedCSSStyleSheet::setEncoding(const String& chs)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> bool canUseSheet(MIMETypeCheck, bool* hasValidMIMEType) const;
</span><span class="cx"> bool mayTryReplaceEncodedData() const final { return true; }
</span><span class="cx">
</span><del>- void didAddClient(CachedResourceClient*) final;
</del><ins>+ void didAddClient(CachedResourceClient&) final;
</ins><span class="cx">
</span><span class="cx"> void setEncoding(const String&) final;
</span><span class="cx"> String encoding() const final;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -63,11 +63,11 @@
</span><span class="cx"> setLoading(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedFont::didAddClient(CachedResourceClient* client)
</del><ins>+void CachedFont::didAddClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><del>- ASSERT(client->resourceClientType() == CachedFontClient::expectedType());
</del><ins>+ ASSERT(client.resourceClientType() == CachedFontClient::expectedType());
</ins><span class="cx"> if (!isLoading())
</span><del>- static_cast<CachedFontClient*>(client)->fontLoaded(*this);
</del><ins>+ static_cast<CachedFontClient&>(client).fontLoaded(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedFont::finishLoading(SharedBuffer* data)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> void load(CachedResourceLoader&) override;
</span><span class="cx"> NO_RETURN_DUE_TO_ASSERT void setBodyDataFrom(const CachedResource&) final { ASSERT_NOT_REACHED(); }
</span><span class="cx">
</span><del>- void didAddClient(CachedResourceClient*) override;
</del><ins>+ void didAddClient(CachedResourceClient&) override;
</ins><span class="cx"> void finishLoading(SharedBuffer*) override;
</span><span class="cx">
</span><span class="cx"> void allClientsRemoved() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> m_svgImageCache = std::make_unique<SVGImageCache>(&downcast<SVGImage>(*m_image));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedImage::didAddClient(CachedResourceClient* client)
</del><ins>+void CachedImage::didAddClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><span class="cx"> if (m_data && !m_image && !errorOccurred()) {
</span><span class="cx"> createImage();
</span><span class="lines">@@ -109,22 +109,21 @@
</span><span class="cx"> m_image->setData(m_data.copyRef(), true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(client->resourceClientType() == CachedImageClient::expectedType());
</del><ins>+ ASSERT(client.resourceClientType() == CachedImageClient::expectedType());
</ins><span class="cx"> if (m_image && !m_image->isNull())
</span><del>- static_cast<CachedImageClient*>(client)->imageChanged(this);
</del><ins>+ static_cast<CachedImageClient&>(client).imageChanged(this);
</ins><span class="cx">
</span><span class="cx"> CachedResource::didAddClient(client);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedImage::didRemoveClient(CachedResourceClient* client)
</del><ins>+void CachedImage::didRemoveClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><del>- ASSERT(client);
- ASSERT(client->resourceClientType() == CachedImageClient::expectedType());
</del><ins>+ ASSERT(client.resourceClientType() == CachedImageClient::expectedType());
</ins><span class="cx">
</span><del>- m_pendingContainerSizeRequests.remove(static_cast<CachedImageClient*>(client));
</del><ins>+ m_pendingContainerSizeRequests.remove(&static_cast<CachedImageClient&>(client));
</ins><span class="cx">
</span><span class="cx"> if (m_svgImageCache)
</span><del>- m_svgImageCache->removeClientFromCache(static_cast<CachedImageClient*>(client));
</del><ins>+ m_svgImageCache->removeClientFromCache(&static_cast<CachedImageClient&>(client));
</ins><span class="cx">
</span><span class="cx"> CachedResource::didRemoveClient(client);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -99,11 +99,11 @@
</span><span class="cx"> void notifyObservers(const IntRect* changeRect = nullptr);
</span><span class="cx"> void checkShouldPaintBrokenImage();
</span><span class="cx">
</span><del>- void switchClientsToRevalidatedResource() override;
- bool mayTryReplaceEncodedData() const override { return true; }
</del><ins>+ void switchClientsToRevalidatedResource() final;
+ bool mayTryReplaceEncodedData() const final { return true; }
</ins><span class="cx">
</span><del>- void didAddClient(CachedResourceClient*) override;
- void didRemoveClient(CachedResourceClient*) override;
</del><ins>+ void didAddClient(CachedResourceClient&) final;
+ void didRemoveClient(CachedResourceClient&) final;
</ins><span class="cx">
</span><span class="cx"> void allClientsRemoved() override;
</span><span class="cx"> void destroyDecodedData() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> c->dataReceived(this, data, length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedRawResource::didAddClient(CachedResourceClient* c)
</del><ins>+void CachedRawResource::didAddClient(CachedResourceClient& c)
</ins><span class="cx"> {
</span><span class="cx"> if (!hasClient(c))
</span><span class="cx"> return;
</span><span class="lines">@@ -126,12 +126,12 @@
</span><span class="cx"> // this resource to be evicted from the cache and all clients to be removed,
</span><span class="cx"> // so a protector is necessary.
</span><span class="cx"> CachedResourceHandle<CachedRawResource> protectedThis(this);
</span><del>- CachedRawResourceClient* client = static_cast<CachedRawResourceClient*>(c);
</del><ins>+ CachedRawResourceClient& client = static_cast<CachedRawResourceClient&>(c);
</ins><span class="cx"> size_t redirectCount = m_redirectChain.size();
</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></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -51,10 +51,10 @@
</span><span class="cx"> bool wasRedirected() const { return !m_redirectChain.isEmpty(); };
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void didAddClient(CachedResourceClient*) override;
- void addDataBuffer(SharedBuffer&) override;
- void addData(const char* data, unsigned length) override;
- void finishLoading(SharedBuffer*) override;
</del><ins>+ void didAddClient(CachedResourceClient&) final;
+ void addDataBuffer(SharedBuffer&) final;
+ void addData(const char* data, unsigned length) final;
+ void finishLoading(SharedBuffer*) final;
</ins><span class="cx">
</span><span class="cx"> bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
</span><span class="cx"> void allClientsRemoved() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -529,24 +529,24 @@
</span><span class="cx"> deleteIfPossible();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::addClient(CachedResourceClient* client)
</del><ins>+void CachedResource::addClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><span class="cx"> if (addClientToSet(client))
</span><span class="cx"> didAddClient(client);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::didAddClient(CachedResourceClient* client)
</del><ins>+void CachedResource::didAddClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><span class="cx"> if (m_decodedDataDeletionTimer.isActive())
</span><span class="cx"> m_decodedDataDeletionTimer.stop();
</span><span class="cx">
</span><del>- if (m_clientsAwaitingCallback.remove(client))
- m_clients.add(client);
</del><ins>+ if (m_clientsAwaitingCallback.remove(&client))
+ m_clients.add(&client);
</ins><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><del>-bool CachedResource::addClientToSet(CachedResourceClient* client)
</del><ins>+bool CachedResource::addClientToSet(CachedResourceClient& client)
</ins><span class="cx"> {
</span><span class="cx"> if (m_preloadResult == PreloadNotReferenced) {
</span><span class="cx"> if (isLoaded())
</span><span class="lines">@@ -564,25 +564,25 @@
</span><span class="cx"> // synchronously (e.g., scripts may not have set all the state they need to handle the load).
</span><span class="cx"> // Therefore, rather than immediately sending callbacks on a cache hit like other CachedResources,
</span><span class="cx"> // we schedule the callbacks and ensure we never finish synchronously.
</span><del>- ASSERT(!m_clientsAwaitingCallback.contains(client));
- m_clientsAwaitingCallback.add(client, std::make_unique<Callback>(*this, *client));
</del><ins>+ ASSERT(!m_clientsAwaitingCallback.contains(&client));
+ m_clientsAwaitingCallback.add(&client, std::make_unique<Callback>(*this, client));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_clients.add(client);
</del><ins>+ m_clients.add(&client);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::removeClient(CachedResourceClient* client)
</del><ins>+void CachedResource::removeClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><del>- auto callback = m_clientsAwaitingCallback.take(client);
</del><ins>+ auto callback = m_clientsAwaitingCallback.take(&client);
</ins><span class="cx"> if (callback) {
</span><del>- ASSERT(!m_clients.contains(client));
</del><ins>+ ASSERT(!m_clients.contains(&client));
</ins><span class="cx"> callback->cancel();
</span><span class="cx"> callback = nullptr;
</span><span class="cx"> } else {
</span><del>- ASSERT(m_clients.contains(client));
- m_clients.remove(client);
</del><ins>+ ASSERT(m_clients.contains(&client));
+ m_clients.remove(&client);
</ins><span class="cx"> didRemoveClient(client);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -775,11 +775,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& client : clientsToMove)
</span><del>- removeClient(client);
</del><ins>+ removeClient(*client);
</ins><span class="cx"> ASSERT(m_clients.isEmpty());
</span><span class="cx">
</span><span class="cx"> for (auto& client : clientsToMove)
</span><del>- m_resourceToRevalidate->addClientToSet(client);
</del><ins>+ m_resourceToRevalidate->addClientToSet(*client);
</ins><span class="cx"> for (auto& client : clientsToMove) {
</span><span class="cx"> // Calling didAddClient may do anything, including trying to cancel revalidation.
</span><span class="cx"> // Assert that it didn't succeed.
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> ASSERT(m_resourceToRevalidate);
</span><span class="cx"> // Calling didAddClient for a client may end up removing another client. In that case it won't be in the set anymore.
</span><span class="cx"> if (m_resourceToRevalidate->m_clients.contains(client))
</span><del>- m_resourceToRevalidate->didAddClient(client);
</del><ins>+ m_resourceToRevalidate->didAddClient(*client);
</ins><span class="cx"> }
</span><span class="cx"> m_switchingClientsToRevalidatedResource = false;
</span><span class="cx"> }
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx">
</span><span class="cx"> void CachedResource::Callback::timerFired()
</span><span class="cx"> {
</span><del>- m_resource.didAddClient(&m_client);
</del><ins>+ m_resource.didAddClient(m_client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(FOUNDATION) || USE(SOUP)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -124,10 +124,10 @@
</span><span class="cx"> ResourceLoadPriority loadPriority() const { return m_loadPriority; }
</span><span class="cx"> void setLoadPriority(const Optional<ResourceLoadPriority>&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void addClient(CachedResourceClient*);
- WEBCORE_EXPORT void removeClient(CachedResourceClient*);
</del><ins>+ WEBCORE_EXPORT void addClient(CachedResourceClient&);
+ WEBCORE_EXPORT void removeClient(CachedResourceClient&);
</ins><span class="cx"> bool hasClients() const { return !m_clients.isEmpty() || !m_clientsAwaitingCallback.isEmpty(); }
</span><del>- bool hasClient(CachedResourceClient* client) { return m_clients.contains(client) || m_clientsAwaitingCallback.contains(client); }
</del><ins>+ bool hasClient(CachedResourceClient& client) { return m_clients.contains(&client) || m_clientsAwaitingCallback.contains(&client); }
</ins><span class="cx"> bool deleteIfPossible();
</span><span class="cx">
</span><span class="cx"> enum PreloadResult {
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> };
</span><span class="cx"> PreloadResult preloadResult() const { return static_cast<PreloadResult>(m_preloadResult); }
</span><span class="cx">
</span><del>- virtual void didAddClient(CachedResourceClient*);
- virtual void didRemoveClient(CachedResourceClient*) { }
</del><ins>+ virtual void didAddClient(CachedResourceClient&);
+ virtual void didRemoveClient(CachedResourceClient&) { }
</ins><span class="cx"> virtual void allClientsRemoved() { }
</span><span class="cx"> void destroyDecodedDataIfNeeded();
</span><span class="cx">
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">
</span><span class="cx"> void finishRequestInitialization();
</span><span class="cx">
</span><del>- bool addClientToSet(CachedResourceClient*);
</del><ins>+ bool addClientToSet(CachedResourceClient&);
</ins><span class="cx">
</span><span class="cx"> void decodedDataDeletionTimerFired();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> CachedSVGDocumentReference::~CachedSVGDocumentReference()
</span><span class="cx"> {
</span><span class="cx"> if (m_document)
</span><del>- m_document->removeClient(this);
</del><ins>+ m_document->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedSVGDocumentReference::load(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><span class="cx"> m_document = loader.requestSVGDocument(WTFMove(request));
</span><span class="cx"> if (m_document)
</span><del>- m_document->addClient(this);
</del><ins>+ m_document->addClient(*this);
</ins><span class="cx">
</span><span class="cx"> m_loadRequested = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedXSLStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedXSLStyleSheet::didAddClient(CachedResourceClient* c)
</del><ins>+void CachedXSLStyleSheet::didAddClient(CachedResourceClient& client)
</ins><span class="cx"> {
</span><del>- ASSERT(c->resourceClientType() == CachedStyleSheetClient::expectedType());
</del><ins>+ ASSERT(client.resourceClientType() == CachedStyleSheetClient::expectedType());
</ins><span class="cx"> if (!isLoading())
</span><del>- static_cast<CachedStyleSheetClient*>(c)->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet);
</del><ins>+ static_cast<CachedStyleSheetClient&>(client).setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedXSLStyleSheet::setEncoding(const String& chs)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> pages from the web. It has a memory cache for these objects.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef CachedXSLStyleSheet_h
-#define CachedXSLStyleSheet_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx">
</span><span class="lines">@@ -42,13 +41,13 @@
</span><span class="cx"> const String& sheet() const { return m_sheet; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void checkNotify() override;
- bool mayTryReplaceEncodedData() const override { return true; }
- void didAddClient(CachedResourceClient*) override;
- void setEncoding(const String&) override;
- String encoding() const override;
- const TextResourceDecoder* textResourceDecoder() const override { return m_decoder.get(); }
- void finishLoading(SharedBuffer*) override;
</del><ins>+ void checkNotify() final;
+ bool mayTryReplaceEncodedData() const final { return true; }
+ void didAddClient(CachedResourceClient&) final;
+ void setEncoding(const String&) final;
+ String encoding() const final;
+ const TextResourceDecoder* textResourceDecoder() const final { return m_decoder.get(); }
+ void finishLoading(SharedBuffer*) final;
</ins><span class="cx">
</span><span class="cx"> String m_sheet;
</span><span class="cx"> RefPtr<TextResourceDecoder> m_decoder;
</span><span class="lines">@@ -59,5 +58,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_CACHED_RESOURCE(CachedXSLStyleSheet, CachedResource::XSLStyleSheet)
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(XSLT)
</span><del>-
-#endif // CachedXSLStyleSheet_h
</del></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> auto cachedImage = std::make_unique<CachedImage>(url, bitmapImage.get(), sessionID);
</span><span class="cx">
</span><del>- cachedImage->addClient(&dummyCachedImageClient());
</del><ins>+ cachedImage->addClient(dummyCachedImageClient());
</ins><span class="cx"> cachedImage->setDecodedSize(bitmapImage->decodedSize());
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> cachedImage->resourceRequest().setDomainForCachePartition(domainForCachePartition);
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> // dead resources are pruned. That might be immediately since
</span><span class="cx"> // removing the last client triggers a MemoryCache::prune, so the
</span><span class="cx"> // resource may be deleted after this call.
</span><del>- downcast<CachedImage>(*resource).removeClient(&dummyCachedImageClient());
</del><ins>+ downcast<CachedImage>(*resource).removeClient(dummyCachedImageClient());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryCache::pruneLiveResources(bool shouldDestroyDecodedDataForAllLiveResources)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> m_resource = m_frame.document()->cachedResourceLoader().requestRawResource(WTFMove(request));
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->addClient(this);
</del><ins>+ m_resource->addClient(*this);
</ins><span class="cx"> else
</span><span class="cx"> LOG_ERROR("Failed to start load for icon at url %s", m_frame.loader().icon().url().string().ascii().data());
</span><span class="cx"> }
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> void IconLoader::stopLoading()
</span><span class="cx"> {
</span><span class="cx"> if (m_resource) {
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> m_resource = nullptr;
</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 (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> CachedResourceLoader* loader = m_parent->player()->cachedResourceLoader();
</span><span class="cx"> m_resource = loader ? loader->requestRawResource(WTFMove(request)) : 0;
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->addClient(this);
</del><ins>+ m_resource->addClient(*this);
</ins><span class="cx"> else {
</span><span class="cx"> LOG_ERROR("Failed to start load for media at url %s", URL(CFURLRequestGetURL(urlRequest.get())).string().ascii().data());
</span><span class="cx"> RetainPtr<CFErrorRef> error = adoptCF(CFErrorCreate(kCFAllocatorDefault, kCFErrorDomainCFNetwork, kCFURLErrorUnknown, nullptr));
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> if (!m_resource)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> m_resource = 0;
</span><span class="cx">
</span><span class="cx"> if (m_parent)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcWebCoreAVFResourceLoadermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> m_resource = loader->requestMedia(WTFMove(request));
</span><span class="cx">
</span><span class="cx"> if (m_resource)
</span><del>- m_resource->addClient(this);
</del><ins>+ m_resource->addClient(*this);
</ins><span class="cx"> else {
</span><span class="cx"> LOG_ERROR("Failed to start load for media at url %s", [[[nsRequest URL] absoluteString] UTF8String]);
</span><span class="cx"> [m_avRequest.get() finishLoadingWithError:0];
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if (!m_resource)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_resource->removeClient(this);
</del><ins>+ m_resource->removeClient(*this);
</ins><span class="cx"> m_resource = 0;
</span><span class="cx">
</span><span class="cx"> if (m_parent && m_avRequest)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResource.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImageResource.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/rendering/RenderImageResource.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> ASSERT(m_renderer);
</span><span class="cx">
</span><span class="cx"> if (m_cachedImage)
</span><del>- m_cachedImage->removeClient(m_renderer);
</del><ins>+ m_cachedImage->removeClient(*m_renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderImageResource::setCachedImage(CachedImage* newImage)
</span><span class="lines">@@ -68,10 +68,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_cachedImage)
</span><del>- m_cachedImage->removeClient(m_renderer);
</del><ins>+ m_cachedImage->removeClient(*m_renderer);
</ins><span class="cx"> m_cachedImage = newImage;
</span><span class="cx"> if (m_cachedImage) {
</span><del>- m_cachedImage->addClient(m_renderer);
</del><ins>+ m_cachedImage->addClient(*m_renderer);
</ins><span class="cx"> if (m_cachedImage->errorOccurred())
</span><span class="cx"> m_renderer->imageChanged(m_cachedImage.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_layer.filterNeedsRepaint();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void RenderLayer::FilterInfo::updateReferenceFilterClients(const FilterOperations& operations)
</span><span class="cx"> {
</span><span class="cx"> removeReferenceFilterClients();
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> auto* documentReference = referenceOperation.cachedSVGDocumentReference();
</span><span class="cx"> if (auto* cachedSVGDocument = documentReference ? documentReference->document() : nullptr) {
</span><span class="cx"> // Reference is external; wait for notifyFinished().
</span><del>- cachedSVGDocument->addClient(this);
</del><ins>+ cachedSVGDocument->addClient(*this);
</ins><span class="cx"> m_externalSVGReferences.append(cachedSVGDocument);
</span><span class="cx"> } else {
</span><span class="cx"> // Reference is internal; add layer as a client so we can trigger filter repaint on SVG attribute change.
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> void RenderLayer::FilterInfo::removeReferenceFilterClients()
</span><span class="cx"> {
</span><span class="cx"> for (auto& resourceHandle : m_externalSVGReferences)
</span><del>- resourceHandle->removeClient(this);
</del><ins>+ resourceHandle->removeClient(*this);
</ins><span class="cx"> m_externalSVGReferences.clear();
</span><span class="cx">
</span><span class="cx"> for (auto& filter : m_internalSVGReferences) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -176,7 +176,8 @@
</span><span class="cx"> ASSERT(!m_isPending);
</span><span class="cx"> if (!m_cachedImage)
</span><span class="cx"> return;
</span><del>- m_cachedImage->addClient(renderer);
</del><ins>+ ASSERT(renderer);
+ m_cachedImage->addClient(*renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StyleCachedImage::removeClient(RenderElement* renderer)
</span><span class="lines">@@ -184,7 +185,8 @@
</span><span class="cx"> ASSERT(!m_isPending);
</span><span class="cx"> if (!m_cachedImage)
</span><span class="cx"> return;
</span><del>- m_cachedImage->removeClient(renderer);
</del><ins>+ ASSERT(renderer);
+ m_cachedImage->removeClient(*renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Image> StyleCachedImage::image(RenderElement* renderer, const FloatSize&) const
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> void SVGFEImageElement::clearResourceReferences()
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedImage) {
</span><del>- m_cachedImage->removeClient(this);
</del><ins>+ m_cachedImage->removeClient(*this);
</ins><span class="cx"> m_cachedImage = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> m_cachedImage = document().cachedResourceLoader().requestImage(WTFMove(request));
</span><span class="cx">
</span><span class="cx"> if (m_cachedImage)
</span><del>- m_cachedImage->addClient(this);
</del><ins>+ m_cachedImage->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGFEImageElement::buildPendingResource()
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontFaceUriElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> SVGFontFaceUriElement::~SVGFontFaceUriElement()
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedFont)
</span><del>- m_cachedFont->removeClient(this);
</del><ins>+ m_cachedFont->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<CSSFontFaceSrcValue> SVGFontFaceUriElement::srcValue() const
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> void SVGFontFaceUriElement::loadFont()
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedFont)
</span><del>- m_cachedFont->removeClient(this);
</del><ins>+ m_cachedFont->removeClient(*this);
</ins><span class="cx">
</span><span class="cx"> const AtomicString& href = getAttribute(XLinkNames::hrefAttr);
</span><span class="cx"> if (!href.isNull()) {
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> request.setInitiator(this);
</span><span class="cx"> m_cachedFont = cachedResourceLoader.requestFont(WTFMove(request), isSVGFontTarget(*this));
</span><span class="cx"> if (m_cachedFont) {
</span><del>- m_cachedFont->addClient(this);
</del><ins>+ m_cachedFont->addClient(*this);
</ins><span class="cx"> m_cachedFont->beginLoadIfNeeded(cachedResourceLoader);
</span><span class="cx"> }
</span><span class="cx"> } else
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> SVGUseElement::~SVGUseElement()
</span><span class="cx"> {
</span><span class="cx"> if (m_externalDocument)
</span><del>- m_externalDocument->removeClient(this);
</del><ins>+ m_externalDocument->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGUseElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_externalDocument)
</span><del>- m_externalDocument->removeClient(this);
</del><ins>+ m_externalDocument->removeClient(*this);
</ins><span class="cx">
</span><span class="cx"> if (externalDocumentURL.isNull())
</span><span class="cx"> m_externalDocument = nullptr;
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> request.setInitiator(this);
</span><span class="cx"> m_externalDocument = document().cachedResourceLoader().requestSVGDocument(WTFMove(request));
</span><span class="cx"> if (m_externalDocument)
</span><del>- m_externalDocument->addClient(this);
</del><ins>+ m_externalDocument->addClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> invalidateShadowTree();
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLImportRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLImportRule.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLImportRule.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/xml/XSLImportRule.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_styleSheet)
</span><span class="cx"> m_styleSheet->setParentStyleSheet(nullptr);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->removeClient(this);
</del><ins>+ m_cachedSheet->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XSLImportRule::setXSLStyleSheet(const String& href, const URL& baseURL, const String& sheet)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> m_styleSheet->parseString(sheet);
</span><span class="cx"> m_loading = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (parent)
</span><span class="cx"> parent->checkLoaded();
</span><span class="cx"> }
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> if (rootSheet)
</span><span class="cx"> cachedResourceLoader = rootSheet->cachedResourceLoader();
</span><del>-
</del><ins>+
</ins><span class="cx"> String absHref = m_strHref;
</span><span class="cx"> XSLStyleSheet* parentSheet = parentStyleSheet();
</span><span class="cx"> if (!parentSheet->baseURL().isNull())
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><del>- m_cachedSheet->removeClient(this);
</del><ins>+ m_cachedSheet->removeClient(*this);
</ins><span class="cx">
</span><span class="cx"> auto options = CachedResourceLoader::defaultCachedResourceOptions();
</span><span class="cx"> options.mode = FetchOptions::Mode::SameOrigin;
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> m_cachedSheet = cachedResourceLoader->requestXSLStyleSheet({ResourceRequest(cachedResourceLoader->document()->completeURL(absHref)), options});
</span><span class="cx">
</span><span class="cx"> if (m_cachedSheet) {
</span><del>- m_cachedSheet->addClient(this);
</del><ins>+ m_cachedSheet->addClient(*this);
</ins><span class="cx">
</span><span class="cx"> // If the imported sheet is in the cache, then setXSLStyleSheet gets called,
</span><span class="cx"> // and the sheet even gets parsed (via parseString). In this case we have
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> bool errorOccurred = m_pendingScript->errorOccurred();
</span><span class="cx"> bool wasCanceled = m_pendingScript->wasCanceled();
</span><span class="cx">
</span><del>- m_pendingScript->removeClient(this);
</del><ins>+ m_pendingScript->removeClient(*this);
</ins><span class="cx"> m_pendingScript = nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<Element> e = m_scriptElement;
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: m_pendingScript handling should be moved into XMLDocumentParser.cpp!
</span><span class="cx"> if (m_pendingScript)
</span><del>- m_pendingScript->removeClient(this);
</del><ins>+ m_pendingScript->removeClient(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLDocumentParser::doWrite(const String& parseString)
</span><span class="lines">@@ -927,7 +927,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=161651
</span><span class="cx"> m_pendingScript = &downcast<LoadableClassicScript>(*scriptElement->loadableScript()).cachedScript();
</span><span class="cx"> m_scriptElement = &element;
</span><del>- m_pendingScript->addClient(this);
</del><ins>+ m_pendingScript->addClient(*this);
</ins><span class="cx">
</span><span class="cx"> // m_pendingScript will be 0 if script was already loaded and addClient() executed it.
</span><span class="cx"> if (m_pendingScript)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-06 Youenn Fablet <youenn@apple.com>
+
+ CachedResource client handling methods should take reference
+ https://bugs.webkit.org/show_bug.cgi?id=163014
+
+ Reviewed by Alex Christensen.
+
+ * WebView/WebHTMLView.mm:
+ (promisedDataClient):
+
</ins><span class="cx"> 2016-10-05 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Put variation fonts work behind a compile-time flag
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (206866 => 206867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-10-06 16:38:48 UTC (rev 206866)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-10-06 16:53:58 UTC (rev 206867)
</span><span class="lines">@@ -789,10 +789,10 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // We need this to be able to safely reference the CachedImage for the promised drag data
</span><del>-static CachedImageClient* promisedDataClient()
</del><ins>+static CachedImageClient& promisedDataClient()
</ins><span class="cx"> {
</span><span class="cx"> static CachedImageClient* staticCachedResourceClient = new CachedImageClient;
</span><del>- return staticCachedResourceClient;
</del><ins>+ return *staticCachedResourceClient;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>