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

Unified Diff: cc/blink/web_layer_impl.cc

Issue 1130043003: [Sketch] CC Animations: Torpedo the old intrusive animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@implscroll
Patch Set: Delete more (headers and animation_registrar_ leftover) Created 5 years, 7 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 | « cc/blink/web_layer_impl.h ('k') | cc/layers/layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/web_layer_impl.cc
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index dd836d1c6cba4aaae946105b759a76830be98da8..57669fc99f434dfa6404f84d98ed8ff0350d9ed6 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -12,7 +12,6 @@
#include "base/strings/string_util.h"
#include "base/threading/thread_checker.h"
#include "base/trace_event/trace_event_impl.h"
-#include "cc/animation/animation.h"
#include "cc/base/region.h"
#include "cc/base/switches.h"
#include "cc/blink/web_animation_impl.h"
@@ -62,8 +61,6 @@ WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {
WebLayerImpl::~WebLayerImpl() {
layer_->ClearRenderSurface();
- if (animation_delegate_adapter_.get())
- layer_->set_layer_animation_delegate(nullptr);
web_layer_client_ = nullptr;
}
@@ -236,39 +233,6 @@ void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) {
layer_->SetBackgroundFilters(filters_impl.AsFilterOperations());
}
-void WebLayerImpl::setAnimationDelegate(
- blink::WebCompositorAnimationDelegate* delegate) {
- animation_delegate_adapter_.reset(
- new WebToCCAnimationDelegateAdapter(delegate));
- layer_->set_layer_animation_delegate(animation_delegate_adapter_.get());
-}
-
-bool WebLayerImpl::addAnimation(blink::WebCompositorAnimation* animation) {
- bool result = layer_->AddAnimation(
- static_cast<WebCompositorAnimationImpl*>(animation)->PassAnimation());
- delete animation;
- return result;
-}
-
-void WebLayerImpl::removeAnimation(int animation_id) {
- layer_->RemoveAnimation(animation_id);
-}
-
-void WebLayerImpl::removeAnimation(
- int animation_id,
- blink::WebCompositorAnimation::TargetProperty target_property) {
- layer_->RemoveAnimation(
- animation_id, static_cast<Animation::TargetProperty>(target_property));
-}
-
-void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) {
- layer_->PauseAnimation(animation_id, time_offset);
-}
-
-bool WebLayerImpl::hasActiveAnimation() {
- return layer_->HasActiveAnimation();
-}
-
void WebLayerImpl::setForceRenderSurface(bool force_render_surface) {
layer_->SetForceRenderSurface(force_render_surface);
}
« no previous file with comments | « cc/blink/web_layer_impl.h ('k') | cc/layers/layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698