Chrome OS: avoid suspending on lid close when casting is active.

chromeos/display/output_configurator.cc

 // Copyright (c) 2012 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 "chromeos/display/output_configurator.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/XInput2.h>
 
@@ skipping 88 matching lines @@
         (state == DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON && !internal) ||
         (state == DISPLAY_POWER_INTERNAL_ON_EXTERNAL_OFF && internal);
     if (output_power)
       (*output_power)[i] = on;
     if (on)
       num_on_outputs++;
   }
   return num_on_outputs;
 }
 
-// Determine if there is an "internal" output and how many outputs are
-// connected.
-bool IsProjecting(
-    const std::vector<OutputConfigurator::OutputSnapshot>& outputs) {
-  bool has_internal_output = false;
-  int connected_output_count = outputs.size();
-  for (size_t i = 0; i < outputs.size(); ++i)
-    has_internal_output |= outputs[i].type == OUTPUT_TYPE_INTERNAL;
-
-  // "Projecting" is defined as having more than 1 output connected while at
-  // least one of them is an internal output.
-  return has_internal_output && (connected_output_count > 1);
-}
-
 }  // namespace
 
 OutputConfigurator::ModeInfo::ModeInfo()
     : width(0),
       height(0),
       interlaced(false),
       refresh_rate(0.0) {}
 
 OutputConfigurator::ModeInfo::ModeInfo(int width,
                                        int height,
@@ skipping 112 matching lines @@
 }
 
 OutputConfigurator::OutputConfigurator()
     : state_controller_(NULL),
       mirroring_controller_(NULL),
       is_panel_fitting_enabled_(false),
       configure_display_(base::SysInfo::IsRunningOnChromeOS()),
       xrandr_event_base_(0),
       output_state_(STATE_INVALID),
       power_state_(DISPLAY_POWER_ALL_ON),
-      next_output_protection_client_id_(1) {
+      next_output_protection_client_id_(1),
+      screen_sharing_count_(0) {
 }
 
 OutputConfigurator::~OutputConfigurator() {}
 
 void OutputConfigurator::SetDelegateForTesting(scoped_ptr<Delegate> delegate) {
   delegate_ = delegate.Pass();
   configure_display_ = true;
 }
 
 void OutputConfigurator::SetInitialDisplayPower(DisplayPowerState power_state) {
   DCHECK_EQ(output_state_, STATE_INVALID);
   power_state_ = power_state;
 }
 
+void OutputConfigurator::SendProjectingStateToPowerManager() {

[Daniel Erat, 2014/01/15 22:42:59]

the order of methods in the .cc file should match that of the .h file

[hshi1, 2014/01/16 02:01:44]

Done.

+  bool has_internal_output = false;
+  int connected_output_count = cached_outputs_.size() + screen_sharing_count_;
+  for (size_t i = 0; i < cached_outputs_.size(); ++i)
+    has_internal_output |= cached_outputs_[i].type == OUTPUT_TYPE_INTERNAL;

[Daniel Erat, 2014/01/15 22:42:59]

nit: just do:

  if (cached_outputs_[i].type == OUTPUT_TYPE_INTERNAL) {
    has_internal_output = true;
    break;
  }

[hshi1, 2014/01/16 02:01:44]

Done.

+
+  // "Projecting" is defined as having more than 1 output connected while at
+  // least one of them is an internal output.
+  bool is_projecting = has_internal_output && (connected_output_count > 1);
+  delegate_->SendProjectingStateToPowerManager(is_projecting);
+}
+
 void OutputConfigurator::Init(bool is_panel_fitting_enabled) {
   is_panel_fitting_enabled_ = is_panel_fitting_enabled;
   if (!configure_display_)
     return;
 
   if (!delegate_)
     delegate_.reset(new RealOutputConfiguratorDelegate());
 }
 
 void OutputConfigurator::Start(uint32 background_color_argb) {
   if (!configure_display_)
     return;
 
   delegate_->GrabServer();
   delegate_->InitXRandRExtension(&xrandr_event_base_);
 
   UpdateCachedOutputs();
   if (cached_outputs_.size() > 1 && background_color_argb)
     delegate_->SetBackgroundColor(background_color_argb);
   const OutputState new_state = ChooseOutputState(power_state_);
   const bool success = EnterStateOrFallBackToSoftwareMirroring(
       new_state, power_state_);
 
   // Force the DPMS on chrome startup as the driver doesn't always detect
   // that all displays are on when signing out.
   delegate_->ForceDPMSOn();
   delegate_->UngrabServer();
-  delegate_->SendProjectingStateToPowerManager(IsProjecting(cached_outputs_));
+  SendProjectingStateToPowerManager();
   NotifyObservers(success, new_state);
 }
 
 bool OutputConfigurator::ApplyProtections(const DisplayProtections& requests) {
   for (std::vector<OutputSnapshot>::const_iterator it = cached_outputs_.begin();
        it != cached_outputs_.end(); ++it) {
     RROutput this_id = it->output;
     uint32_t all_desired = 0;
     DisplayProtections::const_iterator request_it = requests.find(
         it->display_id);
@@ skipping 462 matching lines @@
   configure_timer_.reset();
 
   delegate_->GrabServer();
   UpdateCachedOutputs();
   const OutputState new_state = ChooseOutputState(power_state_);
   const bool success = EnterStateOrFallBackToSoftwareMirroring(
       new_state, power_state_);
   delegate_->UngrabServer();
 
   NotifyObservers(success, new_state);
-  delegate_->SendProjectingStateToPowerManager(IsProjecting(cached_outputs_));
+  SendProjectingStateToPowerManager();
 }
 
 void OutputConfigurator::NotifyObservers(bool success,
                                          OutputState attempted_state) {
   if (success) {
     FOR_EACH_OBSERVER(Observer, observers_,
                       OnDisplayModeChanged(cached_outputs_));
   } else {
     FOR_EACH_OBSERVER(Observer, observers_,
                       OnDisplayModeChangeFailed(attempted_state));
@@ skipping 338 matching lines @@
 
   float width_ratio = static_cast<float>(mirror_mode_info->width) /
       static_cast<float>(native_mode_info->width);
   float height_ratio = static_cast<float>(mirror_mode_info->height) /
       static_cast<float>(native_mode_info->height);
 
   area_ratio = width_ratio * height_ratio;
   return area_ratio;
 }
 
+void OutputConfigurator::OnScreenSharingStateChanged(bool started) {

[Daniel Erat, 2014/01/15 22:42:59]

same here

[hshi1, 2014/01/16 02:01:44]

Done.

+  if (started) {
+      ++screen_sharing_count_;

[Daniel Erat, 2014/01/15 22:42:59]

indent two spaces beyond the previous line, not four

[hshi1, 2014/01/16 02:01:44]

Done.

+  } else {
+    DCHECK_GT(screen_sharing_count_, 0);
+    --screen_sharing_count_;
+  }
+  SendProjectingStateToPowerManager();
+}
+
 }  // namespace chromeos