<!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>[201144] branches/safari-602.1.32-branch/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/201144">201144</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-19 01:40:36 -0700 (Thu, 19 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/201043">r201043</a>. rdar://problem/25835802</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebCoreChangeLog">branches/safari-602.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreplatformgraphicsBitmapImagecpp">branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreplatformgraphicsBitmapImageh">branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201143 => 201144)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-19 08:40:32 UTC (rev 201143)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-19 08:40:36 UTC (rev 201144)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-05-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r201043. rdar://problem/25835802
+
+ 2016-05-16 Simon Fraser <simon.fraser@apple.com>
+
+ BitmapImage::destroyDecodedDataIfNecessary() should only count frames with image data
+ https://bugs.webkit.org/show_bug.cgi?id=157779
+
+ Reviewed by Tim Horton.
+
+ BitmapImage::destroyDecodedDataIfNecessary() throws away all frames of an image if the
+ decoded frame size exceeds a threshold. However, it counts all frames, whether or not
+ they have an image (some frames may only have metadata, but m_frameBytes still returns
+ height*width*4).
+
+ Fix by only count m_frameBytes for frames that have an image.
+
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::destroyDecodedDataIfNecessary):
+ * platform/graphics/BitmapImage.h:
+ (WebCore::FrameData::FrameData):
+ (WebCore::FrameData::usedFrameBytes):
+
</ins><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r200976. rdar://problem/26231897
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.cpp (201143 => 201144)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.cpp 2016-05-19 08:40:32 UTC (rev 201143)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.cpp 2016-05-19 08:40:36 UTC (rev 201144)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned allFrameBytes = 0;
</span><span class="cx"> for (size_t i = 0; i < m_frames.size(); ++i)
</span><del>- allFrameBytes += m_frames[i].m_frameBytes;
</del><ins>+ allFrameBytes += m_frames[i].usedFrameBytes();
</ins><span class="cx">
</span><span class="cx"> if (allFrameBytes > largeAnimationCutoff)
</span><span class="cx"> destroyDecodedData(destroyAll);
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.h (201143 => 201144)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.h 2016-05-19 08:40:32 UTC (rev 201143)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/BitmapImage.h 2016-05-19 08:40:36 UTC (rev 201144)
</span><span class="lines">@@ -72,13 +72,9 @@
</span><span class="cx"> struct FrameData {
</span><span class="cx"> public:
</span><span class="cx"> FrameData()
</span><del>- : m_orientation(DefaultImageOrientation)
- , m_subsamplingLevel(0)
- , m_duration(0)
- , m_haveMetadata(false)
</del><ins>+ : m_haveMetadata(false)
</ins><span class="cx"> , m_isComplete(false)
</span><span class="cx"> , m_hasAlpha(true)
</span><del>- , m_frameBytes(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -90,15 +86,17 @@
</span><span class="cx"> // Clear the cached image data on the frame, and (optionally) the metadata.
</span><span class="cx"> // Returns whether there was cached image data to clear.
</span><span class="cx"> bool clear(bool clearMetadata);
</span><ins>+
+ unsigned usedFrameBytes() const { return m_image ? m_frameBytes : 0; }
</ins><span class="cx">
</span><span class="cx"> NativeImagePtr m_image;
</span><del>- ImageOrientation m_orientation;
- SubsamplingLevel m_subsamplingLevel;
- float m_duration;
</del><ins>+ ImageOrientation m_orientation { DefaultImageOrientation };
+ SubsamplingLevel m_subsamplingLevel { 0 };
+ float m_duration { 0 };
</ins><span class="cx"> bool m_haveMetadata : 1;
</span><span class="cx"> bool m_isComplete : 1;
</span><span class="cx"> bool m_hasAlpha : 1;
</span><del>- unsigned m_frameBytes;
</del><ins>+ unsigned m_frameBytes { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // =================================================
</span></span></pre>
</div>
</div>
</body>
</html>