Ensure that inactive tab images line up correctly with frame image when theme...

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/string_util.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/theme_resources_util.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 120 matching lines @@
 // Saved default values.
 const char* BrowserThemeProvider::kDefaultThemeID = "";
 
 // Default display properties.
 static const int kDefaultDisplayPropertyNTPAlignment =
     BrowserThemeProvider::ALIGN_BOTTOM;
 static const int kDefaultDisplayPropertyNTPTiling =
     BrowserThemeProvider::NO_REPEAT;
 static const int kDefaultDisplayPropertyNTPInverseLogo = 0;
 
+// The sum of kFrameBorderThickness and kNonClientRestoredExtraThickness from
+// OpaqueBrowserFrameView.
+static const int kRestoredTabVerticalOffset = 15;
+
 // The image resources that will be tinted by the 'button' tint value.
 static const int kToolbarButtonIDs[] = {
   IDR_BACK, IDR_BACK_D, IDR_BACK_H, IDR_BACK_P,
   IDR_FORWARD, IDR_FORWARD_D, IDR_FORWARD_H, IDR_FORWARD_P,
   IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P,
   IDR_HOME, IDR_HOME_H, IDR_HOME_P,
   IDR_STAR, IDR_STAR_NOBORDER, IDR_STAR_NOBORDER_CENTER, IDR_STAR_D, IDR_STAR_H,
   IDR_STAR_P,
   IDR_STARRED, IDR_STARRED_NOBORDER, IDR_STARRED_NOBORDER_CENTER, IDR_STARRED_H,
   IDR_STARRED_P,
@@ skipping 316 matching lines @@
   return win_util::ShouldUseVistaFrame();
 #else
   return false;
 #endif
 }
 
 bool BrowserThemeProvider::HasCustomImage(int id) {
   if (!themeable_images_[id])
     return false;
 
-  return (images_.find(id) != images_.end());
+  // A custom image = base name is NOT equal to resource name.  See note in
+  // SaveThemeBitmap describing the process by which an original image is
+  // tagged.
+  if (images_.find(id) != images_.end() &&
+      resource_names_.find(id) != resource_names_.end())
+    return !EndsWith(UTF8ToWide(images_[id]),
+                     UTF8ToWide(resource_names_[id]), false);
+  else
+    return false;
 }
 
 bool BrowserThemeProvider::GetRawData(int id,
                                       std::vector<unsigned char>* raw_data) {
   // Check to see whether we should substitute some images.
   int ntp_alternate;
   GetDisplayProperty(NTP_LOGO_ALTERNATE, &ntp_alternate);
   if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0)
     id = IDR_PRODUCT_LOGO_WHITE;
 
@@ skipping 110 matching lines @@
                                                     image_height);
   } else {
     // TODO(glen): File no-longer exists, we're out of date. We should
     // clear the theme (or maybe just the pref that points to this
     // image).
     return NULL;
   }
 }
 
 void BrowserThemeProvider::SaveThemeBitmap(
-    const std::string resource_name, int id) {
+    std::string resource_name, int id) {
   DCHECK(CalledOnValidThread());
   if (!image_cache_[id]) {
     NOTREACHED();
     return;
   }
 
+  // The images_ directory, at this point, contains only the custom images
+  // provided by the extension. We tag these images "_original" in the prefs
+  // file so we can distinguish them from images which have been generated and
+  // saved to disk by the theme caching process (WriteImagesToDisk).  This way,
+  // when we call HasCustomImage, we can check for the "_original" tag to see
+  // whether an image was originally provided by the extension, or saved
+  // in the caching process.
+  if (images_.find(id) != images_.end())
+    resource_name.append("_original");
+
 #if defined(OS_WIN)
-  FilePath image_path = image_dir_.Append(FilePath(UTF8ToWide(resource_name)));
+  FilePath image_path = image_dir_.Append(UTF8ToWide(resource_name));
 #elif defined(OS_POSIX)
-  FilePath image_path = image_dir_.Append(FilePath(resource_name));
+  FilePath image_path = image_dir_.Append(resource_name);
 #endif
 
   images_disk_cache_[image_path] = id;
 }
 
 
 
 const std::string BrowserThemeProvider::GetTintKey(int id) {
   switch (id) {
     case TINT_FRAME:
@@ skipping 381 matching lines @@
       std::string resource_name;
       if (id == IDR_THEME_TAB_BACKGROUND) {
         base_id = IDR_THEME_FRAME;
         resource_name = "theme_tab_background";
       } else {
         base_id = IDR_THEME_FRAME_INCOGNITO;
         resource_name = "theme_tab_background_incognito";
       }
       std::map<int, SkBitmap*>::iterator it = image_cache_.find(base_id);
       if (it != image_cache_.end()) {
-        SkBitmap* bg_tab = new SkBitmap(TintBitmap(*(it->second),
-                                                   TINT_BACKGROUND_TAB));
+        SkBitmap bg_tint = TintBitmap(*(it->second), TINT_BACKGROUND_TAB);
+        int vertical_offset = HasCustomImage(id) ?
+            kRestoredTabVerticalOffset : 0;
+        SkBitmap* bg_tab = new SkBitmap(
+            skia::ImageOperations::CreateTiledBitmap(bg_tint, 0,
+            vertical_offset, bg_tint.width(), bg_tint.height()));
 
         // If they've provided a custom image, overlay it.
         if (HasCustomImage(id)) {
           SkBitmap* overlay = LoadThemeBitmap(id);
           if (overlay) {
             SkCanvas canvas(*bg_tab);
             for (int x = 0; x < bg_tab->width(); x += overlay->width())
               canvas.drawBitmap(*overlay, static_cast<SkScalar>(x), 0, NULL);
           }
         }
@@ skipping 173 matching lines @@
   }
   image_cache_.clear();
   images_disk_cache_.clear();
 }
 
 #if defined(TOOLKIT_VIEWS)
 void BrowserThemeProvider::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif