<!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>[162778] 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/162778">162778</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-25 13:24:10 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[cg] Look in the PNG dictionary for image duration information
https://bugs.webkit.org/show_bug.cgi?id=127611
<rdar://problem/15408643>
Reviewed by Simon Fraser.
We should look in the PNG properties dictionary for frame duration and loop count data.
* platform/graphics/cg/ImageSourceCG.cpp:
(WebCore::ImageSource::repetitionCount):
Mush repetitionCount a bit more to make it easier to read (early returns, etc.)
Also, look in the PNG properties dictionary for a loop count.
(WebCore::ImageSource::frameDurationAtIndex):
Look in the PNG properties dictionary for delay time.
Get rid of WebCoreCGImagePropertyGIFUnclampedDelayTime; it hasn't
been needed since Snow Leopard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162777 => 162778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 21:16:42 UTC (rev 162777)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 21:24:10 UTC (rev 162778)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-25 Tim Horton <timothy_horton@apple.com>
+
+ [cg] Look in the PNG dictionary for image duration information
+ https://bugs.webkit.org/show_bug.cgi?id=127611
+ <rdar://problem/15408643>
+
+ Reviewed by Simon Fraser.
+
+ We should look in the PNG properties dictionary for frame duration and loop count data.
+
+ * platform/graphics/cg/ImageSourceCG.cpp:
+ (WebCore::ImageSource::repetitionCount):
+ Mush repetitionCount a bit more to make it easier to read (early returns, etc.)
+ Also, look in the PNG properties dictionary for a loop count.
+
+ (WebCore::ImageSource::frameDurationAtIndex):
+ Look in the PNG properties dictionary for delay time.
+ Get rid of WebCoreCGImagePropertyGIFUnclampedDelayTime; it hasn't
+ been needed since Snow Leopard.
+
</ins><span class="cx"> 2014-01-25 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove atomicIncrement/atomicDecrement
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageSourceCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (162777 => 162778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-01-25 21:16:42 UTC (rev 162777)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-01-25 21:24:10 UTC (rev 162778)
</span><span class="lines">@@ -46,14 +46,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+const CFStringRef WebCoreCGImagePropertyAPNGUnclampedDelayTime = CFSTR("UnclampedDelayTime");
+const CFStringRef WebCoreCGImagePropertyAPNGDelayTime = CFSTR("DelayTime");
+const CFStringRef WebCoreCGImagePropertyAPNGLoopCount = CFSTR("LoopCount");
+
</ins><span class="cx"> const CFStringRef kCGImageSourceShouldPreferRGB32 = CFSTR("kCGImageSourceShouldPreferRGB32");
</span><span class="cx"> const CFStringRef kCGImageSourceSkipMetadata = CFSTR("kCGImageSourceSkipMetadata");
</span><span class="cx">
</span><del>-// kCGImagePropertyGIFUnclampedDelayTime is available in the ImageIO framework headers on some versions
-// of SnowLeopard. It's not possible to detect whether the constant is available so we define our own here
-// that won't conflict with ImageIO's version when it is available.
-const CFStringRef WebCoreCGImagePropertyGIFUnclampedDelayTime = CFSTR("UnclampedDelayTime");
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool ImageSource::s_acceleratedImageDecoding;
</span><span class="cx"> #endif
</span><span class="lines">@@ -345,26 +344,41 @@
</span><span class="cx">
</span><span class="cx"> int ImageSource::repetitionCount()
</span><span class="cx"> {
</span><del>- int result = cAnimationLoopOnce; // No property means loop once.
</del><span class="cx"> if (!initialized())
</span><del>- return result;
</del><ins>+ return cAnimationLoopOnce;
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyProperties(m_decoder, imageSourceOptions(SkipMetadata)));
</span><del>- if (properties) {
- CFDictionaryRef gifProperties = (CFDictionaryRef)CFDictionaryGetValue(properties.get(), kCGImagePropertyGIFDictionary);
- if (gifProperties) {
- CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(gifProperties, kCGImagePropertyGIFLoopCount);
- if (num) {
- // A property with value 0 means loop forever.
- CFNumberGetValue(num, kCFNumberIntType, &result);
- if (!result)
- result = cAnimationLoopInfinite;
- }
- } else
- result = cAnimationNone; // Turns out we're not a GIF after all, so we don't animate.
</del><ins>+ if (!properties)
+ return cAnimationLoopOnce;
+
+ CFDictionaryRef gifProperties = (CFDictionaryRef)CFDictionaryGetValue(properties.get(), kCGImagePropertyGIFDictionary);
+ if (gifProperties) {
+ CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(gifProperties, kCGImagePropertyGIFLoopCount);
+
+ // No property means loop once.
+ if (!num)
+ return cAnimationLoopOnce;
+
+ int loopCount;
+ CFNumberGetValue(num, kCFNumberIntType, &loopCount);
+
+ // A property with value 0 means loop forever.
+ return loopCount ? loopCount : cAnimationLoopInfinite;
</ins><span class="cx"> }
</span><del>-
- return result;
</del><ins>+
+ CFDictionaryRef pngProperties = (CFDictionaryRef)CFDictionaryGetValue(properties.get(), kCGImagePropertyPNGDictionary);
+ if (pngProperties) {
+ CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(pngProperties, WebCoreCGImagePropertyAPNGLoopCount);
+ if (!num)
+ return cAnimationLoopOnce;
+
+ int loopCount;
+ CFNumberGetValue(num, kCFNumberIntType, &loopCount);
+ return loopCount ? loopCount : cAnimationLoopInfinite;
+ }
+
+ // Turns out we're not an animated image after all, so we don't animate.
+ return cAnimationNone;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t ImageSource::frameCount() const
</span><span class="lines">@@ -451,16 +465,24 @@
</span><span class="cx"> float duration = 0;
</span><span class="cx"> RetainPtr<CFDictionaryRef> properties = adoptCF(CGImageSourceCopyPropertiesAtIndex(m_decoder, index, imageSourceOptions(SkipMetadata)));
</span><span class="cx"> if (properties) {
</span><del>- CFDictionaryRef typeProperties = (CFDictionaryRef)CFDictionaryGetValue(properties.get(), kCGImagePropertyGIFDictionary);
- if (typeProperties) {
- if (CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(typeProperties, WebCoreCGImagePropertyGIFUnclampedDelayTime)) {
</del><ins>+ CFDictionaryRef gifProperties = (CFDictionaryRef)CFDictionaryGetValue(properties.get(), kCGImagePropertyGIFDictionary);
+ if (gifProperties) {
+ if (CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(gifProperties, kCGImagePropertyGIFUnclampedDelayTime)) {
</ins><span class="cx"> // Use the unclamped frame delay if it exists.
</span><span class="cx"> CFNumberGetValue(num, kCFNumberFloatType, &duration);
</span><del>- } else if (CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(typeProperties, kCGImagePropertyGIFDelayTime)) {
</del><ins>+ } else if (CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(gifProperties, kCGImagePropertyGIFDelayTime)) {
</ins><span class="cx"> // Fall back to the clamped frame delay if the unclamped frame delay does not exist.
</span><span class="cx"> CFNumberGetValue(num, kCFNumberFloatType, &duration);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ CFDictionaryRef pngProperties = (CFDictionaryRef)CFDictionaryGetValue(properties.get(), kCGImagePropertyPNGDictionary);
+ if (pngProperties) {
+ if (CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(pngProperties, WebCoreCGImagePropertyAPNGUnclampedDelayTime))
+ CFNumberGetValue(num, kCFNumberFloatType, &duration);
+ else if (CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(pngProperties, WebCoreCGImagePropertyAPNGDelayTime))
+ CFNumberGetValue(num, kCFNumberFloatType, &duration);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Many annoying ads specify a 0 duration to make an image flash as quickly as possible.
</span></span></pre>
</div>
</div>
</body>
</html>