Blink Compositor Animation: Move AnimationDelegate into platform.

Also, erase the adapter in cc_blink.

This is the last CompositorAnimation interface left in WebKit/public.

Yay!

BUG=577016
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1754913002

Cr-Commit-Position: refs/heads/master@{#378893}

4 files changed, 0 insertions, 88 deletions

diff --git a/cc/blink/BUILD.gn b/cc/blink/BUILD.gn
index 6b8b406..107146f 100644
--- a/cc/blink/BUILD.gn
+++ b/cc/blink/BUILD.gn
@@ -31,8 +31,6 @@ component("blink") {
     "web_layer_impl_fixed_bounds.h",
     "web_scrollbar_layer_impl.cc",
     "web_scrollbar_layer_impl.h",
-    "web_to_cc_animation_delegate_adapter.cc",
-    "web_to_cc_animation_delegate_adapter.h",
   ]
 
   defines = [ "CC_BLINK_IMPLEMENTATION" ]
diff --git a/cc/blink/cc_blink.gyp b/cc/blink/cc_blink.gyp
index a9d0494..61eed79 100644
--- a/cc/blink/cc_blink.gyp
+++ b/cc/blink/cc_blink.gyp
@@ -47,8 +47,6 @@
         'web_layer_impl_fixed_bounds.h',
         'web_scrollbar_layer_impl.cc',
         'web_scrollbar_layer_impl.h',
-        'web_to_cc_animation_delegate_adapter.cc',
-        'web_to_cc_animation_delegate_adapter.h',
       ],
     },
   ]
diff --git a/cc/blink/web_to_cc_animation_delegate_adapter.cc b/cc/blink/web_to_cc_animation_delegate_adapter.cc
deleted file mode 100644
index 2ad069d..0000000
--- a/cc/blink/web_to_cc_animation_delegate_adapter.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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_to_cc_animation_delegate_adapter.h"
-#include "third_party/WebKit/public/platform/WebCompositorAnimationDelegate.h"
-
-namespace cc_blink {
-
-WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter(
-    blink::WebCompositorAnimationDelegate* delegate)
-    : delegate_(delegate) {
-}
-
-void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted(
-    base::TimeTicks monotonic_time,
-    cc::TargetProperty::Type target_property,
-    int group) {
-  delegate_->notifyAnimationStarted(
-      (monotonic_time - base::TimeTicks()).InSecondsF(), group);
-}
-
-void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished(
-    base::TimeTicks monotonic_time,
-    cc::TargetProperty::Type target_property,
-    int group) {
-  delegate_->notifyAnimationFinished(
-      (monotonic_time - base::TimeTicks()).InSecondsF(), group);
-}
-
-void WebToCCAnimationDelegateAdapter::NotifyAnimationAborted(
-    base::TimeTicks monotonic_time,
-    cc::TargetProperty::Type target_property,
-    int group) {
-  delegate_->notifyAnimationAborted(
-      (monotonic_time - base::TimeTicks()).InSecondsF(), group);
-}
-
-}  // namespace cc_blink
diff --git a/cc/blink/web_to_cc_animation_delegate_adapter.h b/cc/blink/web_to_cc_animation_delegate_adapter.h
deleted file mode 100644
index 6c5453e..0000000
--- a/cc/blink/web_to_cc_animation_delegate_adapter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// 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.
-
-#ifndef CC_BLINK_WEB_TO_CC_ANIMATION_DELEGATE_ADAPTER_H_
-#define CC_BLINK_WEB_TO_CC_ANIMATION_DELEGATE_ADAPTER_H_
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "cc/animation/animation_delegate.h"
-
-namespace blink {
-class WebCompositorAnimationDelegate;
-}
-
-namespace cc_blink {
-
-class WebToCCAnimationDelegateAdapter : public cc::AnimationDelegate {
- public:
-  explicit WebToCCAnimationDelegateAdapter(
-      blink::WebCompositorAnimationDelegate* delegate);
-
- private:
-  void NotifyAnimationStarted(base::TimeTicks monotonic_time,
-                              cc::TargetProperty::Type target_property,
-                              int group) override;
-  void NotifyAnimationFinished(base::TimeTicks monotonic_time,
-                               cc::TargetProperty::Type target_property,
-                               int group) override;
-  void NotifyAnimationAborted(base::TimeTicks monotonic_time,
-                              cc::TargetProperty::Type target_property,
-                              int group) override;
-  void NotifyAnimationTakeover(base::TimeTicks monotonic_time,
-                               cc::TargetProperty::Type target_property,
-                               double animation_start_time,
-                               scoped_ptr<cc::AnimationCurve> curve) override {}
-
-  blink::WebCompositorAnimationDelegate* delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebToCCAnimationDelegateAdapter);
-};
-
-}  // namespace cc_blink
-
-#endif  // CC_BLINK_WEB_TO_CC_ANIMATION_DELEGATE_ADAPTER_H_