commit f57925d399f2eda19fdaab9191257e51a3af04a0
author miletus <miletus@chromium.org> Wed Oct 01 19:38:13 2014
committer Commit bot <commit-bot@chromium.org> Wed Oct 01 19:38:44 2014
tree fe4a309c3f5af49155e2711671f644fc4fb130e0
parent cc40100c7c9b5be5ae9f13b888e875d63f2844cd

Use ScrollOffset instead of vector2d to track scroll offset in cc

This is for preparing converting blink side scroll offset to be double
type. Assuming blink side starts to use double scroll offset, it can
be passed back from main/blink to compositor without converting to int
type.

BUG=414283

Review URL: https://codereview.chromium.org/584503005

Cr-Commit-Position: refs/heads/master@{#297692}

cc/layers/layer.h

diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 3452e8b..a627140 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -29,6 +29,7 @@
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkXfermode.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"
@@ -261,9 +262,9 @@
     return draw_properties_.num_unclipped_descendants;
   }
 
-  void SetScrollOffset(gfx::Vector2d scroll_offset);
-  gfx::Vector2d scroll_offset() const { return scroll_offset_; }
-  void SetScrollOffsetFromImplSide(const gfx::Vector2d& scroll_offset);
+  void SetScrollOffset(const gfx::ScrollOffset& scroll_offset);
+  gfx::ScrollOffset scroll_offset() const { return scroll_offset_; }
+  void SetScrollOffsetFromImplSide(const gfx::ScrollOffset& scroll_offset);
 
   void SetScrollClipLayerId(int clip_layer_id);
   bool scrollable() const { return scroll_clip_layer_id_ != INVALID_ID; }
@@ -309,10 +310,9 @@
   void SetForceRenderSurface(bool force_render_surface);
   bool force_render_surface() const { return force_render_surface_; }
 
-  gfx::Vector2d ScrollDelta() const { return gfx::Vector2d(); }
-  gfx::Vector2dF TotalScrollOffset() const {
-    // Floating point to match the LayerImpl version.
-    return scroll_offset() + ScrollDelta();
+  gfx::Vector2dF ScrollDelta() const { return gfx::Vector2dF(); }
+  gfx::ScrollOffset TotalScrollOffset() const {
+    return ScrollOffsetWithDelta(scroll_offset(), ScrollDelta());
   }
 
   void SetDoubleSided(bool double_sided);
@@ -552,14 +552,14 @@
   void RemoveChildOrDependent(Layer* child);
 
   // LayerAnimationValueProvider implementation.
-  virtual gfx::Vector2dF ScrollOffsetForAnimation() const OVERRIDE;
+  virtual gfx::ScrollOffset ScrollOffsetForAnimation() const OVERRIDE;
 
   // LayerAnimationValueObserver implementation.
   virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE;
   virtual void OnOpacityAnimated(float opacity) OVERRIDE;
   virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE;
   virtual void OnScrollOffsetAnimated(
-      const gfx::Vector2dF& scroll_offset) OVERRIDE;
+      const gfx::ScrollOffset& scroll_offset) OVERRIDE;
   virtual void OnAnimationWaitingForDeletion() OVERRIDE;
   virtual bool IsActive() const OVERRIDE;
 
@@ -584,7 +584,7 @@
   // Layer properties.
   gfx::Size bounds_;
 
-  gfx::Vector2d scroll_offset_;
+  gfx::ScrollOffset scroll_offset_;
   // This variable indicates which ancestor layer (if any) whose size,
   // transformed relative to this layer, defines the maximum scroll offset for
   // this layer.