<!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>[164863] trunk</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/164863">164863</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-28 09:30:36 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>SubresourceLoader::didFinishLoading() should not assert when a decode error occurs
https://bugs.webkit.org/show_bug.cgi?id=127029
Reviewed by Darin Adler.
Source/WebCore:
SubresourceLoader::didFinishLoading() can be called for a resource (e.g. an image) that
failed to be decoded or, in the case of an image, whose estimated decoded size exceeds
the maximum decoded size (Settings::maximumDecodedImageSize()).
Test: fast/images/decoded-size-exceeds-max-decoded-size.html
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didFinishLoading):
LayoutTests:
Added a test to ensure that we don't cause an assertion failure when an image fails
to load because of a decode error. In particular, the estimated decoded image size
exceeds the maximum decoded image size.
* fast/images/decoded-size-exceeds-max-decoded-size-expected.txt: Added.
* fast/images/decoded-size-exceeds-max-decoded-size.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastimagesdecodedsizeexceedsmaxdecodedsizeexpectedtxt">trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastimagesdecodedsizeexceedsmaxdecodedsizehtml">trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164862 => 164863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-28 16:56:17 UTC (rev 164862)
+++ trunk/LayoutTests/ChangeLog 2014-02-28 17:30:36 UTC (rev 164863)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-28 Daniel Bates <dabates@apple.com>
+
+ SubresourceLoader::didFinishLoading() should not assert when a decode error occurs
+ https://bugs.webkit.org/show_bug.cgi?id=127029
+
+ Reviewed by Darin Adler.
+
+ Added a test to ensure that we don't cause an assertion failure when an image fails
+ to load because of a decode error. In particular, the estimated decoded image size
+ exceeds the maximum decoded image size.
+
+ * fast/images/decoded-size-exceeds-max-decoded-size-expected.txt: Added.
+ * fast/images/decoded-size-exceeds-max-decoded-size.html: Added.
+
</ins><span class="cx"> 2014-02-28 Martin Hodovan <mhodovan@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result) in WebCore::RenderGeometryMap::mapToContainer
</span></span></pre></div>
<a id="trunkLayoutTestsfastimagesdecodedsizeexceedsmaxdecodedsizeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size-expected.txt (0 => 164863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size-expected.txt 2014-02-28 17:30:36 UTC (rev 164863)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that an image whose size exceeds the maximum decoded size dispatches a DOM error event.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS event.type is 'error'.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastimagesdecodedsizeexceedsmaxdecodedsizehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size.html (0 => 164863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size.html (rev 0)
+++ trunk/LayoutTests/fast/images/decoded-size-exceeds-max-decoded-size.html 2014-02-28 17:30:36 UTC (rev 164863)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+window.jsTestIsAsync = true;
+if (window.internals)
+ window.internals.settings.setMaximumDecodedImageSize(0); // bytes
+</script>
+</head>
+<body>
+<img src="resources/red-256x256.jpg" width="256" height="256" onerror="checkDispatchedEvent(event)" onload="checkDispatchedEvent(event)">
+<script>
+description("Tests that an image whose size exceeds the maximum decoded size dispatches a DOM error event.");
+function checkDispatchedEvent(event)
+{
+ if (event.type === "error")
+ testPassed("event.type is 'error'.");
+ else
+ testPassed("event.type should have been 'error'. Was '" + event.type + "'.");
+ finishJSTest();
+}
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164862 => 164863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-28 16:56:17 UTC (rev 164862)
+++ trunk/Source/WebCore/ChangeLog 2014-02-28 17:30:36 UTC (rev 164863)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-28 Daniel Bates <dabates@apple.com>
+
+ SubresourceLoader::didFinishLoading() should not assert when a decode error occurs
+ https://bugs.webkit.org/show_bug.cgi?id=127029
+
+ Reviewed by Darin Adler.
+
+ SubresourceLoader::didFinishLoading() can be called for a resource (e.g. an image) that
+ failed to be decoded or, in the case of an image, whose estimated decoded size exceeds
+ the maximum decoded size (Settings::maximumDecodedImageSize()).
+
+ Test: fast/images/decoded-size-exceeds-max-decoded-size.html
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didFinishLoading):
+
</ins><span class="cx"> 2014-02-28 Martin Hodovan <mhodovan@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result) in WebCore::RenderGeometryMap::mapToContainer
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (164862 => 164863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2014-02-28 16:56:17 UTC (rev 164862)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2014-02-28 17:30:36 UTC (rev 164863)
</span><span class="lines">@@ -294,7 +294,8 @@
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(!reachedTerminalState());
</span><span class="cx"> ASSERT(!m_resource->resourceToRevalidate());
</span><del>- ASSERT(!m_resource->errorOccurred());
</del><ins>+ // FIXME (129394): We should cancel the load when a decode error occurs instead of continuing the load to completion.
+ ASSERT(!m_resource->errorOccurred() || m_resource->status() == CachedResource::DecodeError);
</ins><span class="cx"> LOG(ResourceLoading, "Received '%s'.", m_resource->url().string().latin1().data());
</span><span class="cx">
</span><span class="cx"> Ref<SubresourceLoader> protect(*this);
</span></span></pre>
</div>
</div>
</body>
</html>