| Index: Source/web/tests/WebViewTest.cpp
|
| diff --git a/Source/web/tests/WebViewTest.cpp b/Source/web/tests/WebViewTest.cpp
|
| index 189b00e533c96fdf5e633b5f88193f02dccfec4b..88850e5891ef28502c1541e4312a4d8d717f20c8 100644
|
| --- a/Source/web/tests/WebViewTest.cpp
|
| +++ b/Source/web/tests/WebViewTest.cpp
|
| @@ -898,17 +898,17 @@ TEST_F(WebViewTest, BackForwardRestoreScroll)
|
| RefPtr<HistoryItem> item2 = mainFrameLocal->loader().currentItem();
|
|
|
| // Go back, then forward, then back again.
|
| - mainFrameLocal->loader().loadHistoryItem(item1.get(), HistorySameDocumentLoad);
|
| - mainFrameLocal->loader().loadHistoryItem(item2.get(), HistorySameDocumentLoad);
|
| - mainFrameLocal->loader().loadHistoryItem(item1.get(), HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item1.get(), FrameLoadTypeBackForward, HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item2.get(), FrameLoadTypeBackForward, HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item1.get(), FrameLoadTypeBackForward, HistorySameDocumentLoad);
|
|
|
| // Click a different anchor
|
| mainFrameLocal->loader().load(FrameLoadRequest(mainFrameLocal->document(), ResourceRequest(mainFrameLocal->document()->completeURL("#b"))));
|
| RefPtr<HistoryItem> item3 = mainFrameLocal->loader().currentItem();
|
|
|
| // Go back, then forward. The scroll position should be properly set on the forward navigation.
|
| - mainFrameLocal->loader().loadHistoryItem(item1.get(), HistorySameDocumentLoad);
|
| - mainFrameLocal->loader().loadHistoryItem(item3.get(), HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item1.get(), FrameLoadTypeBackForward, HistorySameDocumentLoad);
|
| + mainFrameLocal->loader().loadHistoryItem(item3.get(), FrameLoadTypeBackForward, HistorySameDocumentLoad);
|
| EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
|
| EXPECT_GT(webViewImpl->mainFrame()->scrollOffset().height, 2000);
|
| }
|
|
|