From 917543feedad73ad36a410413f9a5edc8b2e2c27 Mon Sep 17 00:00:00 2001 From: "mmoss@google.com" Date: Thu, 28 Aug 2008 18:26:42 +0000 Subject: This call is incorrect because calling it here allows any subframe to update "is_loading_", which represents state on the main frame, and thus should only be updated to reflect changes to that frame (as ProgressTracker is careful to do by testing "m_originatingProgressFrame"). It's also redundant because it is already triggered through the ProgressTracker, even when there is a ProvisionalLoad error. This fixes issues where the favicon for a page was not being loaded because of errors in subframes. BUG=1186854 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1495 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/render_view.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index f0eba8e..af11413 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1203,10 +1203,6 @@ void RenderView::DidFailProvisionalLoadWithError(WebView* webview, error.GetErrorCode(), error.GetFailedURL(), show_repost_interstitial)); - // TODO(darin): This should not be necessary! - if (is_loading_) - DidStopLoading(webview); - // Don't display an error page if this is simply a cancelled load. Aside // from being dumb, WebCore doesn't expect it and it will cause a crash. if (error.GetErrorCode() == net::ERR_ABORTED) -- cgit v1.1