Add ability to store hidpi theme images in data pack

ui/gfx/image/image_skia.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 "ui/gfx/image/image_skia.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 217 matching lines @@
 
   // Attempt to generate image reps for as many scale factors supported by
   // this platform as possible.
   // Do not build return array here because the mapping from scale factor to
   // image rep is one to many in some cases.
   std::vector<ui::ScaleFactor> supported_scale_factors =
       ui::GetSupportedScaleFactors();
   for (size_t i = 0; i < supported_scale_factors.size(); ++i)
     storage_->FindRepresentation(supported_scale_factors[i], true);
 
-  ImageSkiaReps internal_image_reps = storage_->image_reps();
-  // Create list of image reps to return, skipping null image reps which were
-  // added for caching purposes only.
-  ImageSkiaReps image_reps;
-  for (ImageSkiaReps::iterator it = internal_image_reps.begin();
-       it != internal_image_reps.end(); ++it) {
-    if (!it->is_null())
-      image_reps.push_back(*it);
-  }
-
-  return image_reps;
+  return image_reps();
 }
 
 #endif  // OS_MACOSX
 
 bool ImageSkia::empty() const {
   return isNull() || storage_->size().IsEmpty();
 }
 
 int ImageSkia::width() const {
   return isNull() ? 0 : storage_->size().width();
@@ skipping 10 matching lines @@
 bool ImageSkia::extractSubset(ImageSkia* dst, const SkIRect& subset) const {
   gfx::Rect rect(subset.x(), subset.y(), subset.width(), subset.height());
   *dst = ImageSkiaOperations::ExtractSubset(*this, rect);
   return (!dst->isNull());
 }
 
 std::vector<ImageSkiaRep> ImageSkia::image_reps() const {
   if (isNull())
     return std::vector<ImageSkiaRep>();
 
-  return storage_->image_reps();
+  ImageSkiaReps internal_image_reps = storage_->image_reps();
+  // Create list of image reps to return, skipping null image reps which were
+  // added for caching purposes only.
+  ImageSkiaReps image_reps;
+  for (ImageSkiaReps::iterator it = internal_image_reps.begin();
+       it != internal_image_reps.end(); ++it) {
+    if (!it->is_null())
+      image_reps.push_back(*it);
+  }
+
+  return image_reps;
 }
 
 const SkBitmap* ImageSkia::bitmap() const {
   if (isNull()) {
     // Callers expect a ImageSkiaRep even if it is |isNull()|.
     // TODO(pkotwicz): Fix this.
     return &NullImageRep().sk_bitmap();
   }
 
   ImageSkiaReps::iterator it =
       storage_->FindRepresentation(ui::SCALE_FACTOR_100P, true);
   return &it->sk_bitmap();
 }
 
 void ImageSkia::Init(const ImageSkiaRep& image_rep) {
   // TODO(pkotwicz): The image should be null whenever image rep is null.
   if (image_rep.sk_bitmap().empty()) {
     storage_ = NULL;
     return;
   }
   storage_ = new internal::ImageSkiaStorage(
       NULL, gfx::Size(image_rep.GetWidth(), image_rep.GetHeight()));
   storage_->image_reps().push_back(image_rep);
 }
 
 }  // namespace gfx