diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 22:55:04 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 22:55:04 +0000 |
commit | 51af84f74d83a39ee4a56c3a881dd0b1cd2eba01 (patch) | |
tree | 2f7970636ee3d9ed7261b951af05d3eeb745ee0d /content | |
parent | 4b417e55e37a4d9d347a0dfbfc5350f55569819f (diff) | |
download | chromium_src-51af84f74d83a39ee4a56c3a881dd0b1cd2eba01.zip chromium_src-51af84f74d83a39ee4a56c3a881dd0b1cd2eba01.tar.gz chromium_src-51af84f74d83a39ee4a56c3a881dd0b1cd2eba01.tar.bz2 |
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/6865031
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/6881026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/renderer/render_view.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 7521611..556add0 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -752,13 +752,6 @@ 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 |