Allows arbitrary scale factor in ImageSkia.

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>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/gfx/switches.h"
 
 namespace gfx {
 namespace {
 
 // static
 gfx::ImageSkiaRep& NullImageRep() {
   CR_DEFINE_STATIC_LOCAL(ImageSkiaRep, null_image_rep, ());
   return null_image_rep;
 }
 
 std::vector<float>* g_supported_scales = NULL;
+
 }  // namespace
 
 namespace internal {
 namespace {
 
 class Matcher {
  public:
   explicit Matcher(float scale) : scale_(scale) {
   }
 
@@ skipping 92 matching lines @@
       if (diff < smallest_diff && !it->is_null()) {
         closest_iter = it;
         smallest_diff = diff;
       }
     }
 
     if (fetch_new_image && source_.get()) {
       DCHECK(CalledOnValidThread()) <<
           "An ImageSkia with the source must be accessed by the same thread.";
 
-      ImageSkiaRep image = source_->GetImageForScale(scale);
+      ImageSkiaRep image;
+      float request_scale = scale;

[oshima, 2014/05/06 20:59:49]

can you use "resource_scale" ?

[Jun Mukai, 2014/05/06 21:06:27]

Done.

+      if (ImageSkia::IsDSFScalingInImageSkiaEnabled() && g_supported_scales) {
+        if (g_supported_scales->back() <= scale) {
+          request_scale = g_supported_scales->back();
+        } else {
+          for (size_t i = 0; i < g_supported_scales->size(); ++i) {
+            if ((*g_supported_scales)[i] >= request_scale) {
+              request_scale = (*g_supported_scales)[i];

[oshima, 2014/05/06 20:59:49]

can you make it so that this picks 2.0 for 1.25 and up (and so forth)?

[Jun Mukai, 2014/05/06 21:06:27]

I think this does so already, this for-loop attempted to pick up the least
scales which is greater than or equals to the specified scale.
The test case covers such case.

[Jun Mukai, 2014/05/07 00:40:17]

Fixed the code so that 1.25 falls back to 1.0. Added a test case for this. PTAL.

+              break;
+            }
+          }
+        }
+      }
+      if (ImageSkia::IsDSFScalingInImageSkiaEnabled() &&
+          scale != request_scale) {
+        std::vector<ImageSkiaRep>::iterator iter =
+            non_const->FindRepresentation(request_scale, fetch_new_image);
+
+        DCHECK(iter != non_const->image_reps().end());
+        SkBitmap scaled_image;
+        gfx::Size unscaled_size(iter->pixel_width(), iter->pixel_height());
+        gfx::Size scaled_size = ToCeiledSize(
+            gfx::ScaleSize(unscaled_size, scale / iter->scale()));
+
+        image = ImageSkiaRep(skia::ImageOperations::Resize(
+            iter->sk_bitmap(),
+            skia::ImageOperations::RESIZE_LANCZOS3,
+            scaled_size.width(),
+            scaled_size.height()), scale);
+        DCHECK_EQ(image.pixel_width(), scaled_size.width());
+        DCHECK_EQ(image.pixel_height(), scaled_size.height());
+      } else {
+        image = source_->GetImageForScale(scale);
+      }
 
       // If the source returned the new image, store it.
       if (!image.is_null() &&
           std::find_if(image_reps_.begin(), image_reps_.end(),
                        Matcher(image.scale())) == image_reps_.end()) {
         non_const->image_reps().push_back(image);
       }
 
       // If the result image's scale isn't same as the expected scale, create
       // null ImageSkiaRep with the |scale| so that the next lookup will
@@ skipping 83 matching lines @@
 // static
 float ImageSkia::GetMaxSupportedScale() {
   return g_supported_scales->back();
 }
 
 // static
 ImageSkia ImageSkia::CreateFrom1xBitmap(const SkBitmap& bitmap) {
   return ImageSkia(ImageSkiaRep(bitmap, 1.0f));
 }
 
+bool ImageSkia::IsDSFScalingInImageSkiaEnabled() {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+#if defined(OS_WIN)
+  return !command_line->HasSwitch(
+      switches::kDisallowArbitraryScaleFactorInImageSkia);
+#else
+  return command_line->HasSwitch(
+      switches::kAllowArbitraryScaleFactorInImageSkia);
+#endif
+}
+
 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();
   for (std::vector<gfx::ImageSkiaRep>::iterator iter = reps.begin();
        iter != reps.end(); ++iter) {
@@ skipping 160 matching lines @@
 bool ImageSkia::CanModify() const {
   return !storage_.get() || storage_->CanModify();
 }
 
 void ImageSkia::DetachStorageFromThread() {
   if (storage_.get())
     storage_->DetachFromThread();
 }
 
 }  // namespace gfx