| Index: third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
|
| index ea4ebaa56561fa7d9bee2e66d2c6b7856f7c3c95..20c26591d3bbe5de6cef6afaffe2415183749406 100644
|
| --- a/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
|
| @@ -56,7 +56,7 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithScale) {
|
| webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500));
|
| loader.documentLoader()->initialScrollState().wasScrolledByUser = false;
|
| loader.currentItem()->setPageScaleFactor(2);
|
| - loader.currentItem()->setScrollPoint(WebPoint(0, 200));
|
| + loader.currentItem()->setScrollOffset(ScrollOffset(0, 200));
|
|
|
| // Flip back the wasScrolledByUser flag which was set to true by setPageScaleFactor
|
| // because otherwise FrameLoader::restoreScrollPositionAndViewState does nothing.
|
| @@ -85,7 +85,7 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale) {
|
| webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500));
|
| loader.documentLoader()->initialScrollState().wasScrolledByUser = false;
|
| loader.currentItem()->setPageScaleFactor(0);
|
| - loader.currentItem()->setScrollPoint(WebPoint(0, 400));
|
| + loader.currentItem()->setScrollOffset(ScrollOffset(0, 400));
|
|
|
| // FrameLoader::restoreScrollPositionAndViewState flows differently if scale is zero.
|
| loader.restoreScrollPositionAndViewState();
|
|
|