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

Unified Diff: cc/scrollbar_animation_controller_linear_fade_unittest.cc

Issue 11367080: cc: Remove all remaining use of WebCore Rect/Point/Size types from the compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 1 month 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
« no previous file with comments | « cc/scrollbar_animation_controller_linear_fade.cc ('k') | cc/scrollbar_geometry_fixed_thumb.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scrollbar_animation_controller_linear_fade_unittest.cc
diff --git a/cc/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
index 32537cbede9f4be194deb664274cc655ac016ad7..592d793f0537408c5b10827c90b785cb68c156ef 100644
--- a/cc/scrollbar_animation_controller_linear_fade_unittest.cc
+++ b/cc/scrollbar_animation_controller_linear_fade_unittest.cc
@@ -23,8 +23,8 @@ protected:
m_contentLayer = m_scrollLayer->children()[0];
m_scrollbarLayer = ScrollbarLayerImpl::create(3);
- m_scrollLayer->setMaxScrollPosition(IntSize(50, 50));
- m_contentLayer->setBounds(IntSize(50, 50));
+ m_scrollLayer->setMaxScrollOffset(gfx::Vector2d(50, 50));
+ m_contentLayer->setBounds(gfx::Size(50, 50));
m_scrollbarController = ScrollbarAnimationControllerLinearFade::create(m_scrollLayer.get(), 2, 3);
m_scrollbarController->setHorizontalScrollbarLayer(m_scrollbarLayer.get());
@@ -50,13 +50,13 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyHiddenInBegin)
TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyAwakenByScroll)
{
- m_scrollLayer->setScrollDelta(IntSize(1, 1));
+ m_scrollLayer->setScrollDelta(gfx::Vector2d(1, 1));
m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 0);
m_scrollbarController->animate(0);
EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
m_scrollbarController->animate(1);
EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
- m_scrollLayer->setScrollDelta(IntSize(2, 2));
+ m_scrollLayer->setScrollDelta(gfx::Vector2d(2, 2));
m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 1);
m_scrollbarController->animate(2);
EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
@@ -68,7 +68,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyAwakenByScroll)
EXPECT_FLOAT_EQ(2 / 3.0f, m_scrollbarLayer->opacity());
m_scrollbarController->animate(5);
EXPECT_FLOAT_EQ(1 / 3.0f, m_scrollbarLayer->opacity());
- m_scrollLayer->setScrollDelta(IntSize(3, 3));
+ m_scrollLayer->setScrollDelta(gfx::Vector2d(3, 3));
m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 5);
m_scrollbarController->animate(6);
EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
@@ -90,7 +90,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, verifyForceAwakenByPinch)
EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
m_scrollbarController->animate(1);
EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
- m_scrollLayer->setScrollDelta(IntSize(1, 1));
+ m_scrollLayer->setScrollDelta(gfx::Vector2d(1, 1));
m_scrollbarController->updateScrollOffsetAtTime(m_scrollLayer.get(), 1);
m_scrollbarController->animate(2);
EXPECT_FLOAT_EQ(1, m_scrollbarLayer->opacity());
« no previous file with comments | « cc/scrollbar_animation_controller_linear_fade.cc ('k') | cc/scrollbar_geometry_fixed_thumb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698