<!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>[199764] trunk/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/199764">199764</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-19 23:02:24 -0700 (Tue, 19 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/198782">r198782</a>): SHOULD NEVER BE REACHED failure in ImageSource::setData since <a href="http://trac.webkit.org/projects/webkit/changeset/198782">r198782</a>
https://bugs.webkit.org/show_bug.cgi?id=156690
Reviewed by Michael Catanzaro.
The assertion is wrong, because it assumes that ImageDecoder::create() always returns a valid pointer, which is
only true for the CG implementation. The non CG implementation can return nullptr if there isn't enough data to
figure out the image format or if the image format is not supported. This is causing several crashes in the
debug bots.
* platform/graphics/ImageSource.cpp:
(WebCore::ImageSource::setData): Remove the invalid ASSERT and return early if we fail to create the decoder.
(WebCore::ImageSource::ensureDecoderIsCreated): Deleted.
* platform/graphics/ImageSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageSourcecpp">trunk/Source/WebCore/platform/graphics/ImageSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageSourceh">trunk/Source/WebCore/platform/graphics/ImageSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199763 => 199764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-20 05:49:31 UTC (rev 199763)
+++ trunk/Source/WebCore/ChangeLog 2016-04-20 06:02:24 UTC (rev 199764)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-19 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r198782): SHOULD NEVER BE REACHED failure in ImageSource::setData since r198782
+ https://bugs.webkit.org/show_bug.cgi?id=156690
+
+ Reviewed by Michael Catanzaro.
+
+ The assertion is wrong, because it assumes that ImageDecoder::create() always returns a valid pointer, which is
+ only true for the CG implementation. The non CG implementation can return nullptr if there isn't enough data to
+ figure out the image format or if the image format is not supported. This is causing several crashes in the
+ debug bots.
+
+ * platform/graphics/ImageSource.cpp:
+ (WebCore::ImageSource::setData): Remove the invalid ASSERT and return early if we fail to create the decoder.
+ (WebCore::ImageSource::ensureDecoderIsCreated): Deleted.
+ * platform/graphics/ImageSource.h:
+
</ins><span class="cx"> 2016-04-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove remaining bits of dynamic <link> rel='icon' loading
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageSource.cpp (199763 => 199764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageSource.cpp 2016-04-20 05:49:31 UTC (rev 199763)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.cpp 2016-04-20 06:02:24 UTC (rev 199764)
</span><span class="lines">@@ -71,28 +71,18 @@
</span><span class="cx"> setData(data, allDataReceived);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageSource::ensureDecoderIsCreated(const SharedBuffer& data)
-{
- if (initialized())
- return;
-
- m_decoder = ImageDecoder::create(data, m_alphaOption, m_gammaAndColorProfileOption);
-}
-
</del><span class="cx"> void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
</span><span class="cx"> {
</span><span class="cx"> if (!data)
</span><span class="cx"> return;
</span><del>-
- ensureDecoderIsCreated(*data);
-
</del><ins>+
</ins><span class="cx"> if (!initialized()) {
</span><del>- ASSERT_NOT_REACHED();
- return;
</del><ins>+ m_decoder = ImageDecoder::create(*data, m_alphaOption, m_gammaAndColorProfileOption);
+ if (!m_decoder)
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_decoder)
- m_decoder->setData(*data, allDataReceived);
</del><ins>+ m_decoder->setData(*data, allDataReceived);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SubsamplingLevel ImageSource::calculateMaximumSubsamplingLevel() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageSource.h (199763 => 199764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageSource.h 2016-04-20 05:49:31 UTC (rev 199763)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.h 2016-04-20 06:02:24 UTC (rev 199764)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void clearFrameBufferCache(size_t);
</span><del>- void ensureDecoderIsCreated(const SharedBuffer&);
</del><span class="cx"> SubsamplingLevel calculateMaximumSubsamplingLevel() const;
</span><span class="cx"> void dump(TextStream&) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>