Source/web/tests/ProgrammaticScrollTest.cpp - Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport

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/web/tests/ProgrammaticScrollTest.cpp

Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed layout test breakage Created 6 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

Index: Source/web/tests/ProgrammaticScrollTest.cpp

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

index 3d47b0d7bcfd0b1651fe43f0e4364c2c851ec42e..81ba4ca1bce82c56f8b323266360d7c7e60f523d 100644

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

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

@@ -61,7 +61,8 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithScale)

LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();

frame->loader().setLoadType(FrameLoadTypeBackForward);

- webViewImpl->setPageScaleFactor(3.0f, WebPoint(0, 500));

+ webViewImpl->setPageScaleFactor(3.0f);

+ webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500));

frame->view()->setWasScrolledByUser(false);

frame->loader().currentItem()->setPageScaleFactor(2);

frame->loader().currentItem()->setScrollPoint(WebPoint(0, 200));

@@ -90,7 +91,8 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale)

LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();

frame->loader().setLoadType(FrameLoadTypeBackForward);

- webViewImpl->setPageScaleFactor(3.0f, WebPoint(0, 500));

+ webViewImpl->setPageScaleFactor(3.0f);

+ webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500));

frame->view()->setWasScrolledByUser(false);

frame->loader().currentItem()->setPageScaleFactor(0);

frame->loader().currentItem()->setScrollPoint(WebPoint(0, 400));

« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »