Source/web/tests/ScrollAnimatorNoneTest.cpp - Issue 1161713004: Rename ScrollableArea::scroll to userScroll

Unified Diff: Source/web/tests/ScrollAnimatorNoneTest.cpp

Issue 1161713004: Rename ScrollableArea::scroll to userScroll (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed comment Created 5 years, 7 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

Index: Source/web/tests/ScrollAnimatorNoneTest.cpp

diff --git a/Source/web/tests/ScrollAnimatorNoneTest.cpp b/Source/web/tests/ScrollAnimatorNoneTest.cpp

index a34653d548de10d3ef6f528c29a0b64eac7a1414..e3b61758642c76c73432cc419e0500e28d514dfa 100644

--- a/Source/web/tests/ScrollAnimatorNoneTest.cpp

+++ b/Source/web/tests/ScrollAnimatorNoneTest.cpp

@@ -124,25 +124,25 @@ TEST(ScrollAnimatorEnabled, Enabled)

EXPECT_CALL(scrollableArea, maximumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint(1000, 1000)));

EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByLine, 100, 1);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByLine, 100, 1);

EXPECT_NE(100, scrollAnimatorNone->currentX());

EXPECT_NE(0, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

scrollAnimatorNone->reset();

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPage, 100, 1);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByPage, 100, 1);

EXPECT_NE(100, scrollAnimatorNone->currentX());

EXPECT_NE(0, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

scrollAnimatorNone->reset();

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPixel, 4, 25);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByPixel, 4, 25);

EXPECT_NE(100, scrollAnimatorNone->currentX());

EXPECT_NE(0, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

scrollAnimatorNone->reset();

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPrecisePixel, 4, 25);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByPrecisePixel, 4, 25);

EXPECT_EQ(100, scrollAnimatorNone->currentX());

EXPECT_NE(0, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

@@ -158,22 +158,22 @@ TEST(ScrollAnimatorEnabled, Disabled)

EXPECT_CALL(scrollableArea, maximumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint(1000, 1000)));

EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByLine, 100, 1);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByLine, 100, 1);

EXPECT_EQ(100, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

scrollAnimatorNone->reset();

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPage, 100, 1);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByPage, 100, 1);

EXPECT_EQ(100, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

scrollAnimatorNone->reset();

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByDocument, 100, 1);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByDocument, 100, 1);

EXPECT_EQ(100, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

scrollAnimatorNone->reset();

- scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPixel, 100, 1);

+ scrollAnimatorNone->userScroll(HorizontalScrollbar, ScrollByPixel, 100, 1);

EXPECT_EQ(100, scrollAnimatorNone->currentX());

EXPECT_EQ(0, scrollAnimatorNone->currentY());

scrollAnimatorNone->reset();

« no previous file with comments | « Source/platform/scroll/Scrollbar.cpp ('k') | no next file » | no next file with comments »