<!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>[186449] 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/186449">186449</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-07 04:55:04 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186267">r186267</a> - Memory leak for a protected Element having pending events in ImageLoader.
https://bugs.webkit.org/show_bug.cgi?id=146538
Patch by Kyounga Ra <kyounga@alticast.com> on 2015-07-03
Reviewed by Brady Eidson.
If ImageLoader is destroyed before an active derefElementTimer is fired, protected element's refCount never be zero..
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::~ImageLoader):
(WebCore::ImageLoader::updateFromElement):
(WebCore::ImageLoader::updateRenderer):
(WebCore::ImageLoader::updatedHasPendingEvent):
(WebCore::ImageLoader::timerFired):
* loader/ImageLoader.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</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>
</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 (186448 => 186449)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 11:52:49 UTC (rev 186448)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 11:55:04 UTC (rev 186449)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-03 Kyounga Ra <kyounga@alticast.com>
+
+ Memory leak for a protected Element having pending events in ImageLoader.
+ https://bugs.webkit.org/show_bug.cgi?id=146538
+
+ Reviewed by Brady Eidson.
+
+ If ImageLoader is destroyed before an active derefElementTimer is fired, protected element's refCount never be zero..
+
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::~ImageLoader):
+ (WebCore::ImageLoader::updateFromElement):
+ (WebCore::ImageLoader::updateRenderer):
+ (WebCore::ImageLoader::updatedHasPendingEvent):
+ (WebCore::ImageLoader::timerFired):
+ * loader/ImageLoader.h:
+
</ins><span class="cx"> 2015-07-03 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r178097): JavaScript TypeError after clicking on compose button in Yahoo Mail
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.cpp (186448 => 186449)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.cpp 2015-07-07 11:52:49 UTC (rev 186448)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.cpp 2015-07-07 11:55:04 UTC (rev 186449)
</span><span class="lines">@@ -116,11 +116,6 @@
</span><span class="cx"> ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(*this));
</span><span class="cx"> if (m_hasPendingErrorEvent)
</span><span class="cx"> errorEventSender().cancelEvent(*this);
</span><del>-
- // If the ImageLoader is being destroyed but it is still protecting its image-loading Element,
- // remove that protection here.
- if (m_elementIsProtected)
- element().deref();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageLoader::setImage(CachedImage* newImage)
</span><span class="lines">@@ -163,7 +158,7 @@
</span><span class="cx">
</span><span class="cx"> void ImageLoader::updateFromElement()
</span><span class="cx"> {
</span><del>- // If we're not making renderers for the page, then don't load images. We don't want to slow
</del><ins>+ // If we're not making renderers for the page, then don't load images. We don't want to slow
</ins><span class="cx"> // down the raw HTML parsing case by loading images we don't intend to display.
</span><span class="cx"> Document& document = element().document();
</span><span class="cx"> if (!document.hasLivingRenderTree())
</span><span class="lines">@@ -345,7 +340,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Only update the renderer if it doesn't have an image or if what we have
</span><del>- // is a complete image. This prevents flickering in the case where a dynamic
</del><ins>+ // is a complete image. This prevents flickering in the case where a dynamic
</ins><span class="cx"> // change is happening between two images.
</span><span class="cx"> CachedImage* cachedImage = imageResource->cachedImage();
</span><span class="cx"> if (m_image != cachedImage && (m_imageComplete || !cachedImage))
</span><span class="lines">@@ -367,7 +362,7 @@
</span><span class="cx"> if (m_derefElementTimer.isActive())
</span><span class="cx"> m_derefElementTimer.stop();
</span><span class="cx"> else
</span><del>- element().ref();
</del><ins>+ m_protectedElement = &element();
</ins><span class="cx"> } else {
</span><span class="cx"> ASSERT(!m_derefElementTimer.isActive());
</span><span class="cx"> m_derefElementTimer.startOneShot(0);
</span><span class="lines">@@ -376,7 +371,7 @@
</span><span class="cx">
</span><span class="cx"> void ImageLoader::timerFired()
</span><span class="cx"> {
</span><del>- element().deref();
</del><ins>+ m_protectedElement = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageLoader::dispatchPendingEvent(ImageEventSender* eventSender)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderImageLoaderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.h (186448 => 186449)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.h 2015-07-07 11:52:49 UTC (rev 186448)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ImageLoader.h 2015-07-07 11:55:04 UTC (rev 186449)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> Element& m_element;
</span><span class="cx"> CachedResourceHandle<CachedImage> m_image;
</span><span class="cx"> Timer m_derefElementTimer;
</span><ins>+ RefPtr<Element> m_protectedElement;
</ins><span class="cx"> AtomicString m_failedLoadURL;
</span><span class="cx"> bool m_hasPendingBeforeLoadEvent : 1;
</span><span class="cx"> bool m_hasPendingLoadEvent : 1;
</span></span></pre>
</div>
</div>
</body>
</html>