Add support for a virtual display on ChromeOS

ui/display/chromeos/display_configurator.cc

Index: ui/display/chromeos/display_configurator.cc
diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc
index bcfc46ad22790ef5415dbfe310e2249b76a10f7d..70ffc649907ff18db4a8095124f8d47c5b58d54f 100644
--- a/ui/display/chromeos/display_configurator.cc
+++ b/ui/display/chromeos/display_configurator.cc
@@ -9,12 +9,14 @@
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
+#include "ui/display/chromeos/display_snapshot_virtual.h"
 #include "ui/display/chromeos/display_util.h"
 #include "ui/display/chromeos/update_display_configuration_task.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/native_display_delegate.h"
+#include "ui/gfx/display.h"
 
 namespace ui {
 
@@ -142,6 +144,14 @@ DisplayConfigurator::DisplayLayoutManagerImpl::ParseDisplays(
     cached_displays.push_back(display_state);
   }
 
+  // Add virtual display if activated.
+  if (configurator_->IsVirtualDisplayEnabled()) {
+    DisplayState display_state;
+    display_state.display = new DisplaySnapshotVirtual(

[Daniel Erat, 2015/02/23 23:14:53]

are you leaking this? DisplayState documents that it doesn't own its |display|
member.

[dnicoara, 2015/02/24 16:27:06]

Yes, this needs to be kept track of. It is leaking right now.

[robert.bradford, 2015/03/03 19:58:00]

Refactored this so that DisplayConfigurator has a scoped_ptr that for the
DisplaySnapshotVirtual thus avoiding this leak.

+        snapshots.size(), configurator_->virtual_display_mode_.get());
+    cached_displays.push_back(display_state);
+  }
+
   // Set |selected_mode| fields.
   for (size_t i = 0; i < cached_displays.size(); ++i) {
     DisplayState* display_state = &cached_displays[i];
@@ -594,6 +604,7 @@ bool DisplayConfigurator::ApplyProtections(const ContentProtections& requests) {
       case DISPLAY_CONNECTION_TYPE_INTERNAL:
       case DISPLAY_CONNECTION_TYPE_VGA:
       case DISPLAY_CONNECTION_TYPE_NETWORK:
+      case DISPLAY_CONNECTION_TYPE_VIRTUAL:
         // No protections for these types. Do nothing.
         break;
       case DISPLAY_CONNECTION_TYPE_NONE:
@@ -670,6 +681,7 @@ bool DisplayConfigurator::QueryContentProtectionStatus(
       case DISPLAY_CONNECTION_TYPE_INTERNAL:
       case DISPLAY_CONNECTION_TYPE_VGA:
       case DISPLAY_CONNECTION_TYPE_NETWORK:
+      case DISPLAY_CONNECTION_TYPE_VIRTUAL:
         // No protections for these types. Do nothing.
         break;
       case DISPLAY_CONNECTION_TYPE_NONE:
@@ -736,7 +748,8 @@ DisplayConfigurator::GetAvailableColorCalibrationProfiles(int64_t display_id) {
           switches::kDisableDisplayColorCalibration)) {
     for (size_t i = 0; i < cached_displays_.size(); ++i) {
       if (cached_displays_[i].display &&
-          cached_displays_[i].display->display_id() == display_id) {
+          cached_displays_[i].display->display_id() == display_id &&
+          IsNativeDisplay(cached_displays_[i].display->type())) {
         return native_display_delegate_->GetAvailableColorCalibrationProfiles(
             *cached_displays_[i].display);
       }
@@ -751,7 +764,8 @@ bool DisplayConfigurator::SetColorCalibrationProfile(
     ui::ColorCalibrationProfile new_profile) {
   for (size_t i = 0; i < cached_displays_.size(); ++i) {
     if (cached_displays_[i].display &&
-        cached_displays_[i].display->display_id() == display_id) {
+        cached_displays_[i].display->display_id() == display_id &&
+        IsNativeDisplay(cached_displays_[i].display->type())) {
       return native_display_delegate_->SetColorCalibrationProfile(
           *cached_displays_[i].display, new_profile);
     }
@@ -1008,4 +1022,31 @@ void DisplayConfigurator::NotifyObservers(
   }
 }
 
+void DisplayConfigurator::EnableVirtualDisplay(
+    scoped_ptr<DisplayMode> display_mode) {

[oshima, 2015/02/24 19:43:21]

DCHECK(!IsVirtualDisplayEnabled()) << "...".

[robert.bradford, 2015/03/03 19:58:00]

Done.

+  if (!IsVirtualDisplayEnabled()) {
+    virtual_display_mode_ = display_mode.Pass();
+    ConfigureDisplays();

[oshima, 2015/02/24 19:43:21]

Is it harmful to reconfigure?

[robert.bradford, 2015/03/03 19:58:00]

Done.

+  } else {
+    NOTREACHED()
+        << "Attempt to enable virtual display when it is already configured";
+  }
+}
+
+void DisplayConfigurator::DisableVirtualDisplay() {
+  if (IsVirtualDisplayEnabled()) {

[oshima, 2015/02/24 19:43:21]

ditto

[robert.bradford, 2015/03/03 19:58:00]

Done.

+    virtual_display_mode_.reset();
+    ConfigureDisplays();
+  } else {
+    NOTREACHED() << "Attempt to disable virtual display when it is not enabled";
+  }
+}
+
+int64 DisplayConfigurator::GetVirtualDisplayId() {

[dnicoara, 2015/02/24 16:27:06]

You could remove this function. The caller can use the list of displays
(DisplayConfigurator::cached_displays()) to figure out if there are any virtual
displays.

+  for (size_t i = 0; i < cached_displays_.size(); ++i) {

[Daniel Erat, 2015/02/23 23:14:53]

nit: for (const auto& display : cached_displays_) {

+    if (cached_displays_[i].display->type() == DISPLAY_CONNECTION_TYPE_VIRTUAL)
+      return cached_displays_[i].display->display_id();
+  }
+  return gfx::Display::kInvalidDisplayID;
+}
 }  // namespace ui