Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2718)

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

Issue 640663003: Ensure that FrameLoadTypeBackForward only occurs once per navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: new load type Created 6 years, 2 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 | « Source/web/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698