<!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>[181536] releases/WebKitGTK/webkit-2.8/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181536">181536</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-16 03:30:51 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181412">r181412</a> - Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/179340">r179340</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/179344">r179344</a>.
https://bugs.webkit.org/show_bug.cgi?id=142598
Caused images to stay alive forever when navigating away from
the page before they finish loading. (Requested by kling on
Reverted changesets:
"CachedImage: ensure clients overrides imageChanged instead of
notifyFinished"
https://bugs.webkit.org/show_bug.cgi?id=140722
http://trac.webkit.org/changeset/179340
"HTMLImageLoader: fix build failure on assert condition after
<a href="http://trac.webkit.org/projects/webkit/changeset/179340">r179340</a>"
https://bugs.webkit.org/show_bug.cgi?id=140722
http://trac.webkit.org/changeset/179344</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageLoadercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageLoaderh">releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloaderImageLoadercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloaderImageLoaderh">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedImagecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedImageClienth">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImageClient.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderImagecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderImageh">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoresvgSVGFEImageElementcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoresvgSVGFEImageElementh">releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-03-11 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r179340 and r179344.
+ https://bugs.webkit.org/show_bug.cgi?id=142598
+
+ Caused images to stay alive forever when navigating away from
+ the page before they finish loading. (Requested by kling on
+ #webkit).
+
+ Reverted changesets:
+
+ "CachedImage: ensure clients overrides imageChanged instead of
+ notifyFinished"
+ https://bugs.webkit.org/show_bug.cgi?id=140722
+ http://trac.webkit.org/changeset/179340
+
+ "HTMLImageLoader: fix build failure on assert condition after
+ r179340"
+ https://bugs.webkit.org/show_bug.cgi?id=140722
+ http://trac.webkit.org/changeset/179344
+
</ins><span class="cx"> 2015-03-12 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Crash under Heap::reportExtraMemoryAllocatedSlowCase for media element
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.cpp 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -72,15 +72,12 @@
</span><span class="cx"> return stripLeadingAndTrailingHTMLSpaces(attr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLImageLoader::imageChanged(CachedImage* cachedImage, const IntRect*)
</del><ins>+void HTMLImageLoader::notifyFinished(CachedResource*)
</ins><span class="cx"> {
</span><del>- ASSERT(cachedImage == image());
</del><ins>+ CachedImage* cachedImage = image();
</ins><span class="cx">
</span><del>- if (!cachedImage->isLoaded())
- return;
-
</del><span class="cx"> Ref<Element> protect(element());
</span><del>- ImageLoader::imageChanged(cachedImage);
</del><ins>+ ImageLoader::notifyFinished(cachedImage);
</ins><span class="cx">
</span><span class="cx"> bool loadError = cachedImage->errorOccurred() || cachedImage->response().httpStatusCode() >= 400;
</span><span class="cx"> if (!loadError) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehtmlHTMLImageLoaderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.h (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.h 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLImageLoader.h 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> virtual void dispatchLoadEvent() override;
</span><span class="cx"> virtual String sourceURI(const AtomicString&) const override;
</span><span class="cx">
</span><del>- virtual void imageChanged(CachedImage*, const IntRect* = nullptr) override;
</del><ins>+ virtual void notifyFinished(CachedResource*) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.cpp (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.cpp 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.cpp 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -272,14 +272,11 @@
</span><span class="cx"> updateFromElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageLoader::imageChanged(CachedImage* cachedImage, const IntRect*)
</del><ins>+void ImageLoader::notifyFinished(CachedResource* resource)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_failedLoadURL.isEmpty());
</span><del>- ASSERT(cachedImage == m_image.get());
</del><ins>+ ASSERT(resource == m_image.get());
</ins><span class="cx">
</span><del>- if (!cachedImage->isLoaded())
- return;
-
</del><span class="cx"> m_imageComplete = true;
</span><span class="cx"> if (!hasPendingBeforeLoadEvent())
</span><span class="cx"> updateRenderer();
</span><span class="lines">@@ -289,7 +286,7 @@
</span><span class="cx">
</span><span class="cx"> if (element().fastHasAttribute(HTMLNames::crossoriginAttr)
</span><span class="cx"> && !element().document().securityOrigin()->canRequest(image()->response().url())
</span><del>- && !cachedImage->passesAccessControlCheck(element().document().securityOrigin())) {
</del><ins>+ && !resource->passesAccessControlCheck(element().document().securityOrigin())) {
</ins><span class="cx">
</span><span class="cx"> setImageWithoutConsideringPendingLoadEvent(0);
</span><span class="cx">
</span><span class="lines">@@ -307,7 +304,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (cachedImage->wasCanceled()) {
</del><ins>+ if (resource->wasCanceled()) {
</ins><span class="cx"> m_hasPendingLoadEvent = false;
</span><span class="cx"> // Only consider updating the protection ref-count of the Element immediately before returning
</span><span class="cx"> // from this function as doing so might result in the destruction of this ImageLoader.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderImageLoaderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.h (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.h 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.h 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit ImageLoader(Element&);
</span><del>- virtual void imageChanged(CachedImage*, const IntRect* = nullptr) override;
</del><ins>+ virtual void notifyFinished(CachedResource*) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void dispatchLoadEvent() = 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImage.cpp (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImage.cpp 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImage.cpp 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -429,11 +429,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ notifyObservers();
</ins><span class="cx"> if (m_image)
</span><span class="cx"> setEncodedSize(m_image->data() ? m_image->data()->size() : 0);
</span><del>-
- setLoading(false);
- notifyObservers();
</del><ins>+ CachedResource::finishLoading(data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedImage::error(CachedResource::Status status)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedImageClienth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImageClient.h (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImageClient.h 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedImageClient.h 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -38,13 +38,10 @@
</span><span class="cx">
</span><span class="cx"> // Called whenever a frame of an image changes because we got more data from the network.
</span><span class="cx"> // If not null, the IntRect is the changed rect of the image.
</span><del>- virtual void imageChanged(CachedImage*, const IntRect* = nullptr) { }
</del><ins>+ virtual void imageChanged(CachedImage*, const IntRect* = 0) { }
</ins><span class="cx">
</span><span class="cx"> // Called when GIF animation progresses.
</span><span class="cx"> virtual void newImageAnimationFrameAvailable(CachedImage& image) { imageChanged(&image); }
</span><del>-
- // Use imageChanged instead.
- virtual void notifyFinished(CachedResource*) override final { }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.cpp (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.cpp 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.cpp 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -364,6 +364,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderImage::notifyFinished(CachedResource* newImage)
+{
+ if (documentBeingDestroyed())
+ return;
+
+ invalidateBackgroundObscurationStatus();
+
+ if (newImage == imageResource().cachedImage()) {
+ // tell any potential compositing layers
+ // that the image is done and they can reference it directly.
+ contentChanged(ImageChanged);
+ }
+}
+
</ins><span class="cx"> void RenderImage::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit cWidth = contentWidth();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderImageh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.h (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.h 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderImage.h 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx">
</span><span class="cx"> virtual LayoutUnit minimumReplacedHeight() const override;
</span><span class="cx">
</span><ins>+ virtual void notifyFinished(CachedResource*) override final;
</ins><span class="cx"> virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
</span><span class="cx">
</span><span class="cx"> virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const override final;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.cpp (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.cpp 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.cpp 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -190,11 +190,8 @@
</span><span class="cx"> clearResourceReferences();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGFEImageElement::imageChanged(CachedImage* cachedImage, const IntRect*)
</del><ins>+void SVGFEImageElement::notifyFinished(CachedResource*)
</ins><span class="cx"> {
</span><del>- if (!cachedImage || !cachedImage->isLoaded())
- return;
-
</del><span class="cx"> if (!inDocument())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoresvgSVGFEImageElementh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.h (181535 => 181536)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.h 2015-03-16 10:27:14 UTC (rev 181535)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/svg/SVGFEImageElement.h 2015-03-16 10:30:51 UTC (rev 181536)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> bool isSupportedAttribute(const QualifiedName&);
</span><span class="cx"> virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx"> virtual void svgAttributeChanged(const QualifiedName&) override;
</span><del>- virtual void imageChanged(CachedImage*, const IntRect* = nullptr) override;
</del><ins>+ virtual void notifyFinished(CachedResource*) override;
</ins><span class="cx">
</span><span class="cx"> virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;
</span><span class="cx"> virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*) override;
</span></span></pre>
</div>
</div>
</body>
</html>