diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 21:48:03 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 21:48:03 +0000 |
| commit | d466b8a0b44ef89c81fa4ede86de1b488b8ec07d (patch) | |
| tree | f4a6ce8ea2297ab740adc4de59ed2dbf81cb84c6 /chrome/renderer | |
| parent | 68649314f11c3bae8d76944c1b573d826a17951e (diff) | |
| download | chromium_src-d466b8a0b44ef89c81fa4ede86de1b488b8ec07d.zip chromium_src-d466b8a0b44ef89c81fa4ede86de1b488b8ec07d.tar.gz chromium_src-d466b8a0b44ef89c81fa4ede86de1b488b8ec07d.tar.bz2 | |
Keep track of the history's page IDs to avoid navigating to a stale entry.
This ensures that a race between an asynchronous back/forward and a navigation
in the renderer doesn't confuse NavigationController.
BUG=86758
TEST=RenderViewTest.IgnoreStaleNavigations
TEST=NavigationControllerTest.InPage_Replace
Review URL: http://codereview.chromium.org/7327014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/safe_browsing/render_view_fake_resources_test.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc index 34e25f8..77c254d 100644 --- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc +++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc @@ -197,14 +197,11 @@ void RenderViewFakeResourcesTest::OnRenderViewReady() { void RenderViewFakeResourcesTest::GoToOffset( int offset, const WebKit::WebHistoryItem& history_item) { - NavigationState* state = NavigationState::FromDataSource( - GetMainFrame()->dataSource()); - ViewMsg_Navigate_Params params; params.page_id = view_->page_id() + offset; params.pending_history_list_offset = - state->pending_history_list_offset() + offset; - params.current_history_list_offset = state->pending_history_list_offset(); + view_->history_list_offset() + offset; + params.current_history_list_offset = view_->history_list_offset(); params.current_history_list_length = (view_->historyBackListCount() + view_->historyForwardListCount() + 1); params.url = GURL(history_item.urlString()); |