diff options
Diffstat (limited to 'chromium/ui/base/layout_unittest.cc')
| -rw-r--r-- | chromium/ui/base/layout_unittest.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/chromium/ui/base/layout_unittest.cc b/chromium/ui/base/layout_unittest.cc index b082beab72a..070247079ef 100644 --- a/chromium/ui/base/layout_unittest.cc +++ b/chromium/ui/base/layout_unittest.cc @@ -14,14 +14,15 @@ 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(2.5f, GetScaleForScaleFactor(SCALE_FACTOR_250P)); + EXPECT_FLOAT_EQ(3.0f, GetScaleForScaleFactor(SCALE_FACTOR_300P)); } TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) { @@ -61,6 +62,10 @@ TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) { EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(1.91f)); EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.0f)); EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.1f)); + EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.3f)); + EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.5f)); + EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.6f)); + EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(2.9f)); EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.0f)); EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.1f)); EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(999.0f)); |