Fix themes on retina Mac

chrome/browser/themes/browser_theme_pack.cc

 // Copyright (c) 2012 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/themes/browser_theme_pack.h"
 
 #include <limits>
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 25 matching lines @@
 #include "ui/resources/grit/ui_resources.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 
 namespace {
 
 // Version number of the current theme pack. We just throw out and rebuild
 // theme packs that aren't int-equal to this. Increment this number if you
 // change default theme assets.
-const int kThemePackVersion = 34;
+const int kThemePackVersion = 35;
 
 // IDs that are in the DataPack won't clash with the positive integer
 // uint16. kHeaderID should always have the maximum value because we want the
 // "header" to be written last. That way we can detect whether the pack was
 // successfully written and ignore and regenerate if it was only partially
 // written (i.e. chrome crashed on a different thread while writing the pack).
 const int kMaxID = 0x0000FFFF;  // Max unsigned 16-bit int.
 const int kHeaderID = kMaxID - 1;
 const int kTintsID = kMaxID - 2;
 const int kColorsID = kMaxID - 3;
@@ skipping 174 matching lines @@
       int idr = kPersistingImagesDesktopAura[i].idr_id;
       int prs_id = kPersistingImagesDesktopAura[i].persistent_id;
       (*lookup_table)[idr] = prs_id;
     }
 #endif
   }
   std::map<int,int>::iterator it = lookup_table->find(idr);
   return (it == lookup_table->end()) ? -1 : it->second;
 }
 
+// Returns the maximum persistent id.
+int GetMaxPersistentId() {
+  static int max_prs_id = -1;
+  if (max_prs_id == -1) {
+    for (size_t i = 0; i < kPersistingImagesLength; ++i) {
+      if (kPersistingImages[i].persistent_id > max_prs_id)
+        max_prs_id = kPersistingImages[i].persistent_id;
+    }
+#if defined(USE_ASH) && !defined(OS_CHROMEOS)
+    for (size_t i = 0; i < kPersistingImagesDesktopAuraLength; ++i) {
+      if (kPersistingImagesDesktopAura[i].persistent_id > max_prs_id)
+        max_prs_id = kPersistingImagesDesktopAura[i].persistent_id;
+    }
+#endif
+  }
+  return max_prs_id;
+}
+
 // Returns true if the scales in |input| match those in |expected|.
 // The order must match as the index is used in determining the raw id.
 bool InputScalesValid(const base::StringPiece& input,
                       const std::vector<ui::ScaleFactor>& expected) {
   size_t scales_size = static_cast<size_t>(input.size() / sizeof(float));
   if (scales_size != expected.size())
     return false;
   scoped_ptr<float[]> scales(new float[scales_size]);
   // Do a memcpy to avoid misaligned memory access.
   memcpy(scales.get(), input.data(), input.size());
@@ skipping 1268 matching lines @@
 }
 
 int BrowserThemePack::GetRawIDByPersistentID(
     int prs_id,
     ui::ScaleFactor scale_factor) const {
   if (prs_id < 0)
     return -1;
 
   for (size_t i = 0; i < scale_factors_.size(); ++i) {
     if (scale_factors_[i] == scale_factor)
-      return static_cast<int>(kPersistingImagesLength * i) + prs_id;
+      return ((GetMaxPersistentId() + 1) * i) + prs_id;
   }
   return -1;
 }
 
 bool BrowserThemePack::GetScaleFactorFromManifestKey(
     const std::string& key,
     ui::ScaleFactor* scale_factor) const {
   int percent = 0;
   if (base::StringToInt(key, &percent)) {
     float scale = static_cast<float>(percent) / 100.0f;
@@ skipping 72 matching lines @@
                                            false,
                                            &bitmap_data)) {
       NOTREACHED() << "Unable to encode theme image for prs_id="
                    << prs_id << " for scale_factor=" << scale_factors_[i];
       break;
     }
     image_memory_[scaled_raw_id] =
         base::RefCountedBytes::TakeVector(&bitmap_data);
   }
 }