CC AnimationHost: Fix LinkHighlights detach scope.

content/test/web_layer_tree_view_impl_for_testing.cc

Index: content/test/web_layer_tree_view_impl_for_testing.cc
diff --git a/content/test/web_layer_tree_view_impl_for_testing.cc b/content/test/web_layer_tree_view_impl_for_testing.cc
index 8b07ba26e9cc11f7ad4c170070c3cda8b196c9a0..534085df35f01b81a548dd0a2c2dbb28f7cd6ee1 100644
--- a/content/test/web_layer_tree_view_impl_for_testing.cc
+++ b/content/test/web_layer_tree_view_impl_for_testing.cc
@@ -8,7 +8,10 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/thread_task_runner_handle.h"
+#include "cc/animation/animation_host.h"
+#include "cc/animation/animation_timeline.h"
 #include "cc/base/switches.h"
+#include "cc/blink/web_compositor_animation_timeline_impl.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/layer.h"
@@ -19,6 +22,7 @@
 #include "third_party/WebKit/public/platform/WebLayer.h"
 #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 
 using blink::WebColor;
 using blink::WebRect;
@@ -30,7 +34,8 @@ WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting() {}
 
 WebLayerTreeViewImplForTesting::~WebLayerTreeViewImplForTesting() {}
 
-void WebLayerTreeViewImplForTesting::Initialize() {
+void WebLayerTreeViewImplForTesting::Initialize(
+    bool use_compositor_animation_timelines) {
   cc::LayerTreeSettings settings;
 
   // For web contents, layer transforms should scale up the contents of layers
@@ -39,6 +44,11 @@ void WebLayerTreeViewImplForTesting::Initialize() {
 
   // Accelerated animations are enabled for unit tests.
   settings.accelerated_animation_enabled = true;
+  settings.use_compositor_animation_timelines =
+      use_compositor_animation_timelines;
+  blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(
+      use_compositor_animation_timelines);

[loyso (OOO), 2015/11/03 05:08:53]

Alternatively, we can land it with 'settings.use_compositor_animation_timelines
= false' constant
and switch to a new system globally in this upcoming CL:
https://codereview.chromium.org/1308053006/

It would leave all function signatures unchanged.

[chrishtr, 2015/11/03 05:43:29]

I think that would be better, since you'll want to remove the parameter later
anyway.

+
   cc::LayerTreeHost::InitParams params;
   params.client = this;
   params.settings = &settings;
@@ -58,6 +68,26 @@ void WebLayerTreeViewImplForTesting::clearRootLayer() {
   layer_tree_host_->SetRootLayer(scoped_refptr<cc::Layer>());
 }
 
+void WebLayerTreeViewImplForTesting::attachCompositorAnimationTimeline(
+    blink::WebCompositorAnimationTimeline* compositor_timeline) {
+  DCHECK(compositor_timeline);
+  DCHECK(layer_tree_host_->animation_host());
+  layer_tree_host_->animation_host()->AddAnimationTimeline(
+      static_cast<const cc_blink::WebCompositorAnimationTimelineImpl*>(
+          compositor_timeline)
+          ->animation_timeline());
+}
+
+void WebLayerTreeViewImplForTesting::detachCompositorAnimationTimeline(
+    blink::WebCompositorAnimationTimeline* compositor_timeline) {
+  DCHECK(compositor_timeline);
+  DCHECK(layer_tree_host_->animation_host());
+  layer_tree_host_->animation_host()->RemoveAnimationTimeline(
+      static_cast<const cc_blink::WebCompositorAnimationTimelineImpl*>(
+          compositor_timeline)
+          ->animation_timeline());
+}
+
 void WebLayerTreeViewImplForTesting::setViewportSize(
     const WebSize& unused_deprecated,
     const WebSize& device_viewport_size) {