Add ImageSkiaRep::unscaled that tells if the image is for unscaled image.

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 84 matching lines @@
   // Checks if the current thread can safely modify the storage.
   bool CanModify() const {
     return !read_only_ && CalledOnValidThread();
   }
 
   // Checks if the current thread can safely read the storage.
   bool CanRead() const {
     return (read_only_ && !source_.get()) || CalledOnValidThread();
   }
 
+  // Add a new representation. If the storage contains unscaled
+  // image rep, change it to scaled as this now contains
+  // multiple reps.
+  void AddRepresentation(const ImageSkiaRep& image) {
+    for (ImageSkia::ImageSkiaReps::iterator it = image_reps_.begin();
+         it < image_reps_.end();
+         ++it) {
+      if (it->unscaled()) {
+        it->SetScaled();
+        break;
+      }
+    }
+    image_reps_.push_back(image);
+  }
+
   // Returns the iterator of the image rep whose density best matches
   // |scale|. If the image for the |scale| doesn't exist in the storage and
   // |storage| is set, it fetches new image by calling
   // |ImageSkiaSource::GetImageForScale|. If the source returns the image with
   // different scale (if the image doesn't exist in resource, for example), it
   // will fallback to closest image rep.
   std::vector<ImageSkiaRep>::iterator FindRepresentation(
       float scale, bool fetch_new_image) const {
     ImageSkiaStorage* non_const = const_cast<ImageSkiaStorage*>(this);
 
@@ skipping 118 matching lines @@
   return *g_supported_scales;
 }
 
 // static
 float ImageSkia::GetMaxSupportedScale() {
   return g_supported_scales->back();
 }
 
 // static
 ImageSkia ImageSkia::CreateFrom1xBitmap(const SkBitmap& bitmap) {
-  return ImageSkia(ImageSkiaRep(bitmap, 1.0f));
+  return ImageSkia(ImageSkiaRep(bitmap, 0.0f));

[Jun Mukai, 2014/05/09 17:57:39]

Doesn't this cause any other unexpected results?
The caller might expect this as 'good for 1x and blurring scaled image for 2x'.

[oshima, 2014/05/09 20:53:33]

Yes, this is exactly what I wanted to guarantee how this will work.

1.0f image gets scaled in canvas at drawing time right now,
and I want to keep the same behavior with your CL.

 }
 
 scoped_ptr<ImageSkia> ImageSkia::DeepCopy() const {
   ImageSkia* copy = new ImageSkia;
   if (isNull())
     return scoped_ptr<ImageSkia>(copy);
 
   CHECK(CanRead());
 
   std::vector<gfx::ImageSkiaRep>& reps = storage_->image_reps();
@@ skipping 17 matching lines @@
 
   // TODO(oshima): This method should be called |SetRepresentation|
   // and replace the existing rep if there is already one with the
   // same scale so that we can guarantee that a ImageSkia instance contains only
   // one image rep per scale. This is not possible now as ImageLoader currently
   // stores need this feature, but this needs to be fixed.
   if (isNull()) {
     Init(image_rep);
   } else {
     CHECK(CanModify());
-    storage_->image_reps().push_back(image_rep);
+    storage_->AddRepresentation(image_rep);

[Jun Mukai, 2014/05/09 17:57:39]

Why only this has to be replaced by AddRepresentation?  There's several other
image_reps().push_back().

[oshima, 2014/05/09 20:53:33]

I added the comment to explain why.

   }
 }
 
 void ImageSkia::RemoveRepresentation(float scale) {
   if (isNull())
     return;
   CHECK(CanModify());
 
   ImageSkiaReps& image_reps = storage_->image_reps();
   ImageSkiaReps::iterator it =
@@ skipping 124 matching lines @@
 bool ImageSkia::CanModify() const {
   return !storage_.get() || storage_->CanModify();
 }
 
 void ImageSkia::DetachStorageFromThread() {
   if (storage_.get())
     storage_->DetachFromThread();
 }
 
 }  // namespace gfx