diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 23:50:50 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 23:50:50 +0000 |
| commit | 48a5c77589e1f024f8ec2fe4646b784c384d7dcb (patch) | |
| tree | d790d6ab6e197b405e14cb8020058fb2d4872346 /content | |
| parent | d39dbf1383834246647703427bf2b56d7770c1ab (diff) | |
| download | chromium_src-48a5c77589e1f024f8ec2fe4646b784c384d7dcb.zip chromium_src-48a5c77589e1f024f8ec2fe4646b784c384d7dcb.tar.gz chromium_src-48a5c77589e1f024f8ec2fe4646b784c384d7dcb.tar.bz2 | |
Revert 82018 - Revert 81994 - Fixes race condition in displaying error pages. In particular it waspossible for an error page load to cancel a navigation.BUG=79515TEST=noneR=darin@chromium.orgReview URL: http://codereview.chromium.org/6865031TBR=sky@chromium.orgReview URL: http://codereview.chromium.org/6881026
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/6878034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_view.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 556add0..7521611 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -752,6 +752,13 @@ void RenderView::OnNavigate(const ViewMsg_Navigate_Params& params) { NavigationState* navigation_state = pending_navigation_state_.get(); + if (navigation_state) { + // New loads need to reset the error page fetcher. Otherwise if there is an + // outstanding error page fetcher it may complete and clobber the current + // page load. + navigation_state->set_alt_error_page_fetcher(NULL); + } + // If we are reloading, then WebKit will use the history state of the current // page, so we should just ignore any given history state. Otherwise, if we // have history state, then we need to navigate to it, which corresponds to a |