Blink Compositor Animation: Erase old animation system.

cc/blink/web_layer_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/blink/web_layer_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
-#include "base/lazy_instance.h"
 #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_blend_mode.h"
-#include "cc/blink/web_to_cc_animation_delegate_adapter.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "cc/layers/layer_settings.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 
 using cc::Animation;
 using cc::Layer;
 using blink::WebLayer;
 using blink::WebFloatPoint;
 using blink::WebVector;
 using blink::WebRect;
 using blink::WebSize;
 using blink::WebColor;
 
 namespace cc_blink {
-namespace {
-
-base::LazyInstance<cc::LayerSettings> g_layer_settings =
-    LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
 
 WebLayerImpl::WebLayerImpl()
-    : layer_(Layer::Create(LayerSettings())), contents_opaque_is_fixed_(false) {
-}
+    : layer_(Layer::Create(cc::LayerSettings())),
+      contents_opaque_is_fixed_(false) {}
 
 WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer)
     : layer_(layer), contents_opaque_is_fixed_(false) {
 }
 
 WebLayerImpl::~WebLayerImpl() {
-  if (animation_delegate_adapter_.get())
-    layer_->set_layer_animation_delegate(nullptr);
   layer_->SetLayerClient(nullptr);
 }
 
-// static
-void WebLayerImpl::SetLayerSettings(const cc::LayerSettings& settings) {
-  g_layer_settings.Get() = settings;
-}
-
-// static
-const cc::LayerSettings& WebLayerImpl::LayerSettings() {
-  return g_layer_settings.Get();
-}
-
 int WebLayerImpl::id() const {
   return layer_->id();
 }
 
 void WebLayerImpl::invalidateRect(const blink::WebRect& rect) {
   layer_->SetNeedsDisplayRect(rect);
 }
 
 void WebLayerImpl::invalidate() {
   layer_->SetNeedsDisplay();
@@ skipping 141 matching lines @@
 }
 
 void WebLayerImpl::setFilters(const cc::FilterOperations& filters) {
   layer_->SetFilters(filters);
 }
 
 void WebLayerImpl::setBackgroundFilters(const cc::FilterOperations& filters) {
   layer_->SetBackgroundFilters(filters);
 }
 
-void WebLayerImpl::setAnimationDelegate(
-    blink::WebCompositorAnimationDelegate* delegate) {
-  if (!delegate) {
-    animation_delegate_adapter_.reset();
-    layer_->set_layer_animation_delegate(nullptr);
-    return;
-  }
-  animation_delegate_adapter_.reset(
-      new WebToCCAnimationDelegateAdapter(delegate));
-  layer_->set_layer_animation_delegate(animation_delegate_adapter_.get());
-}
-
-bool WebLayerImpl::addAnimation(cc::Animation* animation) {
-  return layer_->AddAnimation(make_scoped_ptr(animation));
-}
-
-void WebLayerImpl::removeAnimation(int animation_id) {
-  layer_->RemoveAnimation(animation_id);
-}
-
-void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) {
-  layer_->PauseAnimation(animation_id, time_offset);
-}
-
-void WebLayerImpl::abortAnimation(int animation_id) {
-  layer_->AbortAnimation(animation_id);
-}
-
-bool WebLayerImpl::hasActiveAnimation() {
+bool WebLayerImpl::hasActiveAnimationForTesting() {
   return layer_->HasActiveAnimation();
 }
 
 void WebLayerImpl::setForceRenderSurface(bool force_render_surface) {
   layer_->SetForceRenderSurface(force_render_surface);
 }
 
 void WebLayerImpl::setScrollPositionDouble(blink::WebDoublePoint position) {
   layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y));
 }
@@ skipping 217 matching lines @@
 
 Layer* WebLayerImpl::layer() const {
   return layer_.get();
 }
 
 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) {
   contents_opaque_is_fixed_ = fixed;
 }
 
 }  // namespace cc_blink