Index: ui/base/resource/resource_bundle_win.cc |
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc |
index 5e0fd2214f4d0bbed79545e5cf3de8bebebc80e7..a1537d39ac393c2369ee1999050c7e00849af5fe 100644 |
--- a/ui/base/resource/resource_bundle_win.cc |
+++ b/ui/base/resource/resource_bundle_win.cc |
@@ -66,6 +66,13 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { |
} |
// static |
+float ResourceBundle::PlatformGetImageScale(ui::ScaleFactor scale_factor) { |
+ if (!gfx::IsHighDPIEnabled()) |
+ return ui::GetImageScale(scale_factor); |
+ return gfx::win::GetDeviceScaleFactor(); |
+} |
+ |
+// static |
SkBitmap ResourceBundle::PlatformScaleImage(const SkBitmap& image, |
float loaded_image_scale, |
float desired_bitmap_scale) { |
@@ -93,12 +100,6 @@ SkBitmap ResourceBundle::PlatformScaleImage(const SkBitmap& image, |
return scaled_image; |
} |
-float ResourceBundle::PlatformGetImageScale() { |
- if (!gfx::IsHighDPIEnabled()) |
- return ui::GetImageScale(GetMaxScaleFactor()); |
- return gfx::win::GetDeviceScaleFactor(); |
-} |
- |
void SetResourcesDataDLL(HINSTANCE handle) { |
resources_data_dll = handle; |
} |