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

Side by Side Diff: ui/base/layout_unittest.cc

Issue 327503003: Added 250p scale factor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « ui/base/layout.cc ('k') | no next file » | 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/command_line.h" 10 #include "base/command_line.h"
11 #include "ui/base/ui_base_switches.h" 11 #include "ui/base/ui_base_switches.h"
12 #endif 12 #endif
13 13
14 namespace ui { 14 namespace ui {
15 15
16 TEST(LayoutTest, GetScaleFactorScale) { 16 TEST(LayoutTest, GetScaleFactorScale) {
17 EXPECT_FLOAT_EQ(1.0f, GetScaleForScaleFactor(SCALE_FACTOR_100P)); 17 EXPECT_FLOAT_EQ(1.0f, GetScaleForScaleFactor(SCALE_FACTOR_100P));
18 EXPECT_FLOAT_EQ(1.25f, GetScaleForScaleFactor(SCALE_FACTOR_125P)); 18 EXPECT_FLOAT_EQ(1.25f, GetScaleForScaleFactor(SCALE_FACTOR_125P));
19 EXPECT_FLOAT_EQ(1.33f, GetScaleForScaleFactor(SCALE_FACTOR_133P)); 19 EXPECT_FLOAT_EQ(1.33f, GetScaleForScaleFactor(SCALE_FACTOR_133P));
20 EXPECT_FLOAT_EQ(1.4f, GetScaleForScaleFactor(SCALE_FACTOR_140P)); 20 EXPECT_FLOAT_EQ(1.4f, GetScaleForScaleFactor(SCALE_FACTOR_140P));
21 EXPECT_FLOAT_EQ(1.5f, GetScaleForScaleFactor(SCALE_FACTOR_150P)); 21 EXPECT_FLOAT_EQ(1.5f, GetScaleForScaleFactor(SCALE_FACTOR_150P));
22 EXPECT_FLOAT_EQ(1.8f, GetScaleForScaleFactor(SCALE_FACTOR_180P)); 22 EXPECT_FLOAT_EQ(1.8f, GetScaleForScaleFactor(SCALE_FACTOR_180P));
23 EXPECT_FLOAT_EQ(2.0f, GetScaleForScaleFactor(SCALE_FACTOR_200P)); 23 EXPECT_FLOAT_EQ(2.0f, GetScaleForScaleFactor(SCALE_FACTOR_200P));
24 EXPECT_FLOAT_EQ(2.5f, GetScaleForScaleFactor(SCALE_FACTOR_250P));
24 EXPECT_FLOAT_EQ(3.0f, GetScaleForScaleFactor(SCALE_FACTOR_300P)); 25 EXPECT_FLOAT_EQ(3.0f, GetScaleForScaleFactor(SCALE_FACTOR_300P));
25 } 26 }
26 27
27 TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) { 28 TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
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);
30 supported_factors.push_back(SCALE_FACTOR_180P); 31 supported_factors.push_back(SCALE_FACTOR_180P);
31 test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors); 32 test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
32 EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.1f)); 33 EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.1f));
33 EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.9f)); 34 EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.9f));
(...skipping 20 matching lines...) Expand all
54 EXPECT_EQ(SCALE_FACTOR_133P, GetSupportedScaleFactor(1.291f)); 55 EXPECT_EQ(SCALE_FACTOR_133P, GetSupportedScaleFactor(1.291f));
55 EXPECT_EQ(SCALE_FACTOR_133P, GetSupportedScaleFactor(1.3f)); 56 EXPECT_EQ(SCALE_FACTOR_133P, GetSupportedScaleFactor(1.3f));
56 EXPECT_EQ(SCALE_FACTOR_140P, GetSupportedScaleFactor(1.4f)); 57 EXPECT_EQ(SCALE_FACTOR_140P, GetSupportedScaleFactor(1.4f));
57 EXPECT_EQ(SCALE_FACTOR_150P, GetSupportedScaleFactor(1.59f)); 58 EXPECT_EQ(SCALE_FACTOR_150P, GetSupportedScaleFactor(1.59f));
58 EXPECT_EQ(SCALE_FACTOR_150P, GetSupportedScaleFactor(1.61f)); 59 EXPECT_EQ(SCALE_FACTOR_150P, GetSupportedScaleFactor(1.61f));
59 EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.7f)); 60 EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.7f));
60 EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.89f)); 61 EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.89f));
61 EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(1.91f)); 62 EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(1.91f));
62 EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.0f)); 63 EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.0f));
63 EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.1f)); 64 EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.1f));
65 EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.3f));
66 EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.5f));
67 EXPECT_EQ(SCALE_FACTOR_250P, GetSupportedScaleFactor(2.6f));
68 EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(2.9f));
64 EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.0f)); 69 EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.0f));
65 EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.1f)); 70 EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(3.1f));
66 EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(999.0f)); 71 EXPECT_EQ(SCALE_FACTOR_300P, GetSupportedScaleFactor(999.0f));
67 } 72 }
68 73
69 } // namespace ui 74 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/layout.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698