summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 23:26:15 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 23:26:15 +0000
commit33c02f1cd3d1723fb505e328b315aba5e0196172 (patch)
tree7b42774d373aab2e44d760fe64a102f228b13e78
parent198a4cc4264c83a9dfbeb6c000edfbe130dc4001 (diff)
downloadchromium_src-33c02f1cd3d1723fb505e328b315aba5e0196172.zip
chromium_src-33c02f1cd3d1723fb505e328b315aba5e0196172.tar.gz
chromium_src-33c02f1cd3d1723fb505e328b315aba5e0196172.tar.bz2
Cancel icon load requests when we are getting shutdown.
Hopefully this will fix the download test flakiness. I was able to reproduce the crash manually by just mass-clicking on the same download link many times (thanks to DotA for improving my APM). With this patch I am no longer able to repro. BUG=14746,14745,15244,15416 TEST=download tests stop flaking out Review URL: http://codereview.chromium.org/149712 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20807 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/download_item_gtk.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index 7e246b6..b7c7780 100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -351,6 +351,7 @@ DownloadItemGtk::DownloadItemGtk(DownloadShelfGtk* parent_shelf,
}
DownloadItemGtk::~DownloadItemGtk() {
+ icon_consumer_.CancelAllRequests();
StopDownloadProgress();
get_download()->RemoveObserver(this);
g_signal_handlers_disconnect_by_func(parent_shelf_->GetHBox(),