summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-28 18:26:42 +0000
committermmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-28 18:26:42 +0000
commit917543feedad73ad36a410413f9a5edc8b2e2c27 (patch)
treee0f4509e9d27a2b0f1c808713afdf482afdd1ab2
parentb2932ca544f902aeb01b0b7021fe758af91881ab (diff)
downloadchromium_src-917543feedad73ad36a410413f9a5edc8b2e2c27.zip
chromium_src-917543feedad73ad36a410413f9a5edc8b2e2c27.tar.gz
chromium_src-917543feedad73ad36a410413f9a5edc8b2e2c27.tar.bz2
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
-rw-r--r--chrome/renderer/render_view.cc4
1 files changed, 0 insertions, 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)