<!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>[166309] trunk</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/166309">166309</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-26 12:36:51 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/155977">r155977</a>): matrix animations no longer animate
https://bugs.webkit.org/show_bug.cgi?id=130789
<rdar://problem/15650946>
Source/WebCore:
Reviewed by Dean Jackson.
<a href="http://trac.webkit.org/projects/webkit/changeset/155977">r155977</a> erroneously removed two lines that set the end points for
matrix animations (used when transform lists don't match), so
put them back.
Also don't repaint when updateContentsScale()
is called and doesn't change the contents scale.
Test: compositing/animation/matrix-animation.html
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateRootRelativeScale):
(WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
(WebCore::GraphicsLayerCA::updateContentsScale):
LayoutTests:
Reviewed by Dean Jackson.
Add test for fill-fowards animation with mismatched transform lists.
* compositing/animation/matrix-animation-expected.html: Added.
* compositing/animation/matrix-animation.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositinganimationmatrixanimationexpectedhtml">trunk/LayoutTests/compositing/animation/matrix-animation-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositinganimationmatrixanimationhtml">trunk/LayoutTests/compositing/animation/matrix-animation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166308 => 166309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-26 19:36:49 UTC (rev 166308)
+++ trunk/LayoutTests/ChangeLog 2014-03-26 19:36:51 UTC (rev 166309)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-26 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r155977): matrix animations no longer animate
+ https://bugs.webkit.org/show_bug.cgi?id=130789
+ <rdar://problem/15650946>
+
+ Reviewed by Dean Jackson.
+
+ Add test for fill-fowards animation with mismatched transform lists.
+
+ * compositing/animation/matrix-animation-expected.html: Added.
+ * compositing/animation/matrix-animation.html: Added.
+
</ins><span class="cx"> 2014-03-26 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Render tree construction is O(N^2) in number of siblings
</span></span></pre></div>
<a id="trunkLayoutTestscompositinganimationmatrixanimationexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/animation/matrix-animation-expected.html (0 => 166309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/animation/matrix-animation-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/animation/matrix-animation-expected.html 2014-03-26 19:36:51 UTC (rev 166309)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ -webkit-transform: scale(1, 1) translate3d(10px, 10px, 0);
+ }
+ </style>
+</head>
+<body>
+ <div class="box"></div>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/compositing/animation/matrix-animation-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestscompositinganimationmatrixanimationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/animation/matrix-animation.html (0 => 166309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/animation/matrix-animation.html (rev 0)
+++ trunk/LayoutTests/compositing/animation/matrix-animation.html 2014-03-26 19:36:51 UTC (rev 166309)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ #box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ -webkit-transform: scale(0.1, 0.1);
+ }
+
+ .animating {
+ -webkit-animation: zoom 1 0.05s forwards;
+ }
+
+ @-webkit-keyframes zoom {
+ from { }
+ to { -webkit-transform: scale(1, 1) translate(10px, 10px); }
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ var box = document.getElementById('box');
+ box.addEventListener('webkitAnimationEnd', function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, false);
+ box.classList.add('animating');
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <div id="box">
+ </div>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/compositing/animation/matrix-animation.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166308 => 166309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:49 UTC (rev 166308)
+++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:51 UTC (rev 166309)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-03-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r155977): matrix animations no longer animate
+ https://bugs.webkit.org/show_bug.cgi?id=130789
+ <rdar://problem/15650946>
+
+ Reviewed by Dean Jackson.
+
+ r155977 erroneously removed two lines that set the end points for
+ matrix animations (used when transform lists don't match), so
+ put them back.
+
+ Also don't repaint when updateContentsScale()
+ is called and doesn't change the contents scale.
+
+ Test: compositing/animation/matrix-animation.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::updateRootRelativeScale):
+ (WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
+ (WebCore::GraphicsLayerCA::updateContentsScale):
+
+2014-03-26 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130778
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (166308 => 166309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-03-26 19:36:49 UTC (rev 166308)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-03-26 19:36:51 UTC (rev 166309)
</span><span class="lines">@@ -1165,7 +1165,7 @@
</span><span class="cx"> transformFromRoot->multiply(unanimatedTransform);
</span><span class="cx"> rootRelativeScaleFactor = maxScaleFromTransform(*transformFromRoot);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (rootRelativeScaleFactor != m_rootRelativeScaleFactor) {
</span><span class="cx"> m_rootRelativeScaleFactor = rootRelativeScaleFactor;
</span><span class="cx"> m_uncommittedChanges |= ContentsScaleChanged | ContentsOpaqueChanged;
</span><span class="lines">@@ -2703,6 +2703,9 @@
</span><span class="cx"> // If any matrix is singular, CA won't animate it correctly. So fall back to software animation
</span><span class="cx"> if (!fromTransform.isInvertible() || !toTransform.isInvertible())
</span><span class="cx"> return false;
</span><ins>+
+ basicAnim->setFromValue(fromTransform);
+ basicAnim->setToValue(toTransform);
</ins><span class="cx"> } else {
</span><span class="cx"> if (isTransformTypeNumber(transformOpType)) {
</span><span class="cx"> float fromValue;
</span><span class="lines">@@ -2945,6 +2948,9 @@
</span><span class="cx"> void GraphicsLayerCA::updateContentsScale(float pageScaleFactor)
</span><span class="cx"> {
</span><span class="cx"> float contentsScale = clampedContentsScaleForScale(m_rootRelativeScaleFactor * pageScaleFactor * deviceScaleFactor());
</span><ins>+ if (contentsScale == m_layer->contentsScale())
+ return;
+
</ins><span class="cx"> m_layer->setContentsScale(contentsScale);
</span><span class="cx"> if (drawsContent())
</span><span class="cx"> m_layer->setNeedsDisplay();
</span></span></pre>
</div>
</div>
</body>
</html>