<!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>[198685] branches/safari-601.1.46-branch</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/198685">198685</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-03-25 12:50:13 -0700 (Fri, 25 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197856">r197856</a>. rdar://problem/25152411</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderImageLoadercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/ImageLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfastdomImageDocumentworldleakexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastdomImageDocumentworldleakhtml">branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (198684 => 198685)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-25 19:32:53 UTC (rev 198684)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-25 19:50:13 UTC (rev 198685)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-03-25 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r197856. rdar://problem/25152411
+
+ 2016-03-09 Andreas Kling <akling@apple.com>
+
+ ImageDocuments leak their world.
+ <https://webkit.org/b/155167>
+ <rdar://problem/24987363>
+
+ Reviewed by Antti Koivisto.
+
+ Made a little test that loads an image into an <iframe> 10 times and then
+ triggers a garbage collection and checks that all the documents got destroyed.
+
+ Prior to this change, all 10 ImageDocuments would remain alive at the end.
+
+ This got rolled out the first time because it failed on bots. It failed due
+ to expecting a specific number of documents to be live at the start of the
+ test, which was not reliable on bots since we appear to have more leaks(!)
+
+ Tweaked the test to check the delta in live document count instead.
+
+ * fast/dom/ImageDocument-world-leak-expected.txt: Added.
+ * fast/dom/ImageDocument-world-leak.html: Added.
+
</ins><span class="cx"> 2016-03-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r198592. rdar://problem/25271136
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastdomImageDocumentworldleakexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak-expected.txt (0 => 198685)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak-expected.txt 2016-03-25 19:50:13 UTC (rev 198685)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Test that ImageDocuments don't leak their world.
+
+PASS: Less than 10 new documents since test began.
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastdomImageDocumentworldleakhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak.html (0 => 198685)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/dom/ImageDocument-world-leak.html 2016-03-25 19:50:13 UTC (rev 198685)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<head>
+<script>
+function gc() {
+ if (window.GCController)
+ GCController.collect();
+}
+
+function numberOfLiveDocuments() {
+ if (window.internals)
+ return window.internals.numberOfLiveDocuments();
+ return 1;
+}
+
+gc();
+
+iterationsToRun = 10;
+iterationsRemaining = iterationsToRun;
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+function test() {
+ var f = document.getElementById("frame");
+ f.onload = function() {
+ f.contentDocument.open();
+ f.contentDocument.close();
+ --iterationsRemaining;
+ if (iterationsRemaining)
+ setTimeout("test()", 0);
+ else {
+ gc();
+ var numberOfLiveDocumentsDelta = numberOfLiveDocuments() - numberOfLiveDocumentsAtStart;
+ var out = document.getElementById("out");
+ if (numberOfLiveDocumentsDelta < iterationsToRun)
+ out.innerText += "PASS: Less than " + iterationsToRun + " new documents since test began.";
+ else
+ out.innerText += "FAIL: Too many new documents since test began: " + numberOfLiveDocumentsDelta;
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ }
+ f.setAttribute("src", "resources/apple.gif");
+}
+
+function begin() {
+ numberOfLiveDocumentsAtStart = numberOfLiveDocuments();
+ test();
+}
+</script>
+</head>
+<body onload="begin()">
+ <p>Test that ImageDocuments don't leak their world. </p>
+ <pre id="out"></pre>
+ <iframe id="frame"></iframe>
+</body>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (198684 => 198685)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-25 19:32:53 UTC (rev 198684)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-25 19:50:13 UTC (rev 198685)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-03-25 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r197856. rdar://problem/25152411
+
+ 2016-03-09 Andreas Kling <akling@apple.com>
+
+ ImageDocuments leak their world.
+ <https://webkit.org/b/155167>
+ <rdar://problem/24987363>
+
+ Reviewed by Antti Koivisto.
+
+ ImageDocument uses a special code path in ImageLoader in order to manually
+ control how the image is loaded. It has to do this because the ImageDocument
+ is really just a synthetic wrapper around a main resource that's an image.
+
+ This custom loading code had a bug where it would create a new CachedImage
+ and neglect to set its CachedResource::m_state flag to Pending (which is
+ normally set by CachedResource::load(), but we don't call that for these.)
+
+ This meant that when ImageDocument called CachedImage::finishLoading() to
+ trigger the notifyFinished() callback path, the image would look at its
+ loading state and see that it was Unknown (not Pending), and conclude that
+ it hadn't loaded yet. So we never got the notifyFinished() signal.
+
+ The world leaks here because ImageLoader slaps a ref on its <img> element
+ while it waits for the loading operation to complete. Once finished, whether
+ successfully or with an error, it derefs the <img>.
+
+ Since we never fired notifyFinished(), we ended up with an extra ref on
+ these <img> forever, and then the element kept its document alive too.
+
+ Test: fast/dom/ImageDocument-world-leak.html
+
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::updateFromElement):
+
</ins><span class="cx"> 2016-03-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge custom patch. rdar://problem/25152415.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/ImageLoader.cpp (198684 => 198685)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/ImageLoader.cpp 2016-03-25 19:32:53 UTC (rev 198684)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/ImageLoader.cpp 2016-03-25 19:50:13 UTC (rev 198685)
</span><span class="lines">@@ -188,6 +188,7 @@
</span><span class="cx"> bool autoLoadOtherImages = document.cachedResourceLoader().autoLoadImages();
</span><span class="cx"> document.cachedResourceLoader().setAutoLoadImages(false);
</span><span class="cx"> newImage = new CachedImage(request.resourceRequest(), m_element.document().page()->sessionID());
</span><ins>+ newImage->setStatus(CachedResource::Pending);
</ins><span class="cx"> newImage->setLoading(true);
</span><span class="cx"> newImage->setOwningCachedResourceLoader(&document.cachedResourceLoader());
</span><span class="cx"> document.cachedResourceLoader().m_documentResources.set(newImage->url(), newImage.get());
</span></span></pre>
</div>
</div>
</body>
</html>