diff options
| author | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 12:31:12 +0000 |
|---|---|---|
| committer | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 12:31:12 +0000 |
| commit | a369c2f2af88d590c4a309f7c2e92b707f7c5ed6 (patch) | |
| tree | f54b73753785f5f33d033b242ae9d400734b49d0 /ui/base/resource | |
| parent | a38bdda0c894ea19e90d5c37589943c9e08c15ef (diff) | |
| download | chromium_src-a369c2f2af88d590c4a309f7c2e92b707f7c5ed6.zip chromium_src-a369c2f2af88d590c4a309f7c2e92b707f7c5ed6.tar.gz chromium_src-a369c2f2af88d590c4a309f7c2e92b707f7c5ed6.tar.bz2 | |
Always add 100P scale format in the supported format list.
Align iOS with the other platforms and add 100P to the list of supported
scale formats.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11293147
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/resource')
| -rw-r--r-- | ui/base/resource/resource_bundle_ios.mm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm index 06da17d..8ff7347 100644 --- a/ui/base/resource/resource_bundle_ios.mm +++ b/ui/base/resource/resource_bundle_ios.mm @@ -107,10 +107,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { // Load the raw data from the resource pack at the current supported scale // factor. This code assumes that only one of the possible scale factors is // supported at runtime, based on the device resolution. - std::vector<ui::ScaleFactor> supported_scale_factors = - ui::GetSupportedScaleFactors(); - DCHECK_EQ(1U, supported_scale_factors.size()); - ui::ScaleFactor scale_factor = supported_scale_factors[0]; + ui::ScaleFactor scale_factor = ui::GetMaxScaleFactor(); scoped_refptr<base::RefCountedStaticMemory> data( LoadDataResourceBytesForScale(resource_id, scale_factor)); |