Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(855)

Unified Diff: ui/base/resource/resource_bundle_unittest.cc

Issue 326073005: Enable arbitrary scale factor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/gfx/image/image_skia.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_unittest.cc
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index a87ade79732e300de3dcdd151ce5c9031b9b5aff..4ba3deacba6b1ff877bd44d8239efb4066d17549 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
« no previous file with comments | « no previous file | ui/gfx/image/image_skia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698