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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/display/win/screen_win_unittest.cc

Issue 2165173002: Only Update the Scale Factor if the Scale Factor Actually Changed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « ui/display/win/screen_win.cc ('k') | ui/views/win/hwnd_message_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/win/screen_win_unittest.cc
diff --git a/ui/display/win/screen_win_unittest.cc b/ui/display/win/screen_win_unittest.cc
index e07397e53d26defc5422716c383429491a0800f1..2c654efd0ed3c7824a5b4eeeb8dc6081dee3ec20 100644
--- a/ui/display/win/screen_win_unittest.cc
+++ b/ui/display/win/screen_win_unittest.cc
@@ -337,6 +337,10 @@ TEST_F(ScreenWinTestSingleDisplay1x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestSingleDisplay1x, GetScaleFactorForHWND) {
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
+}
+
TEST_F(ScreenWinTestSingleDisplay1x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(1u, displays.size());
@@ -495,6 +499,10 @@ TEST_F(ScreenWinTestSingleDisplay1_25x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestSingleDisplay1_25x, GetScaleFactorForHWND) {
+ EXPECT_EQ(1.25, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
+}
+
TEST_F(ScreenWinTestSingleDisplay1_25x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(1u, displays.size());
@@ -642,6 +650,10 @@ TEST_F(ScreenWinTestSingleDisplay1_5x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestSingleDisplay1_5x, GetScaleFactorForHWND) {
+ EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
+}
+
TEST_F(ScreenWinTestSingleDisplay1_5x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(1u, displays.size());
@@ -789,6 +801,10 @@ TEST_F(ScreenWinTestSingleDisplay2x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestSingleDisplay2x, GetScaleFactorForHWND) {
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
+}
+
TEST_F(ScreenWinTestSingleDisplay2x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(1u, displays.size());
@@ -1000,6 +1016,11 @@ TEST_F(ScreenWinTestTwoDisplays1x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestTwoDisplays1x, GetScaleFactorForHWND) {
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
+}
+
TEST_F(ScreenWinTestTwoDisplays1x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(2u, displays.size());
@@ -1259,6 +1280,11 @@ TEST_F(ScreenWinTestTwoDisplays2x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestTwoDisplays2x, GetScaleFactorForHWND) {
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
+}
+
TEST_F(ScreenWinTestTwoDisplays2x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(2u, displays.size());
@@ -1626,6 +1652,13 @@ TEST_F(ScreenWinTestManyDisplays1x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestManyDisplays1x, GetScaleFactorForHWND) {
+ for (size_t i = 0; i < 5u; ++i) {
+ SCOPED_TRACE(base::StringPrintf("i=%zu", i));
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd(i)));
+ }
+}
+
TEST_F(ScreenWinTestManyDisplays1x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(5u, displays.size());
@@ -2052,6 +2085,13 @@ TEST_F(ScreenWinTestManyDisplays2x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestManyDisplays2x, GetScaleFactorForHWND) {
+ for (size_t i = 0; i < 5u; ++i) {
+ SCOPED_TRACE(base::StringPrintf("i=%zu", i));
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd(i)));
+ }
+}
+
TEST_F(ScreenWinTestManyDisplays2x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(5u, displays.size());
@@ -2342,6 +2382,11 @@ TEST_F(ScreenWinTestTwoDisplays1x2x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestTwoDisplays1x2x, GetScaleFactorForHWND) {
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
+}
+
TEST_F(ScreenWinTestTwoDisplays1x2x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(2u, displays.size());
@@ -2609,6 +2654,11 @@ TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetScaleFactorForHWND) {
+ EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
+}
+
TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(2u, displays.size());
@@ -2872,6 +2922,11 @@ TEST_F(ScreenWinTestTwoDisplays2x1x, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestTwoDisplays2x1x, GetScaleFactorForHWND) {
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
+}
+
TEST_F(ScreenWinTestTwoDisplays2x1x, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(2u, displays.size());
@@ -3140,6 +3195,11 @@ TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetSystemMetricsForHwnd) {
EXPECT_EQ(42, ScreenWin::GetSystemMetricsForHwnd(nullptr, 42));
}
+TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetScaleFactorForHWND) {
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetLeftFakeHwnd()));
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
+}
+
TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetDisplays) {
std::vector<Display> displays = GetScreen()->GetAllDisplays();
ASSERT_EQ(2u, displays.size());
@@ -3314,6 +3374,10 @@ TEST_F(ScreenWinUninitializedForced1x, GetSystemMetricsForHwnd) {
ScreenWin::GetSystemMetricsForHwnd(nullptr, SM_CXSIZEFRAME);
}
+TEST_F(ScreenWinUninitializedForced1x, GetScaleFactorForHWND) {
+ EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(nullptr));
+}
+
namespace {
// Forced 2x DPI for Other Tests without TestScreenWin.
@@ -3416,5 +3480,9 @@ TEST_F(ScreenWinUninitializedForced2x, GetSystemMetricsForHwnd) {
ScreenWin::GetSystemMetricsForHwnd(nullptr, SM_CXSIZEFRAME);
}
+TEST_F(ScreenWinUninitializedForced2x, GetScaleFactorForHWND) {
+ EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(nullptr));
+}
+
} // namespace win
} // namespace display
« no previous file with comments | « ui/display/win/screen_win.cc ('k') | ui/views/win/hwnd_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698