<!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>[195204] releases/WebKitGTK/webkit-2.10/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/195204">195204</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-18 04:09:07 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194503">r194503</a> - APNG decoder: only decode the frames up to haltAtFrame
https://bugs.webkit.org/show_bug.cgi?id=146205
Patch by Max Stepin <maxstepin@gmail.com> on 2016-01-02
Reviewed by Michael Catanzaro.
No new tests, already covered by existing tests.
* platform/image-decoders/png/PNGImageDecoder.cpp:
(WebCore::PNGImageReader::close):
(WebCore::PNGImageReader::decode):
(WebCore::PNGImageDecoder::isSizeAvailable):
(WebCore::PNGImageDecoder::frameBufferAtIndex):
(WebCore::PNGImageDecoder::pngComplete):
(WebCore::PNGImageDecoder::decode):
* platform/image-decoders/png/PNGImageDecoder.h:
(WebCore::PNGImageDecoder::isComplete):
(WebCore::PNGImageDecoder::isCompleteAtIndex):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformimagedecoderspngPNGImageDecodercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformimagedecoderspngPNGImageDecoderh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195203 => 195204)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 12:08:07 UTC (rev 195203)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 12:09:07 UTC (rev 195204)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-02 Max Stepin <maxstepin@gmail.com>
+
+ APNG decoder: only decode the frames up to haltAtFrame
+ https://bugs.webkit.org/show_bug.cgi?id=146205
+
+ Reviewed by Michael Catanzaro.
+
+ No new tests, already covered by existing tests.
+
+ * platform/image-decoders/png/PNGImageDecoder.cpp:
+ (WebCore::PNGImageReader::close):
+ (WebCore::PNGImageReader::decode):
+ (WebCore::PNGImageDecoder::isSizeAvailable):
+ (WebCore::PNGImageDecoder::frameBufferAtIndex):
+ (WebCore::PNGImageDecoder::pngComplete):
+ (WebCore::PNGImageDecoder::decode):
+ * platform/image-decoders/png/PNGImageDecoder.h:
+ (WebCore::PNGImageDecoder::isComplete):
+ (WebCore::PNGImageDecoder::isCompleteAtIndex):
+
</ins><span class="cx"> 2015-12-31 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Text with stroke width is not positioned correctly.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformimagedecoderspngPNGImageDecodercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp (195203 => 195204)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp 2016-01-18 12:08:07 UTC (rev 195203)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp 2016-01-18 12:09:07 UTC (rev 195204)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> m_readOffset = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool decode(const SharedBuffer& data, bool sizeOnly)
</del><ins>+ bool decode(const SharedBuffer& data, bool sizeOnly, unsigned haltAtFrame)
</ins><span class="cx"> {
</span><span class="cx"> m_decodingSizeOnly = sizeOnly;
</span><span class="cx"> PNGImageDecoder* decoder = static_cast<PNGImageDecoder*>(png_get_progressive_ptr(m_png));
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> // We explicitly specify the superclass isSizeAvailable() because we
</span><span class="cx"> // merely want to check if we've managed to set the size, not
</span><span class="cx"> // (recursively) trigger additional decoding if we haven't.
</span><del>- if (sizeOnly ? decoder->ImageDecoder::isSizeAvailable() : decoder->isComplete())
</del><ins>+ if (sizeOnly ? decoder->ImageDecoder::isSizeAvailable() : decoder->isCompleteAtIndex(haltAtFrame))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> bool PNGImageDecoder::isSizeAvailable()
</span><span class="cx"> {
</span><span class="cx"> if (!ImageDecoder::isSizeAvailable())
</span><del>- decode(true);
</del><ins>+ decode(true, 0);
</ins><span class="cx">
</span><span class="cx"> return ImageDecoder::isSizeAvailable();
</span><span class="cx"> }
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx">
</span><span class="cx"> ImageFrame& frame = m_frameBufferCache[index];
</span><span class="cx"> if (frame.status() != ImageFrame::FrameComplete)
</span><del>- decode(false);
</del><ins>+ decode(false, index);
</ins><span class="cx"> return &frame;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx"> m_frameBufferCache.first().setStatus(ImageFrame::FrameComplete);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PNGImageDecoder::decode(bool onlySize)
</del><ins>+void PNGImageDecoder::decode(bool onlySize, unsigned haltAtFrame)
</ins><span class="cx"> {
</span><span class="cx"> if (failed())
</span><span class="cx"> return;
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx">
</span><span class="cx"> // If we couldn't decode the image but we've received all the data, decoding
</span><span class="cx"> // has failed.
</span><del>- if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
</del><ins>+ if (!m_reader->decode(*m_data, onlySize, haltAtFrame) && isAllDataReceived())
</ins><span class="cx"> setFailed();
</span><span class="cx"> // If we're done decoding the image, we don't need the PNGImageReader
</span><span class="cx"> // anymore. (If we failed, |m_reader| has already been cleared.)
</span><span class="lines">@@ -771,6 +771,27 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_frameBufferCache.isEmpty()) {
+ m_frameBufferCache.resize(1);
+ m_frameBufferCache[0].setPremultiplyAlpha(m_premultiplyAlpha);
+ }
+
+ if (m_currentFrame < m_frameBufferCache.size()) {
+ ImageFrame& buffer = m_frameBufferCache[m_currentFrame];
+
+ if (!m_delayDenominator)
+ buffer.setDuration(m_delayNumerator * 10);
+ else
+ buffer.setDuration(m_delayNumerator * 1000 / m_delayDenominator);
+
+ if (m_dispose == 2)
+ buffer.setDisposalMethod(ImageFrame::DisposeOverwritePrevious);
+ else if (m_dispose == 1)
+ buffer.setDisposalMethod(ImageFrame::DisposeOverwriteBgcolor);
+ else
+ buffer.setDisposalMethod(ImageFrame::DisposeKeep);
+ }
+
</ins><span class="cx"> m_frameInfo = true;
</span><span class="cx"> m_frameIsHidden = false;
</span><span class="cx">
</span><span class="lines">@@ -927,18 +948,6 @@
</span><span class="cx"> ImageFrame& buffer = m_frameBufferCache[m_currentFrame];
</span><span class="cx"> buffer.setStatus(ImageFrame::FrameComplete);
</span><span class="cx">
</span><del>- if (!m_delayDenominator)
- buffer.setDuration(m_delayNumerator * 10);
- else
- buffer.setDuration(m_delayNumerator * 1000 / m_delayDenominator);
-
- if (m_dispose == 2)
- buffer.setDisposalMethod(ImageFrame::DisposeOverwritePrevious);
- else if (m_dispose == 1)
- buffer.setDisposalMethod(ImageFrame::DisposeOverwriteBgcolor);
- else
- buffer.setDisposalMethod(ImageFrame::DisposeKeep);
-
</del><span class="cx"> png_bytep interlaceBuffer = m_reader->interlaceBuffer();
</span><span class="cx">
</span><span class="cx"> if (m_currentFrame && interlaceBuffer) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformimagedecoderspngPNGImageDecoderh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h (195203 => 195204)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h 2016-01-18 12:08:07 UTC (rev 195203)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h 2016-01-18 12:09:07 UTC (rev 195204)
</span><span class="lines">@@ -80,11 +80,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool isCompleteAtIndex(size_t index)
+ {
+ return (index < m_frameBufferCache.size() && m_frameBufferCache[index].status() == ImageFrame::FrameComplete);
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> // Decodes the image. If |onlySize| is true, stops decoding after
</span><span class="cx"> // calculating the image size. If decoding fails but there is no more
</span><span class="cx"> // data coming, sets the "decode failure" flag.
</span><del>- void decode(bool onlySize);
</del><ins>+ void decode(bool onlySize, unsigned haltAtFrame);
</ins><span class="cx"> #if ENABLE(APNG)
</span><span class="cx"> void initFrameBuffer(size_t frameIndex);
</span><span class="cx"> void frameComplete();
</span></span></pre>
</div>
</div>
</body>
</html>