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

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 373 matching lines @@
     scoped_ptr<LayerImpl> layer =
         LayerImpl::Create(host_impl_->active_tree(), id);
     layer->SetScrollClipLayer(clip_layer->id());
     layer->SetDrawsContent(true);
     layer->SetBounds(size);
     clip_layer->SetBounds(gfx::Size(size.width() / 2, size.height() / 2));
     return layer;
   }
 
   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;
   }
 
   void DrawFrame() {
     LayerTreeHostImpl::FrameData frame;
     EXPECT_EQ(DRAW_SUCCESS, PrepareToDrawFrame(&frame));
     host_impl_->DrawLayers(&frame);
     host_impl_->DidDrawAllLayers(frame);
   }
 
   void RebuildPropertyTrees() {
@@ skipping 8835 matching lines @@
   EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD,
             host_impl_->ScrollBegin(BeginState(gfx::Point(0, y)).get(),
                                     InputHandler::WHEEL)
                 .thread);
   EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(0, y),
                                                       InputHandler::WHEEL));
   host_impl_->ScrollBy(
       UpdateState(gfx::Point(0, y), gfx::Vector2d(0, 50)).get());
   EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(0, y + 50),
                                                       InputHandler::WHEEL));
-  ScrollState scroll_state_end(0, 0, 0 /* start_position_x */,
-                               y + 50 /* start_position_y */, 0, 0, false,
-                               false, true);
-  host_impl_->ScrollEnd(&scroll_state_end);
+  scoped_ptr<ScrollState> scroll_state_end = EndState();
+  host_impl_->ScrollEnd(scroll_state_end.get());
   EXPECT_FALSE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(),
                                                        InputHandler::WHEEL));
 
   // The instant scroll should have marked the smooth scroll animation as
   // aborted.
   EXPECT_FALSE(
       host_impl_->animation_host()->HasActiveAnimation(scrolling_layer->id()));
 
   EXPECT_VECTOR2DF_EQ(gfx::ScrollOffset(0, y + 50),
                       scrolling_layer->CurrentScrollOffset());
@@ skipping 687 matching lines @@
     // There should not be any jitter measured till we hit the fixed point hits
     // threshold.
     float expected_jitter =
         (i == pending_tree->kFixedPointHitsThreshold) ? 500 : 0;
     EXPECT_EQ(jitter, expected_jitter);
   }
 }
 
 }  // namespace
 }  // namespace cc