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

Unified Diff: ui/display/chromeos/display_configurator_unittest.cc

Issue 2498103002: Fix potential GPU crash caused by VT switching (Closed)
Patch Set: Add doc Created 4 years, 1 month 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/chromeos/display_configurator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/display_configurator_unittest.cc
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc
index 527a239c3f60119b6a562462298ad40366a2bf96..61692539c2b7bb093b1d0027b174e0088865d2ca 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -1740,8 +1740,14 @@ TEST_F(DisplayConfiguratorTest, ExternalControl) {
base::Bind(&DisplayConfiguratorTest::OnDisplayControlUpdated,
base::Unretained(this)));
EXPECT_EQ(CALLBACK_SUCCESS, PopDisplayControlResult());
- EXPECT_EQ(JoinActions(kRelinquishDisplayControl, nullptr),
- log_->GetActionsAndClear());
+ EXPECT_EQ(
+ JoinActions(
+ kGrab,
+ GetFramebufferAction(small_mode_.size(), outputs_[0].get(), nullptr)
+ .c_str(),
+ GetCrtcAction(*outputs_[0], nullptr, gfx::Point(0, 0)).c_str(),
+ kUngrab, kRelinquishDisplayControl, nullptr),
+ log_->GetActionsAndClear());
configurator_.TakeControl(
base::Bind(&DisplayConfiguratorTest::OnDisplayControlUpdated,
base::Unretained(this)));
@@ -1752,7 +1758,7 @@ TEST_F(DisplayConfiguratorTest, ExternalControl) {
GetFramebufferAction(small_mode_.size(), outputs_[0].get(), nullptr)
.c_str(),
GetCrtcAction(*outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
- kUngrab, nullptr),
+ kForceDPMS, kUngrab, nullptr),
log_->GetActionsAndClear());
}
« no previous file with comments | « ui/display/chromeos/display_configurator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698