<!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>[185097] 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/185097">185097</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-06-01 19:29:41 -0700 (Mon, 01 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSS animations in filling-forwards state shouldn't force compositing.
<https://webkit.org/b/145389>
<rdar://problem/17923642>
Reviewed by Simon Fraser.
Source/WebCore:
Stop checking if a CSS animation is filling forwards when computing
compositing requirements.
This prevents finished animations from pinning elements in composited
state, and frees up a bunch of IOSurface memory on some content.
* page/animation/AnimationBase.h:
(WebCore::AnimationBase::isAnimatingProperty): Deleted.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGeometry):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
LayoutTests:
Remove tests that were only here to check that animations in fill-forwards
state would participate in overlap testing.
* compositing/animation/layer-for-filling-animation-expected.txt: Update expected result
here to reflect that we no longer expect filling-forwards animations to get composited.
* compositing/animation/filling-animation-overlap-at-end-expected.txt: Removed.
* compositing/animation/filling-animation-overlap-at-end.html: Removed.
* compositing/animation/filling-animation-overlap-expected.txt: Removed.
* compositing/animation/filling-animation-overlap.html: Removed.
* platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-at-end-expected.txt: Removed.
* platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-expected.txt: Removed.
* platform/ios-sim-deprecated/compositing/animation/layer-for-filling-animation-expected.txt: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscompositinganimationlayerforfillinganimationexpectedtxt">trunk/LayoutTests/compositing/animation/layer-for-filling-animation-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBaseh">trunk/Source/WebCore/page/animation/AnimationBase.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositinganimationfillinganimationoverlapatendexpectedtxt">trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositinganimationfillinganimationoverlapatendhtml">trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end.html</a></li>
<li><a href="#trunkLayoutTestscompositinganimationfillinganimationoverlapexpectedtxt">trunk/LayoutTests/compositing/animation/filling-animation-overlap-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositinganimationfillinganimationoverlaphtml">trunk/LayoutTests/compositing/animation/filling-animation-overlap.html</a></li>
<li><a href="#trunkLayoutTestsplatformiossimdeprecatedcompositinganimationfillinganimationoverlapatendexpectedtxt">trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-at-end-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimdeprecatedcompositinganimationfillinganimationoverlapexpectedtxt">trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimdeprecatedcompositinganimationlayerforfillinganimationexpectedtxt">trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/layer-for-filling-animation-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/ChangeLog 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-01 Andreas Kling <akling@apple.com>
+
+ CSS animations in filling-forwards state shouldn't force compositing.
+ <https://webkit.org/b/145389>
+ <rdar://problem/17923642>
+
+ Reviewed by Simon Fraser.
+
+ Remove tests that were only here to check that animations in fill-forwards
+ state would participate in overlap testing.
+
+ * compositing/animation/layer-for-filling-animation-expected.txt: Update expected result
+ here to reflect that we no longer expect filling-forwards animations to get composited.
+
+ * compositing/animation/filling-animation-overlap-at-end-expected.txt: Removed.
+ * compositing/animation/filling-animation-overlap-at-end.html: Removed.
+ * compositing/animation/filling-animation-overlap-expected.txt: Removed.
+ * compositing/animation/filling-animation-overlap.html: Removed.
+ * platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-at-end-expected.txt: Removed.
+ * platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-expected.txt: Removed.
+ * platform/ios-sim-deprecated/compositing/animation/layer-for-filling-animation-expected.txt: Removed.
+
</ins><span class="cx"> 2015-06-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Test gardening after r185087.
</span></span></pre></div>
<a id="trunkLayoutTestscompositinganimationfillinganimationoverlapatendexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end-expected.txt (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end-expected.txt 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end-expected.txt 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 2
- (GraphicsLayer
- (position 34.00 26.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- (GraphicsLayer
- (position 34.00 166.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- )
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestscompositinganimationfillinganimationoverlapatendhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end.html (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end.html 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/compositing/animation/filling-animation-overlap-at-end.html 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- .box {
- position: relative;
- height: 100px;
- width: 100px;
- margin: 40px;
- background-color: orange;
- box-shadow: 0 0 10px black;
- }
-
- .animating {
- -webkit-animation: spin 1 0.1s forwards;
- background-color: blue;
- }
-
- @-webkit-keyframes spin {
- from { -webkit-transform: rotate(0); }
- to { -webkit-transform: rotate(45deg); }
- }
- </style>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- function doTest()
- {
- document.getElementById('box').addEventListener('webkitAnimationEnd', function() {
- if (window.testRunner) {
- document.getElementById('results').innerText = window.internals.layerTreeAsText(document);
- testRunner.notifyDone();
- }
- })
- }
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-<div id="box" class="animating box"></div>
-<div class="box"></div>
-
-<pre id="results">Layer tree dump goes here</pre>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscompositinganimationfillinganimationoverlapexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/compositing/animation/filling-animation-overlap-expected.txt (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/animation/filling-animation-overlap-expected.txt 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/compositing/animation/filling-animation-overlap-expected.txt 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 1
- (GraphicsLayer
- (position 34.00 26.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- )
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestscompositinganimationfillinganimationoverlaphtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/compositing/animation/filling-animation-overlap.html (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/animation/filling-animation-overlap.html 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/compositing/animation/filling-animation-overlap.html 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- .box {
- position: relative;
- height: 100px;
- width: 100px;
- margin: 40px;
- box-shadow: 0 0 10px black;
- background-color: orange;
- }
-
- .animating {
- -webkit-animation: spin 1 0.1s forwards;
- background-color: blue;
- }
-
- @-webkit-keyframes spin {
- from { -webkit-transform: rotate(0); }
- to { -webkit-transform: rotate(10deg); }
- }
- </style>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- function doTest()
- {
- document.getElementById('box').addEventListener('webkitAnimationEnd', function() {
- if (window.testRunner) {
- document.getElementById('results').innerText = window.internals.layerTreeAsText(document);
- testRunner.notifyDone();
- }
- })
- }
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-<div id="box" class="animating box"></div>
-<div class="box"></div>
-
-<pre id="results">Layer tree dump goes here</pre>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestscompositinganimationlayerforfillinganimationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/animation/layer-for-filling-animation-expected.txt (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/animation/layer-for-filling-animation-expected.txt 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/compositing/animation/layer-for-filling-animation-expected.txt 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,18 +1 @@
</span><del>-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 1
- (GraphicsLayer
- (position 44.00 36.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- )
- )
- )
-)
</del><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimdeprecatedcompositinganimationfillinganimationoverlapatendexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-at-end-expected.txt (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-at-end-expected.txt 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-at-end-expected.txt 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-(GraphicsLayer
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (children 2
- (GraphicsLayer
- (position 34.00 26.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- (GraphicsLayer
- (position 34.00 166.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- )
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimdeprecatedcompositinganimationfillinganimationoverlapexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-expected.txt (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-expected.txt 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/filling-animation-overlap-expected.txt 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-(GraphicsLayer
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (position 34.00 26.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- )
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimdeprecatedcompositinganimationlayerforfillinganimationexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/layer-for-filling-animation-expected.txt (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/layer-for-filling-animation-expected.txt 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/LayoutTests/platform/ios-sim-deprecated/compositing/animation/layer-for-filling-animation-expected.txt 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-(GraphicsLayer
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (position 44.00 36.00)
- (bounds 128.00 128.00)
- (drawsContent 1)
- )
- )
- )
- )
-)
-
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/Source/WebCore/ChangeLog 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-01 Andreas Kling <akling@apple.com>
+
+ CSS animations in filling-forwards state shouldn't force compositing.
+ <https://webkit.org/b/145389>
+ <rdar://problem/17923642>
+
+ Reviewed by Simon Fraser.
+
+ Stop checking if a CSS animation is filling forwards when computing
+ compositing requirements.
+
+ This prevents finished animations from pinning elements in composited
+ state, and frees up a bunch of IOSurface memory on some content.
+
+ * page/animation/AnimationBase.h:
+ (WebCore::AnimationBase::isAnimatingProperty): Deleted.
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGeometry):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
+
</ins><span class="cx"> 2015-06-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Out of bounds read in WebCore::ComplexTextController::adjustGlyphsAndAdvances
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.h (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.h 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/Source/WebCore/page/animation/AnimationBase.h 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -163,7 +163,6 @@
</span><span class="cx"> Delaying = 1 << 0,
</span><span class="cx"> Paused = 1 << 1,
</span><span class="cx"> Running = 1 << 2,
</span><del>- FillingFowards = 1 << 3
</del><span class="cx"> };
</span><span class="cx"> typedef unsigned RunningState;
</span><span class="cx"> bool isAnimatingProperty(CSSPropertyID property, bool acceleratedOnly, RunningState runningState) const
</span><span class="lines">@@ -183,9 +182,6 @@
</span><span class="cx"> if ((runningState & Running) && !inPausedState() && (m_animationState >= AnimationState::StartWaitStyleAvailable && m_animationState <= AnimationState::Done))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if ((runningState & FillingFowards) && m_animationState == AnimationState::FillingForwards)
- return true;
-
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -674,11 +674,11 @@
</span><span class="cx">
</span><span class="cx"> // Set transform property, if it is not animating. We have to do this here because the transform
</span><span class="cx"> // is affected by the layer dimensions.
</span><del>- if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
</del><ins>+ if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused))
</ins><span class="cx"> updateTransform(style);
</span><span class="cx">
</span><span class="cx"> // Set opacity, if it is not animating.
</span><del>- if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyOpacity, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
</del><ins>+ if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyOpacity, AnimationBase::Running | AnimationBase::Paused))
</ins><span class="cx"> updateOpacity(style);
</span><span class="cx">
</span><span class="cx"> updateFilters(style);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (185096 => 185097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-06-02 02:15:31 UTC (rev 185096)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-06-02 02:29:41 UTC (rev 185097)
</span><span class="lines">@@ -2564,7 +2564,7 @@
</span><span class="cx"> if (!(m_compositingTriggers & ChromeClient::AnimationTrigger))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- const AnimationBase::RunningState activeAnimationState = AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards;
</del><ins>+ const AnimationBase::RunningState activeAnimationState = AnimationBase::Running | AnimationBase::Paused;
</ins><span class="cx"> AnimationController& animController = renderer.animation();
</span><span class="cx"> return (animController.isRunningAnimationOnRenderer(renderer, CSSPropertyOpacity, activeAnimationState)
</span><span class="cx"> && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
</span></span></pre>
</div>
</div>
</body>
</html>