Make scroll offset type of float in cc

cc/layers/layer_impl.h

 // 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <set>
 #include <string>
 
@@ skipping 12 matching lines @@
 #include "cc/layers/layer_lists.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/output/filter_operations.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/resources/resource_provider.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkPicture.h"
+#include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace base {
 namespace debug {
 class ConvertableToTraceFormat;
 class TracedValue;
 }
@@ skipping 326 matching lines @@
   void SetContentBounds(const gfx::Size& content_bounds);
   gfx::Size content_bounds() const { return draw_properties_.content_bounds; }
 
   float contents_scale_x() const { return draw_properties_.contents_scale_x; }
   float contents_scale_y() const { return draw_properties_.contents_scale_y; }
   void SetContentsScale(float contents_scale_x, float contents_scale_y);
 
   void SetScrollOffsetDelegate(ScrollOffsetDelegate* scroll_offset_delegate);
   bool IsExternalFlingActive() const;
 
-  void SetScrollOffset(const gfx::Vector2d& scroll_offset);
-  void SetScrollOffsetAndDelta(const gfx::Vector2d& scroll_offset,
+  void SetScrollOffset(const gfx::ScrollOffset& scroll_offset);
+  void SetScrollOffsetAndDelta(const gfx::ScrollOffset& scroll_offset,
                                const gfx::Vector2dF& scroll_delta);
-  gfx::Vector2d scroll_offset() const { return scroll_offset_; }
+  gfx::ScrollOffset scroll_offset() const { return scroll_offset_; }
 
   gfx::Vector2d MaxScrollOffset() const;

[danakj, 2014/09/25 15:13:31]

Should this and ClampScroll be ScrollOffsets?

[Yufeng Shen (Slow to review), 2014/09/25 20:06:23]

Done.

   gfx::Vector2dF ClampScrollToMaxScrollOffset();
   void SetScrollbarPosition(ScrollbarLayerImplBase* scrollbar_layer,
                             LayerImpl* scrollbar_clip_layer) const;
   void SetScrollDelta(const gfx::Vector2dF& scroll_delta);
   gfx::Vector2dF ScrollDelta() const;
 
   gfx::Vector2dF TotalScrollOffset() const;

[danakj, 2014/09/25 15:13:31]

TODO to change to ScrollOffset?

[Yufeng Shen (Slow to review), 2014/09/25 20:06:24]

done in this patch.

 
-  void SetSentScrollDelta(const gfx::Vector2d& sent_scroll_delta);
-  gfx::Vector2d sent_scroll_delta() const { return sent_scroll_delta_; }
+  void SetSentScrollDelta(const gfx::ScrollOffset& sent_scroll_delta);

[danakj, 2014/09/25 15:13:30]

Why isn't the delta a Vector2dF?

We should be consistent, all deltas (relative to an offset) are one thing all
offsets (relative to origin) are one thing.

[Yufeng Shen (Slow to review), 2014/09/25 20:06:23]

right, I change all the scroll delta to Vector2dF, and all the scroll offset
to be ScrollOffset.

+  gfx::ScrollOffset sent_scroll_delta() const { return sent_scroll_delta_; }
 
   // Returns the delta of the scroll that was outside of the bounds of the
   // initial scroll
   gfx::Vector2dF ScrollBy(const gfx::Vector2dF& scroll);
 
   void SetScrollClipLayer(int scroll_clip_layer_id);
   LayerImpl* scroll_clip_layer() const { return scroll_clip_layer_; }
   bool scrollable() const { return !!scroll_clip_layer_; }
 
   void set_user_scrollable_horizontal(bool scrollable) {
@@ skipping 194 matching lines @@
   scoped_ptr<LayerImpl> mask_layer_;
   int replica_layer_id_;  // ditto
   scoped_ptr<LayerImpl> replica_layer_;
   int layer_id_;
   LayerTreeImpl* layer_tree_impl_;
 
   // Properties synchronized from the associated Layer.
   gfx::Point3F transform_origin_;
   gfx::Size bounds_;
   gfx::Vector2dF bounds_delta_;
-  gfx::Vector2d scroll_offset_;
+  gfx::ScrollOffset scroll_offset_;
   ScrollOffsetDelegate* scroll_offset_delegate_;
   LayerImpl* scroll_clip_layer_;
   bool scrollable_ : 1;
   bool should_scroll_on_main_thread_ : 1;
   bool have_wheel_event_handlers_ : 1;
   bool have_scroll_event_handlers_ : 1;
   bool user_scrollable_horizontal_ : 1;
   bool user_scrollable_vertical_ : 1;
   bool stacking_order_changed_ : 1;
   // Whether the "back" of this layer should draw.
@@ skipping 22 matching lines @@
   SkColor background_color_;
 
   float opacity_;
   SkXfermode::Mode blend_mode_;
   gfx::PointF position_;
   gfx::Transform transform_;
 
   LayerPositionConstraint position_constraint_;
 
   gfx::Vector2dF scroll_delta_;
-  gfx::Vector2d sent_scroll_delta_;
+  gfx::ScrollOffset sent_scroll_delta_;

[danakj, 2014/09/25 15:13:30]

impl-side deltas are Vector2dF can this be that?

[Yufeng Shen (Slow to review), 2014/09/25 20:06:23]

Done.

   gfx::Vector2dF last_scroll_offset_;

[danakj, 2014/09/25 15:13:31]

shouldnt this be a ScrollOffset?

[Yufeng Shen (Slow to review), 2014/09/25 20:06:23]

Done.

 
   int num_descendants_that_draw_content_;
 
   // The global depth value of the center of the layer. This value is used
   // to sort layers from back to front.
   float draw_depth_;
 
   FilterOperations filters_;
   FilterOperations background_filters_;
 
@@ skipping 40 matching lines @@
   DrawProperties<LayerImpl> draw_properties_;
 
   scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_