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

ui/base/resource/resource_bundle.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/base/resource/resource_bundle.h"
 
 #include <vector>
 
 #include "base/big_endian.h"
 #include "base/command_line.h"
@@ skipping 87 matching lines @@
       : rb_(rb), resource_id_(resource_id) {}
   virtual ~ResourceBundleImageSource() {}
 
   // gfx::ImageSkiaSource overrides:
   virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
     SkBitmap image;
     bool fell_back_to_1x = false;
     ScaleFactor scale_factor = GetSupportedScaleFactor(scale);
     bool found = rb_->LoadBitmap(resource_id_, &scale_factor,
                                  &image, &fell_back_to_1x);
+    // If the resource is in the package with SCALE_FACTOR_NONE, it
+    // can be used in any scale factor. The image is maked as "unscaled"
+    // so that the ImageSkia do not automatically scale.
+    bool unscaled = scale_factor == ui::SCALE_FACTOR_NONE;
+    if (unscaled)
+      scale_factor = ui::SCALE_FACTOR_100P;
+
     if (!found)
       return gfx::ImageSkiaRep();
 
     if (fell_back_to_1x) {
       // GRIT fell back to the 100% image, so rescale it to the correct size.
       image = skia::ImageOperations::Resize(
           image,
           skia::ImageOperations::RESIZE_LANCZOS3,
           gfx::ToCeiledInt(image.width() * scale),
           gfx::ToCeiledInt(image.height() * scale));
-    } else {
+    } else if (!unscaled) {
       image = PlatformScaleImage(image,
                                  ui::GetScaleForScaleFactor(scale_factor),
                                  scale);
     }
-    return gfx::ImageSkiaRep(image, scale);
+    return gfx::ImageSkiaRep(image, unscaled ? 0.0f : scale);
   }
 
  private:
   ResourceBundle* rb_;
   const int resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundleImageSource);
 };
 
 // static
@@ skipping 587 matching lines @@
   NOTREACHED() << "Unable to decode theme image resource " << resource_id;
   return false;
 }
 
 bool ResourceBundle::LoadBitmap(int resource_id,
                                 ScaleFactor* scale_factor,
                                 SkBitmap* bitmap,
                                 bool* fell_back_to_1x) const {
   DCHECK(fell_back_to_1x);
   for (size_t i = 0; i < data_packs_.size(); ++i) {
-    // If the resource is in the package with SCALE_FACTOR_NONE, it
-    // can be used in any scale factor, but set 100P in ImageSkia so
-    // that it will be scaled property.
     if (data_packs_[i]->GetScaleFactor() == ui::SCALE_FACTOR_NONE &&
         LoadBitmap(*data_packs_[i], resource_id, bitmap, fell_back_to_1x)) {
-      *scale_factor = ui::SCALE_FACTOR_100P;
       DCHECK(!*fell_back_to_1x);
+      *scale_factor = ui::SCALE_FACTOR_NONE;
       return true;
     }
     if (data_packs_[i]->GetScaleFactor() == *scale_factor &&
         LoadBitmap(*data_packs_[i], resource_id, bitmap, fell_back_to_1x)) {
       return true;
     }
   }
   return false;
 }
 
@@ skipping 57 matching lines @@
 #if !defined(OS_WIN)
 // static
 SkBitmap ResourceBundle::PlatformScaleImage(const SkBitmap& image,
                                             float loaded_image_scale,
                                             float desired_scale) {
   return image;
 }
 #endif
 
 }  // namespace ui