Resize images for hi-dpi based on a custom PNG chunk added by GRIT r78, and roll GRIT r78

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 40 matching lines @@
 // information.
 class ImageSkiaStorage : public base::RefCounted<ImageSkiaStorage>,
                          public base::NonThreadSafe {
  public:
   ImageSkiaStorage(ImageSkiaSource* source, const gfx::Size& size)
       : source_(source),
         size_(size),
         read_only_(false) {
   }
 
+  ImageSkiaStorage(ImageSkiaSource* source, ui::ScaleFactor scale_factor)
+      : source_(source),
+        read_only_(false) {
+    const ImageSkiaRep& image = *FindRepresentation(scale_factor, true);
+    if (image.is_null())
+      source_.reset();

[oshima, 2012/10/11 01:31:54]

no need to reset here. You can just check image_reps().empty() below.

[benrg, 2012/10/15 21:58:54]

It's not empty -- FindRepresentation inserts an empty image so that it can
short-circuit the next search.

[oshima, 2012/10/16 23:12:09]

ok, you can still use image_reps().begin()->is_null(), but i'm also OK as is.

+    else
+      size_.SetSize(image.GetWidth(), image.GetHeight());
+  }
+
   bool has_source() const { return source_.get() != NULL; }
 
   std::vector<gfx::ImageSkiaRep>& image_reps() { return image_reps_; }
 
   const gfx::Size& size() const { return size_; }
 
   bool read_only() const { return read_only_; }
 
   void DeleteSource() {
     source_.reset();
@@ skipping 84 matching lines @@
     // Don't blow up even if someone else deleted the ImageSkia.
     DetachFromThread();
   }
 
   // Vector of bitmaps and their associated scale factor.
   std::vector<gfx::ImageSkiaRep> image_reps_;
 
   scoped_ptr<ImageSkiaSource> source_;
 
   // Size of the image in DIP.
-  const gfx::Size size_;
+  gfx::Size size_;
 
   bool read_only_;
 
   friend class base::RefCounted<ImageSkiaStorage>;
 };
 
 }  // internal
 
 ImageSkia::ImageSkia() : storage_(NULL) {
 }
 
 ImageSkia::ImageSkia(ImageSkiaSource* source, const gfx::Size& size)
     : storage_(new internal::ImageSkiaStorage(source, size)) {
   DCHECK(source);
   // No other thread has reference to this, so it's safe to detach the thread.
   DetachStorageFromThread();
 }
 
+ImageSkia::ImageSkia(ImageSkiaSource* source, ui::ScaleFactor scale_factor)
+    : storage_(new internal::ImageSkiaStorage(source, scale_factor)) {
+  DCHECK(source);
+  if (!storage_->has_source())
+    storage_ = NULL;
+  // No other thread has reference to this, so it's safe to detach the thread.
+  DetachStorageFromThread();
+}
+
 ImageSkia::ImageSkia(const SkBitmap& bitmap) {
   Init(ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
   // No other thread has reference to this, so it's safe to detach the thread.
   DetachStorageFromThread();
 }
 
 ImageSkia::ImageSkia(const ImageSkiaRep& image_rep) {
   Init(image_rep);
   // No other thread has reference to this, so it's safe to detach the thread.
   DetachStorageFromThread();
@@ skipping 188 matching lines @@
 bool ImageSkia::CanModify() const {
   return !storage_ || storage_->CanModify();
 }
 
 void ImageSkia::DetachStorageFromThread() {
   if (storage_)
     storage_->DetachFromThread();
 }
 
 }  // namespace gfx