<!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>[179242] 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/179242">179242</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 21:53:53 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a Ref<CachedResourceLoader> in Document instead of a RefPtr
https://bugs.webkit.org/show_bug.cgi?id=140971
Reviewed by Andreas Kling.
Source/WebCore:
Use a Ref<CachedResourceLoader> in Document instead of a RefPtr as it
can never be null. Also have Document::cachedResourceLoader() return a
reference instead of a pointer. This gets rid of a lot of unnecessary
null-checks.
Source/WebKit/win:
Use more references instead of pointers.
* WebDataSource.cpp:
(WebDataSource::subresourceForURL):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSCanvasValueh">trunk/Source/WebCore/css/CSSCanvasValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSCrossfadeValuecpp">trunk/Source/WebCore/css/CSSCrossfadeValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCrossfadeValueh">trunk/Source/WebCore/css/CSSCrossfadeValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSCursorImageValuecpp">trunk/Source/WebCore/css/CSSCursorImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCursorImageValueh">trunk/Source/WebCore/css/CSSCursorImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValueh">trunk/Source/WebCore/css/CSSFilterImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSrcValuecpp">trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGradientValueh">trunk/Source/WebCore/css/CSSGradientValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValuecpp">trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValueh">trunk/Source/WebCore/css/CSSImageGeneratorValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValuecpp">trunk/Source/WebCore/css/CSSImageSetValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValueh">trunk/Source/WebCore/css/CSSImageSetValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValuecpp">trunk/Source/WebCore/css/CSSImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValueh">trunk/Source/WebCore/css/CSSImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleImportcpp">trunk/Source/WebCore/css/StyleRuleImport.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomProcessingInstructioncpp">trunk/Source/WebCore/dom/ProcessingInstruction.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLResourcePreloadercpp">trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.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="#trunkSourceWebCoreloaderMediaResourceLoadercpp">trunk/Source/WebCore/loader/MediaResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoaderh">trunk/Source/WebCore/loader/SubresourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</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="#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="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp">trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentReferenceh">trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconLoadercpp">trunk/Source/WebCore/loader/icon/IconLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp">trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.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="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp">trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTProcessorLibxsltcpp">trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserh">trunk/Source/WebCore/xml/parser/XMLDocumentParser.h</a></li>
<li><a href="#trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp">trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebDataSourcecpp">trunk/Source/WebKit/win/WebDataSource.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-27 Chris Dumez <cdumez@apple.com>
+
+ Use a Ref<CachedResourceLoader> in Document instead of a RefPtr
+ https://bugs.webkit.org/show_bug.cgi?id=140971
+
+ Reviewed by Andreas Kling.
+
+ Use a Ref<CachedResourceLoader> in Document instead of a RefPtr as it
+ can never be null. Also have Document::cachedResourceLoader() return a
+ reference instead of a pointer. This gets rid of a lot of unnecessary
+ null-checks.
+
</ins><span class="cx"> 2015-01-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> More build fixes for newer clang.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCanvasValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCanvasValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCanvasValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSCanvasValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> FloatSize fixedSize(const RenderElement*);
</span><span class="cx">
</span><span class="cx"> bool isPending() const { return false; }
</span><del>- void loadSubimages(CachedResourceLoader*) { }
</del><ins>+ void loadSubimages(CachedResourceLoader&) { }
</ins><span class="cx">
</span><span class="cx"> bool equals(const CSSCanvasValue&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCrossfadeValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCrossfadeValue.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSCrossfadeValue.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> float percentage = m_percentageValue->getFloatValue();
</span><span class="cx"> float inversePercentage = 1 - percentage;
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader();
</del><ins>+ CachedResourceLoader& cachedResourceLoader = renderer->document().cachedResourceLoader();
</ins><span class="cx"> CachedImage* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), cachedResourceLoader);
</span><span class="cx"> CachedImage* cachedToImage = cachedImageForCSSValue(m_toValue.get(), cachedResourceLoader);
</span><span class="cx">
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> return subimageKnownToBeOpaque(*m_fromValue, renderer) && subimageKnownToBeOpaque(*m_toValue, renderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSCrossfadeValue::loadSubimages(CachedResourceLoader* cachedResourceLoader)
</del><ins>+void CSSCrossfadeValue::loadSubimages(CachedResourceLoader& cachedResourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> CachedResourceHandle<CachedImage> oldCachedFromImage = m_cachedFromImage;
</span><span class="cx"> CachedResourceHandle<CachedImage> oldCachedToImage = m_cachedToImage;
</span><span class="lines">@@ -142,9 +142,9 @@
</span><span class="cx"> PassRefPtr<Image> CSSCrossfadeValue::image(RenderElement* renderer, const FloatSize& size)
</span><span class="cx"> {
</span><span class="cx"> if (size.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader();
</del><ins>+ CachedResourceLoader& cachedResourceLoader = renderer->document().cachedResourceLoader();
</ins><span class="cx"> CachedImage* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), cachedResourceLoader);
</span><span class="cx"> CachedImage* cachedToImage = cachedImageForCSSValue(m_toValue.get(), cachedResourceLoader);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCrossfadeValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCrossfadeValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCrossfadeValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSCrossfadeValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> bool isPending() const;
</span><span class="cx"> bool knownToBeOpaque(const RenderElement*) const;
</span><span class="cx">
</span><del>- void loadSubimages(CachedResourceLoader*);
</del><ins>+ void loadSubimages(CachedResourceLoader&);
</ins><span class="cx">
</span><span class="cx"> void setPercentage(PassRefPtr<CSSPrimitiveValue> percentageValue) { m_percentageValue = percentageValue; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCursorImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCursorImageValue.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleImage* CSSCursorImageValue::cachedImage(CachedResourceLoader* loader)
</del><ins>+StyleImage* CSSCursorImageValue::cachedImage(CachedResourceLoader& loader)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><span class="cx"> if (is<CSSImageSetValue>(m_imageValue.get()))
</span><span class="lines">@@ -143,9 +143,9 @@
</span><span class="cx"> // For SVG images we need to lazily substitute in the correct URL. Rather than attempt
</span><span class="cx"> // to change the URL of the CSSImageValue (which would then change behavior like cssText),
</span><span class="cx"> // we create an alternate CSSImageValue to use.
</span><del>- if (isSVGCursor() && loader && loader->document()) {
</del><ins>+ if (isSVGCursor() && loader.document()) {
</ins><span class="cx"> // FIXME: This will fail if the <cursor> element is in a shadow DOM (bug 59827)
</span><del>- if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(downcast<CSSImageValue>(m_imageValue.get()).url(), *loader->document())) {
</del><ins>+ if (SVGCursorElement* cursorElement = resourceReferencedByCursorElement(downcast<CSSImageValue>(m_imageValue.get()).url(), *loader.document())) {
</ins><span class="cx"> detachPendingImage();
</span><span class="cx"> Ref<CSSImageValue> svgImageValue(CSSImageValue::create(cursorElement->href()));
</span><span class="cx"> StyleCachedImage* cachedImage = svgImageValue->cachedImage(loader);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCursorImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCursorImageValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCursorImageValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSCursorImageValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><span class="cx"> bool updateIfSVGCursorIsUsed(Element*);
</span><del>- StyleImage* cachedImage(CachedResourceLoader*);
</del><ins>+ StyleImage* cachedImage(CachedResourceLoader&);
</ins><span class="cx"> StyleImage* cachedOrPendingImage(Document&);
</span><span class="cx">
</span><span class="cx"> void removeReferencedElement(SVGElement*);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> FloatSize CSSFilterImageValue::fixedSize(const RenderElement* renderer)
</span><span class="cx"> {
</span><del>- CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader();
</del><ins>+ CachedResourceLoader& cachedResourceLoader = renderer->document().cachedResourceLoader();
</ins><span class="cx"> CachedImage* cachedImage = cachedImageForCSSValue(m_imageValue.get(), cachedResourceLoader);
</span><span class="cx">
</span><span class="cx"> if (!cachedImage)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSFilterImageValue::loadSubimages(CachedResourceLoader* cachedResourceLoader)
</del><ins>+void CSSFilterImageValue::loadSubimages(CachedResourceLoader& cachedResourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> CachedResourceHandle<CachedImage> oldCachedImage = m_cachedImage;
</span><span class="cx">
</span><span class="lines">@@ -98,9 +98,9 @@
</span><span class="cx"> PassRefPtr<Image> CSSFilterImageValue::image(RenderElement* renderer, const FloatSize& size)
</span><span class="cx"> {
</span><span class="cx"> if (size.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader();
</del><ins>+ CachedResourceLoader& cachedResourceLoader = renderer->document().cachedResourceLoader();
</ins><span class="cx"> CachedImage* cachedImage = cachedImageForCSSValue(m_imageValue.get(), cachedResourceLoader);
</span><span class="cx">
</span><span class="cx"> if (!cachedImage)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> bool isPending() const;
</span><span class="cx"> bool knownToBeOpaque(const RenderElement*) const;
</span><span class="cx">
</span><del>- void loadSubimages(CachedResourceLoader*);
</del><ins>+ void loadSubimages(CachedResourceLoader&);
</ins><span class="cx">
</span><span class="cx"> bool hasFailedOrCanceledSubresources() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSrcValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> if (!m_cachedFont) {
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document->completeURL(m_resource)));
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><del>- m_cachedFont = document->cachedResourceLoader()->requestFont(request, isSVG);
</del><ins>+ m_cachedFont = document->cachedResourceLoader().requestFont(request, isSVG);
</ins><span class="cx"> }
</span><span class="cx"> return m_cachedFont.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -540,15 +540,14 @@
</span><span class="cx">
</span><span class="cx"> m_beginLoadingTimer.stop();
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = m_document->cachedResourceLoader();
- for (size_t i = 0; i < m_fontsToBeginLoading.size(); ++i) {
</del><ins>+ CachedResourceLoader& cachedResourceLoader = m_document->cachedResourceLoader();
+ for (auto& fontHandle : m_fontsToBeginLoading) {
</ins><span class="cx"> // Balances incrementRequestCount() in beginLoadingFontSoon().
</span><del>- cachedResourceLoader->decrementRequestCount(m_fontsToBeginLoading[i].get());
</del><ins>+ cachedResourceLoader.decrementRequestCount(fontHandle.get());
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> m_fontsToBeginLoading.clear();
</span><span class="cx">
</span><del>- m_document = 0;
</del><ins>+ m_document = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSFontSelector::beginLoadingFontSoon(CachedFont* font)
</span><span class="lines">@@ -560,7 +559,7 @@
</span><span class="cx"> // Increment the request count now, in order to prevent didFinishLoad from being dispatched
</span><span class="cx"> // after this font has been requested but before it began loading. Balanced by
</span><span class="cx"> // decrementRequestCount() in beginLoadTimerFired() and in clearDocument().
</span><del>- m_document->cachedResourceLoader()->incrementRequestCount(font);
</del><ins>+ m_document->cachedResourceLoader().incrementRequestCount(font);
</ins><span class="cx"> m_beginLoadingTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -572,14 +571,14 @@
</span><span class="cx"> // CSSFontSelector could get deleted via beginLoadIfNeeded() or loadDone() unless protected.
</span><span class="cx"> Ref<CSSFontSelector> protect(*this);
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = m_document->cachedResourceLoader();
- for (size_t i = 0; i < fontsToBeginLoading.size(); ++i) {
- fontsToBeginLoading[i]->beginLoadIfNeeded(cachedResourceLoader);
</del><ins>+ CachedResourceLoader& cachedResourceLoader = m_document->cachedResourceLoader();
+ for (auto& fontHandle : fontsToBeginLoading) {
+ fontHandle->beginLoadIfNeeded(cachedResourceLoader);
</ins><span class="cx"> // Balances incrementRequestCount() in beginLoadingFontSoon().
</span><del>- cachedResourceLoader->decrementRequestCount(fontsToBeginLoading[i].get());
</del><ins>+ cachedResourceLoader.decrementRequestCount(fontHandle.get());
</ins><span class="cx"> }
</span><span class="cx"> // Ensure that if the request count reaches zero, the frame loader will know about it.
</span><del>- cachedResourceLoader->loadDone(0);
</del><ins>+ cachedResourceLoader.loadDone(nullptr);
</ins><span class="cx"> // New font loads may be triggered by layout after the document load is complete but before we have dispatched
</span><span class="cx"> // didFinishLoading for the frame. Make sure the delegate is always dispatched by checking explicitly.
</span><span class="cx"> if (m_document && m_document->frame())
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGradientValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGradientValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGradientValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSGradientValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> bool isPending() const { return false; }
</span><span class="cx"> bool knownToBeOpaque(const RenderElement*) const;
</span><span class="cx">
</span><del>- void loadSubimages(CachedResourceLoader*) { }
</del><ins>+ void loadSubimages(CachedResourceLoader&) { }
</ins><span class="cx"> PassRefPtr<CSSGradientValue> gradientWithStylesResolved(StyleResolver*);
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSImageGeneratorValue::loadSubimages(CachedResourceLoader* cachedResourceLoader)
</del><ins>+void CSSImageGeneratorValue::loadSubimages(CachedResourceLoader& cachedResourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> switch (classType()) {
</span><span class="cx"> case CrossfadeClass:
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CachedImage* CSSImageGeneratorValue::cachedImageForCSSValue(CSSValue* value, CachedResourceLoader* cachedResourceLoader)
</del><ins>+CachedImage* CSSImageGeneratorValue::cachedImageForCSSValue(CSSValue* value, CachedResourceLoader& cachedResourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> bool isPending() const;
</span><span class="cx"> bool knownToBeOpaque(const RenderElement*) const;
</span><span class="cx">
</span><del>- void loadSubimages(CachedResourceLoader*);
</del><ins>+ void loadSubimages(CachedResourceLoader&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> CSSImageGeneratorValue(ClassType);
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> const HashCountedSet<RenderElement*>& clients() const { return m_clients; }
</span><span class="cx">
</span><span class="cx"> // Helper functions for Crossfade and Filter.
</span><del>- static CachedImage* cachedImageForCSSValue(CSSValue*, CachedResourceLoader*);
</del><ins>+ static CachedImage* cachedImageForCSSValue(CSSValue*, CachedResourceLoader&);
</ins><span class="cx"> static bool subimageIsPending(CSSValue*);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -100,11 +100,9 @@
</span><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader, const ResourceLoaderOptions& options)
</del><ins>+StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- ASSERT(loader);
-
- Document* document = loader->document();
</del><ins>+ Document* document = loader.document();
</ins><span class="cx"> if (Page* page = document->page())
</span><span class="cx"> m_scaleFactor = page->deviceScaleFactor();
</span><span class="cx"> else
</span><span class="lines">@@ -122,7 +120,7 @@
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><span class="cx"> if (options.requestOriginPolicy() == PotentiallyCrossOriginEnabled)
</span><span class="cx"> updateRequestForAccessControl(request.mutableResourceRequest(), document->securityOrigin(), options.allowCredentials());
</span><del>- if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
</del><ins>+ if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
</ins><span class="cx"> detachPendingImage();
</span><span class="cx"> m_imageSet = StyleCachedImageSet::create(cachedImage.get(), image.scaleFactor, this);
</span><span class="cx"> m_accessedBestFitImage = true;
</span><span class="lines">@@ -132,7 +130,7 @@
</span><span class="cx"> return is<StyleCachedImageSet>(m_imageSet.get()) ? downcast<StyleCachedImageSet>(m_imageSet.get()) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader)
</del><ins>+StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader& loader)
</ins><span class="cx"> {
</span><span class="cx"> return cachedImageSet(loader, CachedResourceLoader::defaultCachedResourceOptions());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSImageSetValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> }
</span><span class="cx"> ~CSSImageSetValue();
</span><span class="cx">
</span><del>- StyleCachedImageSet* cachedImageSet(CachedResourceLoader*, const ResourceLoaderOptions&);
- StyleCachedImageSet* cachedImageSet(CachedResourceLoader*);
</del><ins>+ StyleCachedImageSet* cachedImageSet(CachedResourceLoader&, const ResourceLoaderOptions&);
+ StyleCachedImageSet* cachedImageSet(CachedResourceLoader&);
</ins><span class="cx">
</span><span class="cx"> // Returns a StyleCachedImageSet if the best fit image has been cached already, otherwise a StylePendingImage.
</span><span class="cx"> StyleImage* cachedOrPendingImageSet(Document&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -71,23 +71,21 @@
</span><span class="cx"> return m_image.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader, const ResourceLoaderOptions& options)
</del><ins>+StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- ASSERT(loader);
-
</del><span class="cx"> if (!m_accessedImage) {
</span><span class="cx"> m_accessedImage = true;
</span><span class="cx">
</span><del>- CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url)), options);
</del><ins>+ CachedResourceRequest request(ResourceRequest(loader.document()->completeURL(m_url)), options);
</ins><span class="cx"> if (m_initiatorName.isEmpty())
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><span class="cx"> else
</span><span class="cx"> request.setInitiator(m_initiatorName);
</span><span class="cx">
</span><span class="cx"> if (options.requestOriginPolicy() == PotentiallyCrossOriginEnabled)
</span><del>- updateRequestForAccessControl(request.mutableResourceRequest(), loader->document()->securityOrigin(), options.allowCredentials());
</del><ins>+ updateRequestForAccessControl(request.mutableResourceRequest(), loader.document()->securityOrigin(), options.allowCredentials());
</ins><span class="cx">
</span><del>- if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
</del><ins>+ if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
</ins><span class="cx"> detachPendingImage();
</span><span class="cx"> m_image = StyleCachedImage::create(cachedImage.get());
</span><span class="cx"> }
</span><span class="lines">@@ -96,7 +94,7 @@
</span><span class="cx"> return is<StyleCachedImage>(m_image.get()) ? downcast<StyleCachedImage>(m_image.get()) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader)
</del><ins>+StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader& loader)
</ins><span class="cx"> {
</span><span class="cx"> return cachedImage(loader, CachedResourceLoader::defaultCachedResourceOptions());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/CSSImageValue.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> static Ref<CSSImageValue> create(const String& url, StyleImage* image) { return adoptRef(*new CSSImageValue(url, image)); }
</span><span class="cx"> ~CSSImageValue();
</span><span class="cx">
</span><del>- StyleCachedImage* cachedImage(CachedResourceLoader*, const ResourceLoaderOptions&);
- StyleCachedImage* cachedImage(CachedResourceLoader*);
</del><ins>+ StyleCachedImage* cachedImage(CachedResourceLoader&, const ResourceLoaderOptions&);
+ StyleCachedImage* cachedImage(CachedResourceLoader&);
</ins><span class="cx"> // Returns a StyleCachedImage if the image is cached already, otherwise a StylePendingImage.
</span><span class="cx"> StyleImage* cachedOrPendingImage();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -1059,7 +1059,7 @@
</span><span class="cx"> URL url = styleResolver.document().completeURL(cssUrl);
</span><span class="cx">
</span><span class="cx"> bool isExternalDocument = SVGURIReference::isExternalURIReference(cssUrl, styleResolver.document());
</span><del>- newMaskImage = MaskImageOperation::create(maskImageValue, cssUrl, url.fragmentIdentifier(), isExternalDocument, styleResolver.document().cachedResourceLoader());
</del><ins>+ newMaskImage = MaskImageOperation::create(maskImageValue, cssUrl, url.fragmentIdentifier(), isExternalDocument, &styleResolver.document().cachedResourceLoader());
</ins><span class="cx"> if (isExternalDocument)
</span><span class="cx"> styleResolver.state().maskImagesWithPendingSVGDocuments().append(newMaskImage);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -2229,7 +2229,7 @@
</span><span class="cx"> if (!hasFilters && !hasMasks)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = state.document().cachedResourceLoader();
</del><ins>+ CachedResourceLoader& cachedResourceLoader = state.document().cachedResourceLoader();
</ins><span class="cx">
</span><span class="cx"> if (hasFilters) {
</span><span class="cx"> for (auto& filterOperation : state.filtersWithPendingSVGDocuments())
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleImportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRuleImport.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRuleImport.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/css/StyleRuleImport.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -96,10 +96,6 @@
</span><span class="cx"> if (!document)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = document->cachedResourceLoader();
- if (!cachedResourceLoader)
- return;
-
</del><span class="cx"> URL absURL;
</span><span class="cx"> if (!m_parentStyleSheet->baseURL().isNull())
</span><span class="cx"> // use parent styleheet's URL as the base URL
</span><span class="lines">@@ -122,9 +118,9 @@
</span><span class="cx"> if (m_cachedSheet)
</span><span class="cx"> m_cachedSheet->removeClient(&m_styleSheetClient);
</span><span class="cx"> if (m_parentStyleSheet->isUserStyleSheet())
</span><del>- m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(request);
</del><ins>+ m_cachedSheet = document->cachedResourceLoader().requestUserCSSStyleSheet(request);
</ins><span class="cx"> else
</span><del>- m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(request);
</del><ins>+ m_cachedSheet = document->cachedResourceLoader().requestCSSStyleSheet(request);
</ins><span class="cx"> if (m_cachedSheet) {
</span><span class="cx"> // if the import rule is issued dynamically, the sheet may be
</span><span class="cx"> // removed from the pending sheet count, so let the doc know
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -415,6 +415,7 @@
</span><span class="cx"> , m_ignorePendingStylesheets(false)
</span><span class="cx"> , m_pendingSheetLayout(NoLayoutWithPendingSheets)
</span><span class="cx"> , m_frame(frame)
</span><ins>+ , m_cachedResourceLoader(m_frame ? Ref<CachedResourceLoader>(m_frame->loader().activeDocumentLoader()->cachedResourceLoader()) : CachedResourceLoader::create(nullptr))
</ins><span class="cx"> , m_activeParserCount(0)
</span><span class="cx"> , m_wellFormed(false)
</span><span class="cx"> , m_printing(false)
</span><span class="lines">@@ -528,10 +529,6 @@
</span><span class="cx"> if ((frame && frame->ownerElement()) || !url.isEmpty())
</span><span class="cx"> setURL(url);
</span><span class="cx">
</span><del>- if (m_frame)
- m_cachedResourceLoader = &m_frame->loader().activeDocumentLoader()->cachedResourceLoader();
- if (!m_cachedResourceLoader)
- m_cachedResourceLoader = CachedResourceLoader::create(nullptr);
</del><span class="cx"> m_cachedResourceLoader->setDocument(this);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="lines">@@ -625,7 +622,6 @@
</span><span class="cx"> // load the initial empty document and the SVGDocument with the same DocumentLoader).
</span><span class="cx"> if (m_cachedResourceLoader->document() == this)
</span><span class="cx"> m_cachedResourceLoader->setDocument(nullptr);
</span><del>- m_cachedResourceLoader.clear();
</del><span class="cx">
</span><span class="cx"> // We must call clearRareData() here since a Document class inherits TreeScope
</span><span class="cx"> // as well as Node. See a comment on TreeScope.h for the reason.
</span><span class="lines">@@ -3816,8 +3812,7 @@
</span><span class="cx"> return;
</span><span class="cx"> m_domWindow->dispatchLoadEvent();
</span><span class="cx"> m_loadEventFinished = true;
</span><del>- if (m_cachedResourceLoader)
- m_cachedResourceLoader->documentDidFinishLoadEvent();
</del><ins>+ m_cachedResourceLoader->documentDidFinishLoadEvent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::enqueueWindowEvent(PassRefPtr<Event> event)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/dom/Document.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> // auto is specified.
</span><span class="cx"> WEBCORE_EXPORT void pageSizeAndMarginsInPixels(int pageIndex, IntSize& pageSize, int& marginTop, int& marginRight, int& marginBottom, int& marginLeft);
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader() { return m_cachedResourceLoader.get(); }
</del><ins>+ CachedResourceLoader& cachedResourceLoader() { return m_cachedResourceLoader; }
</ins><span class="cx">
</span><span class="cx"> void didBecomeCurrentDocumentInFrame();
</span><span class="cx"> void destroyRenderTree();
</span><span class="lines">@@ -1395,7 +1395,7 @@
</span><span class="cx"> Frame* m_frame;
</span><span class="cx"> RefPtr<DOMWindow> m_domWindow;
</span><span class="cx">
</span><del>- RefPtr<CachedResourceLoader> m_cachedResourceLoader;
</del><ins>+ Ref<CachedResourceLoader> m_cachedResourceLoader;
</ins><span class="cx"> RefPtr<DocumentParser> m_parser;
</span><span class="cx"> unsigned m_activeParserCount;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomProcessingInstructioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ProcessingInstruction.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/dom/ProcessingInstruction.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href)));
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> if (m_isXSL)
</span><del>- m_cachedSheet = document().cachedResourceLoader()->requestXSLStyleSheet(request);
</del><ins>+ m_cachedSheet = document().cachedResourceLoader().requestXSLStyleSheet(request);
</ins><span class="cx"> else
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> charset = document().charset();
</span><span class="cx"> request.setCharset(charset);
</span><span class="cx">
</span><del>- m_cachedSheet = document().cachedResourceLoader()->requestCSSStyleSheet(request);
</del><ins>+ m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(request);
</ins><span class="cx"> }
</span><span class="cx"> if (m_cachedSheet)
</span><span class="cx"> m_cachedSheet->addClient(this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> request.setCharset(scriptCharset());
</span><span class="cx"> request.setInitiator(&element());
</span><span class="cx">
</span><del>- m_cachedScript = m_element.document().cachedResourceLoader()->requestScript(request);
</del><ins>+ m_cachedScript = m_element.document().cachedResourceLoader().requestScript(request);
</ins><span class="cx"> m_isExternalScript = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/editing/Editor.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -1281,8 +1281,7 @@
</span><span class="cx"> if (!canPaste())
</span><span class="cx"> return;
</span><span class="cx"> updateMarkersForWordsAffectedByEditing(false);
</span><del>- CachedResourceLoader* loader = document().cachedResourceLoader();
- ResourceCacheValidationSuppressor validationSuppressor(loader);
</del><ins>+ ResourceCacheValidationSuppressor validationSuppressor(document().cachedResourceLoader());
</ins><span class="cx"> if (m_frame.selection().selection().isContentRichlyEditable())
</span><span class="cx"> pasteWithPasteboard(&pasteboard, true);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> ResourceLoadPriority priority = isActive ? ResourceLoadPriorityUnresolved : ResourceLoadPriorityVeryLow;
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(url)), charset, priority);
</span><span class="cx"> request.setInitiator(this);
</span><del>- m_cachedSheet = document().cachedResourceLoader()->requestCSSStyleSheet(request);
</del><ins>+ m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(request);
</ins><span class="cx">
</span><span class="cx"> if (m_cachedSheet)
</span><span class="cx"> m_cachedSheet->addClient(this);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -5721,7 +5721,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceLoader* HTMLMediaElement::mediaPlayerCachedResourceLoader()
</span><span class="cx"> {
</span><del>- return document().cachedResourceLoader();
</del><ins>+ return &document().cachedResourceLoader();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformMediaResourceLoader> HTMLMediaElement::mediaPlayerCreateResourceLoader(std::unique_ptr<PlatformMediaResourceLoaderClient> client)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLResourcePreloadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CachedResourceRequest request = preload->resourceRequest(m_document);
</span><del>- m_document.cachedResourceLoader()->preload(preload->resourceType(), request, preload->charset());
</del><ins>+ m_document.cachedResourceLoader().preload(preload->resourceType(), request, preload->charset());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResource* InspectorPageAgent::cachedResource(Frame* frame, const URL& url)
</span><span class="cx"> {
</span><del>- CachedResource* cachedResource = frame->document()->cachedResourceLoader()->cachedResource(url);
</del><ins>+ CachedResource* cachedResource = frame->document()->cachedResourceLoader().cachedResource(url);
</ins><span class="cx"> if (!cachedResource) {
</span><span class="cx"> ResourceRequest request(url);
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<CachedResource*> result;
</span><span class="cx">
</span><del>- for (auto& cachedResourceHandle : frame->document()->cachedResourceLoader()->allCachedResources().values()) {
</del><ins>+ for (auto& cachedResourceHandle : frame->document()->cachedResourceLoader().allCachedResources().values()) {
</ins><span class="cx"> auto* cachedResource = cachedResourceHandle.get();
</span><span class="cx"> if (cachedResource->resourceRequest().hiddenFromInspector())
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> newRequest.setInitiator(m_options.initiator);
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT(!m_resource);
</span><del>- m_resource = m_document.cachedResourceLoader()->requestRawResource(newRequest);
</del><ins>+ m_resource = m_document.cachedResourceLoader().requestRawResource(newRequest);
</ins><span class="cx"> if (m_resource) {
</span><span class="cx"> if (m_resource->loader()) {
</span><span class="cx"> unsigned long identifier = m_resource->loader()->identifier();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -713,8 +713,8 @@
</span><span class="cx"> m_frame.document()->initContentSecurityPolicy();
</span><span class="cx">
</span><span class="cx"> const Settings& settings = m_frame.settings();
</span><del>- m_frame.document()->cachedResourceLoader()->setImagesEnabled(settings.areImagesEnabled());
- m_frame.document()->cachedResourceLoader()->setAutoLoadImages(settings.loadsImagesAutomatically());
</del><ins>+ m_frame.document()->cachedResourceLoader().setImagesEnabled(settings.areImagesEnabled());
+ m_frame.document()->cachedResourceLoader().setAutoLoadImages(settings.loadsImagesAutomatically());
</ins><span class="cx">
</span><span class="cx"> if (m_documentLoader) {
</span><span class="cx"> String dnsPrefetchControl = m_documentLoader->response().httpHeaderField(HTTPHeaderName::XDNSPrefetchControl);
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Still waiting for images/scripts?
</span><del>- if (m_frame.document()->cachedResourceLoader()->requestCount())
</del><ins>+ if (m_frame.document()->cachedResourceLoader().requestCount())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Still waiting for elements that don't go through a FrameLoader?
</span><span class="lines">@@ -2447,11 +2447,11 @@
</span><span class="cx"> int FrameLoader::numPendingOrLoadingRequests(bool recurse) const
</span><span class="cx"> {
</span><span class="cx"> if (!recurse)
</span><del>- return m_frame.document()->cachedResourceLoader()->requestCount();
</del><ins>+ return m_frame.document()->cachedResourceLoader().requestCount();
</ins><span class="cx">
</span><span class="cx"> int count = 0;
</span><span class="cx"> for (Frame* frame = &m_frame; frame; frame = frame->tree().traverseNext(&m_frame))
</span><del>- count += frame->document()->cachedResourceLoader()->requestCount();
</del><ins>+ count += frame->document()->cachedResourceLoader().requestCount();
</ins><span class="cx"> return count;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -188,15 +188,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_loadManually) {
</span><del>- bool autoLoadOtherImages = document.cachedResourceLoader()->autoLoadImages();
- document.cachedResourceLoader()->setAutoLoadImages(false);
</del><ins>+ bool autoLoadOtherImages = document.cachedResourceLoader().autoLoadImages();
+ document.cachedResourceLoader().setAutoLoadImages(false);
</ins><span class="cx"> newImage = new CachedImage(request.resourceRequest(), m_element.document().page()->sessionID());
</span><span class="cx"> newImage->setLoading(true);
</span><del>- newImage->setOwningCachedResourceLoader(document.cachedResourceLoader());
- document.cachedResourceLoader()->m_documentResources.set(newImage->url(), newImage.get());
- document.cachedResourceLoader()->setAutoLoadImages(autoLoadOtherImages);
</del><ins>+ newImage->setOwningCachedResourceLoader(&document.cachedResourceLoader());
+ document.cachedResourceLoader().m_documentResources.set(newImage->url(), newImage.get());
+ document.cachedResourceLoader().setAutoLoadImages(autoLoadOtherImages);
</ins><span class="cx"> } else
</span><del>- newImage = document.cachedResourceLoader()->requestImage(request);
</del><ins>+ newImage = document.cachedResourceLoader().requestImage(request);
</ins><span class="cx">
</span><span class="cx"> // If we do not have an image here, it means that a cross-site
</span><span class="cx"> // violation occurred, or that the image was blocked via Content
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -117,9 +117,9 @@
</span><span class="cx">
</span><span class="cx"> if (m_cachedLinkResource) {
</span><span class="cx"> m_cachedLinkResource->removeClient(this);
</span><del>- m_cachedLinkResource = 0;
</del><ins>+ m_cachedLinkResource = nullptr;
</ins><span class="cx"> }
</span><del>- m_cachedLinkResource = document->cachedResourceLoader()->requestLinkResource(type, linkRequest);
</del><ins>+ m_cachedLinkResource = document->cachedResourceLoader().requestLinkResource(type, linkRequest);
</ins><span class="cx"> if (m_cachedLinkResource)
</span><span class="cx"> m_cachedLinkResource->addClient(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -66,8 +66,7 @@
</span><span class="cx">
</span><span class="cx"> m_didPassAccessControlCheck = false;
</span><span class="cx">
</span><del>- CachedResourceLoader* loader = m_document.cachedResourceLoader();
- m_resource = loader ? loader->requestRawResource(cacheRequest) : nullptr;
</del><ins>+ m_resource = m_document.cachedResourceLoader().requestRawResource(cacheRequest);
</ins><span class="cx"> if (!m_resource)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -54,16 +54,16 @@
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, subresourceLoaderCounter, ("SubresourceLoader"));
</span><span class="cx">
</span><del>-SubresourceLoader::RequestCountTracker::RequestCountTracker(CachedResourceLoader* cachedResourceLoader, CachedResource* resource)
</del><ins>+SubresourceLoader::RequestCountTracker::RequestCountTracker(CachedResourceLoader& cachedResourceLoader, CachedResource* resource)
</ins><span class="cx"> : m_cachedResourceLoader(cachedResourceLoader)
</span><span class="cx"> , m_resource(resource)
</span><span class="cx"> {
</span><del>- m_cachedResourceLoader->incrementRequestCount(m_resource);
</del><ins>+ m_cachedResourceLoader.incrementRequestCount(m_resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SubresourceLoader::RequestCountTracker::~RequestCountTracker()
</span><span class="cx"> {
</span><del>- m_cachedResourceLoader->decrementRequestCount(m_resource);
</del><ins>+ m_cachedResourceLoader.decrementRequestCount(m_resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SubresourceLoader::SubresourceLoader(Frame* frame, CachedResource* resource, const ResourceLoaderOptions& options)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -107,10 +107,10 @@
</span><span class="cx">
</span><span class="cx"> class RequestCountTracker {
</span><span class="cx"> public:
</span><del>- RequestCountTracker(CachedResourceLoader*, CachedResource*);
</del><ins>+ RequestCountTracker(CachedResourceLoader&, CachedResource*);
</ins><span class="cx"> ~RequestCountTracker();
</span><span class="cx"> private:
</span><del>- CachedResourceLoader* m_cachedResourceLoader;
</del><ins>+ CachedResourceLoader& m_cachedResourceLoader;
</ins><span class="cx"> CachedResource* m_resource;
</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 (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -169,8 +169,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = document->cachedResourceLoader();
- m_resource = cachedResourceLoader->requestTextTrack(cueRequest);
</del><ins>+ m_resource = document->cachedResourceLoader().requestTextTrack(cueRequest);
</ins><span class="cx"> if (!m_resource)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedFont::load(CachedResourceLoader*, const ResourceLoaderOptions& options)
</del><ins>+void CachedFont::load(CachedResourceLoader&, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><span class="cx"> // Don't load the file yet. Wait for an access before triggering the load.
</span><span class="cx"> setLoading(true);
</span><span class="lines">@@ -84,11 +84,11 @@
</span><span class="cx"> checkNotify();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedFont::beginLoadIfNeeded(CachedResourceLoader* dl)
</del><ins>+void CachedFont::beginLoadIfNeeded(CachedResourceLoader& loader)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_loadInitiated) {
</span><span class="cx"> m_loadInitiated = true;
</span><del>- CachedResource::load(dl, m_options);
</del><ins>+ CachedResource::load(loader, m_options);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> CachedFont(const ResourceRequest&, SessionID, Type = FontResource);
</span><span class="cx"> virtual ~CachedFont();
</span><span class="cx">
</span><del>- void beginLoadIfNeeded(CachedResourceLoader* dl);
</del><ins>+ void beginLoadIfNeeded(CachedResourceLoader&);
</ins><span class="cx"> virtual bool stillNeedsLoad() const override { return !m_loadInitiated; }
</span><span class="cx">
</span><span class="cx"> virtual bool ensureCustomFontData(bool externalSVG, const AtomicString& remoteURI);
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> virtual void checkNotify() override;
</span><span class="cx"> virtual bool mayTryReplaceEncodedData() const override;
</span><span class="cx">
</span><del>- virtual void load(CachedResourceLoader*, const ResourceLoaderOptions&) override;
</del><ins>+ virtual void load(CachedResourceLoader&, const ResourceLoaderOptions&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void didAddClient(CachedResourceClient*) override;
</span><span class="cx"> virtual void finishLoading(SharedBuffer*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -107,9 +107,9 @@
</span><span class="cx"> clearImage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedImage::load(CachedResourceLoader* cachedResourceLoader, const ResourceLoaderOptions& options)
</del><ins>+void CachedImage::load(CachedResourceLoader& cachedResourceLoader, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- if (!cachedResourceLoader || cachedResourceLoader->autoLoadImages())
</del><ins>+ if (cachedResourceLoader.autoLoadImages())
</ins><span class="cx"> CachedResource::load(cachedResourceLoader, options);
</span><span class="cx"> else
</span><span class="cx"> setLoading(false);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> bool isManuallyCached() const { return m_isManuallyCached; }
</span><span class="cx"> virtual bool mustRevalidateDueToCacheHeaders(const CachedResourceLoader&, CachePolicy) const override;
</span><del>- virtual void load(CachedResourceLoader*, const ResourceLoaderOptions&) override;
</del><ins>+ virtual void load(CachedResourceLoader&, const ResourceLoaderOptions&) override;
</ins><span class="cx">
</span><span class="cx"> bool isOriginClean(SecurityOrigin*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -185,13 +185,13 @@
</span><span class="cx"> error(CachedResource::LoadError);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::addAdditionalRequestHeaders(CachedResourceLoader* cachedResourceLoader)
</del><ins>+void CachedResource::addAdditionalRequestHeaders(CachedResourceLoader& cachedResourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> // Note: We skip the Content-Security-Policy check here because we check
</span><span class="cx"> // the Content-Security-Policy at the CachedResourceLoader layer so we can
</span><span class="cx"> // handle different resource types differently.
</span><span class="cx">
</span><del>- FrameLoader& frameLoader = cachedResourceLoader->frame()->loader();
</del><ins>+ FrameLoader& frameLoader = cachedResourceLoader.frame()->loader();
</ins><span class="cx"> String outgoingReferrer;
</span><span class="cx"> String outgoingOrigin;
</span><span class="cx"> if (m_resourceRequest.httpReferrer().isNull()) {
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> outgoingOrigin = SecurityOrigin::createFromString(outgoingReferrer)->toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- outgoingReferrer = SecurityPolicy::generateReferrerHeader(cachedResourceLoader->document()->referrerPolicy(), m_resourceRequest.url(), outgoingReferrer);
</del><ins>+ outgoingReferrer = SecurityPolicy::generateReferrerHeader(cachedResourceLoader.document()->referrerPolicy(), m_resourceRequest.url(), outgoingReferrer);
</ins><span class="cx"> if (outgoingReferrer.isEmpty())
</span><span class="cx"> m_resourceRequest.clearHTTPReferrer();
</span><span class="cx"> else
</span><span class="lines">@@ -212,14 +212,14 @@
</span><span class="cx"> frameLoader.addExtraFieldsToSubresourceRequest(m_resourceRequest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::load(CachedResourceLoader* cachedResourceLoader, const ResourceLoaderOptions& options)
</del><ins>+void CachedResource::load(CachedResourceLoader& cachedResourceLoader, const ResourceLoaderOptions& options)
</ins><span class="cx"> {
</span><del>- if (!cachedResourceLoader->frame()) {
</del><ins>+ if (!cachedResourceLoader.frame()) {
</ins><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FrameLoader& frameLoader = cachedResourceLoader->frame()->loader();
</del><ins>+ FrameLoader& frameLoader = cachedResourceLoader.frame()->loader();
</ins><span class="cx"> if (options.securityCheck() == DoSecurityCheck && (frameLoader.state() == FrameStateProvisional || !frameLoader.activeDocumentLoader() || frameLoader.activeDocumentLoader()->isStopping())) {
</span><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> // When QuickLook is invoked to convert a document, it returns a unique URL in the
</span><span class="cx"> // NSURLReponse for the main document. To make safeQLURLForDocumentURLAndResourceURL()
</span><span class="cx"> // work, we need to use the QL URL not the original URL.
</span><del>- const URL& documentURL = cachedResourceLoader->frame() ? cachedResourceLoader->frame()->loader().documentLoader()->response().url() : cachedResourceLoader->document()->url();
</del><ins>+ const URL& documentURL = cachedResourceLoader.frame() ? cachedResourceLoader.frame()->loader().documentLoader()->response().url() : cachedResourceLoader.document()->url();
</ins><span class="cx"> m_resourceRequest.setURL(safeQLURLForDocumentURLAndResourceURL(documentURL, url()));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -248,8 +248,8 @@
</span><span class="cx"> const String& lastModified = resourceToRevalidate->response().httpHeaderField(HTTPHeaderName::LastModified);
</span><span class="cx"> const String& eTag = resourceToRevalidate->response().httpHeaderField(HTTPHeaderName::ETag);
</span><span class="cx"> if (!lastModified.isEmpty() || !eTag.isEmpty()) {
</span><del>- ASSERT(cachedResourceLoader->cachePolicy(type()) != CachePolicyReload);
- if (cachedResourceLoader->cachePolicy(type()) == CachePolicyRevalidate)
</del><ins>+ ASSERT(cachedResourceLoader.cachePolicy(type()) != CachePolicyReload);
+ if (cachedResourceLoader.cachePolicy(type()) == CachePolicyRevalidate)
</ins><span class="cx"> m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
</span><span class="cx"> if (!lastModified.isEmpty())
</span><span class="cx"> m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> m_fragmentIdentifierForRequest = String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_loader = platformStrategies()->loaderStrategy()->resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->frame(), this, request, options);
</del><ins>+ m_loader = platformStrategies()->loaderStrategy()->resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader.frame(), this, request, options);
</ins><span class="cx"> if (!m_loader) {
</span><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> CachedResource(const ResourceRequest&, Type, SessionID);
</span><span class="cx"> virtual ~CachedResource();
</span><span class="cx">
</span><del>- virtual void load(CachedResourceLoader*, const ResourceLoaderOptions&);
</del><ins>+ virtual void load(CachedResourceLoader&, const ResourceLoaderOptions&);
</ins><span class="cx">
</span><span class="cx"> virtual void setEncoding(const String&) { }
</span><span class="cx"> virtual String encoding() const { return String(); }
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> double freshnessLifetime(const ResourceResponse&) const;
</span><span class="cx">
</span><del>- void addAdditionalRequestHeaders(CachedResourceLoader*);
</del><ins>+ void addAdditionalRequestHeaders(CachedResourceLoader&);
</ins><span class="cx"> void failBeforeStarting();
</span><span class="cx">
</span><span class="cx"> HashMap<CachedResourceClient*, std::unique_ptr<Callback>> m_clientsAwaitingCallback;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> memoryCache().add(userSheet.get());
</span><span class="cx"> // FIXME: loadResource calls setOwningCachedResourceLoader() if the resource couldn't be added to cache. Does this function need to call it, too?
</span><span class="cx">
</span><del>- userSheet->load(this, ResourceLoaderOptions(DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo));
</del><ins>+ userSheet->load(*this, ResourceLoaderOptions(DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials, AskClientForAllCredentials, SkipSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo));
</ins><span class="cx">
</span><span class="cx"> return userSheet;
</span><span class="cx"> }
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> resource->setLoadPriority(request.priority());
</span><span class="cx">
</span><span class="cx"> if ((policy != Use || resource->stillNeedsLoad()) && CachedResourceRequest::NoDefer == request.defer()) {
</span><del>- resource->load(this, request.options());
</del><ins>+ resource->load(*this, request.options());
</ins><span class="cx">
</span><span class="cx"> // We don't support immediate loads, but we do support immediate failure.
</span><span class="cx"> if (resource->errorOccurred()) {
</span><span class="lines">@@ -763,7 +763,7 @@
</span><span class="cx"> for (DocumentResourceMap::iterator it = m_documentResources.begin(); it != end; ++it) {
</span><span class="cx"> CachedResource* resource = it->value.get();
</span><span class="cx"> if (is<CachedImage>(*resource) && resource->stillNeedsLoad() && !clientDefersImage(resource->url()))
</span><del>- downcast<CachedImage>(*resource).load(this, defaultCachedResourceOptions());
</del><ins>+ downcast<CachedImage>(*resource).load(*this, defaultCachedResourceOptions());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -194,22 +194,18 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ResourceCacheValidationSuppressor);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- ResourceCacheValidationSuppressor(CachedResourceLoader* loader)
</del><ins>+ ResourceCacheValidationSuppressor(CachedResourceLoader& loader)
</ins><span class="cx"> : m_loader(loader)
</span><del>- , m_previousState(false)
</del><ins>+ , m_previousState(m_loader.m_allowStaleResources)
</ins><span class="cx"> {
</span><del>- if (m_loader) {
- m_previousState = m_loader->m_allowStaleResources;
- m_loader->m_allowStaleResources = true;
- }
</del><ins>+ m_loader.m_allowStaleResources = true;
</ins><span class="cx"> }
</span><span class="cx"> ~ResourceCacheValidationSuppressor()
</span><span class="cx"> {
</span><del>- if (m_loader)
- m_loader->m_allowStaleResources = m_previousState;
</del><ins>+ m_loader.m_allowStaleResources = m_previousState;
</ins><span class="cx"> }
</span><span class="cx"> private:
</span><del>- CachedResourceLoader* m_loader;
</del><ins>+ CachedResourceLoader& m_loader;
</ins><span class="cx"> bool m_previousState;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -53,15 +53,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedSVGDocumentReference::load(CachedResourceLoader* loader)
</del><ins>+void CachedSVGDocumentReference::load(CachedResourceLoader& loader)
</ins><span class="cx"> {
</span><del>- ASSERT(loader);
</del><span class="cx"> if (m_loadRequested)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url)));
</del><ins>+ CachedResourceRequest request(ResourceRequest(loader.document()->completeURL(m_url)));
</ins><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><del>- m_document = loader->requestSVGDocument(request);
</del><ins>+ m_document = loader.requestSVGDocument(request);
</ins><span class="cx"> if (m_document) {
</span><span class="cx"> m_document->setCanReuse(m_canReuseResource);
</span><span class="cx"> m_document->addClient(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumentReferenceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~CachedSVGDocumentReference();
</span><span class="cx">
</span><del>- void load(CachedResourceLoader*);
</del><ins>+ void load(CachedResourceLoader&);
</ins><span class="cx"> bool loadRequested() const { return m_loadRequested; }
</span><span class="cx">
</span><span class="cx"> CachedSVGDocument* document() { return m_document.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconLoader.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconLoader.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/loader/icon/IconLoader.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow);
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().icon);
</span><span class="cx">
</span><del>- m_resource = m_frame.document()->cachedResourceLoader()->requestRawResource(request);
</del><ins>+ m_resource = m_frame.document()->cachedResourceLoader().requestRawResource(request);
</ins><span class="cx"> if (m_resource)
</span><span class="cx"> m_resource->addClient(this);
</span><span class="cx"> else
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_resource) {
</span><span class="cx"> m_resource->removeClient(this);
</span><del>- m_resource = 0;
</del><ins>+ m_resource = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/page/DragController.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -487,8 +487,7 @@
</span><span class="cx"> if (!range)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- CachedResourceLoader* cachedResourceLoader = range->ownerDocument().cachedResourceLoader();
- ResourceCacheValidationSuppressor validationSuppressor(cachedResourceLoader);
</del><ins>+ ResourceCacheValidationSuppressor validationSuppressor(range->ownerDocument().cachedResourceLoader());
</ins><span class="cx"> if (dragIsMove(innerFrame->selection(), dragData) || dragCaret.isContentRichlyEditable()) {
</span><span class="cx"> bool chosePlainText = false;
</span><span class="cx"> RefPtr<DocumentFragment> fragment = documentFragmentFromDragData(dragData, *innerFrame, *range, true, chosePlainText);
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><del>- frame->document()->cachedResourceLoader()->setImagesEnabled(page->settings().areImagesEnabled());
- frame->document()->cachedResourceLoader()->setAutoLoadImages(page->settings().loadsImagesAutomatically());
</del><ins>+ frame->document()->cachedResourceLoader().setImagesEnabled(page->settings().areImagesEnabled());
+ frame->document()->cachedResourceLoader().setAutoLoadImages(page->settings().loadsImagesAutomatically());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -196,8 +196,8 @@
</span><span class="cx"> LayoutSize scrollOffset;
</span><span class="cx">
</span><span class="cx"> FrameView* view = nullptr;
</span><del>- if (m_player && m_player->cachedResourceLoader() && m_player->cachedResourceLoader()->document())
- view = m_player->cachedResourceLoader()->document()->view();
</del><ins>+ if (m_player && m_player->cachedResourceLoader() && m_player->cachedResourceLoader().document())
+ view = m_player->cachedResourceLoader().document()->view();
</ins><span class="cx"> if (view)
</span><span class="cx"> scrollOffset = view->scrollOffsetForFixedPosition();
</span><span class="cx">
</span><span class="lines">@@ -434,9 +434,9 @@
</span><span class="cx"> {
</span><span class="cx"> HWND hWndParent = nullptr;
</span><span class="cx"> FrameView* view = nullptr;
</span><del>- if (!m_player || !m_player->cachedResourceLoader() || !m_player->cachedResourceLoader()->document())
</del><ins>+ if (!m_player || !m_player->cachedResourceLoader() || !m_player->cachedResourceLoader().document())
</ins><span class="cx"> return;
</span><del>- view = m_player->cachedResourceLoader()->document()->view();
</del><ins>+ view = m_player->cachedResourceLoader().document()->view();
</ins><span class="cx"> if (!view || !view->hostWindow())
</span><span class="cx"> return;
</span><span class="cx"> hWndParent = view->hostWindow()->platformPageClient();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> {
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href())));
</span><span class="cx"> request.setInitiator(this);
</span><del>- m_cachedImage = document().cachedResourceLoader()->requestImage(request);
</del><ins>+ m_cachedImage = document().cachedResourceLoader().requestImage(request);
</ins><span class="cx">
</span><span class="cx"> if (m_cachedImage)
</span><span class="cx"> m_cachedImage->addClient(this);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontFaceUriElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -101,10 +101,10 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& href = getAttribute(XLinkNames::hrefAttr);
</span><span class="cx"> if (!href.isNull()) {
</span><del>- CachedResourceLoader* cachedResourceLoader = document().cachedResourceLoader();
</del><ins>+ CachedResourceLoader& cachedResourceLoader = document().cachedResourceLoader();
</ins><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href)));
</span><span class="cx"> request.setInitiator(this);
</span><del>- m_cachedFont = cachedResourceLoader->requestFont(request, isSVGFontTarget(*this));
</del><ins>+ m_cachedFont = cachedResourceLoader.requestFont(request, isSVGFontTarget(*this));
</ins><span class="cx"> if (m_cachedFont) {
</span><span class="cx"> m_cachedFont->addClient(this);
</span><span class="cx"> m_cachedFont->beginLoadIfNeeded(cachedResourceLoader);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> if (url.hasFragmentIdentifier()) {
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(url.string()));
</span><span class="cx"> request.setInitiator(this);
</span><del>- setCachedDocument(document().cachedResourceLoader()->requestSVGDocument(request));
</del><ins>+ setCachedDocument(document().cachedResourceLoader().requestSVGDocument(request));
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> setCachedDocument(0);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> bool Internals::isPreloaded(const String& url)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span><del>- return document->cachedResourceLoader()->isPreloaded(url);
</del><ins>+ return document->cachedResourceLoader().isPreloaded(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Internals::isLoadingFromMemoryCache(const String& url)
</span><span class="lines">@@ -1685,11 +1685,7 @@
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- CachedResourceLoader* cachedResourceLoader = document->cachedResourceLoader();
- if (!cachedResourceLoader)
- return;
- cachedResourceLoader->garbageCollectDocumentResources();
</del><ins>+ document->cachedResourceLoader().garbageCollectDocumentResources();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::allowRoundingHacks() const
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLStyleSheetLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -127,8 +127,8 @@
</span><span class="cx"> {
</span><span class="cx"> Document* document = ownerDocument();
</span><span class="cx"> if (!document)
</span><del>- return 0;
- return document->cachedResourceLoader();
</del><ins>+ return nullptr;
+ return &document->cachedResourceLoader();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool XSLStyleSheet::parseString(const String& string)
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTProcessorLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> // HTML (create an HTML document), XML (create an XML document),
</span><span class="cx"> // and text (wrap in a <pre> and create an XML document).
</span><span class="cx">
</span><del>- const xmlChar* resultType = 0;
</del><ins>+ const xmlChar* resultType = nullptr;
</ins><span class="cx"> XSLT_GET_IMPORT_PTR(resultType, sheet, method);
</span><span class="cx"> if (!resultType && resultDoc->type == XML_HTML_DOCUMENT_NODE)
</span><span class="cx"> resultType = (const xmlChar*)"html";
</span><span class="lines">@@ -305,11 +305,11 @@
</span><span class="cx"> {
</span><span class="cx"> Ref<Document> ownerDocument(sourceNode.document());
</span><span class="cx">
</span><del>- setXSLTLoadCallBack(docLoaderFunc, this, ownerDocument->cachedResourceLoader());
</del><ins>+ setXSLTLoadCallBack(docLoaderFunc, this, &ownerDocument->cachedResourceLoader());
</ins><span class="cx"> xsltStylesheetPtr sheet = xsltStylesheetPointer(m_stylesheet, m_stylesheetRootNode.get());
</span><span class="cx"> if (!sheet) {
</span><del>- setXSLTLoadCallBack(0, 0, 0);
- m_stylesheet = 0;
</del><ins>+ setXSLTLoadCallBack(nullptr, nullptr, nullptr);
+ m_stylesheet = nullptr;
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> m_stylesheet->clearDocuments();
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParser.h (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParser.h 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(XSLT)
</span><del>-void* xmlDocPtrForString(CachedResourceLoader*, const String& source, const String& url);
</del><ins>+void* xmlDocPtrForString(CachedResourceLoader&, const String& source, const String& url);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HashMap<String, String> parseAttributes(const String&, bool& attrsOK);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlparserXMLDocumentParserLibxml2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> // keep this alive until this function is done.
</span><span class="cx"> Ref<XMLDocumentParser> protect(*this);
</span><span class="cx">
</span><del>- XMLDocumentParserScope scope(document()->cachedResourceLoader());
</del><ins>+ XMLDocumentParserScope scope(&document()->cachedResourceLoader());
</ins><span class="cx">
</span><span class="cx"> // FIXME: Can we parse 8-bit strings directly as Latin-1 instead of upconverting to UTF-16?
</span><span class="cx"> switchToUTF16(context->context());
</span><span class="lines">@@ -1352,7 +1352,7 @@
</span><span class="cx"> m_sawXSLTransform = false;
</span><span class="cx"> m_sawFirstElement = false;
</span><span class="cx">
</span><del>- XMLDocumentParserScope scope(document()->cachedResourceLoader());
</del><ins>+ XMLDocumentParserScope scope(&document()->cachedResourceLoader());
</ins><span class="cx"> if (m_parsingFragment)
</span><span class="cx"> m_context = XMLParserContext::createMemoryParser(&sax, this, chunk);
</span><span class="cx"> else {
</span><span class="lines">@@ -1367,11 +1367,11 @@
</span><span class="cx"> if (m_context) {
</span><span class="cx"> // Tell libxml we're done.
</span><span class="cx"> {
</span><del>- XMLDocumentParserScope scope(document()->cachedResourceLoader());
</del><ins>+ XMLDocumentParserScope scope(&document()->cachedResourceLoader());
</ins><span class="cx"> xmlParseChunk(context(), 0, 0, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_context = 0;
</del><ins>+ m_context = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1406,10 +1406,10 @@
</span><span class="cx"> return BOMHighByte == 0xFF ? "UTF-16LE" : "UTF-16BE";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void* xmlDocPtrForString(CachedResourceLoader* cachedResourceLoader, const String& source, const String& url)
</del><ins>+void* xmlDocPtrForString(CachedResourceLoader& cachedResourceLoader, const String& source, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> if (source.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // Parse in a single chunk into an xmlDocPtr
</span><span class="cx"> // FIXME: Hook up error handlers so that a failure to parse the main document results in
</span><span class="lines">@@ -1420,7 +1420,7 @@
</span><span class="cx"> size_t sizeInBytes = source.length() * (is8Bit ? sizeof(LChar) : sizeof(UChar));
</span><span class="cx"> const char* encoding = is8Bit ? "iso-8859-1" : nativeEndianUTF16Encoding();
</span><span class="cx">
</span><del>- XMLDocumentParserScope scope(cachedResourceLoader, errorFunc, 0);
</del><ins>+ XMLDocumentParserScope scope(&cachedResourceLoader, errorFunc);
</ins><span class="cx"> return xmlReadMemory(characters, sizeInBytes, url.latin1().data(), encoding, XSLT_PARSE_OPTIONS);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-27 Chris Dumez <cdumez@apple.com>
+
+ Use a Ref<CachedResourceLoader> in Document instead of a RefPtr
+ https://bugs.webkit.org/show_bug.cgi?id=140971
+
+ Reviewed by Andreas Kling.
+
+ Use more references instead of pointers.
+
+ * WebDataSource.cpp:
+ (WebDataSource::subresourceForURL):
+
</ins><span class="cx"> 2015-01-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] ASSERTION FAILED !m_ptr under AccessibilityController::winAddNotificationListener
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDataSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDataSource.cpp (179241 => 179242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDataSource.cpp 2015-01-28 05:48:59 UTC (rev 179241)
+++ trunk/Source/WebKit/win/WebDataSource.cpp 2015-01-28 05:53:53 UTC (rev 179242)
</span><span class="lines">@@ -288,14 +288,14 @@
</span><span class="cx"> return E_POINTER;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *resource = 0;
</del><ins>+ *resource = nullptr;
</ins><span class="cx">
</span><del>- Document *doc = m_loader->frameLoader()->frame().document();
</del><ins>+ Document* doc = m_loader->frameLoader()->frame().document();
</ins><span class="cx">
</span><span class="cx"> if (!doc)
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><del>- CachedResource *cachedResource = doc->cachedResourceLoader()->cachedResource(String(url));
</del><ins>+ CachedResource* cachedResource = doc->cachedResourceLoader().cachedResource(String(url));
</ins><span class="cx">
</span><span class="cx"> if (!cachedResource)
</span><span class="cx"> return E_FAIL;
</span></span></pre>
</div>
</div>
</body>
</html>