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

Side by Side Diff: ui/display/win/screen_win_unittest.cc

Issue 2665623002: Fix Jumplist favicons to have high resolution in HDPI Windows displays (Closed)
Patch Set: Update comments and remove redundant .h files. Created 3 years, 10 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/display/win/screen_win.h" 5 #include "ui/display/win/screen_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <inttypes.h> 8 #include <inttypes.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 10
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 337
338 TEST_F(ScreenWinTestSingleDisplay1x, GetSystemMetricsInDIP) { 338 TEST_F(ScreenWinTestSingleDisplay1x, GetSystemMetricsInDIP) {
339 EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31)); 339 EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31));
340 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42)); 340 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
341 } 341 }
342 342
343 TEST_F(ScreenWinTestSingleDisplay1x, GetScaleFactorForHWND) { 343 TEST_F(ScreenWinTestSingleDisplay1x, GetScaleFactorForHWND) {
344 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd())); 344 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
345 } 345 }
346 346
347 TEST_F(ScreenWinTestSingleDisplay1x, GetLargestDeviceScaleFactor) {
348 EXPECT_EQ(1.0, ScreenWin::GetLargestDeviceScaleFactor());
349 }
350
347 TEST_F(ScreenWinTestSingleDisplay1x, GetDisplays) { 351 TEST_F(ScreenWinTestSingleDisplay1x, GetDisplays) {
348 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 352 std::vector<Display> displays = GetScreen()->GetAllDisplays();
349 ASSERT_EQ(1u, displays.size()); 353 ASSERT_EQ(1u, displays.size());
350 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1200), displays[0].bounds()); 354 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1200), displays[0].bounds());
351 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1100), displays[0].work_area()); 355 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1100), displays[0].work_area());
352 } 356 }
353 357
354 TEST_F(ScreenWinTestSingleDisplay1x, GetNumDisplays) { 358 TEST_F(ScreenWinTestSingleDisplay1x, GetNumDisplays) {
355 EXPECT_EQ(1, GetScreen()->GetNumDisplays()); 359 EXPECT_EQ(1, GetScreen()->GetNumDisplays());
356 } 360 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 508
505 TEST_F(ScreenWinTestSingleDisplay1_25x, GetSystemMetricsInDIP) { 509 TEST_F(ScreenWinTestSingleDisplay1_25x, GetSystemMetricsInDIP) {
506 EXPECT_EQ(25, ScreenWin::GetSystemMetricsInDIP(31)); 510 EXPECT_EQ(25, ScreenWin::GetSystemMetricsInDIP(31));
507 EXPECT_EQ(34, ScreenWin::GetSystemMetricsInDIP(42)); 511 EXPECT_EQ(34, ScreenWin::GetSystemMetricsInDIP(42));
508 } 512 }
509 513
510 TEST_F(ScreenWinTestSingleDisplay1_25x, GetScaleFactorForHWND) { 514 TEST_F(ScreenWinTestSingleDisplay1_25x, GetScaleFactorForHWND) {
511 EXPECT_EQ(1.25, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd())); 515 EXPECT_EQ(1.25, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
512 } 516 }
513 517
518 TEST_F(ScreenWinTestSingleDisplay1_25x, GetLargestDeviceScaleFactor) {
519 EXPECT_EQ(1.25, ScreenWin::GetLargestDeviceScaleFactor());
520 }
521
514 TEST_F(ScreenWinTestSingleDisplay1_25x, GetDisplays) { 522 TEST_F(ScreenWinTestSingleDisplay1_25x, GetDisplays) {
515 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 523 std::vector<Display> displays = GetScreen()->GetAllDisplays();
516 ASSERT_EQ(1u, displays.size()); 524 ASSERT_EQ(1u, displays.size());
517 EXPECT_EQ(gfx::Rect(0, 0, 1536, 960), displays[0].bounds()); 525 EXPECT_EQ(gfx::Rect(0, 0, 1536, 960), displays[0].bounds());
518 EXPECT_EQ(gfx::Rect(0, 0, 1536, 880), displays[0].work_area()); 526 EXPECT_EQ(gfx::Rect(0, 0, 1536, 880), displays[0].work_area());
519 } 527 }
520 528
521 TEST_F(ScreenWinTestSingleDisplay1_25x, GetDisplayNearestWindow) { 529 TEST_F(ScreenWinTestSingleDisplay1_25x, GetDisplayNearestWindow) {
522 Screen* screen = GetScreen(); 530 Screen* screen = GetScreen();
523 gfx::NativeWindow native_window = GetNativeWindowFromHWND(GetFakeHwnd()); 531 gfx::NativeWindow native_window = GetNativeWindowFromHWND(GetFakeHwnd());
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 668
661 TEST_F(ScreenWinTestSingleDisplay1_5x, GetSystemMetricsInDIP) { 669 TEST_F(ScreenWinTestSingleDisplay1_5x, GetSystemMetricsInDIP) {
662 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(31)); 670 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(31));
663 EXPECT_EQ(28, ScreenWin::GetSystemMetricsInDIP(42)); 671 EXPECT_EQ(28, ScreenWin::GetSystemMetricsInDIP(42));
664 } 672 }
665 673
666 TEST_F(ScreenWinTestSingleDisplay1_5x, GetScaleFactorForHWND) { 674 TEST_F(ScreenWinTestSingleDisplay1_5x, GetScaleFactorForHWND) {
667 EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd())); 675 EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
668 } 676 }
669 677
678 TEST_F(ScreenWinTestSingleDisplay1_5x, GetLargestDeviceScaleFactor) {
679 EXPECT_EQ(1.5, ScreenWin::GetLargestDeviceScaleFactor());
680 }
681
670 TEST_F(ScreenWinTestSingleDisplay1_5x, GetDisplays) { 682 TEST_F(ScreenWinTestSingleDisplay1_5x, GetDisplays) {
671 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 683 std::vector<Display> displays = GetScreen()->GetAllDisplays();
672 ASSERT_EQ(1u, displays.size()); 684 ASSERT_EQ(1u, displays.size());
673 EXPECT_EQ(gfx::Rect(0, 0, 1280, 800), displays[0].bounds()); 685 EXPECT_EQ(gfx::Rect(0, 0, 1280, 800), displays[0].bounds());
674 EXPECT_EQ(gfx::Rect(0, 0, 1280, 734), displays[0].work_area()); 686 EXPECT_EQ(gfx::Rect(0, 0, 1280, 734), displays[0].work_area());
675 } 687 }
676 688
677 TEST_F(ScreenWinTestSingleDisplay1_5x, GetDisplayNearestWindow) { 689 TEST_F(ScreenWinTestSingleDisplay1_5x, GetDisplayNearestWindow) {
678 Screen* screen = GetScreen(); 690 Screen* screen = GetScreen();
679 gfx::NativeWindow native_window = GetNativeWindowFromHWND(GetFakeHwnd()); 691 gfx::NativeWindow native_window = GetNativeWindowFromHWND(GetFakeHwnd());
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 828
817 TEST_F(ScreenWinTestSingleDisplay2x, GetSystemMetricsInDIP) { 829 TEST_F(ScreenWinTestSingleDisplay2x, GetSystemMetricsInDIP) {
818 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31)); 830 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
819 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42)); 831 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
820 } 832 }
821 833
822 TEST_F(ScreenWinTestSingleDisplay2x, GetScaleFactorForHWND) { 834 TEST_F(ScreenWinTestSingleDisplay2x, GetScaleFactorForHWND) {
823 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd())); 835 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
824 } 836 }
825 837
838 TEST_F(ScreenWinTestSingleDisplay2x, GetLargestDeviceScaleFactor) {
839 EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
840 }
841
826 TEST_F(ScreenWinTestSingleDisplay2x, GetDisplays) { 842 TEST_F(ScreenWinTestSingleDisplay2x, GetDisplays) {
827 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 843 std::vector<Display> displays = GetScreen()->GetAllDisplays();
828 ASSERT_EQ(1u, displays.size()); 844 ASSERT_EQ(1u, displays.size());
829 EXPECT_EQ(gfx::Rect(0, 0, 960, 600), displays[0].bounds()); 845 EXPECT_EQ(gfx::Rect(0, 0, 960, 600), displays[0].bounds());
830 EXPECT_EQ(gfx::Rect(0, 0, 960, 550), displays[0].work_area()); 846 EXPECT_EQ(gfx::Rect(0, 0, 960, 550), displays[0].work_area());
831 } 847 }
832 848
833 TEST_F(ScreenWinTestSingleDisplay2x, GetDisplayNearestWindow) { 849 TEST_F(ScreenWinTestSingleDisplay2x, GetDisplayNearestWindow) {
834 Screen* screen = GetScreen(); 850 Screen* screen = GetScreen();
835 gfx::NativeWindow native_window = GetNativeWindowFromHWND(GetFakeHwnd()); 851 gfx::NativeWindow native_window = GetNativeWindowFromHWND(GetFakeHwnd());
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 TEST_F(ScreenWinTestTwoDisplays1x, GetSystemMetricsInDIP) { 1061 TEST_F(ScreenWinTestTwoDisplays1x, GetSystemMetricsInDIP) {
1046 EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31)); 1062 EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31));
1047 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42)); 1063 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
1048 } 1064 }
1049 1065
1050 TEST_F(ScreenWinTestTwoDisplays1x, GetScaleFactorForHWND) { 1066 TEST_F(ScreenWinTestTwoDisplays1x, GetScaleFactorForHWND) {
1051 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd())); 1067 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
1052 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd())); 1068 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
1053 } 1069 }
1054 1070
1071 TEST_F(ScreenWinTestTwoDisplays1x, GetLargestDeviceScaleFactor) {
1072 EXPECT_EQ(1.0, ScreenWin::GetLargestDeviceScaleFactor());
1073 }
1074
1055 TEST_F(ScreenWinTestTwoDisplays1x, GetDisplays) { 1075 TEST_F(ScreenWinTestTwoDisplays1x, GetDisplays) {
1056 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 1076 std::vector<Display> displays = GetScreen()->GetAllDisplays();
1057 ASSERT_EQ(2u, displays.size()); 1077 ASSERT_EQ(2u, displays.size());
1058 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1200), displays[0].bounds()); 1078 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1200), displays[0].bounds());
1059 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1100), displays[0].work_area()); 1079 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1100), displays[0].work_area());
1060 EXPECT_EQ(gfx::Rect(1920, 0, 800, 600), displays[1].bounds()); 1080 EXPECT_EQ(gfx::Rect(1920, 0, 800, 600), displays[1].bounds());
1061 EXPECT_EQ(gfx::Rect(1920, 0, 800, 600), displays[1].work_area()); 1081 EXPECT_EQ(gfx::Rect(1920, 0, 800, 600), displays[1].work_area());
1062 } 1082 }
1063 1083
1064 TEST_F(ScreenWinTestTwoDisplays1x, GetNumDisplays) { 1084 TEST_F(ScreenWinTestTwoDisplays1x, GetNumDisplays) {
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 TEST_F(ScreenWinTestTwoDisplays2x, GetSystemMetricsInDIP) { 1342 TEST_F(ScreenWinTestTwoDisplays2x, GetSystemMetricsInDIP) {
1323 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31)); 1343 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
1324 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42)); 1344 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
1325 } 1345 }
1326 1346
1327 TEST_F(ScreenWinTestTwoDisplays2x, GetScaleFactorForHWND) { 1347 TEST_F(ScreenWinTestTwoDisplays2x, GetScaleFactorForHWND) {
1328 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd())); 1348 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
1329 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd())); 1349 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
1330 } 1350 }
1331 1351
1352 TEST_F(ScreenWinTestTwoDisplays2x, GetLargestDeviceScaleFactor) {
1353 EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
1354 }
1355
1332 TEST_F(ScreenWinTestTwoDisplays2x, GetDisplays) { 1356 TEST_F(ScreenWinTestTwoDisplays2x, GetDisplays) {
1333 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 1357 std::vector<Display> displays = GetScreen()->GetAllDisplays();
1334 ASSERT_EQ(2u, displays.size()); 1358 ASSERT_EQ(2u, displays.size());
1335 EXPECT_EQ(gfx::Rect(0, 0, 960, 600), displays[0].bounds()); 1359 EXPECT_EQ(gfx::Rect(0, 0, 960, 600), displays[0].bounds());
1336 EXPECT_EQ(gfx::Rect(0, 0, 960, 550), displays[0].work_area()); 1360 EXPECT_EQ(gfx::Rect(0, 0, 960, 550), displays[0].work_area());
1337 EXPECT_EQ(gfx::Rect(960, 0, 400, 300), displays[1].bounds()); 1361 EXPECT_EQ(gfx::Rect(960, 0, 400, 300), displays[1].bounds());
1338 EXPECT_EQ(gfx::Rect(960, 0, 400, 300), displays[1].work_area()); 1362 EXPECT_EQ(gfx::Rect(960, 0, 400, 300), displays[1].work_area());
1339 } 1363 }
1340 1364
1341 TEST_F(ScreenWinTestTwoDisplays2x, GetDisplayNearestWindowPrimaryDisplay) { 1365 TEST_F(ScreenWinTestTwoDisplays2x, GetDisplayNearestWindowPrimaryDisplay) {
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42)); 1725 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
1702 } 1726 }
1703 1727
1704 TEST_F(ScreenWinTestManyDisplays1x, GetScaleFactorForHWND) { 1728 TEST_F(ScreenWinTestManyDisplays1x, GetScaleFactorForHWND) {
1705 for (size_t i = 0; i < 5u; ++i) { 1729 for (size_t i = 0; i < 5u; ++i) {
1706 SCOPED_TRACE(base::StringPrintf("i=%zu", i)); 1730 SCOPED_TRACE(base::StringPrintf("i=%zu", i));
1707 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd(i))); 1731 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd(i)));
1708 } 1732 }
1709 } 1733 }
1710 1734
1735 TEST_F(ScreenWinTestManyDisplays1x, GetLargestDeviceScaleFactor) {
1736 EXPECT_EQ(1.0, ScreenWin::GetLargestDeviceScaleFactor());
1737 }
1738
1711 TEST_F(ScreenWinTestManyDisplays1x, GetDisplays) { 1739 TEST_F(ScreenWinTestManyDisplays1x, GetDisplays) {
1712 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 1740 std::vector<Display> displays = GetScreen()->GetAllDisplays();
1713 ASSERT_EQ(5u, displays.size()); 1741 ASSERT_EQ(5u, displays.size());
1714 EXPECT_EQ(gfx::Rect(0, 0, 640, 480), displays[0].bounds()); 1742 EXPECT_EQ(gfx::Rect(0, 0, 640, 480), displays[0].bounds());
1715 EXPECT_EQ(gfx::Rect(0, 0, 640, 380), displays[0].work_area()); 1743 EXPECT_EQ(gfx::Rect(0, 0, 640, 380), displays[0].work_area());
1716 EXPECT_EQ(gfx::Rect(640, 0, 1024, 768), displays[1].bounds()); 1744 EXPECT_EQ(gfx::Rect(640, 0, 1024, 768), displays[1].bounds());
1717 EXPECT_EQ(gfx::Rect(640, 0, 1024, 768), displays[1].work_area()); 1745 EXPECT_EQ(gfx::Rect(640, 0, 1024, 768), displays[1].work_area());
1718 EXPECT_EQ(gfx::Rect(0, 480, 640, 300), displays[2].bounds()); 1746 EXPECT_EQ(gfx::Rect(0, 480, 640, 300), displays[2].bounds());
1719 EXPECT_EQ(gfx::Rect(0, 480, 640, 300), displays[2].work_area()); 1747 EXPECT_EQ(gfx::Rect(0, 480, 640, 300), displays[2].work_area());
1720 EXPECT_EQ(gfx::Rect(1664, 768, 400, 400), displays[3].bounds()); 1748 EXPECT_EQ(gfx::Rect(1664, 768, 400, 400), displays[3].bounds());
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
2139 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42)); 2167 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
2140 } 2168 }
2141 2169
2142 TEST_F(ScreenWinTestManyDisplays2x, GetScaleFactorForHWND) { 2170 TEST_F(ScreenWinTestManyDisplays2x, GetScaleFactorForHWND) {
2143 for (size_t i = 0; i < 5u; ++i) { 2171 for (size_t i = 0; i < 5u; ++i) {
2144 SCOPED_TRACE(base::StringPrintf("i=%zu", i)); 2172 SCOPED_TRACE(base::StringPrintf("i=%zu", i));
2145 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd(i))); 2173 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd(i)));
2146 } 2174 }
2147 } 2175 }
2148 2176
2177 TEST_F(ScreenWinTestManyDisplays2x, GetLargestDeviceScaleFactor) {
2178 EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
2179 }
2180
2149 TEST_F(ScreenWinTestManyDisplays2x, GetDisplays) { 2181 TEST_F(ScreenWinTestManyDisplays2x, GetDisplays) {
2150 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 2182 std::vector<Display> displays = GetScreen()->GetAllDisplays();
2151 ASSERT_EQ(5u, displays.size()); 2183 ASSERT_EQ(5u, displays.size());
2152 EXPECT_EQ(gfx::Rect(0, 0, 320, 240), displays[0].bounds()); 2184 EXPECT_EQ(gfx::Rect(0, 0, 320, 240), displays[0].bounds());
2153 EXPECT_EQ(gfx::Rect(0, 0, 320, 190), displays[0].work_area()); 2185 EXPECT_EQ(gfx::Rect(0, 0, 320, 190), displays[0].work_area());
2154 EXPECT_EQ(gfx::Rect(320, 0, 512, 384), displays[1].bounds()); 2186 EXPECT_EQ(gfx::Rect(320, 0, 512, 384), displays[1].bounds());
2155 EXPECT_EQ(gfx::Rect(320, 0, 512, 384), displays[1].work_area()); 2187 EXPECT_EQ(gfx::Rect(320, 0, 512, 384), displays[1].work_area());
2156 EXPECT_EQ(gfx::Rect(0, 240, 320, 150), displays[2].bounds()); 2188 EXPECT_EQ(gfx::Rect(0, 240, 320, 150), displays[2].bounds());
2157 EXPECT_EQ(gfx::Rect(0, 240, 320, 150), displays[2].work_area()); 2189 EXPECT_EQ(gfx::Rect(0, 240, 320, 150), displays[2].work_area());
2158 EXPECT_EQ(gfx::Rect(832, 384, 200, 200), displays[3].bounds()); 2190 EXPECT_EQ(gfx::Rect(832, 384, 200, 200), displays[3].bounds());
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
2447 TEST_F(ScreenWinTestTwoDisplays1x2x, GetSystemMetricsInDIP) { 2479 TEST_F(ScreenWinTestTwoDisplays1x2x, GetSystemMetricsInDIP) {
2448 EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31)); 2480 EXPECT_EQ(31, ScreenWin::GetSystemMetricsInDIP(31));
2449 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42)); 2481 EXPECT_EQ(42, ScreenWin::GetSystemMetricsInDIP(42));
2450 } 2482 }
2451 2483
2452 TEST_F(ScreenWinTestTwoDisplays1x2x, GetScaleFactorForHWND) { 2484 TEST_F(ScreenWinTestTwoDisplays1x2x, GetScaleFactorForHWND) {
2453 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd())); 2485 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
2454 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd())); 2486 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
2455 } 2487 }
2456 2488
2489 TEST_F(ScreenWinTestTwoDisplays1x2x, GetLargestDeviceScaleFactor) {
2490 EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
2491 }
2492
2457 TEST_F(ScreenWinTestTwoDisplays1x2x, GetDisplays) { 2493 TEST_F(ScreenWinTestTwoDisplays1x2x, GetDisplays) {
2458 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 2494 std::vector<Display> displays = GetScreen()->GetAllDisplays();
2459 ASSERT_EQ(2u, displays.size()); 2495 ASSERT_EQ(2u, displays.size());
2460 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1200), displays[0].bounds()); 2496 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1200), displays[0].bounds());
2461 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1100), displays[0].work_area()); 2497 EXPECT_EQ(gfx::Rect(0, 0, 1920, 1100), displays[0].work_area());
2462 EXPECT_EQ(gfx::Rect(1920, 0, 400, 300), displays[1].bounds()); 2498 EXPECT_EQ(gfx::Rect(1920, 0, 400, 300), displays[1].bounds());
2463 EXPECT_EQ(gfx::Rect(1920, 0, 400, 300), displays[1].work_area()); 2499 EXPECT_EQ(gfx::Rect(1920, 0, 400, 300), displays[1].work_area());
2464 } 2500 }
2465 2501
2466 TEST_F(ScreenWinTestTwoDisplays1x2x, GetNumDisplays) { 2502 TEST_F(ScreenWinTestTwoDisplays1x2x, GetNumDisplays) {
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
2732 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetSystemMetricsInDIP) { 2768 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetSystemMetricsInDIP) {
2733 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(31)); 2769 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(31));
2734 EXPECT_EQ(28, ScreenWin::GetSystemMetricsInDIP(42)); 2770 EXPECT_EQ(28, ScreenWin::GetSystemMetricsInDIP(42));
2735 } 2771 }
2736 2772
2737 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetScaleFactorForHWND) { 2773 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetScaleFactorForHWND) {
2738 EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd())); 2774 EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
2739 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd())); 2775 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
2740 } 2776 }
2741 2777
2778 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetLargestDeviceScaleFactor) {
2779 EXPECT_EQ(1.5, ScreenWin::GetLargestDeviceScaleFactor());
2780 }
2781
2742 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetDisplays) { 2782 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetDisplays) {
2743 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 2783 std::vector<Display> displays = GetScreen()->GetAllDisplays();
2744 ASSERT_EQ(2u, displays.size()); 2784 ASSERT_EQ(2u, displays.size());
2745 EXPECT_EQ(gfx::Rect(0, 0, 534, 400), displays[0].bounds()); 2785 EXPECT_EQ(gfx::Rect(0, 0, 534, 400), displays[0].bounds());
2746 EXPECT_EQ(gfx::Rect(0, 0, 534, 367), displays[0].work_area()); 2786 EXPECT_EQ(gfx::Rect(0, 0, 534, 367), displays[0].work_area());
2747 EXPECT_EQ(gfx::Rect(534, -80, 640, 480), displays[1].bounds()); 2787 EXPECT_EQ(gfx::Rect(534, -80, 640, 480), displays[1].bounds());
2748 EXPECT_EQ(gfx::Rect(534, -80, 640, 480), displays[1].work_area()); 2788 EXPECT_EQ(gfx::Rect(534, -80, 640, 480), displays[1].work_area());
2749 } 2789 }
2750 2790
2751 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetDisplayNearestWindowPrimaryDisplay) { 2791 TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetDisplayNearestWindowPrimaryDisplay) {
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
3013 TEST_F(ScreenWinTestTwoDisplays2x1x, GetSystemMetricsInDIP) { 3053 TEST_F(ScreenWinTestTwoDisplays2x1x, GetSystemMetricsInDIP) {
3014 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31)); 3054 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
3015 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42)); 3055 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
3016 } 3056 }
3017 3057
3018 TEST_F(ScreenWinTestTwoDisplays2x1x, GetScaleFactorForHWND) { 3058 TEST_F(ScreenWinTestTwoDisplays2x1x, GetScaleFactorForHWND) {
3019 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd())); 3059 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
3020 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd())); 3060 EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
3021 } 3061 }
3022 3062
3063 TEST_F(ScreenWinTestTwoDisplays2x1x, GetLargestDeviceScaleFactor) {
3064 EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
3065 }
3066
3023 TEST_F(ScreenWinTestTwoDisplays2x1x, GetDisplays) { 3067 TEST_F(ScreenWinTestTwoDisplays2x1x, GetDisplays) {
3024 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 3068 std::vector<Display> displays = GetScreen()->GetAllDisplays();
3025 ASSERT_EQ(2u, displays.size()); 3069 ASSERT_EQ(2u, displays.size());
3026 EXPECT_EQ(gfx::Rect(0, 0, 960, 600), displays[0].bounds()); 3070 EXPECT_EQ(gfx::Rect(0, 0, 960, 600), displays[0].bounds());
3027 EXPECT_EQ(gfx::Rect(0, 0, 960, 550), displays[0].work_area()); 3071 EXPECT_EQ(gfx::Rect(0, 0, 960, 550), displays[0].work_area());
3028 EXPECT_EQ(gfx::Rect(960, 0, 800, 600), displays[1].bounds()); 3072 EXPECT_EQ(gfx::Rect(960, 0, 800, 600), displays[1].bounds());
3029 EXPECT_EQ(gfx::Rect(960, 0, 800, 600), displays[1].work_area()); 3073 EXPECT_EQ(gfx::Rect(960, 0, 800, 600), displays[1].work_area());
3030 } 3074 }
3031 3075
3032 TEST_F(ScreenWinTestTwoDisplays2x1x, GetNumDisplays) { 3076 TEST_F(ScreenWinTestTwoDisplays2x1x, GetNumDisplays) {
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
3299 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetSystemMetricsInDIP) { 3343 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetSystemMetricsInDIP) {
3300 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31)); 3344 EXPECT_EQ(16, ScreenWin::GetSystemMetricsInDIP(31));
3301 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42)); 3345 EXPECT_EQ(21, ScreenWin::GetSystemMetricsInDIP(42));
3302 } 3346 }
3303 3347
3304 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetScaleFactorForHWND) { 3348 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetScaleFactorForHWND) {
3305 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd())); 3349 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
3306 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd())); 3350 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
3307 } 3351 }
3308 3352
3353 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetLargestDeviceScaleFactor) {
3354 EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
3355 }
3356
3309 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetDisplays) { 3357 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetDisplays) {
3310 std::vector<Display> displays = GetScreen()->GetAllDisplays(); 3358 std::vector<Display> displays = GetScreen()->GetAllDisplays();
3311 ASSERT_EQ(2u, displays.size()); 3359 ASSERT_EQ(2u, displays.size());
3312 EXPECT_EQ(gfx::Rect(0, 0, 1600, 800), displays[0].bounds()); 3360 EXPECT_EQ(gfx::Rect(0, 0, 1600, 800), displays[0].bounds());
3313 EXPECT_EQ(gfx::Rect(0, 0, 1600, 750), displays[0].work_area()); 3361 EXPECT_EQ(gfx::Rect(0, 0, 1600, 750), displays[0].work_area());
3314 EXPECT_EQ(gfx::Rect(3200, 0, 1920, 1200), displays[1].bounds()); 3362 EXPECT_EQ(gfx::Rect(3200, 0, 1920, 1200), displays[1].bounds());
3315 EXPECT_EQ(gfx::Rect(3200, 0, 1920, 1200), displays[1].work_area()); 3363 EXPECT_EQ(gfx::Rect(3200, 0, 1920, 1200), displays[1].work_area());
3316 } 3364 }
3317 3365
3318 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetNumDisplays) { 3366 TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetNumDisplays) {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
3597 // this test is to make sure we don't crash. 3645 // this test is to make sure we don't crash.
3598 ScreenWin::GetSystemMetricsInDIP(SM_CXSIZEFRAME); 3646 ScreenWin::GetSystemMetricsInDIP(SM_CXSIZEFRAME);
3599 } 3647 }
3600 3648
3601 TEST_F(ScreenWinUninitializedForced2x, GetScaleFactorForHWND) { 3649 TEST_F(ScreenWinUninitializedForced2x, GetScaleFactorForHWND) {
3602 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(nullptr)); 3650 EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(nullptr));
3603 } 3651 }
3604 3652
3605 } // namespace win 3653 } // namespace win
3606 } // namespace display 3654 } // namespace display
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698