Track and free generated images in the browser theme provider.

chrome/browser/browser_theme_provider.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser_theme_provider.h"
+#include "chrome/browser/browser_theme_provider.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/theme_resources_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/theme_resources.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/skia_utils.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 // Strings used by themes to identify colors for different parts of our UI.
 static const char* kColorFrame = "frame";
 static const char* kColorFrameInactive = "frame_inactive";
 static const char* kColorFrameIncognito = "frame_incognito";
 static const char* kColorFrameIncognitoInactive =
     "frame_incognito_inactive";
 static const char* kColorToolbar = "toolbar";
 static const char* kColorTabText = "tab_text";
 static const char* kColorBackgroundTabText = "background_tab_text";
@@ skipping 65 matching lines @@
       button_images_[kToolbarButtonIDs[i]] = true;
     }
     frame_tints_[IDR_THEME_FRAME] = TINT_FRAME;
     frame_tints_[IDR_THEME_FRAME_INACTIVE] = TINT_FRAME_INACTIVE;
     frame_tints_[IDR_THEME_FRAME_INCOGNITO] = TINT_FRAME_INCOGNITO;
     frame_tints_[IDR_THEME_FRAME_INCOGNITO_INACTIVE] =
         TINT_FRAME_INCOGNITO_INACTIVE;
   }
 }
 
-BrowserThemeProvider::~BrowserThemeProvider() { }
+BrowserThemeProvider::~BrowserThemeProvider() {
+  FreeImages();
+}
 
 void BrowserThemeProvider::Init(Profile* profile) {
   DCHECK(CalledOnValidThread());
   profile_ = profile;
   LoadThemePrefs();
 }
 
 SkBitmap* BrowserThemeProvider::GetBitmapNamed(int id) {
   DCHECK(CalledOnValidThread());
 
@@ skipping 81 matching lines @@
     default:
       NOTREACHED() << "Unknown color requested";
   }
 
   // Return a debugging red color.
   return 0xffff0000;
 }
 
 void BrowserThemeProvider::SetTheme(Extension* extension) {
   // Clear our image cache.
-  image_cache_.clear();
+  FreeImages();
 
   DCHECK(extension);
   DCHECK(extension->IsTheme());
   SetImageData(extension->GetThemeImages(),
                extension->path());
   SetColorData(extension->GetThemeColors());
   SetTintData(extension->GetThemeTints());
   GenerateFrameColors();
   GenerateFrameImages();
 
   SaveImageData(extension->GetThemeImages());
   SaveColorData();
   SaveTintData();
 
   NotifyThemeChanged();
   UserMetrics::RecordAction(L"Themes_Installed", profile_);
 }
 
 void BrowserThemeProvider::UseDefaultTheme() {
   // Clear our image cache.
-  image_cache_.clear();
+  FreeImages();
 
   images_.clear();
   colors_.clear();
   tints_.clear();
 
   SaveImageData(NULL);
   SaveColorData();
   SaveTintData();
 
   NotifyThemeChanged();
@@ skipping 212 matching lines @@
     int base_id = (id == IDR_THEME_TAB_BACKGROUND) ?
         IDR_THEME_FRAME : IDR_THEME_FRAME_INCOGNITO;
 
     std::map<int, SkBitmap*>::iterator it = image_cache_.find(base_id);
     if (it != image_cache_.end()) {
       SkBitmap* frame = it->second;
       SkBitmap blurred =
           skia::ImageOperations::CreateBlurredBitmap(*frame, 5);
       SkBitmap* bg_tab =
           new SkBitmap(TintBitmap(blurred, TINT_BACKGROUND_TAB));
+      generated_images_.push_back(bg_tab);
       return bg_tab;
     }
   }
 
   return NULL;
 }
 
 void BrowserThemeProvider::NotifyThemeChanged() {
   // TODO(glen): If we're in glass and IDR_THEME_FRAME has been provided,
   //    swap us back to opaque frame.
@@ skipping 75 matching lines @@
       skia::HSL hsl = (*iter).second;
       ListValue* hsl_list = new ListValue();
       hsl_list->Set(0, Value::CreateRealValue(hsl.h));
       hsl_list->Set(1, Value::CreateRealValue(hsl.s));
       hsl_list->Set(2, Value::CreateRealValue(hsl.l));
       pref_tints->Set(UTF8ToWide((*iter).first), hsl_list);
       ++iter;
     }
   }
 }
+
+void BrowserThemeProvider::FreeImages() {
+  for (std::vector<SkBitmap*>::iterator i = generated_images_.begin();
+       i != generated_images_.end(); i++) {
+    delete *i;
+  }
+  generated_images_.clear();
+  image_cache_.clear();
+}