Merge 24709 - Fix theme caching on Vista 64 when default theme is installed f...

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 "chrome/browser/browser_theme_provider.h"
 
 #include "base/file_util.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
@@ skipping 478 matching lines @@
   SaveImageData(extension->GetThemeImages());
   SaveColorData();
   SaveTintData();
   SaveDisplayPropertyData();
   SaveThemeID(extension->id());
 
   // Process all images when we first set theme.
   process_images_ = true;
 
   GenerateFrameColors();
-  GenerateFrameImages();
-  GenerateTabImages();
-  WriteImagesToDisk();
+  if (ShouldTintFrames()) {
+    GenerateFrameImages();
+    GenerateTabImages();
+    WriteImagesToDisk();
+  }
 
   NotifyThemeChanged();
   UserMetrics::RecordAction(L"Themes_Installed", profile_);
 }
 
 void BrowserThemeProvider::UseDefaultTheme() {
   ClearAllThemeData();
   NotifyThemeChanged();
   UserMetrics::RecordAction(L"Themes_Reset", profile_);
 }
@@ skipping 405 matching lines @@
       } else if (base_id != id && HasCustomImage(base_id)) {
         frame.reset(LoadThemeBitmap(base_id));
       } else if (base_id == IDR_THEME_FRAME_OVERLAY &&
                  HasCustomImage(IDR_THEME_FRAME)) {
         // If there is no theme overlay, don't tint the default frame,
         // because it will overwrite the custom frame image when we cache and
         // reload from disk.
         frame.reset(NULL);
       } else {
         // If the theme doesn't specify an image, then apply the tint to
-        // the default frame. Note that the default theme provides default
-        // bitmaps for all frame types, so this isn't strictly necessary
-        // in the case where no tint is provided either.
+        // the default frame.
         frame.reset(new SkBitmap(*rb_.GetBitmapNamed(IDR_THEME_FRAME)));
       }
 
       if (frame.get()) {
         SkBitmap* tinted = new SkBitmap(TintBitmap(*frame, iter->second));
         image_cache_[id] = tinted;
         SaveThemeBitmap(resource_name, id);
       }
     }
     ++iter;
   }
 }
 
+bool BrowserThemeProvider::ShouldTintFrames() {
+  return (HasCustomImage(IDR_THEME_FRAME) ||
+    tints_.find(GetTintKey(TINT_BACKGROUND_TAB)) != tints_.end() ||
+    tints_.find(GetTintKey(TINT_FRAME)) != tints_.end() ||
+    tints_.find(GetTintKey(TINT_FRAME_INACTIVE)) != tints_.end() ||
+    tints_.find(GetTintKey(TINT_FRAME_INCOGNITO)) != tints_.end() ||
+    tints_.find(GetTintKey(TINT_FRAME_INCOGNITO_INACTIVE)) != tints_.end());
+}
+
 void BrowserThemeProvider::GenerateTabImages() {
   GenerateBitmap(IDR_THEME_TAB_BACKGROUND);
   GenerateBitmap(IDR_THEME_TAB_BACKGROUND_INCOGNITO);
 }
 
 void BrowserThemeProvider::ClearAllThemeData() {
   // Clear our image cache.
   ClearCaches();
 
   images_.clear();
@@ skipping 200 matching lines @@
   // the image_cache_, and have therefore all been deleted in the lines above.
   // TODO(mirandac): make memory management clearer here.
   image_save_cache_.clear();
 }
 
 #if defined(TOOLKIT_VIEWS)
 void BrowserThemeProvider::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif