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

Side by Side 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: Final rebase after DIP scale fix. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/layout.cc ('k') | ui/gfx/android/device_display_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/layout.h" 5 #include "ui/base/layout.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 #if defined(OS_CHROMEOS) 9 #if defined(OS_CHROMEOS)
10 #include "base/chromeos/chromeos_version.h" 10 #include "base/chromeos/chromeos_version.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "ui/base/ui_base_switches.h" 12 #include "ui/base/ui_base_switches.h"
13 #endif 13 #endif
14 14
15 namespace ui { 15 namespace ui {
16 16
17 TEST(LayoutTest, GetScaleFactorScale) { 17 TEST(LayoutTest, GetScaleFactorScale) {
18 EXPECT_FLOAT_EQ(1.0f, GetScaleFactorScale(SCALE_FACTOR_100P)); 18 EXPECT_FLOAT_EQ(1.0f, GetScaleFactorScale(SCALE_FACTOR_100P));
19 EXPECT_FLOAT_EQ(1.4f, GetScaleFactorScale(SCALE_FACTOR_140P)); 19 EXPECT_FLOAT_EQ(1.4f, GetScaleFactorScale(SCALE_FACTOR_140P));
20 EXPECT_FLOAT_EQ(1.5f, GetScaleFactorScale(SCALE_FACTOR_150P));
20 EXPECT_FLOAT_EQ(1.8f, GetScaleFactorScale(SCALE_FACTOR_180P)); 21 EXPECT_FLOAT_EQ(1.8f, GetScaleFactorScale(SCALE_FACTOR_180P));
21 EXPECT_FLOAT_EQ(2.0f, GetScaleFactorScale(SCALE_FACTOR_200P)); 22 EXPECT_FLOAT_EQ(2.0f, GetScaleFactorScale(SCALE_FACTOR_200P));
22 } 23 }
23 24
24 TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) { 25 TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
25 std::vector<ScaleFactor> original_supported_factors = 26 std::vector<ScaleFactor> original_supported_factors =
26 GetSupportedScaleFactors(); 27 GetSupportedScaleFactors();
27 28
28 std::vector<ScaleFactor> supported_factors; 29 std::vector<ScaleFactor> supported_factors;
29 supported_factors.push_back(SCALE_FACTOR_100P); 30 supported_factors.push_back(SCALE_FACTOR_100P);
(...skipping 21 matching lines...) Expand all
51 } 52 }
52 test::SetSupportedScaleFactors(supported_factors); 53 test::SetSupportedScaleFactors(supported_factors);
53 54
54 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.1f)); 55 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.1f));
55 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.9f)); 56 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.9f));
56 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.0f)); 57 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.0f));
57 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.19f)); 58 EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.19f));
58 EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.21f)); 59 EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.21f));
59 EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.3f)); 60 EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.3f));
60 EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.4f)); 61 EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.4f));
61 EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.59f)); 62 EXPECT_EQ(SCALE_FACTOR_150P, GetScaleFactorFromScale(1.59f));
62 EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.61f)); 63 EXPECT_EQ(SCALE_FACTOR_150P, GetScaleFactorFromScale(1.61f));
63 EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.7f)); 64 EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.7f));
64 EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.89f)); 65 EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.89f));
65 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(1.91f)); 66 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(1.91f));
66 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.0f)); 67 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.0f));
67 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.1f)); 68 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.1f));
68 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(999.0f)); 69 EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(999.0f));
69 70
70 test::SetSupportedScaleFactors(original_supported_factors); 71 test::SetSupportedScaleFactors(original_supported_factors);
71 } 72 }
72 73
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 std::vector<ScaleFactor> supported_factors( 105 std::vector<ScaleFactor> supported_factors(
105 scale_factors, scale_factors + arraysize(scale_factors)); 106 scale_factors, scale_factors + arraysize(scale_factors));
106 test::SetSupportedScaleFactors(supported_factors); 107 test::SetSupportedScaleFactors(supported_factors);
107 EXPECT_EQ(SCALE_FACTOR_200P, GetMaxScaleFactor()); 108 EXPECT_EQ(SCALE_FACTOR_200P, GetMaxScaleFactor());
108 } 109 }
109 test::SetSupportedScaleFactors(original_supported_factors); 110 test::SetSupportedScaleFactors(original_supported_factors);
110 #endif 111 #endif
111 } 112 }
112 113
113 } // namespace ui 114 } // namespace ui
OLDNEW
« no previous file with comments | « 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