Don't handle display change event/requests to avoid being killed by session manager

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 <cmath>
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
@@ skipping 508 matching lines @@
   }
   if (props)
     XFree(props);
 
   return ret;
 }
 
 }  // namespace
 
 OutputConfigurator::OutputConfigurator()
-    : is_running_on_chrome_os_(base::chromeos::IsRunningOnChromeOS()),
+    // If we aren't running on ChromeOS (like linux desktop),
+    // don't try to configure display.
+    : configure_display_(base::chromeos::IsRunningOnChromeOS()),
       is_panel_fitting_enabled_(false),
       connected_output_count_(0),
       xrandr_event_base_(0),
       output_state_(STATE_INVALID),
       mirror_mode_will_preserve_aspect_(false),
       mirror_mode_preserved_aspect_(false),
       last_enter_state_time_() {
 }
 
 OutputConfigurator::~OutputConfigurator() {
   RecordPreviousStateUMA();
 }
 
 void OutputConfigurator::Init(bool is_panel_fitting_enabled,
                               uint32 background_color_argb) {
   TRACE_EVENT0("chromeos", "OutputConfigurator::Init");
-  if (!is_running_on_chrome_os_)
+  if (!configure_display_)
     return;
   is_panel_fitting_enabled_ = is_panel_fitting_enabled;
 
   // Cache the initial output state.
   Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay();
   CHECK(display != NULL);
   XGrabServer(display);
   Window window = DefaultRootWindow(display);
   XRRScreenResources* screen = GetScreenResourcesAndRecordUMA(display, window);
   CHECK(screen != NULL);
@@ skipping 49 matching lines @@
   CHECK(DPMSForceLevel(display, DPMSModeOn));
 
   // Relinquish X resources.
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
 
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       SetIsProjecting(is_projecting);
 }
 
+void OutputConfigurator::Stop() {
+  configure_display_ = false;
+}
+
 bool OutputConfigurator::CycleDisplayMode() {
   TRACE_EVENT0("chromeos", "OutputConfigurator::CycleDisplayMode");
   VLOG(1) << "CycleDisplayMode";
-  if (!is_running_on_chrome_os_)
+  if (!configure_display_)
     return false;
 
   bool did_change = false;
   Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay();
   CHECK(display != NULL);
   XGrabServer(display);
   Window window = DefaultRootWindow(display);
   XRRScreenResources* screen = GetScreenResourcesAndRecordUMA(display, window);
   CHECK(screen != NULL);
 
@@ skipping 17 matching lines @@
     NotifyOnDisplayChanged();
   else
     FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChangeFailed());
   return did_change;
 }
 
 bool OutputConfigurator::ScreenPowerSet(bool power_on, bool all_displays) {
   TRACE_EVENT0("chromeos", "OutputConfigurator::ScreenPowerSet");
   VLOG(1) << "OutputConfigurator::SetScreensOn " << power_on
           << " all displays " << all_displays;
-  if (!is_running_on_chrome_os_)
+  if (!configure_display_)
     return false;
 
   bool success = false;
   Display* display = base::MessagePumpAuraX11::GetDefaultXDisplay();
   CHECK(display != NULL);
   XGrabServer(display);
   Window window = DefaultRootWindow(display);
   XRRScreenResources* screen = GetScreenResourcesAndRecordUMA(display, window);
   CHECK(screen != NULL);
 
@@ skipping 84 matching lines @@
     NotifyOnDisplayChanged();
   else
     FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChangeFailed());
   return true;
 }
 
 bool OutputConfigurator::Dispatch(const base::NativeEvent& event) {
   TRACE_EVENT0("chromeos", "OutputConfigurator::Dispatch");
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify)
     XRRUpdateConfiguration(event);
-  // Ignore this event if the Xrandr extension isn't supported.
-  if (!is_running_on_chrome_os_ ||
+  // Ignore this event if the Xrandr extension isn't supported, or
+  // the device is being shutdown.
+  if (!configure_display_ ||
       (event->type - xrandr_event_base_ != RRNotify)) {
     return true;
   }
   XEvent* xevent = static_cast<XEvent*>(event);
   XRRNotifyEvent* notify_event =
       reinterpret_cast<XRRNotifyEvent*>(xevent);
   if (notify_event->subtype == RRNotify_OutputChange) {
     XRROutputChangeNotifyEvent* output_change_event =
         reinterpret_cast<XRROutputChangeNotifyEvent*>(xevent);
     if ((output_change_event->connection == RR_Connected) ||
@@ skipping 563 matching lines @@
 // static
 RRMode OutputConfigurator::GetOutputNativeMode(
     const XRROutputInfo* output_info) {
   if (output_info->nmode <= 0)
     return None;
 
   return output_info->modes[0];
 }
 
 }  // namespace chromeos