diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 01:55:57 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 01:55:57 +0000 |
| commit | 3ed163f45424aff8e0cace52542e08f6d847b2e0 (patch) | |
| tree | 5219ec89329eb223c7278715f7a354a15cf5bac6 | |
| parent | 2500a0f7c4ac54a55d621069dc044ddc6702a518 (diff) | |
| download | chromium_src-3ed163f45424aff8e0cace52542e08f6d847b2e0.zip chromium_src-3ed163f45424aff8e0cace52542e08f6d847b2e0.tar.gz chromium_src-3ed163f45424aff8e0cace52542e08f6d847b2e0.tar.bz2 | |
Fix memory stomping by ImageLoadingTracker in BrowserActionButton.
In the views code, tracker_ is set to null in this case. Without
this, I get lots of random crashes when I have 2 page actions
installed (buildbot extension and google tasks extension) and I open
close lots of windows.
BUG=26751,25558
Review URL: http://codereview.chromium.org/379020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31534 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gtk/browser_actions_toolbar_gtk.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc index 176b4ee..fb36c0d 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc @@ -105,6 +105,7 @@ class BrowserActionButton : public NotificationObserver, void OnImageLoaded(SkBitmap* image, size_t index) { if (image) default_icon_ = gfx::GdkPixbufFromSkBitmap(image); + tracker_ = NULL; // The tracker object will delete itself when we return. UpdateState(); } |