<!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>[202800] 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/202800">202800</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-03 23:30:28 -0700 (Sun, 03 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[image-decoders] Make ImageDecoder::size() lazily decode the image if needed to return a valid size
https://bugs.webkit.org/show_bug.cgi?id=159297
Reviewed by Antonio Gomes.
It's otherwise confusing leading to bugs like #159089.
* platform/image-decoders/ImageDecoder.cpp:
(WebCore::ImageDecoder::createFrameImageAtIndex): Check the size at the beginning and return early if it's
empty. We no longer need to check the size after calling frameBufferAtIndex().
* platform/image-decoders/ImageDecoder.h:
(WebCore::ImageDecoder::size): Check first is size is available, which lazily decodes the image.
(WebCore::ImageDecoder::scaledSize): Remove const.
(WebCore::ImageDecoder::frameSizeAtIndex): Ditto.
* platform/image-decoders/ico/ICOImageDecoder.cpp:
(WebCore::ICOImageDecoder::size): Ditto.
(WebCore::ICOImageDecoder::frameSizeAtIndex): Ditto.
* platform/image-decoders/ico/ICOImageDecoder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersicoICOImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersicoICOImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202799 => 202800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-04 06:27:32 UTC (rev 202799)
+++ trunk/Source/WebCore/ChangeLog 2016-07-04 06:30:28 UTC (rev 202800)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-07-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [image-decoders] Make ImageDecoder::size() lazily decode the image if needed to return a valid size
+ https://bugs.webkit.org/show_bug.cgi?id=159297
+
+ Reviewed by Antonio Gomes.
+
+ It's otherwise confusing leading to bugs like #159089.
+
+ * platform/image-decoders/ImageDecoder.cpp:
+ (WebCore::ImageDecoder::createFrameImageAtIndex): Check the size at the beginning and return early if it's
+ empty. We no longer need to check the size after calling frameBufferAtIndex().
+ * platform/image-decoders/ImageDecoder.h:
+ (WebCore::ImageDecoder::size): Check first is size is available, which lazily decodes the image.
+ (WebCore::ImageDecoder::scaledSize): Remove const.
+ (WebCore::ImageDecoder::frameSizeAtIndex): Ditto.
+ * platform/image-decoders/ico/ICOImageDecoder.cpp:
+ (WebCore::ICOImageDecoder::size): Ditto.
+ (WebCore::ICOImageDecoder::frameSizeAtIndex): Ditto.
+ * platform/image-decoders/ico/ICOImageDecoder.h:
+
</ins><span class="cx"> 2016-07-02 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Synchronous preflight checker should set loading options to not use credentials
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp (202799 => 202800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2016-07-04 06:27:32 UTC (rev 202799)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2016-07-04 06:30:28 UTC (rev 202800)
</span><span class="lines">@@ -312,13 +312,14 @@
</span><span class="cx">
</span><span class="cx"> NativeImagePtr ImageDecoder::createFrameImageAtIndex(size_t index, SubsamplingLevel)
</span><span class="cx"> {
</span><del>- ImageFrame* buffer = frameBufferAtIndex(index);
</del><span class="cx"> // Zero-height images can cause problems for some ports. If we have an empty image dimension, just bail.
</span><del>- // It's important to check the size after calling frameBufferAtIndex() to ensure the decoder has updated the size.
- // See https://bugs.webkit.org/show_bug.cgi?id=159089.
- if (!buffer || buffer->status() == ImageFrame::FrameEmpty || size().isEmpty())
</del><ins>+ if (size().isEmpty())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ ImageFrame* buffer = frameBufferAtIndex(index);
+ if (!buffer || buffer->status() == ImageFrame::FrameEmpty)
+ return nullptr;
+
</ins><span class="cx"> // Return the buffer contents as a native image. For some ports, the data
</span><span class="cx"> // is already in a native container, and this just increments its refcount.
</span><span class="cx"> return buffer->asNewNativeImage();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h (202799 => 202800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2016-07-04 06:27:32 UTC (rev 202799)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2016-07-04 06:30:28 UTC (rev 202800)
</span><span class="lines">@@ -271,9 +271,9 @@
</span><span class="cx"> return !m_failed && m_sizeAvailable;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual IntSize size() const { return m_size; }
</del><ins>+ virtual IntSize size() { return isSizeAvailable() ? m_size : IntSize(); }
</ins><span class="cx">
</span><del>- IntSize scaledSize() const
</del><ins>+ IntSize scaledSize()
</ins><span class="cx"> {
</span><span class="cx"> return m_scaled ? IntSize(m_scaledColumns.size(), m_scaledRows.size()) : size();
</span><span class="cx"> }
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> // sizes. This does NOT differ from size() for GIF, since decoding GIFs
</span><span class="cx"> // composites any smaller frames against previous frames to create full-
</span><span class="cx"> // size frames.
</span><del>- virtual IntSize frameSizeAtIndex(size_t, SubsamplingLevel) const
</del><ins>+ virtual IntSize frameSizeAtIndex(size_t, SubsamplingLevel)
</ins><span class="cx"> {
</span><span class="cx"> return size();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersicoICOImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp (202799 => 202800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp 2016-07-04 06:27:32 UTC (rev 202799)
+++ trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp 2016-07-04 06:30:28 UTC (rev 202800)
</span><span class="lines">@@ -78,12 +78,12 @@
</span><span class="cx"> return ImageDecoder::isSizeAvailable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntSize ICOImageDecoder::size() const
</del><ins>+IntSize ICOImageDecoder::size()
</ins><span class="cx"> {
</span><span class="cx"> return m_frameSize.isEmpty() ? ImageDecoder::size() : m_frameSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntSize ICOImageDecoder::frameSizeAtIndex(size_t index, SubsamplingLevel) const
</del><ins>+IntSize ICOImageDecoder::frameSizeAtIndex(size_t index, SubsamplingLevel)
</ins><span class="cx"> {
</span><span class="cx"> return (index && (index < m_dirEntries.size())) ? m_dirEntries[index].m_size : size();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersicoICOImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h (202799 => 202800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h 2016-07-04 06:27:32 UTC (rev 202799)
+++ trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h 2016-07-04 06:30:28 UTC (rev 202800)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> String filenameExtension() const override { return "ico"; }
</span><span class="cx"> void setData(SharedBuffer&, bool allDataReceived) override;
</span><span class="cx"> bool isSizeAvailable() override;
</span><del>- IntSize size() const override;
- IntSize frameSizeAtIndex(size_t, SubsamplingLevel) const override;
</del><ins>+ IntSize size() override;
+ IntSize frameSizeAtIndex(size_t, SubsamplingLevel) override;
</ins><span class="cx"> bool setSize(unsigned width, unsigned height) override;
</span><span class="cx"> size_t frameCount() override;
</span><span class="cx"> ImageFrame* frameBufferAtIndex(size_t) override;
</span></span></pre>
</div>
</div>
</body>
</html>