<!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>[174973] releases/WebKitGTK/webkit-2.6/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/174973">174973</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 09:32:00 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174804">r174804</a> - Leverage the new RenderElement::m_isCSSAnimating flag in more places
https://bugs.webkit.org/show_bug.cgi?id=137786
Reviewed by Simon Fraser.
Leverage the new RenderElement::m_isCSSAnimating flag that was introduced
in <a href="http://trac.webkit.org/projects/webkit/changeset/174703">r174703</a> in more places, for performance. This avoids doing extra work
for renderers on which we are not running animations on. This patch also
updates the API a bit to use more references instead of pointers, making
it clear the RenderElement cannot be null and thus avoiding unnecessary
null checks.
No new tests, no behavior change.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::computeRenderStyleForProperty):
* page/animation/AnimationController.cpp:
(WebCore::AnimationControllerPrivate::ensureCompositeAnimation):
(WebCore::AnimationControllerPrivate::clear):
(WebCore::AnimationControllerPrivate::updateAnimationTimerForRenderer):
(WebCore::AnimationControllerPrivate::isRunningAnimationOnRenderer):
(WebCore::AnimationControllerPrivate::isRunningAcceleratedAnimationOnRenderer):
(WebCore::AnimationControllerPrivate::pauseAnimationAtTime):
(WebCore::AnimationControllerPrivate::pauseTransitionAtTime):
(WebCore::AnimationControllerPrivate::getAnimatedStyleForRenderer):
(WebCore::AnimationController::cancelAnimations):
(WebCore::AnimationController::updateAnimations):
(WebCore::AnimationController::getAnimatedStyleForRenderer):
(WebCore::AnimationController::notifyAnimationStarted):
(WebCore::AnimationController::isRunningAnimationOnRenderer):
(WebCore::AnimationController::isRunningAcceleratedAnimationOnRenderer):
* page/animation/AnimationController.h:
* page/animation/AnimationControllerPrivate.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::willBeDestroyed):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::currentTransform):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::notifyAnimationStarted):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
(WebCore::RenderLayerCompositor::isRunningAcceleratedTransformAnimation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorecssCSSComputedStyleDeclarationcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorepageanimationAnimationControllercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorepageanimationAnimationControllerh">releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorepageanimationAnimationControllerPrivateh">releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationControllerPrivate.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderElementcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayerBackingcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayerCompositorcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2014-10-16 Chris Dumez <cdumez@apple.com>
+
+ Leverage the new RenderElement::m_isCSSAnimating flag in more places
+ https://bugs.webkit.org/show_bug.cgi?id=137786
+
+ Reviewed by Simon Fraser.
+
+ Leverage the new RenderElement::m_isCSSAnimating flag that was introduced
+ in r174703 in more places, for performance. This avoids doing extra work
+ for renderers on which we are not running animations on. This patch also
+ updates the API a bit to use more references instead of pointers, making
+ it clear the RenderElement cannot be null and thus avoiding unnecessary
+ null checks.
+
+ No new tests, no behavior change.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::computeRenderStyleForProperty):
+ * page/animation/AnimationController.cpp:
+ (WebCore::AnimationControllerPrivate::ensureCompositeAnimation):
+ (WebCore::AnimationControllerPrivate::clear):
+ (WebCore::AnimationControllerPrivate::updateAnimationTimerForRenderer):
+ (WebCore::AnimationControllerPrivate::isRunningAnimationOnRenderer):
+ (WebCore::AnimationControllerPrivate::isRunningAcceleratedAnimationOnRenderer):
+ (WebCore::AnimationControllerPrivate::pauseAnimationAtTime):
+ (WebCore::AnimationControllerPrivate::pauseTransitionAtTime):
+ (WebCore::AnimationControllerPrivate::getAnimatedStyleForRenderer):
+ (WebCore::AnimationController::cancelAnimations):
+ (WebCore::AnimationController::updateAnimations):
+ (WebCore::AnimationController::getAnimatedStyleForRenderer):
+ (WebCore::AnimationController::notifyAnimationStarted):
+ (WebCore::AnimationController::isRunningAnimationOnRenderer):
+ (WebCore::AnimationController::isRunningAcceleratedAnimationOnRenderer):
+ * page/animation/AnimationController.h:
+ * page/animation/AnimationControllerPrivate.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::willBeDestroyed):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::currentTransform):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGeometry):
+ (WebCore::RenderLayerBacking::notifyAnimationStarted):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
+ (WebCore::RenderLayerCompositor::isRunningAcceleratedTransformAnimation):
+
</ins><span class="cx"> 2014-10-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce an isCSSAnimated flag on RenderElement for performance
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -1664,7 +1664,7 @@
</span><span class="cx">
</span><span class="cx"> if (renderer && renderer->isComposited() && AnimationController::supportsAcceleratedAnimationOfProperty(propertyID)) {
</span><span class="cx"> AnimationUpdateBlock animationUpdateBlock(&renderer->animation());
</span><del>- RefPtr<RenderStyle> style = renderer->animation().getAnimatedStyleForRenderer(toRenderElement(renderer));
</del><ins>+ RefPtr<RenderStyle> style = renderer->animation().getAnimatedStyleForRenderer(toRenderElement(*renderer));
</ins><span class="cx"> if (pseudoElementSpecifier && !styledNode->isPseudoElement()) {
</span><span class="cx"> // FIXME: This cached pseudo style will only exist if the animation has been run at least once.
</span><span class="cx"> return style->getCachedPseudoStyle(pseudoElementSpecifier);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.cpp (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.cpp 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.cpp 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -67,24 +67,25 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CompositeAnimation& AnimationControllerPrivate::ensureCompositeAnimation(RenderElement* renderer)
</del><ins>+CompositeAnimation& AnimationControllerPrivate::ensureCompositeAnimation(RenderElement& renderer)
</ins><span class="cx"> {
</span><del>- auto result = m_compositeAnimations.add(renderer, nullptr);
</del><ins>+ auto result = m_compositeAnimations.add(&renderer, nullptr);
</ins><span class="cx"> if (result.isNewEntry) {
</span><span class="cx"> result.iterator->value = CompositeAnimation::create(this);
</span><del>- renderer->setIsCSSAnimating(true);
</del><ins>+ renderer.setIsCSSAnimating(true);
</ins><span class="cx"> }
</span><span class="cx"> return *result.iterator->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AnimationControllerPrivate::clear(RenderElement* renderer)
</del><ins>+bool AnimationControllerPrivate::clear(RenderElement& renderer)
</ins><span class="cx"> {
</span><ins>+ ASSERT(renderer.isCSSAnimating());
+ ASSERT(m_compositeAnimations.contains(&renderer));
</ins><span class="cx"> // Return false if we didn't do anything OR we are suspended (so we don't try to
</span><span class="cx"> // do a setNeedsStyleRecalc() when suspended).
</span><del>- RefPtr<CompositeAnimation> animation = m_compositeAnimations.take(renderer);
- if (!animation)
- return false;
- renderer->setIsCSSAnimating(false);
</del><ins>+ RefPtr<CompositeAnimation> animation = m_compositeAnimations.take(&renderer);
+ ASSERT(animation);
+ renderer.setIsCSSAnimating(false);
</ins><span class="cx"> animation->clearRenderer();
</span><span class="cx"> return animation->isSuspended();
</span><span class="cx"> }
</span><span class="lines">@@ -119,11 +120,11 @@
</span><span class="cx"> return timeToNextService;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AnimationControllerPrivate::updateAnimationTimerForRenderer(RenderElement* renderer)
</del><ins>+void AnimationControllerPrivate::updateAnimationTimerForRenderer(RenderElement& renderer)
</ins><span class="cx"> {
</span><span class="cx"> double timeToNextService = 0;
</span><span class="cx">
</span><del>- const CompositeAnimation* compositeAnimation = m_compositeAnimations.get(renderer);
</del><ins>+ const CompositeAnimation* compositeAnimation = m_compositeAnimations.get(&renderer);
</ins><span class="cx"> if (!compositeAnimation->isSuspended() && compositeAnimation->hasAnimations())
</span><span class="cx"> timeToNextService = compositeAnimation->timeToNextService();
</span><span class="cx">
</span><span class="lines">@@ -239,19 +240,19 @@
</span><span class="cx"> fireEventsAndUpdateStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AnimationControllerPrivate::isRunningAnimationOnRenderer(RenderElement* renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</del><ins>+bool AnimationControllerPrivate::isRunningAnimationOnRenderer(RenderElement& renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</ins><span class="cx"> {
</span><del>- ASSERT(renderer->isCSSAnimating());
- ASSERT(m_compositeAnimations.contains(renderer));
- const CompositeAnimation& animation = *m_compositeAnimations.get(renderer);
</del><ins>+ ASSERT(renderer.isCSSAnimating());
+ ASSERT(m_compositeAnimations.contains(&renderer));
+ const CompositeAnimation& animation = *m_compositeAnimations.get(&renderer);
</ins><span class="cx"> return animation.isAnimatingProperty(property, false, runningState);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AnimationControllerPrivate::isRunningAcceleratedAnimationOnRenderer(RenderElement* renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</del><ins>+bool AnimationControllerPrivate::isRunningAcceleratedAnimationOnRenderer(RenderElement& renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</ins><span class="cx"> {
</span><del>- ASSERT(renderer->isCSSAnimating());
- ASSERT(m_compositeAnimations.contains(renderer));
- const CompositeAnimation& animation = *m_compositeAnimations.get(renderer);
</del><ins>+ ASSERT(renderer.isCSSAnimating());
+ ASSERT(m_compositeAnimations.contains(&renderer));
+ const CompositeAnimation& animation = *m_compositeAnimations.get(&renderer);
</ins><span class="cx"> return animation.isAnimatingProperty(property, true, runningState);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -323,7 +324,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- CompositeAnimation& compositeAnimation = ensureCompositeAnimation(renderer);
</del><ins>+ CompositeAnimation& compositeAnimation = ensureCompositeAnimation(*renderer);
</ins><span class="cx"> if (compositeAnimation.pauseAnimationAtTime(name, t)) {
</span><span class="cx"> renderer->element()->setNeedsStyleRecalc(SyntheticStyleChange);
</span><span class="cx"> startUpdateStyleIfNeededDispatcher();
</span><span class="lines">@@ -338,7 +339,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- CompositeAnimation& compositeAnimation = ensureCompositeAnimation(renderer);
</del><ins>+ CompositeAnimation& compositeAnimation = ensureCompositeAnimation(*renderer);
</ins><span class="cx"> if (compositeAnimation.pauseTransitionAtTime(cssPropertyID(property), t)) {
</span><span class="cx"> renderer->element()->setNeedsStyleRecalc(SyntheticStyleChange);
</span><span class="cx"> startUpdateStyleIfNeededDispatcher();
</span><span class="lines">@@ -368,18 +369,14 @@
</span><span class="cx"> startTimeResponse(time);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<RenderStyle> AnimationControllerPrivate::getAnimatedStyleForRenderer(RenderElement* renderer)
</del><ins>+PassRefPtr<RenderStyle> AnimationControllerPrivate::getAnimatedStyleForRenderer(RenderElement& renderer)
</ins><span class="cx"> {
</span><del>- if (!renderer)
- return 0;
-
- const CompositeAnimation* rendererAnimations = m_compositeAnimations.get(renderer);
- if (!rendererAnimations)
- return &renderer->style();
-
- RefPtr<RenderStyle> animatingStyle = rendererAnimations->getAnimatedStyle();
</del><ins>+ ASSERT(renderer.isCSSAnimating());
+ ASSERT(m_compositeAnimations.contains(&renderer));
+ const CompositeAnimation& rendererAnimations = *m_compositeAnimations.get(&renderer);
+ RefPtr<RenderStyle> animatingStyle = rendererAnimations.getAnimatedStyle();
</ins><span class="cx"> if (!animatingStyle)
</span><del>- animatingStyle = &renderer->style();
</del><ins>+ animatingStyle = &renderer.style();
</ins><span class="cx">
</span><span class="cx"> return animatingStyle.release();
</span><span class="cx"> }
</span><span class="lines">@@ -479,17 +476,18 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AnimationController::cancelAnimations(RenderElement* renderer)
</del><ins>+void AnimationController::cancelAnimations(RenderElement& renderer)
</ins><span class="cx"> {
</span><del>- if (!m_data->hasAnimations())
</del><ins>+ if (!renderer.isCSSAnimating())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_data->clear(renderer)) {
- Element* element = renderer->element();
- ASSERT(!element || !element->document().inPageCache());
- if (element)
- element->setNeedsStyleRecalc(SyntheticStyleChange);
- }
</del><ins>+ if (!m_data->clear(renderer))
+ return;
+
+ Element* element = renderer.element();
+ ASSERT(!element || !element->document().inPageCache());
+ if (element)
+ element->setNeedsStyleRecalc(SyntheticStyleChange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRef<RenderStyle> AnimationController::updateAnimations(RenderElement& renderer, PassRef<RenderStyle> newStyle)
</span><span class="lines">@@ -517,11 +515,11 @@
</span><span class="cx">
</span><span class="cx"> Ref<RenderStyle> newStyleBeforeAnimation(WTF::move(newStyle));
</span><span class="cx">
</span><del>- CompositeAnimation& rendererAnimations = m_data->ensureCompositeAnimation(&renderer);
</del><ins>+ CompositeAnimation& rendererAnimations = m_data->ensureCompositeAnimation(renderer);
</ins><span class="cx"> auto blendedStyle = rendererAnimations.animate(renderer, oldStyle, newStyleBeforeAnimation.get());
</span><span class="cx">
</span><span class="cx"> if (renderer.parent() || newStyleBeforeAnimation->animations() || (oldStyle && oldStyle->animations())) {
</span><del>- m_data->updateAnimationTimerForRenderer(&renderer);
</del><ins>+ m_data->updateAnimationTimerForRenderer(renderer);
</ins><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME)
</span><span class="cx"> renderer.view().frameView().scheduleAnimation();
</span><span class="cx"> #endif
</span><span class="lines">@@ -537,12 +535,14 @@
</span><span class="cx"> return blendedStyle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<RenderStyle> AnimationController::getAnimatedStyleForRenderer(RenderElement* renderer)
</del><ins>+PassRefPtr<RenderStyle> AnimationController::getAnimatedStyleForRenderer(RenderElement& renderer)
</ins><span class="cx"> {
</span><ins>+ if (!renderer.isCSSAnimating())
+ return &renderer.style();
</ins><span class="cx"> return m_data->getAnimatedStyleForRenderer(renderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AnimationController::notifyAnimationStarted(RenderElement*, double startTime)
</del><ins>+void AnimationController::notifyAnimationStarted(RenderElement&, double startTime)
</ins><span class="cx"> {
</span><span class="cx"> m_data->receivedStartTimeResponse(startTime);
</span><span class="cx"> }
</span><span class="lines">@@ -562,14 +562,14 @@
</span><span class="cx"> return m_data->pauseTransitionAtTime(renderer, property, t);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AnimationController::isRunningAnimationOnRenderer(RenderElement* renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</del><ins>+bool AnimationController::isRunningAnimationOnRenderer(RenderElement& renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</ins><span class="cx"> {
</span><del>- return renderer->isCSSAnimating() && m_data->isRunningAnimationOnRenderer(renderer, property, runningState);
</del><ins>+ return renderer.isCSSAnimating() && m_data->isRunningAnimationOnRenderer(renderer, property, runningState);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool AnimationController::isRunningAcceleratedAnimationOnRenderer(RenderElement* renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</del><ins>+bool AnimationController::isRunningAcceleratedAnimationOnRenderer(RenderElement& renderer, CSSPropertyID property, AnimationBase::RunningState runningState) const
</ins><span class="cx"> {
</span><del>- return renderer->isCSSAnimating() && m_data->isRunningAcceleratedAnimationOnRenderer(renderer, property, runningState);
</del><ins>+ return renderer.isCSSAnimating() && m_data->isRunningAcceleratedAnimationOnRenderer(renderer, property, runningState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AnimationController::isSuspended() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorepageanimationAnimationControllerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.h (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.h 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationController.h 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -47,19 +47,19 @@
</span><span class="cx"> explicit AnimationController(Frame&);
</span><span class="cx"> ~AnimationController();
</span><span class="cx">
</span><del>- void cancelAnimations(RenderElement*);
</del><ins>+ void cancelAnimations(RenderElement&);
</ins><span class="cx"> PassRef<RenderStyle> updateAnimations(RenderElement&, PassRef<RenderStyle> newStyle);
</span><del>- PassRefPtr<RenderStyle> getAnimatedStyleForRenderer(RenderElement*);
</del><ins>+ PassRefPtr<RenderStyle> getAnimatedStyleForRenderer(RenderElement&);
</ins><span class="cx">
</span><span class="cx"> // This is called when an accelerated animation or transition has actually started to animate.
</span><del>- void notifyAnimationStarted(RenderElement*, double startTime);
</del><ins>+ void notifyAnimationStarted(RenderElement&, double startTime);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool pauseAnimationAtTime(RenderElement*, const AtomicString& name, double t); // To be used only for testing
</span><span class="cx"> WEBCORE_EXPORT bool pauseTransitionAtTime(RenderElement*, const String& property, double t); // To be used only for testing
</span><span class="cx"> WEBCORE_EXPORT unsigned numberOfActiveAnimations(Document*) const; // To be used only for testing
</span><span class="cx">
</span><del>- bool isRunningAnimationOnRenderer(RenderElement*, CSSPropertyID, AnimationBase::RunningState) const;
- bool isRunningAcceleratedAnimationOnRenderer(RenderElement*, CSSPropertyID, AnimationBase::RunningState) const;
</del><ins>+ bool isRunningAnimationOnRenderer(RenderElement&, CSSPropertyID, AnimationBase::RunningState) const;
+ bool isRunningAcceleratedAnimationOnRenderer(RenderElement&, CSSPropertyID, AnimationBase::RunningState) const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isSuspended() const;
</span><span class="cx"> WEBCORE_EXPORT void suspendAnimations();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorepageanimationAnimationControllerPrivateh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationControllerPrivate.h (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationControllerPrivate.h 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/animation/AnimationControllerPrivate.h 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> double updateAnimations(SetChanged callSetChanged = DoNotCallSetChanged);
</span><span class="cx"> void updateAnimationTimer(SetChanged callSetChanged = DoNotCallSetChanged);
</span><span class="cx">
</span><del>- CompositeAnimation& ensureCompositeAnimation(RenderElement*);
- bool clear(RenderElement*);
</del><ins>+ CompositeAnimation& ensureCompositeAnimation(RenderElement&);
+ bool clear(RenderElement&);
</ins><span class="cx">
</span><span class="cx"> void updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>&);
</span><span class="cx"> void startUpdateStyleIfNeededDispatcher();
</span><span class="lines">@@ -86,14 +86,14 @@
</span><span class="cx"> void resumeAnimationsForDocument(Document*);
</span><span class="cx"> void startAnimationsIfNotSuspended(Document*);
</span><span class="cx">
</span><del>- bool isRunningAnimationOnRenderer(RenderElement*, CSSPropertyID, AnimationBase::RunningState) const;
- bool isRunningAcceleratedAnimationOnRenderer(RenderElement*, CSSPropertyID, AnimationBase::RunningState) const;
</del><ins>+ bool isRunningAnimationOnRenderer(RenderElement&, CSSPropertyID, AnimationBase::RunningState) const;
+ bool isRunningAcceleratedAnimationOnRenderer(RenderElement&, CSSPropertyID, AnimationBase::RunningState) const;
</ins><span class="cx">
</span><span class="cx"> bool pauseAnimationAtTime(RenderElement*, const AtomicString& name, double t);
</span><span class="cx"> bool pauseTransitionAtTime(RenderElement*, const String& property, double t);
</span><span class="cx"> unsigned numberOfActiveAnimations(Document*) const;
</span><span class="cx">
</span><del>- PassRefPtr<RenderStyle> getAnimatedStyleForRenderer(RenderElement* renderer);
</del><ins>+ PassRefPtr<RenderStyle> getAnimatedStyleForRenderer(RenderElement&);
</ins><span class="cx">
</span><span class="cx"> double beginAnimationUpdateTime();
</span><span class="cx"> void setBeginAnimationUpdateTime(double t) { m_beginAnimationUpdateTime = t; }
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> void animationWillBeRemoved(AnimationBase*);
</span><span class="cx">
</span><del>- void updateAnimationTimerForRenderer(RenderElement*);
</del><ins>+ void updateAnimationTimerForRenderer(RenderElement&);
</ins><span class="cx">
</span><span class="cx"> bool allowsNewAnimationsWhileSuspended() const { return m_allowsNewAnimationsWhileSuspended; }
</span><span class="cx"> void setAllowsNewAnimationsWhileSuspended(bool);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderElement.cpp (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderElement.cpp 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderElement.cpp 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -1006,7 +1006,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::willBeDestroyed()
</span><span class="cx"> {
</span><del>- animation().cancelAnimations(this);
</del><ins>+ animation().cancelAnimations(*this);
</ins><span class="cx">
</span><span class="cx"> destroyLeftoverChildren();
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayer.cpp 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -867,7 +867,7 @@
</span><span class="cx"> FloatRect pixelSnappedBorderRect = snapRectToDevicePixels(box->borderBoxRect(), box->document().deviceScaleFactor());
</span><span class="cx"> if (renderer().style().isRunningAcceleratedAnimation()) {
</span><span class="cx"> TransformationMatrix currTransform;
</span><del>- RefPtr<RenderStyle> style = renderer().animation().getAnimatedStyleForRenderer(&renderer());
</del><ins>+ RefPtr<RenderStyle> style = renderer().animation().getAnimatedStyleForRenderer(renderer());
</ins><span class="cx"> style->applyTransform(currTransform, pixelSnappedBorderRect, applyOrigin);
</span><span class="cx"> makeMatrixRenderable(currTransform, canRender3DTransforms());
</span><span class="cx"> return currTransform;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerBacking.cpp (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -642,11 +642,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(), CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
</del><ins>+ if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
</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 | AnimationBase::FillingFowards))
</ins><span class="cx"> updateOpacity(style);
</span><span class="cx">
</span><span class="cx"> updateFilters(style);
</span><span class="lines">@@ -2445,7 +2445,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::notifyAnimationStarted(const GraphicsLayer*, const String&, double time)
</span><span class="cx"> {
</span><del>- renderer().animation().notifyAnimationStarted(&renderer(), time);
</del><ins>+ renderer().animation().notifyAnimationStarted(renderer(), time);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::notifyFlushRequired(const GraphicsLayer* layer)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerCompositor.cpp (174972 => 174973)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-21 16:28:34 UTC (rev 174972)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-21 16:32:00 UTC (rev 174973)
</span><span class="lines">@@ -2497,10 +2497,10 @@
</span><span class="cx">
</span><span class="cx"> const AnimationBase::RunningState activeAnimationState = AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards;
</span><span class="cx"> AnimationController& animController = renderer.animation();
</span><del>- return (animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyOpacity, activeAnimationState)
</del><ins>+ return (animController.isRunningAnimationOnRenderer(renderer, CSSPropertyOpacity, activeAnimationState)
</ins><span class="cx"> && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
</span><del>- || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitFilter, activeAnimationState)
- || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitTransform, activeAnimationState);
</del><ins>+ || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitFilter, activeAnimationState)
+ || animController.isRunningAnimationOnRenderer(renderer, CSSPropertyWebkitTransform, activeAnimationState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::requiresCompositingForIndirectReason(RenderLayerModelObject& renderer, bool hasCompositedDescendants, bool has3DTransformedDescendants, RenderLayer::IndirectCompositingReason& reason) const
</span><span class="lines">@@ -2693,7 +2693,7 @@
</span><span class="cx"> if (!(m_compositingTriggers & ChromeClient::AnimationTrigger))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return renderer.animation().isRunningAcceleratedAnimationOnRenderer(&renderer, CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused);
</del><ins>+ return renderer.animation().isRunningAcceleratedAnimationOnRenderer(renderer, CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If an element has negative z-index children, those children render in front of the
</span></span></pre>
</div>
</div>
</body>
</html>