summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_theme_provider.h
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 17:07:55 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 17:07:55 +0000
commit0b39289a3fd93eeb219fddb924e01210ac0baa1e (patch)
tree00672b4302d011c130359424640ebafa51adb66d /chrome/browser/browser_theme_provider.h
parent8e65e095598d7f26cf781dd43b971c7b3ffd0ac4 (diff)
downloadchromium_src-0b39289a3fd93eeb219fddb924e01210ac0baa1e.zip
chromium_src-0b39289a3fd93eeb219fddb924e01210ac0baa1e.tar.gz
chromium_src-0b39289a3fd93eeb219fddb924e01210ac0baa1e.tar.bz2
Take 2 at fixing BrowserThemeProvider memory leaks.
This time, don't delete images in generated_images_ since we're now going to delete them in image_cache_. Review URL: http://codereview.chromium.org/151048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_provider.h')
-rw-r--r--chrome/browser/browser_theme_provider.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/browser_theme_provider.h b/chrome/browser/browser_theme_provider.h
index b5817a2..7e5c144 100644
--- a/chrome/browser/browser_theme_provider.h
+++ b/chrome/browser/browser_theme_provider.h
@@ -165,7 +165,8 @@ class BrowserThemeProvider : public base::RefCounted<BrowserThemeProvider>,
void FreePlatformImages();
// Cached images. We cache all retrieved and generated bitmaps and keep
- // track of the pointers.
+ // track of the pointers. We own these and will delete them when we're done
+ // using them.
typedef std::map<int, SkBitmap*> ImageCache;
ImageCache image_cache_;
#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
@@ -176,10 +177,6 @@ class BrowserThemeProvider : public base::RefCounted<BrowserThemeProvider>,
NSImageMap nsimage_cache_;
#endif
- // List of generate images that aren't stored in ResourceBundles image cache
- // and need to be freed.
- std::vector<SkBitmap*> generated_images_;
-
ResourceBundle& rb_;
Profile* profile_;