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

Unified Diff: Source/core/testing/Internals.cpp

Issue 33483002: Have Frame::animation() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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
Index: Source/core/testing/Internals.cpp
diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp
index 1ece4eac5e2d90a0457ceff4e9db95bb642c8c40..51d8eb5e137cd00fbc5221e17d1d960084bb01c9 100644
--- a/Source/core/testing/Internals.cpp
+++ b/Source/core/testing/Internals.cpp
@@ -410,10 +410,8 @@ unsigned Internals::numberOfActiveAnimations() const
{
Frame* contextFrame = frame();
if (RuntimeEnabledFeatures::webAnimationsCSSEnabled())
- return frame()->document()->timeline()->numberOfActiveAnimationsForTesting();
- if (AnimationController* controller = contextFrame->animation())
- return controller->numberOfActiveAnimations(contextFrame->document());
- return 0;
+ return contextFrame->document()->timeline()->numberOfActiveAnimationsForTesting();
+ return contextFrame->animation().numberOfActiveAnimations(contextFrame->document());
}
void Internals::pauseAnimations(double pauseTime, ExceptionState& es)
@@ -426,7 +424,7 @@ void Internals::pauseAnimations(double pauseTime, ExceptionState& es)
if (RuntimeEnabledFeatures::webAnimationsCSSEnabled())
frame()->document()->timeline()->pauseAnimationsForTesting(pauseTime);
else
- frame()->animation()->pauseAnimationsForTesting(pauseTime);
+ frame()->animation().pauseAnimationsForTesting(pauseTime);
}
bool Internals::hasShadowInsertionPoint(const Node* root, ExceptionState& es) const
« Source/core/frame/animation/AnimationController.h ('K') | « Source/core/rendering/RenderObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698