Add support for virtual displays

ui/display/chromeos/display_configurator_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/chromeos/display_configurator.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/test/action_logger_util.h"
@@ skipping 319 matching lines @@
   EXPECT_EQ(modes[15],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(320, 200)));
 
   // No mode found.
   EXPECT_EQ(NULL,
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(1440, 900)));
 }
 
+TEST_F(DisplayConfiguratorTest, EnableVirtualDisplay) {
+  InitWithSingleOutput();
+
+  observer_.Reset();
+  const DisplayConfigurator::DisplayStateList* cached =
+      &configurator_.cached_displays();

[oshima, 2015/11/24 22:19:27]

const ... & cached =

(I understand this is used in this file, but this is better)

[robert.bradford, 2015/11/26 16:29:40]

Done. And I addressed the other user of this.

+  ASSERT_EQ(static_cast<size_t>(1), cached->size());

[oshima, 2015/11/24 22:19:27]

1u

[robert.bradford, 2015/11/26 16:29:40]

Done. And some similar ones too.

+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+
+  // Add virtual display.
+  int64_t virtual_display_id =
+      configurator_.AddVirtualDisplay(big_mode_.size());
+  EXPECT_FALSE(mirroring_controller_.SoftwareMirroringEnabled());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
+            configurator_.display_state());
+
+  // Virtual should not trigger addition of added crtc but does change FB
+  // height.
+  const int kVirtualHeight = small_mode_.size().height() +
+                             DisplayConfigurator::kVerticalGap +
+                             big_mode_.size().height();
+  EXPECT_EQ(
+      JoinActions(
+          kGrab, GetFramebufferAction(
+                     gfx::Size(big_mode_.size().width(), kVirtualHeight),
+                     &outputs_[0], NULL)

[oshima, 2015/11/24 22:19:27]

nullptr. same for other files

[robert.bradford, 2015/11/26 16:29:40]

Done.

+                     .c_str(),
+          GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
+          kUngrab, NULL),
+      log_->GetActionsAndClear());
+  EXPECT_EQ(1, observer_.num_changes());
+  ASSERT_EQ(static_cast<size_t>(2), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+  EXPECT_EQ(big_mode_.size(), (*cached)[1]->current_mode()->size());
+  EXPECT_EQ(virtual_display_id, (*cached)[1]->display_id());
+
+  // Remove virtual display.
+  observer_.Reset();
+  EXPECT_TRUE(configurator_.RemoveVirtualDisplay(virtual_display_id));
+  EXPECT_EQ(
+      JoinActions(
+          kGrab,
+          GetFramebufferAction(small_mode_.size(), &outputs_[0], NULL).c_str(),
+          GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
+          kUngrab, NULL),
+      log_->GetActionsAndClear());
+  EXPECT_EQ(1, observer_.num_changes());
+  ASSERT_EQ(static_cast<size_t>(1), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_SINGLE, configurator_.display_state());
+}
+
+TEST_F(DisplayConfiguratorTest, EnableTwoVirtualDisplays) {
+  InitWithSingleOutput();
+
+  observer_.Reset();
+  const DisplayConfigurator::DisplayStateList* cached =
+      &configurator_.cached_displays();
+  ASSERT_EQ(static_cast<size_t>(1), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+
+  // Add 1st virtual display.
+  int64_t virtual_display_id_1 =
+      configurator_.AddVirtualDisplay(big_mode_.size());
+  EXPECT_FALSE(mirroring_controller_.SoftwareMirroringEnabled());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
+            configurator_.display_state());
+
+  // Virtual should not trigger addition of added crtc but does change FB
+  // height.
+  const int kSingleVirtualHeight = small_mode_.size().height() +
+                                   DisplayConfigurator::kVerticalGap +
+                                   big_mode_.size().height();
+  EXPECT_EQ(
+      JoinActions(
+          kGrab, GetFramebufferAction(
+                     gfx::Size(big_mode_.size().width(), kSingleVirtualHeight),
+                     &outputs_[0], NULL)
+                     .c_str(),
+          GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
+          kUngrab, NULL),
+      log_->GetActionsAndClear());
+  EXPECT_EQ(1, observer_.num_changes());
+  ASSERT_EQ(static_cast<size_t>(2), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+  EXPECT_EQ(big_mode_.size(), (*cached)[1]->current_mode()->size());
+  EXPECT_EQ(virtual_display_id_1, (*cached)[1]->display_id());
+
+  // Add 2nd virtual display
+  int64_t virtual_display_id_2 =
+      configurator_.AddVirtualDisplay(big_mode_.size());
+  EXPECT_FALSE(mirroring_controller_.SoftwareMirroringEnabled());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED,
+            configurator_.display_state());
+
+  const int kDualVirtualHeight =
+      small_mode_.size().height() +
+      (DisplayConfigurator::kVerticalGap + big_mode_.size().height()) * 2;
+  EXPECT_EQ(
+      JoinActions(
+          kGrab, GetFramebufferAction(
+                     gfx::Size(big_mode_.size().width(), kDualVirtualHeight),
+                     &outputs_[0], NULL)
+                     .c_str(),
+          GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
+          kUngrab, NULL),
+      log_->GetActionsAndClear());
+  EXPECT_EQ(2, observer_.num_changes());
+  ASSERT_EQ(static_cast<size_t>(3), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+  EXPECT_EQ(big_mode_.size(), (*cached)[1]->current_mode()->size());
+  EXPECT_EQ(big_mode_.size(), (*cached)[2]->current_mode()->size());
+  EXPECT_EQ(virtual_display_id_1, (*cached)[1]->display_id());
+  EXPECT_EQ(virtual_display_id_2, (*cached)[2]->display_id());
+
+  // Remove 1st virtual display.
+  observer_.Reset();
+  EXPECT_TRUE(configurator_.RemoveVirtualDisplay(virtual_display_id_1));
+  EXPECT_EQ(
+      JoinActions(
+          kGrab, GetFramebufferAction(
+                     gfx::Size(big_mode_.size().width(), kSingleVirtualHeight),
+                     &outputs_[0], NULL)
+                     .c_str(),
+          GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
+          kUngrab, NULL),
+      log_->GetActionsAndClear());
+  EXPECT_EQ(1, observer_.num_changes());
+  ASSERT_EQ(static_cast<size_t>(2), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+  EXPECT_EQ(big_mode_.size(), (*cached)[1]->current_mode()->size());
+  EXPECT_EQ(virtual_display_id_2, (*cached)[1]->display_id());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
+            configurator_.display_state());
+
+  // Remove 2nd virtual display.
+  observer_.Reset();
+  EXPECT_TRUE(configurator_.RemoveVirtualDisplay(virtual_display_id_2));
+  EXPECT_EQ(
+      JoinActions(
+          kGrab,
+          GetFramebufferAction(small_mode_.size(), &outputs_[0], NULL).c_str(),
+          GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
+          kUngrab, NULL),
+      log_->GetActionsAndClear());
+  EXPECT_EQ(1, observer_.num_changes());
+  ASSERT_EQ(static_cast<size_t>(1), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0]->current_mode()->size());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_SINGLE, configurator_.display_state());
+}
+
 TEST_F(DisplayConfiguratorTest, ConnectSecondOutput) {
   InitWithSingleOutput();
 
   // Connect a second output and check that the configurator enters
   // extended mode.
   observer_.Reset();
   state_controller_.set_state(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
   UpdateOutputs(2, true);
   const int kDualHeight = small_mode_.size().height() +
                           DisplayConfigurator::kVerticalGap +
@@ skipping 557 matching lines @@
   InitWithSingleOutput();
   const DisplayConfigurator::DisplayStateList* cached =
       &configurator_.cached_displays();
   ASSERT_EQ(static_cast<size_t>(1), cached->size());
   EXPECT_EQ(outputs_[0].current_mode(), (*cached)[0]->current_mode());
 
   // After connecting a second output, check that it shows up in
   // |cached_displays_| even if an invalid state is requested.
   state_controller_.set_state(MULTIPLE_DISPLAY_STATE_SINGLE);
   UpdateOutputs(2, true);
-  cached = &configurator_.cached_displays();
   ASSERT_EQ(static_cast<size_t>(2), cached->size());
   EXPECT_EQ(outputs_[0].current_mode(), (*cached)[0]->current_mode());
   EXPECT_EQ(outputs_[1].current_mode(), (*cached)[1]->current_mode());
 }
 
 TEST_F(DisplayConfiguratorTest, PanelFitting) {
   // Configure the internal display to support only the big mode and the
   // external display to support only the small mode.
   outputs_[0].set_current_mode(&big_mode_);
   outputs_[0].set_native_mode(&big_mode_);
@@ skipping 536 matching lines @@
                         GetFramebufferAction(small_mode_.size(), &outputs_[0],
                                              nullptr).c_str(),
                         GetCrtcAction(outputs_[0], &small_mode_,
                                       gfx::Point(0, 0)).c_str(),
                         kUngrab, NULL),
             log_->GetActionsAndClear());
 }
 
 }  // namespace test
 }  // namespace ui