<!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>[208033] 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/208033">208033</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-10-27 22:34:34 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove RenderStyle::isRunningAcceleratedAnimation()
https://bugs.webkit.org/show_bug.cgi?id=164109
Reviewed by David Hyatt.
RenderStyle::isRunningAcceleratedAnimation() was added in <a href="http://trac.webkit.org/projects/webkit/changeset/40876">r40876</a> to handle interrupted
accelerated transitions, and to allow RenderLayer::currentTransform() to know when it
has to manually get the animated style.
The latter can now use isRunningAcceleratedAnimationOnRenderer(), and interrupting
accelerated transitions seems to work fine without it, so remove it.
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::animate):
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::animate):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::currentTransform):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::isRunningAcceleratedAnimation): Deleted.
(WebCore::RenderStyle::setIsRunningAcceleratedAnimation): Deleted.
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageanimationImplicitAnimationcpp">trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationcpp">trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208032 => 208033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-28 05:28:55 UTC (rev 208032)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 05:34:34 UTC (rev 208033)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-10-27 Simon Fraser <simon.fraser@apple.com>
+
+ Remove RenderStyle::isRunningAcceleratedAnimation()
+ https://bugs.webkit.org/show_bug.cgi?id=164109
+
+ Reviewed by David Hyatt.
+
+ RenderStyle::isRunningAcceleratedAnimation() was added in r40876 to handle interrupted
+ accelerated transitions, and to allow RenderLayer::currentTransform() to know when it
+ has to manually get the animated style.
+
+ The latter can now use isRunningAcceleratedAnimationOnRenderer(), and interrupting
+ accelerated transitions seems to work fine without it, so remove it.
+
+ * page/animation/ImplicitAnimation.cpp:
+ (WebCore::ImplicitAnimation::animate):
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::animate):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::currentTransform):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::isRunningAcceleratedAnimation): Deleted.
+ (WebCore::RenderStyle::setIsRunningAcceleratedAnimation): Deleted.
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2016-10-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Teach WebGL code about new buffer targets in WebGL2
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationImplicitAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (208032 => 208033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2016-10-28 05:28:55 UTC (rev 208032)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2016-10-28 05:34:34 UTC (rev 208033)
</span><span class="lines">@@ -79,17 +79,9 @@
</span><span class="cx"> if (!animatedStyle)
</span><span class="cx"> animatedStyle = RenderStyle::clonePtr(*targetStyle);
</span><span class="cx">
</span><del>- bool needsAnim = CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress());
</del><ins>+ CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress());
</ins><span class="cx"> // FIXME: we also need to detect cases where we have to software animate for other reasons,
</span><span class="cx"> // such as a child using inheriting the transform. https://bugs.webkit.org/show_bug.cgi?id=23902
</span><del>- if (!needsAnim) {
- // If we are running an accelerated animation, set a flag in the style which causes the style
- // to compare as different to any other style. This ensures that changes to the property
- // that is animating are correctly detected during the animation (e.g. when a transition
- // gets interrupted).
- // FIXME: still need this hack?
- animatedStyle->setIsRunningAcceleratedAnimation();
- }
</del><span class="cx">
</span><span class="cx"> // Fire the start timeout if needed
</span><span class="cx"> fireAnimationEventsIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (208032 => 208033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-10-28 05:28:55 UTC (rev 208032)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-10-28 05:34:34 UTC (rev 208033)
</span><span class="lines">@@ -176,13 +176,7 @@
</span><span class="cx"> double progress = 0;
</span><span class="cx"> fetchIntervalEndpointsForProperty(propertyID, fromStyle, toStyle, progress);
</span><span class="cx">
</span><del>- bool needsAnim = CSSPropertyAnimation::blendProperties(this, propertyID, animatedStyle.get(), fromStyle, toStyle, progress);
- if (!needsAnim)
- // If we are running an accelerated animation, set a flag in the style
- // to indicate it. This can be used to make sure we get an updated
- // style for hit testing, etc.
- // FIXME: still need this?
- animatedStyle->setIsRunningAcceleratedAnimation();
</del><ins>+ CSSPropertyAnimation::blendProperties(this, propertyID, animatedStyle.get(), fromStyle, toStyle, progress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return state() != oldState;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (208032 => 208033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-10-28 05:28:55 UTC (rev 208032)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-10-28 05:34:34 UTC (rev 208033)
</span><span class="lines">@@ -995,9 +995,8 @@
</span><span class="cx"> return TransformationMatrix();
</span><span class="cx">
</span><span class="cx"> RenderBox* box = renderBox();
</span><del>- ASSERT(box);
- // FIXME: replace with call to AnimationController::isRunningAcceleratedAnimationOnRenderer() and remove RenderStyle::isRunningAcceleratedAnimation().
- if (renderer().style().isRunningAcceleratedAnimation()) {
</del><ins>+
+ if (renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused)) {
</ins><span class="cx"> TransformationMatrix currTransform;
</span><span class="cx"> FloatRect pixelSnappedBorderRect = snapRectToDevicePixels(box->borderBoxRect(), box->document().deviceScaleFactor());
</span><span class="cx"> std::unique_ptr<RenderStyle> style = renderer().animation().getAnimatedStyleForRenderer(renderer());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (208032 => 208033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-10-28 05:28:55 UTC (rev 208032)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-10-28 05:34:34 UTC (rev 208033)
</span><span class="lines">@@ -1120,9 +1120,6 @@
</span><span class="cx"> const LengthSize& pageSize() const { return rareNonInheritedData->m_pageSize; }
</span><span class="cx"> PageSizeType pageSizeType() const { return static_cast<PageSizeType>(rareNonInheritedData->m_pageSizeType); }
</span><span class="cx">
</span><del>- // When set, this ensures that styles compare as different. Used during accelerated animations.
- bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_runningAcceleratedAnimation; }
-
</del><span class="cx"> LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxContain; }
</span><span class="cx"> const LineClampValue& lineClamp() const { return rareNonInheritedData->lineClamp; }
</span><span class="cx"> const IntSize& initialLetter() const { return rareNonInheritedData->m_initialLetter; }
</span><span class="lines">@@ -1694,8 +1691,6 @@
</span><span class="cx"> void setPageSizeType(PageSizeType t) { SET_VAR(rareNonInheritedData, m_pageSizeType, t); }
</span><span class="cx"> void resetPageSizeType() { SET_VAR(rareNonInheritedData, m_pageSizeType, PAGE_SIZE_AUTO); }
</span><span class="cx">
</span><del>- void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_runningAcceleratedAnimation, b); }
-
</del><span class="cx"> void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_lineBoxContain, c); }
</span><span class="cx"> void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (208032 => 208033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-10-28 05:28:55 UTC (rev 208032)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-10-28 05:34:34 UTC (rev 208033)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> , m_borderFit(RenderStyle::initialBorderFit())
</span><span class="cx"> , m_textCombine(RenderStyle::initialTextCombine())
</span><span class="cx"> , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
</span><del>- , m_runningAcceleratedAnimation(false)
</del><span class="cx"> , m_aspectRatioType(RenderStyle::initialAspectRatioType())
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_effectiveBlendMode(RenderStyle::initialBlendMode())
</span><span class="lines">@@ -194,7 +193,6 @@
</span><span class="cx"> , m_borderFit(o.m_borderFit)
</span><span class="cx"> , m_textCombine(o.m_textCombine)
</span><span class="cx"> , m_textDecorationStyle(o.m_textDecorationStyle)
</span><del>- , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
</del><span class="cx"> , m_aspectRatioType(o.m_aspectRatioType)
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_effectiveBlendMode(o.m_effectiveBlendMode)
</span><span class="lines">@@ -303,7 +301,6 @@
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> && m_scrollSnapType == o.m_scrollSnapType
</span><span class="cx"> #endif
</span><del>- && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> && m_effectiveBlendMode == o.m_effectiveBlendMode
</span><span class="cx"> && m_isolation == o.m_isolation
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (208032 => 208033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-10-28 05:28:55 UTC (rev 208032)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-10-28 05:34:34 UTC (rev 208033)
</span><span class="lines">@@ -207,8 +207,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_textDecorationStyle : 3; // TextDecorationStyle
</span><span class="cx">
</span><del>- unsigned m_runningAcceleratedAnimation : 1;
-
</del><span class="cx"> unsigned m_aspectRatioType : 2;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span></span></pre>
</div>
</div>
</body>
</html>