| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ash/display/display_info.h" | 5 #include "ash/display/display_info.h" |
| 6 | 6 |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 namespace internal { | 10 namespace internal { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 EXPECT_EQ(gfx::Display::ROTATE_90, info.rotation()); | 38 EXPECT_EQ(gfx::Display::ROTATE_90, info.rotation()); |
| 39 // TODO(oshima): This should be rotated too. Fix this. | 39 // TODO(oshima): This should be rotated too. Fix this. |
| 40 EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString()); | 40 EXPECT_EQ("5,3,5,3", info.overscan_insets_in_dip().ToString()); |
| 41 | 41 |
| 42 info = DisplayInfo::CreateFromSpecWithID("10+20-300x400*2/l@1.5", 10); | 42 info = DisplayInfo::CreateFromSpecWithID("10+20-300x400*2/l@1.5", 10); |
| 43 EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString()); | 43 EXPECT_EQ("10,20 300x400", info.bounds_in_native().ToString()); |
| 44 EXPECT_EQ(gfx::Display::ROTATE_270, info.rotation()); | 44 EXPECT_EQ(gfx::Display::ROTATE_270, info.rotation()); |
| 45 EXPECT_EQ(1.5f, info.configured_ui_scale()); | 45 EXPECT_EQ(1.5f, info.configured_ui_scale()); |
| 46 | 46 |
| 47 info = DisplayInfo::CreateFromSpecWithID( | 47 info = DisplayInfo::CreateFromSpecWithID( |
| 48 "200x200#300x200|200x200%59.9|100x100%60", 10); | 48 "200x200#300x200|200x200|100x100", 10); |
| 49 EXPECT_EQ("0,0 200x200", info.bounds_in_native().ToString()); | 49 EXPECT_EQ("0,0 200x200", info.bounds_in_native().ToString()); |
| 50 EXPECT_EQ(3u, info.display_modes().size()); | 50 EXPECT_EQ(3u, info.resolutions().size()); |
| 51 EXPECT_EQ("300x200", info.display_modes()[0].size.ToString()); | 51 EXPECT_EQ("300x200", info.resolutions()[0].size.ToString()); |
| 52 EXPECT_EQ("200x200", info.display_modes()[1].size.ToString()); | 52 EXPECT_EQ("200x200", info.resolutions()[1].size.ToString()); |
| 53 EXPECT_EQ("100x100", info.display_modes()[2].size.ToString()); | 53 EXPECT_EQ("100x100", info.resolutions()[2].size.ToString()); |
| 54 EXPECT_EQ(59.9f, info.display_modes()[1].refresh_rate); | |
| 55 EXPECT_EQ(60.0f, info.display_modes()[2].refresh_rate); | |
| 56 EXPECT_TRUE(info.display_modes()[0].native); | |
| 57 EXPECT_FALSE(info.display_modes()[1].native); | |
| 58 EXPECT_FALSE(info.display_modes()[2].native); | |
| 59 } | 54 } |
| 60 | 55 |
| 61 } // namespace internal | 56 } // namespace internal |
| 62 } // namespace ash | 57 } // namespace ash |
| OLD | NEW |