diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 18:12:20 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 18:12:20 +0000 |
| commit | 4167c3a50e73968cd47e0eb2502f017f432d367a (patch) | |
| tree | d0e4db57d4f51ecca5e34fe0e83831a17c07bfbc | |
| parent | 0810c506e44b6b06c73836982cb525dfa6e4de4b (diff) | |
| download | chromium_src-4167c3a50e73968cd47e0eb2502f017f432d367a.zip chromium_src-4167c3a50e73968cd47e0eb2502f017f432d367a.tar.gz chromium_src-4167c3a50e73968cd47e0eb2502f017f432d367a.tar.bz2 | |
Fixes bug in BookmarkBarNode. I wasn't resetting a load handle
resulting in the possibility of trying to cancel a bogus load handle.
I'm TBRing this one as I just introduced this and its easy to hit a
DCHECK now.
BUG=1256202
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1163 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/bookmark_bar_model.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/bookmark_bar_model.cc b/chrome/browser/bookmark_bar_model.cc index e9a0511..7ca6157 100644 --- a/chrome/browser/bookmark_bar_model.cc +++ b/chrome/browser/bookmark_bar_model.cc @@ -533,14 +533,14 @@ void BookmarkBarModel::OnFavIconDataAvailable( bool expired, GURL icon_url) { SkBitmap fav_icon; + BookmarkBarNode* node = + load_consumer_.GetClientData( + profile_->GetHistoryService(Profile::EXPLICIT_ACCESS), handle); + DCHECK(node); + node->favicon_load_handle_ = 0; if (know_favicon && data.get() && PNGDecoder::Decode(&data->data, &fav_icon)) { - BookmarkBarNode* node = - load_consumer_.GetClientData( - profile_->GetHistoryService(Profile::EXPLICIT_ACCESS), handle); - DCHECK(node); node->favicon_ = fav_icon; - node->favicon_load_handle_ = 0; FavIconLoaded(node); } } |