Refactor Scroll Customization to share cc::ScrollStateData with blink.

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 12 matching lines @@
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 
 namespace cc {
 namespace {
 
 scoped_ptr<ScrollState> BeginState(const gfx::Point& point) {
-  return ScrollState::Create(gfx::Vector2dF(), point, gfx::Vector2dF(), true,
-                             false, false);
+  ScrollStateData scroll_state_data;
+  scroll_state_data.is_beginning = true;
+  scroll_state_data.start_position_x = point.x();
+  scroll_state_data.start_position_y = point.y();
+  scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
+  return scroll_state;
 }
 
 scoped_ptr<ScrollState> UpdateState(const gfx::Point& point,
                                     const gfx::Vector2dF& delta) {
-  return ScrollState::Create(delta, point, gfx::Vector2dF(), false, false,
-                             false);
+  ScrollStateData scroll_state_data;
+  scroll_state_data.delta_x = delta.x();
+  scroll_state_data.delta_y = delta.y();
+  scroll_state_data.start_position_x = point.x();
+  scroll_state_data.start_position_y = point.y();
+  scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
+  return scroll_state;
 }
 
 scoped_ptr<ScrollState> EndState() {
-  return ScrollState::Create(gfx::Vector2dF(), gfx::Point(), gfx::Vector2dF(),
-                             false, false, true);
+  ScrollStateData scroll_state_data;
+  scroll_state_data.is_ending = true;
+  scoped_ptr<ScrollState> scroll_state(new ScrollState(scroll_state_data));
+  return scroll_state;
 }
 
 class LayerTreeHostScrollTest : public LayerTreeTest {
  protected:
   void SetupTree() override {
     LayerTreeTest::SetupTree();
     Layer* root_layer = layer_tree_host()->root_layer();
 
     // Create an effective max_scroll_offset of (100, 100).
     gfx::Size scroll_layer_bounds(root_layer->bounds().width() + 100,
@@ skipping 1280 matching lines @@
   RunTest(CompositorMode::THREADED, false);
 }
 
 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) {
   scroll_destroy_whole_tree_ = true;
   RunTest(CompositorMode::THREADED, false);
 }
 
 }  // namespace
 }  // namespace cc