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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/layout_unittest.cc

Issue 232483005: Enable --high-dpi-support by default. Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Disabling broken unit tests. (Don't submit this code!) Created 6 years, 7 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 | « content/browser/renderer_host/render_process_host_impl.cc ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/layout_unittest.cc
diff --git a/ui/base/layout_unittest.cc b/ui/base/layout_unittest.cc
index b082beab72a8727a160ba805a41533689106f2df..310cd09bcc6b42a002151890cb276831ea192b1b 100644
--- a/ui/base/layout_unittest.cc
+++ b/ui/base/layout_unittest.cc
@@ -14,14 +14,14 @@
namespace ui {
TEST(LayoutTest, GetScaleFactorScale) {
- EXPECT_FLOAT_EQ(1.0f, GetImageScale(SCALE_FACTOR_100P));
- EXPECT_FLOAT_EQ(1.25f, GetImageScale(SCALE_FACTOR_125P));
- EXPECT_FLOAT_EQ(1.33f, GetImageScale(SCALE_FACTOR_133P));
- EXPECT_FLOAT_EQ(1.4f, GetImageScale(SCALE_FACTOR_140P));
- EXPECT_FLOAT_EQ(1.5f, GetImageScale(SCALE_FACTOR_150P));
- EXPECT_FLOAT_EQ(1.8f, GetImageScale(SCALE_FACTOR_180P));
- EXPECT_FLOAT_EQ(2.0f, GetImageScale(SCALE_FACTOR_200P));
- EXPECT_FLOAT_EQ(3.0f, GetImageScale(SCALE_FACTOR_300P));
+ EXPECT_FLOAT_EQ(1.0f, GetScaleForScaleFactor(SCALE_FACTOR_100P));
+ EXPECT_FLOAT_EQ(1.25f, GetScaleForScaleFactor(SCALE_FACTOR_125P));
+ EXPECT_FLOAT_EQ(1.33f, GetScaleForScaleFactor(SCALE_FACTOR_133P));
+ EXPECT_FLOAT_EQ(1.4f, GetScaleForScaleFactor(SCALE_FACTOR_140P));
+ EXPECT_FLOAT_EQ(1.5f, GetScaleForScaleFactor(SCALE_FACTOR_150P));
+ EXPECT_FLOAT_EQ(1.8f, GetScaleForScaleFactor(SCALE_FACTOR_180P));
+ EXPECT_FLOAT_EQ(2.0f, GetScaleForScaleFactor(SCALE_FACTOR_200P));
+ EXPECT_FLOAT_EQ(3.0f, GetScaleForScaleFactor(SCALE_FACTOR_300P));
}
TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698