Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4231)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/layer_impl_unittest.cc

Issue 584503005: Make scroll offset type of float in cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update unittests Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/layers/layer.h ('K') | « cc/layers/layer_impl.cc ('k') | cc/trees/layer_tree_host.cc » ('j') | cc/trees/layer_tree_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl_unittest.cc
diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
index c5cac8dfe841356828ab284f42931e1922699d5a..7fb127cd9de931d539de573730d764f3193d8650 100644
--- a/cc/layers/layer_impl_unittest.cc
+++ b/cc/layers/layer_impl_unittest.cc
@@ -449,44 +449,44 @@ 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 {
@@ -506,36 +506,37 @@ class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate {
};
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 {
@@ -553,63 +554,66 @@ class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate {
};
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;
@@ -617,20 +621,21 @@ TEST_F(LayerImplScrollTest, ApplySentScrollsWithIgnoringDelegate) {
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);
@@ -639,29 +644,32 @@ TEST_F(LayerImplScrollTest, ApplySentScrollsWithAcceptingDelegate) {
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) {
« cc/layers/layer.h ('K') | « cc/layers/layer_impl.cc ('k') | cc/trees/layer_tree_host.cc » ('j') | cc/trees/layer_tree_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698