Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp - Issue 14807003: Unifies ScrollView and RenderLayer to use non-shifted [minPos, maxPos] scroll offset

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp

Issue 14807003: Unifies ScrollView and RenderLayer to use non-shifted [minPos, maxPos] scroll offset (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: fix unit tests and ScrollAnimatorMac Created 7 years, 8 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

« no previous file with comments | « LayoutTests/fast/multicol/shrink-to-column-height-for-pagination.html ('k') | Source/core/platform/ScrollAnimator.cpp » ('j') | Source/core/platform/Scrollbar.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp

diff --git a/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp b/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp

index 1ec39a0d51e28da2bc1ccbc7a8c672a11e9a2bfa..d6e6a04bc7d4d423656801b5950f61bff36974e0 100644

--- a/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp

+++ b/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp

@@ -117,6 +117,8 @@ TEST(ScrollAnimatorEnabled, Enabled)

MockScrollAnimatorNone scrollAnimatorNone(&scrollableArea);

EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));

+ EXPECT_CALL(scrollableArea, minimumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint()));

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

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

scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);

@@ -149,7 +151,9 @@ TEST(ScrollAnimatorEnabled, Disabled)

MockScrollableArea scrollableArea(false);

MockScrollAnimatorNone scrollAnimatorNone(&scrollableArea);

- EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));

+// EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));

jamesr 2013/05/07 03:33:31 delete this line if you don't want it, don't just

+ EXPECT_CALL(scrollableArea, minimumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint()));

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

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

scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);