Initial sets of fixes for themes to work well with HiDPI Windows. More changes coming in a separate…

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 (!found)
+      return gfx::ImageSkiaRep();
+
     // 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 (scale_factor == ui::SCALE_FACTOR_NONE)
+      return gfx::ImageSkiaRep(image, 0.0f);
 
     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 if (!unscaled) {
-      SkBitmap scaled_image =
-          PlatformScaleImage(image,
-                             ui::GetScaleForScaleFactor(scale_factor),
-                             scale);
-      if (scaled_image.isNull())
-        scale = GetScaleForScaleFactor(scale_factor);
-      else
-        image = scaled_image;
     } else {
       scale = GetScaleForScaleFactor(scale_factor);
     }
-    return gfx::ImageSkiaRep(image, unscaled ? 0.0f : scale);
+    return gfx::ImageSkiaRep(image, scale);
   }
 
  private:
   ResourceBundle* rb_;
   const int resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundleImageSource);
 };
 
 // static
@@ skipping 204 matching lines @@
   if (image.IsEmpty()) {
     DCHECK(!data_packs_.empty()) <<
         "Missing call to SetResourcesDataDLL?";
 
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
   ui::ScaleFactor scale_factor_to_load = GetMaxScaleFactor();
 #else
   ui::ScaleFactor scale_factor_to_load = ui::SCALE_FACTOR_100P;
 #endif
 
-    float scale = GetImageScale(scale_factor_to_load);
-
     // TODO(oshima): Consider reading the image size from png IHDR chunk and
     // skip decoding here and remove #ifdef below.
     // ResourceBundle::GetSharedInstance() is destroyed after the
     // BrowserMainLoop has finished running. |image_skia| is guaranteed to be
     // destroyed before the resource bundle is destroyed.
     gfx::ImageSkia image_skia(new ResourceBundleImageSource(this, resource_id),
-                              scale);
+                              GetScaleForScaleFactor(scale_factor_to_load));
     if (image_skia.isNull()) {
       LOG(WARNING) << "Unable to load image with id " << resource_id;
       NOTREACHED();  // Want to assert in debug mode.
       // The load failed to retrieve the image; show a debugging red square.
       return GetEmptyImage();
     }
     image_skia.SetReadOnly();
     image = gfx::Image(image_skia);
   }
 
@@ skipping 425 matching lines @@
 
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
-#if !defined(OS_WIN)
-// static
-SkBitmap ResourceBundle::PlatformScaleImage(const SkBitmap& image,
-                                            float loaded_image_scale,
-                                            float desired_scale) {
-  return SkBitmap();
-}
-#endif
-
 }  // namespace ui