diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-11 11:49:08 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-11 11:49:08 +0000 |
| commit | 9eb2a379ce68bd85d57ee0cafd09f5b6ce68210e (patch) | |
| tree | 4bca59ab4ac109f93e28d014e76ae037f8a7d851 /ui/base/resource | |
| parent | 225e9a117b37dfde78c4eec2c991f9b3c4c0cffc (diff) | |
| download | chromium_src-9eb2a379ce68bd85d57ee0cafd09f5b6ce68210e.zip chromium_src-9eb2a379ce68bd85d57ee0cafd09f5b6ce68210e.tar.gz chromium_src-9eb2a379ce68bd85d57ee0cafd09f5b6ce68210e.tar.bz2 | |
Enable arbitrary scale factor
BUG=372212
R=mukai@chromium.org
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/326073005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/resource')
| -rw-r--r-- | ui/base/resource/resource_bundle_unittest.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc index a87ade7..4ba3dea 100644 --- a/ui/base/resource/resource_bundle_unittest.cc +++ b/ui/base/resource/resource_bundle_unittest.cc @@ -492,11 +492,10 @@ TEST_F(ResourceBundleImageTest, GetImageNamed) { ui::ScaleFactor scale_factor = GetSupportedScaleFactor(image_rep.scale()); EXPECT_TRUE(scale_factor == ui::SCALE_FACTOR_100P || scale_factor == ui::SCALE_FACTOR_200P); -#if !defined(OS_WIN) - // If the image is not found, the it should simply image rep should - // contain the scale of the image rep, not the requested scale. - EXPECT_EQ(1.0f, image_skia->GetRepresentation(1.4f).scale()); -#endif + + // ImageSkia scales image if the one for the requested scale factor is not + // available. + EXPECT_EQ(1.4f, image_skia->GetRepresentation(1.4f).scale()); } // Test that GetImageNamed() behaves properly for images which GRIT has |