Try 2: Completely redo how themes are stored on disk and processed at install time.

chrome/browser/browser_theme_pack.cc

Index: chrome/browser/browser_theme_pack.cc
diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/browser_theme_pack.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f30bd6bffed1e6ca233a446c025059958e4b7c01
--- /dev/null
+++ b/chrome/browser/browser_theme_pack.cc
@@ -0,0 +1,864 @@
+// 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_pack.h"
+
+#include <climits>
+
+#include "app/gfx/codec/png_codec.h"
+#include "app/gfx/skbitmap_operations.h"
+#include "base/data_pack.h"
+#include "base/logging.h"
+#include "base/stl_util-inl.h"
+#include "base/string_util.h"
+#include "base/values.h"
+#include "chrome/browser/browser_theme_provider.h"
+#include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/theme_resources_util.h"
+#include "chrome/common/extensions/extension.h"
+#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
+#include "net/base/file_stream.h"
+#include "net/base/net_errors.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkUnPreMultiply.h"
+
+namespace {
+
+// Version number of the current theme pack. We just throw out and rebuild
+// theme packs that aren't int-equal to this.
+const int kThemePackVersion = 1;
+
+// IDs that are in the DataPack won't clash with the positive integer
+// int32_t. 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 kHeaderID = UINT_MAX - 1;
+const int kTintsID = UINT_MAX - 2;
+const int kColorsID = UINT_MAX - 3;
+const int kDisplayPropertiesID = UINT_MAX - 4;
+
+// Static size of the tint/color/display property arrays that are mmapped.
+const int kTintArraySize = 6;
+const int kColorArraySize = 19;
+const int kDisplayPropertySize = 3;
+
+// The sum of kFrameBorderThickness and kNonClientRestoredExtraThickness from
+// OpaqueBrowserFrameView.
+const int kRestoredTabVerticalOffset = 15;
+
+
+struct StringToIntTable {
+  const char* key;
+  int id;
+};
+
+// Strings used by themes to identify tints in the JSON.
+StringToIntTable kTintTable[] = {
+  { "buttons", BrowserThemeProvider::TINT_BUTTONS },
+  { "frame", BrowserThemeProvider::TINT_FRAME },
+  { "frame_inactive", BrowserThemeProvider::TINT_FRAME_INACTIVE },
+  { "frame_incognito_inactive",
+    BrowserThemeProvider::TINT_FRAME_INCOGNITO_INACTIVE },
+  { "background_tab", BrowserThemeProvider::TINT_BACKGROUND_TAB },
+  { NULL, 0 }
+};
+
+// Strings used by themes to identify colors in the JSON.
+StringToIntTable kColorTable[] = {
+  { "frame", BrowserThemeProvider::COLOR_FRAME },
+  { "frame_inactive", BrowserThemeProvider::COLOR_FRAME_INACTIVE },
+  { "frame_incognito", BrowserThemeProvider::COLOR_FRAME_INCOGNITO },
+  { "frame_incognito_inactive",
+    BrowserThemeProvider::COLOR_FRAME_INCOGNITO_INACTIVE },
+  { "toolbar", BrowserThemeProvider::COLOR_TOOLBAR },
+  { "tab_text", BrowserThemeProvider::COLOR_TAB_TEXT },
+  { "tab_background_text", BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT },
+  { "bookmark_text", BrowserThemeProvider::COLOR_BOOKMARK_TEXT },
+  { "ntp_background", BrowserThemeProvider::COLOR_NTP_BACKGROUND },
+  { "ntp_text", BrowserThemeProvider::COLOR_NTP_TEXT },
+  { "ntp_link", BrowserThemeProvider::COLOR_NTP_LINK },
+  { "ntp_link_underline", BrowserThemeProvider::COLOR_NTP_LINK_UNDERLINE },
+  { "ntp_header", BrowserThemeProvider::COLOR_NTP_HEADER },
+  { "ntp_section", BrowserThemeProvider::COLOR_NTP_SECTION },
+  { "ntp_section_text", BrowserThemeProvider::COLOR_NTP_SECTION_TEXT },
+  { "ntp_section_link", BrowserThemeProvider::COLOR_NTP_SECTION_LINK },
+  { "ntp_section_link_underline",
+    BrowserThemeProvider::COLOR_NTP_SECTION_LINK_UNDERLINE },
+  { "control_background", BrowserThemeProvider::COLOR_CONTROL_BACKGROUND },
+  { "button_background", BrowserThemeProvider::COLOR_BUTTON_BACKGROUND },
+  { NULL, 0 }
+};
+
+// Strings used by themes to identify display properties keys in JSON.
+StringToIntTable kDisplayProperties[] = {
+  { "ntp_background_alignment",
+    BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT },
+  { "ntp_background_repeat", BrowserThemeProvider::NTP_BACKGROUND_TILING },
+  { "ntp_logo_alternate", BrowserThemeProvider::NTP_LOGO_ALTERNATE },
+  { NULL, 0 }
+};
+
+// Strings used by the tiling values in JSON.
+StringToIntTable kTilingStrings[] = {
+  { "no-repeat", BrowserThemeProvider::NO_REPEAT },
+  { "repeat-x", BrowserThemeProvider::REPEAT_X },
+  { "repeat-y", BrowserThemeProvider::REPEAT_Y },
+  { "repeat", BrowserThemeProvider::REPEAT },
+  { NULL, 0 }
+};
+
+int GetIntForString(const std::string& key, StringToIntTable* table) {
+  for (int i = 0; table[i].key != NULL; ++i) {
+    if (base::strcasecmp(key.c_str(), table[i].key) == 0) {
+      return table[i].id;
+    }
+  }
+
+  return -1;
+}
+
+struct IntToIntTable {
+  int key;
+  int value;
+};
+
+// Mapping used in GenerateFrameImages() to associate frame images with the
+// tint ID that should maybe be applied to it.
+IntToIntTable kFrameTintMap[] = {
+  { IDR_THEME_FRAME, BrowserThemeProvider::TINT_FRAME },
+  { IDR_THEME_FRAME_INACTIVE, BrowserThemeProvider::TINT_FRAME_INACTIVE },
+  { IDR_THEME_FRAME_OVERLAY, BrowserThemeProvider::TINT_FRAME },
+  { IDR_THEME_FRAME_OVERLAY_INACTIVE,
+    BrowserThemeProvider::TINT_FRAME_INACTIVE },
+  { IDR_THEME_FRAME_INCOGNITO, BrowserThemeProvider::TINT_FRAME_INCOGNITO },
+  { IDR_THEME_FRAME_INCOGNITO_INACTIVE,
+    BrowserThemeProvider::TINT_FRAME_INCOGNITO_INACTIVE }
+};
+
+// Mapping used in GenerateTabBackgroundImages() to associate what frame image
+// goes with which tab background.
+IntToIntTable kTabBackgroundMap[] = {
+  { IDR_THEME_TAB_BACKGROUND, IDR_THEME_FRAME },
+  { IDR_THEME_TAB_BACKGROUND_INCOGNITO, IDR_THEME_FRAME_INCOGNITO }
+};
+
+// A list of images that don't need tinting or any other modification and can
+// be byte-copied directly into the finished DataPack. This should contain all
+// themeable image IDs that aren't in kFrameTintMap or kTabBackgroundMap.
+const int kPreloadIDs[] = {
+  IDR_THEME_TOOLBAR,
+  IDR_THEME_NTP_BACKGROUND,
+  IDR_THEME_BUTTON_BACKGROUND,
+  IDR_THEME_NTP_ATTRIBUTION,
+  IDR_THEME_WINDOW_CONTROL_BACKGROUND
+};
+
+// The image resources that will be tinted by the 'button' tint value.
+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,
+  IDR_GO, IDR_GO_NOBORDER, IDR_GO_NOBORDER_CENTER, IDR_GO_H, IDR_GO_P,
+  IDR_STOP, IDR_STOP_NOBORDER, IDR_STOP_NOBORDER_CENTER, IDR_STOP_H, IDR_STOP_P,
+  IDR_MENU_BOOKMARK,
+  IDR_MENU_PAGE, IDR_MENU_PAGE_RTL,
+  IDR_MENU_CHROME, IDR_MENU_CHROME_RTL,
+  IDR_MENU_DROPARROW,
+  IDR_THROBBER, IDR_THROBBER_WAITING, IDR_THROBBER_LIGHT,
+  IDR_LOCATIONBG
+};
+
+// Returns a piece of memory with the contents of the file |path|.
+RefCountedMemory* ReadFileData(const FilePath& path) {
+  if (!path.empty()) {
+    net::FileStream file;
+    int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
+    if (file.Open(path, flags) == net::OK) {
+      int64 avail = file.Available();
+      if (avail > 0 && avail < INT_MAX) {
+        size_t size = static_cast<size_t>(avail);
+        std::vector<unsigned char> raw_data;
+        raw_data.resize(size);
+        char* data = reinterpret_cast<char*>(&(raw_data.front()));
+        if (file.ReadUntilComplete(data, size) == avail)
+          return RefCountedBytes::TakeVector(&raw_data);
+      }
+    }
+  }
+
+  return NULL;
+}
+
+// Does error checking for invalid incoming data while trying to read an
+// floaing point value.

[Miranda Callahan, 2009/12/14 20:47:51]

floating

+bool ValidRealValue(ListValue* tint_list, int index, double* out) {
+  if (tint_list->GetReal(index, out))
+    return true;
+
+  int value = 0;
+  if (tint_list->GetInteger(index, &value)) {
+    *out = value;
+    return true;
+  }
+
+  return false;
+}
+
+}  // namespace
+
+BrowserThemePack::~BrowserThemePack() {
+  if (!data_pack_.get()) {
+    delete header_;
+    delete [] tints_;
+    delete [] colors_;
+    delete [] display_properties_;
+  }
+
+  STLDeleteValues(&image_cache_);
+}
+
+// static
+BrowserThemePack* BrowserThemePack::BuildFromExtension(Extension* extension) {
+  DCHECK(extension);
+  DCHECK(extension->IsTheme());
+
+  BrowserThemePack* pack = new BrowserThemePack;
+  pack->BuildHeader(extension);
+  pack->BuildTintsFromJSON(extension->GetThemeTints());
+  pack->BuildColorsFromJSON(extension->GetThemeColors());
+  pack->BuildDisplayPropertiesFromJSON(extension->GetThemeDisplayProperties());
+
+  // Builds the images. (Image building is dependent on tints).
+  std::map<int, FilePath> file_paths;
+  pack->ParseImageNamesFromJSON(extension->GetThemeImages(),
+                                extension->path(),
+                                &file_paths);
+
+  pack->LoadRawBitmapsTo(file_paths, &pack->image_cache_);
+
+  pack->GenerateFrameImages(&pack->image_cache_);
+
+#if !defined(OS_MACOSX)
+  // OSX uses its own special buttons that are PDFs that do odd sorts of vector
+  // graphics tricks. Other platforms use bitmaps and we must pre-tint them.
+  pack->GenerateTintedButtons(
+      pack->GetTintInternal(BrowserThemeProvider::TINT_BUTTONS),
+      &pack->image_cache_);
+#endif
+
+  pack->GenerateTabBackgroundImages(&pack->image_cache_);
+
+  // Repack all the images from |image_cache_| into |image_memory_| for
+  // writing to the data pack

[Miranda Callahan, 2009/12/14 20:47:51]

. at end of sentence

+  pack->RepackImageCacheToImageMemory();
+
+  // The BrowserThemePack is now in a consistent state.
+  return pack;
+}
+
+// static
+scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack(
+    FilePath path, const std::string& expected_id) {
+  scoped_refptr<BrowserThemePack> pack = new BrowserThemePack;
+  pack->data_pack_.reset(new base::DataPack);
+
+  if (!pack->data_pack_->Load(path)) {
+    LOG(ERROR) << "Failed to load theme data pack.";
+    return NULL;
+  }
+
+  base::StringPiece pointer;
+  if (!pack->data_pack_->GetStringPiece(kHeaderID, &pointer))
+    return NULL;
+  pack->header_ = reinterpret_cast<BrowserThemePackHeader*>(const_cast<char*>(
+      pointer.data()));
+
+  if (pack->header_->version != kThemePackVersion)
+    return NULL;
+  // TODO(erg): Check endianess once DataPack works on the other endian.
+  std::string theme_id(reinterpret_cast<char*>(pack->header_->theme_id),
+                       Extension::kIdSize);
+  std::string truncated_id = expected_id.substr(0, Extension::kIdSize);
+  if (theme_id != truncated_id) {
+    DLOG(ERROR) << "Wrong id: " << theme_id << " vs " << expected_id;
+    return NULL;
+  }
+
+  if (!pack->data_pack_->GetStringPiece(kTintsID, &pointer))
+    return NULL;
+  pack->tints_ = reinterpret_cast<TintEntry*>(const_cast<char*>(
+      pointer.data()));
+
+  if (!pack->data_pack_->GetStringPiece(kColorsID, &pointer))
+    return NULL;
+  pack->colors_ =
+      reinterpret_cast<ColorPair*>(const_cast<char*>(pointer.data()));
+
+  if (!pack->data_pack_->GetStringPiece(kDisplayPropertiesID, &pointer))
+    return NULL;
+  pack->display_properties_ = reinterpret_cast<DisplayPropertyPair*>(
+      const_cast<char*>(pointer.data()));
+
+  return pack;
+}
+
+bool BrowserThemePack::WriteToDisk(FilePath path) const {
+  std::map<uint32, base::StringPiece> resources;
+
+  resources[kHeaderID] = base::StringPiece(
+      reinterpret_cast<const char*>(header_), sizeof(BrowserThemePackHeader));
+  resources[kTintsID] = base::StringPiece(
+      reinterpret_cast<const char*>(tints_), sizeof(TintEntry[kTintArraySize]));
+  resources[kColorsID] = base::StringPiece(
+      reinterpret_cast<const char*>(colors_),
+      sizeof(ColorPair[kColorArraySize]));
+  resources[kDisplayPropertiesID] = base::StringPiece(
+      reinterpret_cast<const char*>(display_properties_),
+      sizeof(DisplayPropertyPair[kDisplayPropertySize]));
+
+  for (RawImages::const_iterator it = image_memory_.begin();
+       it != image_memory_.end(); ++it) {
+    resources[it->first] = base::StringPiece(
+        reinterpret_cast<const char*>(it->second->front()), it->second->size());
+  }
+
+  return base::DataPack::WritePack(path, resources);
+}
+
+bool BrowserThemePack::GetTint(int id, color_utils::HSL* hsl) const {
+  if (tints_) {
+    for (int i = 0; i < kTintArraySize; ++i) {
+      if (tints_[i].id == id) {
+        hsl->h = tints_[i].h;
+        hsl->s = tints_[i].s;
+        hsl->l = tints_[i].l;
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+bool BrowserThemePack::GetColor(int id, SkColor* color) const {
+  if (colors_) {
+    for (int i = 0; i < kColorArraySize; ++i) {
+      if (colors_[i].id == id) {
+        *color = colors_[i].color;
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+bool BrowserThemePack::GetDisplayProperty(int id, int* result) const {
+  if (display_properties_) {
+    for (int i = 0; i < kDisplayPropertySize; ++i) {
+      if (display_properties_[i].id == id) {
+        *result = display_properties_[i].property;
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+SkBitmap* BrowserThemePack::GetBitmapNamed(int id) const {
+  // Check our cache of prepared images, first.
+  ImageCache::const_iterator image_iter = image_cache_.find(id);
+  if (image_iter != image_cache_.end())
+    return image_iter->second;
+
+  scoped_refptr<RefCountedMemory> memory;
+  if (data_pack_.get()) {
+    memory = data_pack_->GetStaticMemory(id);
+  } else {
+    RawImages::const_iterator it = image_memory_.find(id);
+    if (it != image_memory_.end()) {
+      memory = it->second;
+    }
+  }
+
+  if (memory.get()) {
+    // Decode the PNG.
+    SkBitmap bitmap;
+    if (!gfx::PNGCodec::Decode(memory->front(), memory->size(),
+                               &bitmap)) {
+      NOTREACHED() << "Unable to decode theme image resource " << id
+                   << " from saved DataPack.";
+      return NULL;
+    }
+
+    SkBitmap* ret = new SkBitmap(bitmap);
+    image_cache_[id] = ret;
+
+    return ret;
+  }
+
+  return NULL;
+}
+
+RefCountedMemory* BrowserThemePack::GetRawData(int id) const {
+  RefCountedMemory* memory = NULL;
+
+  if (data_pack_.get()) {
+    memory = data_pack_->GetStaticMemory(id);
+  } else {
+    RawImages::const_iterator it = image_memory_.find(id);
+    if (it != image_memory_.end()) {
+      memory = it->second;
+    }
+  }
+
+  return memory;
+}
+
+bool BrowserThemePack::HasCustomImage(int id) const {
+  if (data_pack_.get()) {
+    base::StringPiece ignored;
+    return data_pack_->GetStringPiece(id, &ignored);
+  } else {
+    return image_memory_.count(id) > 0;
+  }
+}
+
+// private:
+
+BrowserThemePack::BrowserThemePack()
+    : header_(NULL),
+      tints_(NULL),
+      colors_(NULL),
+      display_properties_(NULL) {
+}
+
+void BrowserThemePack::BuildHeader(Extension* extension) {
+  header_ = new BrowserThemePackHeader;
+  header_->version = kThemePackVersion;
+
+  // TODO(erg): Need to make this endian safe on other computers. Prerequisite
+  // is that base::DataPack removes this same check.
+#if defined(__BYTE_ORDER)
+  // Linux check
+  COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
+                 datapack_assumes_little_endian);
+#elif defined(__BIG_ENDIAN__)
+  // Mac check
+  #error DataPack assumes little endian
+#endif
+  header_->little_endian = 1;
+
+  const std::string& id = extension->id();
+  memcpy(header_->theme_id, id.c_str(), Extension::kIdSize);
+}
+
+void BrowserThemePack::BuildTintsFromJSON(DictionaryValue* tints_value) {
+  tints_ = new TintEntry[kTintArraySize];
+  for (int i = 0; i < kTintArraySize; ++i) {
+    tints_[i].id = -1;
+    tints_[i].h = -1;
+    tints_[i].s = -1;
+    tints_[i].l = -1;
+  }
+
+  // Parse the incoming data from |tints_value| into an intermediary structure.
+  std::map<int, color_utils::HSL> temp_tints;
+  for (DictionaryValue::key_iterator iter(tints_value->begin_keys());
+       iter != tints_value->end_keys(); ++iter) {
+    ListValue* tint_list;
+    if (tints_value->GetList(*iter, &tint_list) &&
+        (tint_list->GetSize() == 3)) {
+      color_utils::HSL hsl = { -1, -1, -1 };
+
+      if (ValidRealValue(tint_list, 0, &hsl.h) &&
+          ValidRealValue(tint_list, 1, &hsl.s) &&
+          ValidRealValue(tint_list, 2, &hsl.l)) {
+
+        int id = GetIntForString(WideToUTF8(*iter), kTintTable);
+        if (id != -1) {
+          temp_tints[id] = hsl;
+        }
+      }
+    }
+  }
+
+  // Copy data from the intermediary data structure to the array.
+  int count = 0;
+  for (std::map<int, color_utils::HSL>::const_iterator it =
+           temp_tints.begin(); it != temp_tints.end() && count < kTintArraySize;
+       ++it, ++count) {
+    tints_[count].id = it->first;
+    tints_[count].h = it->second.h;
+    tints_[count].s = it->second.s;
+    tints_[count].l = it->second.l;
+  }
+}
+
+void BrowserThemePack::BuildColorsFromJSON(DictionaryValue* colors_value) {
+  colors_ = new ColorPair[kColorArraySize];
+  for (int i = 0; i < kColorArraySize; ++i) {
+    colors_[i].id = -1;
+    colors_[i].color = SkColorSetRGB(0, 0, 0);
+  }
+
+  std::map<int, SkColor> temp_colors;
+  ReadColorsFromJSON(colors_value, &temp_colors);
+  GenerateMissingColors(&temp_colors);
+
+  // Copy data from the intermediary data structure to the array.
+  int count = 0;
+  for (std::map<int, SkColor>::const_iterator it = temp_colors.begin();
+       it != temp_colors.end() && count < kColorArraySize; ++it, ++count) {
+    colors_[count].id = it->first;
+    colors_[count].color = it->second;
+  }
+}
+
+void BrowserThemePack::ReadColorsFromJSON(
+    DictionaryValue* colors_value,
+    std::map<int, SkColor>* temp_colors) {
+  // Parse the incoming data from |colors_value| into an intermediary structure.
+  for (DictionaryValue::key_iterator iter(colors_value->begin_keys());
+       iter != colors_value->end_keys(); ++iter) {
+    ListValue* color_list;
+    if (colors_value->GetList(*iter, &color_list) &&
+        ((color_list->GetSize() == 3) || (color_list->GetSize() == 4))) {
+      SkColor color = SK_ColorWHITE;
+      int r, g, b;
+      if (color_list->GetInteger(0, &r) &&
+          color_list->GetInteger(1, &g) &&
+          color_list->GetInteger(2, &b)) {
+        if (color_list->GetSize() == 4) {
+          double alpha;
+          int alpha_int;
+          if (color_list->GetReal(3, &alpha)) {
+            color = SkColorSetARGB(static_cast<int>(alpha * 255), r, g, b);
+          } else if (color_list->GetInteger(3, &alpha_int) &&
+                     (alpha_int == 0 || alpha_int == 1)) {
+            color = SkColorSetARGB(alpha_int ? 255 : 0, r, g, b);
+          } else {
+            // Invalid entry for part 4.
+            continue;
+          }
+        } else {
+          color = SkColorSetRGB(r, g, b);
+        }
+
+        int id = GetIntForString(WideToUTF8(*iter), kColorTable);
+        if (id != -1) {
+          (*temp_colors)[id] = color;
+        }
+      }
+    }
+  }
+}
+
+void BrowserThemePack::GenerateMissingColors(
+    std::map<int, SkColor>* colors) {
+  // Generate link colors, if missing. (See GetColor()).
+  if (!colors->count(BrowserThemeProvider::COLOR_NTP_HEADER) &&
+      colors->count(BrowserThemeProvider::COLOR_NTP_SECTION)) {
+    (*colors)[BrowserThemeProvider::COLOR_NTP_HEADER] =
+        (*colors)[BrowserThemeProvider::COLOR_NTP_SECTION];
+  }
+
+  if (!colors->count(BrowserThemeProvider::COLOR_NTP_SECTION_LINK_UNDERLINE) &&
+      colors->count(BrowserThemeProvider::COLOR_NTP_SECTION_LINK)) {
+    SkColor color_section_link =
+        (*colors)[BrowserThemeProvider::COLOR_NTP_SECTION_LINK];
+    (*colors)[BrowserThemeProvider::COLOR_NTP_SECTION_LINK_UNDERLINE] =
+        SkColorSetA(color_section_link, SkColorGetA(color_section_link) / 3);
+  }
+
+  if (!colors->count(BrowserThemeProvider::COLOR_NTP_LINK_UNDERLINE) &&
+      colors->count(BrowserThemeProvider::COLOR_NTP_LINK)) {
+    SkColor color_link = (*colors)[BrowserThemeProvider::COLOR_NTP_LINK];
+    (*colors)[BrowserThemeProvider::COLOR_NTP_LINK_UNDERLINE] =
+        SkColorSetA(color_link, SkColorGetA(color_link) / 3);
+  }
+
+  // Generate frame colors, if missing. (See GenerateFrameColors()).
+  SkColor frame;
+  std::map<int, SkColor>::const_iterator it =
+      colors->find(BrowserThemeProvider::COLOR_FRAME);
+  if (it != colors->end()) {
+    frame = it->second;
+  } else {
+    frame = BrowserThemeProvider::GetDefaultColor(
+        BrowserThemeProvider::COLOR_FRAME);
+  }
+
+  if (!colors->count(BrowserThemeProvider::COLOR_FRAME)) {
+    (*colors)[BrowserThemeProvider::COLOR_FRAME] =
+        HSLShift(frame, GetTintInternal(BrowserThemeProvider::TINT_FRAME));
+  }
+  if (!colors->count(BrowserThemeProvider::COLOR_FRAME_INACTIVE)) {
+    (*colors)[BrowserThemeProvider::COLOR_FRAME_INACTIVE] =
+        HSLShift(frame, GetTintInternal(
+            BrowserThemeProvider::TINT_FRAME_INACTIVE));
+  }
+  if (!colors->count(BrowserThemeProvider::COLOR_FRAME_INCOGNITO)) {
+    (*colors)[BrowserThemeProvider::COLOR_FRAME_INCOGNITO] =
+        HSLShift(frame, GetTintInternal(
+            BrowserThemeProvider::TINT_FRAME_INCOGNITO));
+  }
+  if (!colors->count(BrowserThemeProvider::COLOR_FRAME_INCOGNITO_INACTIVE)) {
+    (*colors)[BrowserThemeProvider::COLOR_FRAME_INCOGNITO_INACTIVE] =
+        HSLShift(frame, GetTintInternal(
+            BrowserThemeProvider::TINT_FRAME_INCOGNITO_INACTIVE));
+  }
+}
+
+void BrowserThemePack::BuildDisplayPropertiesFromJSON(
+    DictionaryValue* display_properties_value) {
+  display_properties_ = new DisplayPropertyPair[kDisplayPropertySize];
+  for (int i = 0; i < kDisplayPropertySize; ++i) {
+    display_properties_[i].id = -1;
+    display_properties_[i].property = 0;
+  }
+
+  std::map<int, int> temp_properties;
+  for (DictionaryValue::key_iterator iter(
+       display_properties_value->begin_keys());
+       iter != display_properties_value->end_keys(); ++iter) {
+    int property_id = GetIntForString(WideToUTF8(*iter), kDisplayProperties);
+    switch (property_id) {
+      case BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT: {
+        std::string val;
+        if (display_properties_value->GetString(*iter, &val)) {
+          temp_properties[BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT] =
+              BrowserThemeProvider::StringToAlignment(val);
+        }
+        break;
+      }
+      case BrowserThemeProvider::NTP_BACKGROUND_TILING: {
+        std::string val;
+        if (display_properties_value->GetString(*iter, &val)) {
+          temp_properties[BrowserThemeProvider::NTP_BACKGROUND_TILING] =
+              GetIntForString(val, kTilingStrings);
+        }
+        break;
+      }
+      case BrowserThemeProvider::NTP_LOGO_ALTERNATE: {
+        int val = 0;
+        if (display_properties_value->GetInteger(*iter, &val))
+          temp_properties[BrowserThemeProvider::NTP_LOGO_ALTERNATE] = val;
+        break;
+      }
+    }
+  }
+
+  // Copy data from the intermediary data structure to the array.
+  int count = 0;
+  for (std::map<int, int>::const_iterator it = temp_properties.begin();
+       it != temp_properties.end() && count < kDisplayPropertySize;
+       ++it, ++count) {
+    display_properties_[count].id = it->first;
+    display_properties_[count].property = it->second;
+  }
+}
+
+void BrowserThemePack::ParseImageNamesFromJSON(
+    DictionaryValue* images_value,
+    FilePath images_path,
+    std::map<int, FilePath>* file_paths) const {
+  for (DictionaryValue::key_iterator iter(images_value->begin_keys());
+       iter != images_value->end_keys(); ++iter) {
+    std::string val;
+    if (images_value->GetString(*iter, &val)) {
+      int id = ThemeResourcesUtil::GetId(WideToUTF8(*iter));
+      if (id != -1)
+        (*file_paths)[id] = images_path.AppendASCII(val);
+    }
+  }
+}
+
+void BrowserThemePack::LoadRawBitmapsTo(
+    const std::map<int, FilePath>& file_paths,
+    ImageCache* raw_bitmaps) {
+  for (std::map<int, FilePath>::const_iterator it = file_paths.begin();
+       it != file_paths.end(); ++it) {
+    scoped_refptr<RefCountedMemory> raw_data(ReadFileData(it->second));
+    int id = it->first;
+
+    // Some images need to go directly into |image_memory_|. No modification is
+    // necessary or desirable.
+    bool is_copyable = false;
+    for (size_t i = 0; i < arraysize(kPreloadIDs); ++i) {
+      if (kPreloadIDs[i] == id) {
+        is_copyable = true;
+        break;
+      }
+    }
+
+    if (is_copyable) {
+      image_memory_[id] = raw_data;
+    } else if (raw_data.get() && raw_data->size()) {
+      // Decode the PNG.
+      SkBitmap bitmap;
+      if (gfx::PNGCodec::Decode(raw_data->front(), raw_data->size(),
+                                &bitmap)) {
+        (*raw_bitmaps)[it->first] = new SkBitmap(bitmap);
+      } else {
+        NOTREACHED() << "Unable to decode theme image resource " << it->first;
+      }
+    }
+  }
+}
+
+void BrowserThemePack::GenerateFrameImages(ImageCache* bitmaps) const {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+
+  // Create all the output bitmaps in a separate cache and move them back into
+  // the input bitmaps because there can be name collisions.
+  ImageCache temp_output;
+
+  for (size_t i = 0; i < arraysize(kFrameTintMap); ++i) {
+    int id = kFrameTintMap[i].key;
+    scoped_ptr<SkBitmap> frame;
+    // If there's no frame image provided for the specified id, then load
+    // the default provided frame. If that's not provided, skip this whole
+    // thing and just use the default images.
+    int base_id;
+
+    if (id == IDR_THEME_FRAME_INCOGNITO_INACTIVE) {
+      base_id = bitmaps->count(IDR_THEME_FRAME_INCOGNITO) ?
+                IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME;
+    } else if (id == IDR_THEME_FRAME_OVERLAY_INACTIVE) {
+      base_id = IDR_THEME_FRAME_OVERLAY;
+    } else if (id == IDR_THEME_FRAME_INACTIVE) {
+      base_id = IDR_THEME_FRAME;
+    } else if (id == IDR_THEME_FRAME_INCOGNITO &&
+               !bitmaps->count(IDR_THEME_FRAME_INCOGNITO)) {
+      base_id = IDR_THEME_FRAME;
+    } else {
+      base_id = id;
+    }
+
+    if (bitmaps->count(id)) {
+      frame.reset(new SkBitmap(*(*bitmaps)[id]));
+    } else if (base_id != id && bitmaps->count(base_id)) {
+      frame.reset(new SkBitmap(*(*bitmaps)[base_id]));
+    } else if (base_id == IDR_THEME_FRAME_OVERLAY &&
+               bitmaps->count(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.
+      frame.reset(new SkBitmap(*rb.GetBitmapNamed(IDR_THEME_FRAME)));
+    }
+
+    if (frame.get()) {
+      temp_output[id] = new SkBitmap(
+          SkBitmapOperations::CreateHSLShiftedBitmap(
+              *frame, GetTintInternal(kFrameTintMap[i].value)));
+    }
+  }
+
+  MergeImageCaches(temp_output, bitmaps);
+}
+
+void BrowserThemePack::GenerateTintedButtons(
+    color_utils::HSL button_tint,
+    ImageCache* processed_bitmaps) const {
+  if (button_tint.h != -1 || button_tint.s != -1 || button_tint.l != -1) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    for (size_t i = 0; i < arraysize(kToolbarButtonIDs); ++i) {
+      scoped_ptr<SkBitmap> button(
+          new SkBitmap(*rb.GetBitmapNamed(kToolbarButtonIDs[i])));
+      (*processed_bitmaps)[kToolbarButtonIDs[i]] = new SkBitmap(
+          SkBitmapOperations::CreateHSLShiftedBitmap(*button, button_tint));
+    }
+  }
+}
+
+void BrowserThemePack::GenerateTabBackgroundImages(ImageCache* bitmaps) const {
+  ImageCache temp_output;
+  for (size_t i = 0; i < arraysize(kTabBackgroundMap); ++i) {
+    int id = kTabBackgroundMap[i].key;
+    int base_id = kTabBackgroundMap[i].value;
+
+    // We only need to generate the background tab images if we were provided
+    // with a IDR_THEME_FRAME.
+    ImageCache::const_iterator it = bitmaps->find(base_id);
+    if (it != bitmaps->end()) {
+      SkBitmap bg_tint = SkBitmapOperations::CreateHSLShiftedBitmap(
+          *(it->second), GetTintInternal(
+              BrowserThemeProvider::TINT_BACKGROUND_TAB));
+      int vertical_offset = bitmaps->count(id) ? kRestoredTabVerticalOffset : 0;
+      SkBitmap* bg_tab = new SkBitmap(SkBitmapOperations::CreateTiledBitmap(
+          bg_tint, 0, vertical_offset, bg_tint.width(), bg_tint.height()));
+
+      // If they've provided a custom image, overlay it.
+      ImageCache::const_iterator overlay_it = bitmaps->find(id);
+      if (overlay_it != bitmaps->end()) {
+        SkBitmap* overlay = overlay_it->second;
+        SkCanvas canvas(*bg_tab);
+        for (int x = 0; x < bg_tab->width(); x += overlay->width())
+          canvas.drawBitmap(*overlay, static_cast<SkScalar>(x), 0, NULL);
+      }
+
+      temp_output[id] = bg_tab;
+    }
+  }
+
+  MergeImageCaches(temp_output, bitmaps);
+}
+
+void BrowserThemePack::RepackImageCacheToImageMemory() {
+  // TODO(erg): This shouldn't be done on the main thread. This should be done
+  // during the WriteToDisk() method, but will require some tricky locking.
+  for (ImageCache::const_iterator it = image_cache_.begin();
+       it != image_cache_.end(); ++it) {
+    std::vector<unsigned char> image_data;
+    if (!gfx::PNGCodec::EncodeBGRASkBitmap(*(it->second), false, &image_data)) {
+      NOTREACHED() << "Image file for resource " << it->first
+                   << " could not be encoded.";
+    } else {
+      image_memory_[it->first] = RefCountedBytes::TakeVector(&image_data);
+    }
+  }
+}
+
+void BrowserThemePack::MergeImageCaches(
+    const ImageCache& source, ImageCache* destination) const {
+
+  for (ImageCache::const_iterator it = source.begin(); it != source.end();
+       ++it) {
+    ImageCache::const_iterator bitmap_it = destination->find(it->first);
+    if (bitmap_it != destination->end())
+      delete bitmap_it->second;
+
+    (*destination)[it->first] = it->second;
+  }
+}
+
+color_utils::HSL BrowserThemePack::GetTintInternal(int id) const {
+  if (tints_) {
+    for (int i = 0; i < kTintArraySize; ++i) {
+      if (tints_[i].id == id) {
+        color_utils::HSL hsl;
+        hsl.h = tints_[i].h;
+        hsl.s = tints_[i].s;
+        hsl.l = tints_[i].l;
+        return hsl;
+      }
+    }
+  }
+
+  return BrowserThemeProvider::GetDefaultTint(id);
+}