[Ozone-GBM] Handle GPU crashes

ui/ozone/platform/dri/chromeos/native_display_delegate_proxy.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/ozone/platform/dri/chromeos/native_display_delegate_proxy.h"
 
 #include "base/logging.h"
 #include "ui/display/types/chromeos/display_snapshot.h"
 #include "ui/display/types/chromeos/native_display_observer.h"
 #include "ui/events/ozone/device/device_event.h"
@@ skipping 95 matching lines @@
     NativeDisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void NativeDisplayDelegateProxy::OnDeviceEvent(const DeviceEvent& event) {
   if (event.device_type() != DeviceEvent::DISPLAY)
     return;
 
   if (event.action_type() == DeviceEvent::CHANGE) {
     VLOG(1) << "Got display changed event";
-    proxy_->Send(new OzoneGpuMsg_RefreshNativeDisplays());
+    proxy_->Send(new OzoneGpuMsg_RefreshNativeDisplays(
+        std::vector<DisplaySnapshot_Params>()));
   }
 }
 
 void NativeDisplayDelegateProxy::OnChannelEstablished(
     int host_id, IPC::Sender* sender) {
+  std::vector<DisplaySnapshot_Params> display_params;
+  for (size_t i = 0; i < displays_.size(); ++i)
+    display_params.push_back(GetDisplaySnapshotParams(*displays_[i]));
+
   // Force an initial configure such that the browser process can get the actual
-  // state.
-  proxy_->Send(new OzoneGpuMsg_RefreshNativeDisplays());
+  // state. Pass in the current display state since the GPU process may have
+  // crashed and we want to re-synchronize the state between processes.
+  proxy_->Send(new OzoneGpuMsg_RefreshNativeDisplays(display_params));
 }
 
 void NativeDisplayDelegateProxy::OnChannelDestroyed(int host_id) {
 }
 
 bool NativeDisplayDelegateProxy::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
 
   IPC_BEGIN_MESSAGE_MAP(NativeDisplayDelegateProxy, message)
   IPC_MESSAGE_HANDLER(OzoneHostMsg_UpdateNativeDisplays,
                       OnUpdateNativeDisplays)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void NativeDisplayDelegateProxy::OnUpdateNativeDisplays(
     const std::vector<DisplaySnapshot_Params>& displays) {
   displays_.clear();
   for (size_t i = 0; i < displays.size(); ++i)
     displays_.push_back(new DisplaySnapshotProxy(displays[i]));
 
   FOR_EACH_OBSERVER(
       NativeDisplayObserver, observers_, OnConfigurationChanged());
 }
 
 }  // namespace ui