Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / base / resource / resource_bundle_win.cc

diff --git a/src/ui/base/resource/resource_bundle_win.cc b/src/ui/base/resource/resource_bundle_win.cc
index 3938722..045f8ae 100644 (file)
--- a/src/ui/base/resource/resource_bundle_win.cc
+++ b/src/ui/base/resource/resource_bundle_win.cc
@@ -7,9 +7,13 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "skia/ext/image_operations.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_data_dll_win.h"
+#include "ui/gfx/geometry/size_conversions.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/win/dpi.h"
 
 namespace ui {
@@ -38,9 +42,17 @@ base::FilePath GetResourcesPakFilePath(const std::string& pak_name) {
 void ResourceBundle::LoadCommonResources() {
   // As a convenience, add the current resource module as a data packs.
   data_packs_.push_back(new ResourceDataDLL(GetCurrentResourceDLL()));
-  AddDataPackFromPath(
-      GetResourcesPakFilePath("chrome_100_percent.pak"),
-      SCALE_FACTOR_100P);
+
+  if (IsScaleFactorSupported(SCALE_FACTOR_100P)) {
+    AddDataPackFromPath(
+        GetResourcesPakFilePath("chrome_100_percent.pak"),
+        SCALE_FACTOR_100P);
+  }
+  if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
+    AddDataPackFromPath(
+        GetResourcesPakFilePath("chrome_200_percent.pak"),
+        SCALE_FACTOR_200P);
+  }
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {