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

Unified Diff: webkit/renderer/compositor_bindings/web_animation_impl.cc

Issue 24165003: Don't clone WebAnimation in WebLayerImpl::addAnimation(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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: webkit/renderer/compositor_bindings/web_animation_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_animation_impl.cc b/webkit/renderer/compositor_bindings/web_animation_impl.cc
index 1c15bc3170db8e0c3ab56bc5eedf31e53a5b7666..377dcbf2892f7fa24bf3018ce6d05592b54ba8d2 100644
--- a/webkit/renderer/compositor_bindings/web_animation_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_animation_impl.cc
@@ -53,44 +53,42 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& web_curve,
WebAnimationImpl::~WebAnimationImpl() {}
-int WebAnimationImpl::id() { return animation_->id(); }
+int WebAnimationImpl::id() { return Animation()->id(); }
WebKit::WebAnimation::TargetProperty WebAnimationImpl::targetProperty() const {
return static_cast<WebAnimationImpl::TargetProperty>(
- animation_->target_property());
+ Animation()->target_property());
}
-int WebAnimationImpl::iterations() const { return animation_->iterations(); }
+int WebAnimationImpl::iterations() const { return Animation()->iterations(); }
-void WebAnimationImpl::setIterations(int n) { animation_->set_iterations(n); }
+void WebAnimationImpl::setIterations(int n) { Animation()->set_iterations(n); }
-double WebAnimationImpl::startTime() const { return animation_->start_time(); }
+double WebAnimationImpl::startTime() const { return Animation()->start_time(); }
void WebAnimationImpl::setStartTime(double monotonic_time) {
- animation_->set_start_time(monotonic_time);
+ Animation()->set_start_time(monotonic_time);
}
double WebAnimationImpl::timeOffset() const {
- return animation_->time_offset();
+ return Animation()->time_offset();
}
void WebAnimationImpl::setTimeOffset(double monotonic_time) {
- animation_->set_time_offset(monotonic_time);
+ Animation()->set_time_offset(monotonic_time);
}
bool WebAnimationImpl::alternatesDirection() const {
- return animation_->alternates_direction();
+ return Animation()->alternates_direction();
}
void WebAnimationImpl::setAlternatesDirection(bool alternates) {
- animation_->set_alternates_direction(alternates);
+ Animation()->set_alternates_direction(alternates);
}
-scoped_ptr<cc::Animation> WebAnimationImpl::CloneToAnimation() {
- scoped_ptr<cc::Animation> to_return(
- animation_->Clone(cc::Animation::NonControllingInstance));
- to_return->set_needs_synchronized_start_time(true);
- return to_return.Pass();
+scoped_ptr<cc::Animation> WebAnimationImpl::PassAnimation() {
+ Animation()->set_needs_synchronized_start_time(true);
+ return animation_.Pass();
}
} // namespace webkit

Powered by Google App Engine
This is Rietveld 408576698