Make scroll offset type of float in cc

cc/layers/layer_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/layers/layer_impl.h"
 
 #include "cc/layers/painted_scrollbar_layer_impl.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
 #include "cc/test/fake_impl_proxy.h"
@@ skipping 431 matching lines @@
   FakeImplProxy proxy_;
   TestSharedBitmapManager shared_bitmap_manager_;
   FakeLayerTreeHostImpl host_impl_;
   int root_id_;
 };
 
 TEST_F(LayerImplScrollTest, ScrollByWithZeroOffset) {
   // Test that LayerImpl::ScrollBy only affects ScrollDelta and total scroll
   // offset is bounded by the range [0, max scroll offset].
 
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->TotalScrollOffset());

[danakj, 2014/09/18 21:21:52]

you can just use EXPECT_EQ for these now

[Yufeng Shen (Slow to review), 2014/09/18 22:47:55]

Done.

+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
 
   layer()->ScrollBy(gfx::Vector2dF(-100, 100));
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
 
-  EXPECT_VECTOR_EQ(layer()->ScrollDelta(), layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(layer()->ScrollDelta(), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->scroll_offset());
 
   layer()->ScrollBy(gfx::Vector2dF(100, -100));
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset());
 
-  EXPECT_VECTOR_EQ(layer()->ScrollDelta(), layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(layer()->ScrollDelta(), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->scroll_offset());
 }
 
 TEST_F(LayerImplScrollTest, ScrollByWithNonZeroOffset) {
-  gfx::Vector2d scroll_offset(10, 5);
+  gfx::Vector2dF scroll_offset(10.1f, 5.2f);
   layer()->SetScrollOffset(scroll_offset);
 
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
 
   layer()->ScrollBy(gfx::Vector2dF(-100, 100));
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
 
-  EXPECT_VECTOR_EQ(layer()->ScrollDelta() + scroll_offset,
+  EXPECT_VECTOR2DF_EQ(layer()->ScrollDelta() + scroll_offset,
                    layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 
   layer()->ScrollBy(gfx::Vector2dF(100, -100));
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset());
 
-  EXPECT_VECTOR_EQ(layer()->ScrollDelta() + scroll_offset,
+  EXPECT_VECTOR2DF_EQ(layer()->ScrollDelta() + scroll_offset,
                    layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 }
 
 class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate {
  public:
   virtual void SetTotalScrollOffset(const gfx::Vector2dF& new_value) OVERRIDE {}
   virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE {
     return fixed_offset_;
   }
   virtual bool IsExternalFlingActive() const OVERRIDE { return false; }
 
   void set_fixed_offset(const gfx::Vector2dF& fixed_offset) {
     fixed_offset_ = fixed_offset;
   }
 
  private:
   gfx::Vector2dF fixed_offset_;
 };
 
 TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) {
-  gfx::Vector2d scroll_offset(10, 5);
+  gfx::Vector2dF scroll_offset(10.0f, 5.0f);
   layer()->SetScrollOffset(scroll_offset);
 
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
 
   ScrollDelegateIgnore delegate;
-  gfx::Vector2dF fixed_offset(32, 12);
+  gfx::Vector2dF fixed_offset(32.0f, 12.0f);
   delegate.set_fixed_offset(fixed_offset);
   layer()->SetScrollOffsetDelegate(&delegate);
 
-  EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(fixed_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 
   layer()->ScrollBy(gfx::Vector2dF(-100, 100));
 
-  EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(fixed_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 
   layer()->SetScrollOffsetDelegate(NULL);
 
-  EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(fixed_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 
-  gfx::Vector2dF scroll_delta(1, 1);
+  gfx::Vector2dF scroll_delta(1.0f, 1.0f);
   layer()->ScrollBy(scroll_delta);
 
-  EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(fixed_offset + scroll_delta,
+                      layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 }
 
 class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate {
  public:
   virtual void SetTotalScrollOffset(const gfx::Vector2dF& new_value) OVERRIDE {
     current_offset_ = new_value;
   }
   virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE {
     return current_offset_;
   }
   virtual bool IsExternalFlingActive() const OVERRIDE { return false; }
 
  private:
   gfx::Vector2dF current_offset_;
 };
 
 TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) {
-  gfx::Vector2d scroll_offset(10, 5);
+  gfx::Vector2dF scroll_offset(10.2f, 5.1f);
   layer()->SetScrollOffset(scroll_offset);
 
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
 
   ScrollDelegateAccept delegate;
   layer()->SetScrollOffsetDelegate(&delegate);
 
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
 
   layer()->ScrollBy(gfx::Vector2dF(-100, 100));
 
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 
   layer()->SetScrollOffsetDelegate(NULL);
 
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 
   gfx::Vector2dF scroll_delta(1, 1);
   layer()->ScrollBy(scroll_delta);
 
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(1, 80), layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(1, 80), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
 }
 
 TEST_F(LayerImplScrollTest, ApplySentScrollsNoDelegate) {
-  gfx::Vector2d scroll_offset(10, 5);
+  gfx::Vector2dF scroll_offset(10.1f, 5.2f);
   gfx::Vector2dF scroll_delta(20.5f, 8.5f);
-  gfx::Vector2d sent_scroll_delta(12, -3);
+  gfx::Vector2dF sent_scroll_delta(12.4f, -3.2f);
 
   layer()->SetScrollOffset(scroll_offset);
   layer()->ScrollBy(scroll_delta);
   layer()->SetSentScrollDelta(sent_scroll_delta);
 
-  EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_delta, layer()->ScrollDelta());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(sent_scroll_delta, layer()->sent_scroll_delta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset + scroll_delta,
+                      layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_delta, layer()->ScrollDelta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(sent_scroll_delta, layer()->sent_scroll_delta());
 
   layer()->ApplySentScrollDeltasFromAbortedCommit();
 
-  EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_delta - sent_scroll_delta, layer()->ScrollDelta());
-  EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset + scroll_delta,
+                      layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_delta - sent_scroll_delta, layer()->ScrollDelta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset + sent_scroll_delta,
+                      layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2d(), layer()->sent_scroll_delta());
 }
 
 TEST_F(LayerImplScrollTest, ApplySentScrollsWithIgnoringDelegate) {
-  gfx::Vector2d scroll_offset(10, 5);
-  gfx::Vector2d sent_scroll_delta(12, -3);
-  gfx::Vector2dF fixed_offset(32, 12);
+  gfx::Vector2dF scroll_offset(10.1f, 5.2f);
+  gfx::Vector2dF sent_scroll_delta(12.1f, -3.3f);
+  gfx::Vector2dF fixed_offset(32.2f, 12.0f);
 
   layer()->SetScrollOffset(scroll_offset);
   ScrollDelegateIgnore delegate;
   delegate.set_fixed_offset(fixed_offset);
   layer()->SetScrollOffsetDelegate(&delegate);
   layer()->SetSentScrollDelta(sent_scroll_delta);
 
-  EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(sent_scroll_delta, layer()->sent_scroll_delta());
+  EXPECT_VECTOR2DF_EQ(fixed_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(sent_scroll_delta, layer()->sent_scroll_delta());
 
   layer()->ApplySentScrollDeltasFromAbortedCommit();
 
-  EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta());
+  EXPECT_VECTOR2DF_EQ(fixed_offset, layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset + sent_scroll_delta,
+                      layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2d(), layer()->sent_scroll_delta());
 }
 
 TEST_F(LayerImplScrollTest, ApplySentScrollsWithAcceptingDelegate) {
-  gfx::Vector2d scroll_offset(10, 5);
-  gfx::Vector2d sent_scroll_delta(12, -3);
+  gfx::Vector2dF scroll_offset(10.1f, 5.1f);
+  gfx::Vector2dF sent_scroll_delta(12.2f, -3.0f);
   gfx::Vector2dF scroll_delta(20.5f, 8.5f);
 
   layer()->SetScrollOffset(scroll_offset);
   ScrollDelegateAccept delegate;
   layer()->SetScrollOffsetDelegate(&delegate);
   layer()->ScrollBy(scroll_delta);
   layer()->SetSentScrollDelta(sent_scroll_delta);
 
-  EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(sent_scroll_delta, layer()->sent_scroll_delta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset + scroll_delta,
+                      layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset, layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(sent_scroll_delta, layer()->sent_scroll_delta());
 
   layer()->ApplySentScrollDeltasFromAbortedCommit();
 
-  EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset());
-  EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset());
-  EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta());
+  EXPECT_VECTOR2DF_EQ(scroll_offset + scroll_delta,
+                      layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(scroll_offset + sent_scroll_delta,
+                      layer()->scroll_offset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2d(), layer()->sent_scroll_delta());
 }
 
 // The user-scrollability breaks for zoomed-in pages. So disable this.
 // http://crbug.com/322223
 TEST_F(LayerImplScrollTest, DISABLED_ScrollUserUnscrollableLayer) {
-  gfx::Vector2d scroll_offset(10, 5);
+  gfx::Vector2dF scroll_offset(10.1f, 5.2f);
   gfx::Vector2dF scroll_delta(20.5f, 8.5f);
 
   layer()->set_user_scrollable_vertical(false);
   layer()->SetScrollOffset(scroll_offset);
   gfx::Vector2dF unscrolled = layer()->ScrollBy(scroll_delta);
 
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 8.5f), unscrolled);
-  EXPECT_VECTOR_EQ(gfx::Vector2dF(30.5f, 5), layer()->TotalScrollOffset());
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(0, 8.5f), unscrolled);
+  EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(30.5f, 5), layer()->TotalScrollOffset());
 }
 
 TEST_F(LayerImplScrollTest, SetNewScrollbarParameters) {
   gfx::Vector2d scroll_offset(10, 5);
   layer()->SetScrollOffset(scroll_offset);
 
   scoped_ptr<PaintedScrollbarLayerImpl> vertical_scrollbar(
       PaintedScrollbarLayerImpl::Create(tree(), 100, VERTICAL));
   vertical_scrollbar->SetScrollLayerAndClipLayerByIds(
       layer()->id(), tree()->root_layer()->id());
 
   int expected_vertical_maximum =
       layer()->bounds().height() - tree()->root_layer()->bounds().height();
   EXPECT_EQ(expected_vertical_maximum, vertical_scrollbar->maximum());
   EXPECT_EQ(scroll_offset.y(), vertical_scrollbar->current_pos());
 
   scoped_ptr<PaintedScrollbarLayerImpl> horizontal_scrollbar(
       PaintedScrollbarLayerImpl::Create(tree(), 101, HORIZONTAL));
   horizontal_scrollbar->SetScrollLayerAndClipLayerByIds(
       layer()->id(), tree()->root_layer()->id());
 
   int expected_horizontal_maximum =
       layer()->bounds().width() - tree()->root_layer()->bounds().width();
   EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum());
   EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos());
 }
 
 }  // namespace
 }  // namespace cc