cc: Move TryScroll from LayerImpl to LayerTreeHostImpl

cc/trees/layer_tree_host_unittest_scroll.cc

 // Copyright 2012 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/trees/layer_tree_host.h"
 
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 1031 matching lines @@
     LayerImpl* root = impl->active_tree()->root_layer();
     LayerImpl* scroll_layer = impl->OuterViewportScrollLayer();
     scroll_layer->SetScrollClipLayer(root->children()[0]->id());
 
     // Set max_scroll_offset = (100, 100).
     scroll_layer->SetBounds(
         gfx::Size(root->bounds().width() + 100, root->bounds().height() + 100));
     impl->active_tree()->property_trees()->needs_rebuild = true;
     impl->active_tree()->BuildPropertyTreesForTesting();
 
-    InputHandler::ScrollStatus status = scroll_layer->TryScroll(
-        gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE);
+    ScrollTree& scroll_tree =
+        impl->active_tree()->property_trees()->scroll_tree;
+    ScrollNode* scroll_node =
+        scroll_tree.Node(scroll_layer->scroll_tree_index());
+
+    InputHandler::ScrollStatus status =
+        impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE,
+                        scroll_tree, scroll_node);
 
     EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
     EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain,
               status.main_thread_scrolling_reasons);
 
     // Set max_scroll_offset = (0, 0).
     scroll_layer->SetBounds(root->bounds());
     impl->active_tree()->property_trees()->needs_rebuild = true;
     impl->active_tree()->BuildPropertyTreesForTesting();
-    status = scroll_layer->TryScroll(
-        gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE);
+    scroll_tree = impl->active_tree()->property_trees()->scroll_tree;
+    scroll_node = scroll_tree.Node(scroll_layer->scroll_tree_index());
+    status = impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE,
+                             scroll_tree, scroll_node);
     EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread);
     EXPECT_EQ(MainThreadScrollingReason::kNotScrollable,
               status.main_thread_scrolling_reasons);
 
     // Set max_scroll_offset = (-100, -100).
     scroll_layer->SetBounds(gfx::Size());
     impl->active_tree()->property_trees()->needs_rebuild = true;
     impl->active_tree()->BuildPropertyTreesForTesting();
-    status = scroll_layer->TryScroll(
-        gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE);
+    scroll_tree = impl->active_tree()->property_trees()->scroll_tree;
+    scroll_node = scroll_tree.Node(scroll_layer->scroll_tree_index());
+    status = impl->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::GESTURE,
+                             scroll_tree, scroll_node);
     EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread);
     EXPECT_EQ(MainThreadScrollingReason::kNotScrollable,
               status.main_thread_scrolling_reasons);
 
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
@@ skipping 13 matching lines @@
     layer_tree_host()->outer_viewport_scroll_layer()->SetScrollOffset(
         gfx::ScrollOffset(20.f, 20.f));
     layer_tree_host()
         ->outer_viewport_scroll_layer()
         ->SetNonFastScrollableRegion(gfx::Rect(20, 20, 20, 20));
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* scroll_layer = impl->OuterViewportScrollLayer();
 
+    ScrollTree& scroll_tree =
+        impl->active_tree()->property_trees()->scroll_tree;
+    ScrollNode* scroll_node =
+        scroll_tree.Node(scroll_layer->scroll_tree_index());
+
     // Verify that the scroll layer's scroll offset is taken into account when
     // checking whether the screen space point is inside the non-fast
     // scrollable region.
 
-    InputHandler::ScrollStatus status = scroll_layer->TryScroll(
-        gfx::PointF(1.f, 1.f), InputHandler::GESTURE);
+    InputHandler::ScrollStatus status = impl->TryScroll(
+        gfx::PointF(1.f, 1.f), InputHandler::GESTURE, scroll_tree, scroll_node);
     EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread);
     EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion,
               status.main_thread_scrolling_reasons);
 
-    status = scroll_layer->TryScroll(
-        gfx::PointF(21.f, 21.f), InputHandler::GESTURE);
+    status = impl->TryScroll(gfx::PointF(21.f, 21.f), InputHandler::GESTURE,
+                             scroll_tree, scroll_node);
     EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
     EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain,
               status.main_thread_scrolling_reasons);
 
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
@@ skipping 11 matching lines @@
     layer_tree_host()
         ->inner_viewport_scroll_layer()
         ->AddMainThreadScrollingReasons(
             MainThreadScrollingReason::kEventHandlers);
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* inner_scroll_layer = impl->InnerViewportScrollLayer();
     LayerImpl* outer_scroll_layer = impl->OuterViewportScrollLayer();
 
-    InputHandler::ScrollStatus status = inner_scroll_layer->TryScroll(
-        gfx::PointF(1.f, 1.f), InputHandler::GESTURE);
+    ScrollTree& scroll_tree =
+        impl->active_tree()->property_trees()->scroll_tree;
+    ScrollNode* inner_scroll_node =
+        scroll_tree.Node(inner_scroll_layer->scroll_tree_index());
+    ScrollNode* outer_scroll_node =
+        scroll_tree.Node(outer_scroll_layer->scroll_tree_index());
+
+    InputHandler::ScrollStatus status =
+        impl->TryScroll(gfx::PointF(1.f, 1.f), InputHandler::GESTURE,
+                        scroll_tree, inner_scroll_node);
     EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread);
     EXPECT_EQ(MainThreadScrollingReason::kEventHandlers,
               status.main_thread_scrolling_reasons);
 
-    status = outer_scroll_layer->TryScroll(gfx::PointF(1.f, 1.f),
-                                           InputHandler::GESTURE);
+    status = impl->TryScroll(gfx::PointF(1.f, 1.f), InputHandler::GESTURE,
+                             scroll_tree, outer_scroll_node);
     EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
     EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain,
               status.main_thread_scrolling_reasons);
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
@@ skipping 184 matching lines @@
   RunTest(CompositorMode::THREADED, false);
 }
 
 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) {
   scroll_destroy_whole_tree_ = true;
   RunTest(CompositorMode::THREADED, false);
 }
 
 }  // namespace
 }  // namespace cc