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

Unified Diff: ui/base/layout_unittest.cc

Issue 11886074: Use correct favicon scale factor on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split DeviceTelephonyInfo from DeviceDisplayInfo; added SCALE_FACTOR_150P and 300P. Created 7 years, 11 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
Index: ui/base/layout_unittest.cc
diff --git a/ui/base/layout_unittest.cc b/ui/base/layout_unittest.cc
index 9cda5d5f904c98ca61c077a065005d7be6c8a4ff..2d8e45c36160af687ceca09cfa8bbef3823e2baf 100644
--- a/ui/base/layout_unittest.cc
+++ b/ui/base/layout_unittest.cc
@@ -17,8 +17,10 @@ namespace ui {
TEST(LayoutTest, GetScaleFactorScale) {
EXPECT_FLOAT_EQ(1.0f, GetScaleFactorScale(SCALE_FACTOR_100P));
EXPECT_FLOAT_EQ(1.4f, GetScaleFactorScale(SCALE_FACTOR_140P));
+ EXPECT_FLOAT_EQ(1.5f, GetScaleFactorScale(SCALE_FACTOR_150P));
EXPECT_FLOAT_EQ(1.8f, GetScaleFactorScale(SCALE_FACTOR_180P));
EXPECT_FLOAT_EQ(2.0f, GetScaleFactorScale(SCALE_FACTOR_200P));
+ EXPECT_FLOAT_EQ(3.0f, GetScaleFactorScale(SCALE_FACTOR_300P));
}
TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
@@ -58,14 +60,14 @@ TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.21f));
EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.3f));
EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.4f));
- EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.59f));
- EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.61f));
+ EXPECT_EQ(SCALE_FACTOR_150P, GetScaleFactorFromScale(1.59f));
+ EXPECT_EQ(SCALE_FACTOR_150P, GetScaleFactorFromScale(1.61f));
EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.7f));
EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.89f));
EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(1.91f));
EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.0f));
EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.1f));
- EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(999.0f));
+ EXPECT_EQ(SCALE_FACTOR_300P, GetScaleFactorFromScale(999.0f));
test::SetSupportedScaleFactors(original_supported_factors);
}
« ui/base/layout.cc ('K') | « ui/base/layout.cc ('k') | ui/gfx/android/device_display_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698