Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Unified Diff: Source/core/animation/CompositorAnimations.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/animation/Animation.cpp ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/CompositorAnimations.cpp
diff --git a/Source/core/animation/CompositorAnimations.cpp b/Source/core/animation/CompositorAnimations.cpp
index 70b84943a160781918c524f348c9cc108d989f0a..813e2340a3f1da9a8af0a0ca40db50bee8b9f5a0 100644
--- a/Source/core/animation/CompositorAnimations.cpp
+++ b/Source/core/animation/CompositorAnimations.cpp
@@ -257,7 +257,7 @@ void CompositorAnimations::cancelIncompatibleAnimationsOnCompositor(const Elemen
bool CompositorAnimations::canStartAnimationOnCompositor(const Element& element)
{
- return element.renderer() && element.renderer()->compositingState() == PaintsIntoOwnBacking;
+ return element.layoutObject() && element.layoutObject()->compositingState() == PaintsIntoOwnBacking;
}
bool CompositorAnimations::startAnimationOnCompositor(const Element& element, int group, double startTime, double timeOffset, const Timing& timing, const AnimationPlayer* player, const AnimationEffect& effect, Vector<int>& startedAnimationIds, double playerPlaybackRate)
@@ -268,7 +268,7 @@ bool CompositorAnimations::startAnimationOnCompositor(const Element& element, in
const KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(effect);
- Layer* layer = toLayoutBoxModelObject(element.renderer())->layer();
+ Layer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
ASSERT(layer);
Vector<OwnPtr<WebCompositorAnimation>> animations;
@@ -299,7 +299,7 @@ void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, i
// compositing update.
return;
}
- toLayoutBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
+ toLayoutBoxModelObject(element.layoutObject())->layer()->compositedLayerMapping()->mainGraphicsLayer()->removeAnimation(id);
}
void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& element, int id, double pauseTime)
@@ -312,7 +312,7 @@ void CompositorAnimations::pauseAnimationForTestingOnCompositor(const Element& e
ASSERT_NOT_REACHED();
return;
}
- toLayoutBoxModelObject(element.renderer())->layer()->compositedLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
+ toLayoutBoxModelObject(element.layoutObject())->layer()->compositedLayerMapping()->mainGraphicsLayer()->pauseAnimation(id, pauseTime);
}
// -----------------------------------------------------------------------
« no previous file with comments | « Source/core/animation/Animation.cpp ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698