Add observer for DisplayMetricsChanged

This is to notify DirectCompositionSurfaceWin if there are display
metrics change(s) such as desktop resolution on the monitor(s).
DirectCompositionSurfaceWin needs the current monitor size.

Bug: 1027046
Change-Id: I0df02aa4a566723468219d9333b5f26379688700
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523903Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Maggie Chen <magchen@chromium.org>
Commit-Queue: Maggie Chen <magchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826499}

components/viz/host/host_gpu_memory_buffer_manager_unittest.cc

@@ -4,7 +4,9 @@
 
 #include "components/viz/host/host_gpu_memory_buffer_manager.h"
 
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ -163,6 +165,8 @@ class TestGpuService : public mojom::GpuService {
 
   void DisplayRemoved() override {}
 
+  void DisplayMetricsChanged() override {}
+
   void DestroyAllChannels() override {}
 
   void OnBackgroundCleanup() override {}

components/viz/service/gl/gpu_service_impl.cc

@@ -996,6 +996,19 @@ void GpuServiceImpl::DisplayRemoved() {
     ui::GpuSwitchingManager::GetInstance()->NotifyDisplayRemoved();
 }
 
+void GpuServiceImpl::DisplayMetricsChanged() {
+  if (io_runner_->BelongsToCurrentThread()) {
+    main_runner_->PostTask(
+        FROM_HERE,
+        base::BindOnce(&GpuServiceImpl::DisplayMetricsChanged, weak_ptr_));
+    return;
+  }
+  DVLOG(1) << "GPU: Display Metrics changed";
+
+  if (!in_host_process())
+    ui::GpuSwitchingManager::GetInstance()->NotifyDisplayMetricsChanged();
+}
+
 void GpuServiceImpl::DestroyAllChannels() {
   if (io_runner_->BelongsToCurrentThread()) {
     main_runner_->PostTask(

components/viz/service/gl/gpu_service_impl.h

@@ -175,6 +175,7 @@ class VIZ_SERVICE_EXPORT GpuServiceImpl : public gpu::GpuChannelManagerDelegate,
   void GpuSwitched(gl::GpuPreference active_gpu_heuristic) override;
   void DisplayAdded() override;
   void DisplayRemoved() override;
+  void DisplayMetricsChanged() override;
   void DestroyAllChannels() override;
   void OnBackgroundCleanup() override;
   void OnBackgrounded() override;

content/browser/gpu/gpu_data_manager_impl.cc

@@ -369,6 +369,13 @@ void GpuDataManagerImpl::OnDisplayRemoved(const display::Display& old_display) {
   private_->OnDisplayRemoved(old_display);
 }
 
+void GpuDataManagerImpl::OnDisplayMetricsChanged(
+    const display::Display& display,
+    uint32_t changed_metrics) {
+  base::AutoLock auto_lock(lock_);
+  private_->OnDisplayMetricsChanged(display, changed_metrics);
+}
+
 // static
 void GpuDataManagerImpl::BindReceiver(
     mojo::PendingReceiver<blink::mojom::GpuDataManager> receiver) {

content/browser/gpu/gpu_data_manager_impl.h

@@ -178,6 +178,8 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
   // DisplayObserver overrides.
   void OnDisplayAdded(const display::Display& new_display) override;
   void OnDisplayRemoved(const display::Display& old_display) override;
+  void OnDisplayMetricsChanged(const display::Display& display,
+                               uint32_t changed_metrics) override;
 
   // Binds a new Mojo receiver to handle requests from a renderer.
   static void BindReceiver(

content/browser/gpu/gpu_data_manager_impl_private.cc

@@ -1335,6 +1335,32 @@ void GpuDataManagerImplPrivate::OnDisplayRemoved(
                            }));
 }
 
+void GpuDataManagerImplPrivate::OnDisplayMetricsChanged(
+    const display::Display& display,
+    uint32_t changed_metrics) {
+#if defined(OS_WIN)
+  if (gpu_info_dx_diag_requested_) {
+    // Reset DxDiag flags so the data can be updated again
+    gpu_info_dx_diag_requested_ = false;
+    gpu_info_.dx_diagnostics = gpu::DxDiagNode();
+    // This DxDiag request goes to the unsandboxed GPU info collection GPU
+    // process while the notification below goes to the sandboxed GPU process.
+    RequestDxDiagNodeData();
+  }
+#endif
+
+  base::AutoUnlock unlock(owner_->lock_);
+
+  // Notify observers in the browser process.
+  ui::GpuSwitchingManager::GetInstance()->NotifyDisplayMetricsChanged();
+  // Pass the notification to the GPU process to notify observers there.
+  GpuProcessHost::CallOnIO(GPU_PROCESS_KIND_SANDBOXED, false /* force_create */,
+                           base::BindOnce([](GpuProcessHost* host) {
+                             if (host)
+                               host->gpu_service()->DisplayMetricsChanged();
+                           }));
+}
+
 bool GpuDataManagerImplPrivate::UpdateActiveGpu(uint32_t vendor_id,
                                                 uint32_t device_id) {
   // Heuristics for dual-GPU detection.

content/browser/gpu/gpu_data_manager_impl_private.h

@@ -129,6 +129,8 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
 
   void OnDisplayAdded(const display::Display& new_display);
   void OnDisplayRemoved(const display::Display& old_display);
+  void OnDisplayMetricsChanged(const display::Display& display,
+                               uint32_t changed_metrics);
 
  private:
   friend class GpuDataManagerImplPrivateTest;

content/browser/gpu/peak_gpu_memory_tracker_impl_browsertest.cc

@@ -107,6 +107,7 @@ class TestGpuService : public viz::mojom::GpuService {
   void GpuSwitched(gl::GpuPreference active_gpu_heuristic) override {}
   void DisplayAdded() override {}
   void DisplayRemoved() override {}
+  void DisplayMetricsChanged() override {}
   void DestroyAllChannels() override {}
   void OnBackgroundCleanup() override {}
   void OnBackgrounded() override {}

services/viz/privileged/mojom/gl/gpu_service.mojom

@@ -124,6 +124,9 @@ interface GpuService {
   // Tells GPU that host has seen a monitor being unplugged.
   DisplayRemoved();
 
+  // Tells GPU that host has seen the display metrics changed.
+  DisplayMetricsChanged();
+
   // Tells GPU that all GPU channels are to be destroyed.
   DestroyAllChannels();
 

ui/gl/direct_composition_surface_win.cc

@@ -849,6 +849,8 @@ void DirectCompositionSurfaceWin::OnDisplayRemoved() {
   RunOverlayHdrGpuInfoUpdateCallback();
 }
 
+void DirectCompositionSurfaceWin::OnDisplayMetricsChanged() {}
+
 scoped_refptr<base::TaskRunner>
 DirectCompositionSurfaceWin::GetWindowTaskRunnerForTesting() {
   return child_window_.GetTaskRunnerForTesting();

ui/gl/direct_composition_surface_win.h

@@ -145,6 +145,7 @@ class GL_EXPORT DirectCompositionSurfaceWin : public GLSurfaceEGL,
   void OnGpuSwitched(gl::GpuPreference active_gpu_heuristic) override;
   void OnDisplayAdded() override;
   void OnDisplayRemoved() override;
+  void OnDisplayMetricsChanged() override;
 
   HWND window() const { return window_; }
 

ui/gl/gpu_switching_manager.cc

@@ -39,4 +39,9 @@ void GpuSwitchingManager::NotifyDisplayRemoved() {
     observer.OnDisplayRemoved();
 }
 
+void GpuSwitchingManager::NotifyDisplayMetricsChanged() {
+  for (GpuSwitchingObserver& observer : observer_list_)
+    observer.OnDisplayMetricsChanged();
+}
+
 }  // namespace ui

ui/gl/gpu_switching_manager.h

@@ -40,6 +40,10 @@ class GL_EXPORT GpuSwitchingManager {
   // Called when a monitor is unplugged.  Only Windows is supported for now.
   void NotifyDisplayRemoved();
 
+  // Called when the display metrics changed.  Only Windows is supported for
+  // now.
+  void NotifyDisplayMetricsChanged();
+
  private:
   friend struct base::DefaultSingletonTraits<GpuSwitchingManager>;
 

ui/gl/gpu_switching_observer.h

@@ -20,6 +20,9 @@ class GL_EXPORT GpuSwitchingObserver {
 
   // Called for any observer when a monitor is unplugged.
   virtual void OnDisplayRemoved() {}
+
+  // Called for any observer when the display metrics changed.
+  virtual void OnDisplayMetricsChanged() {}
 };
 
 }  // namespace ui