From 0587c5c29f3e3244c6936d9f8920b834bd705a52 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe.birchill@mozilla.com>
Date: Thu, 15 Sep 2022 10:13:13 +0000
Subject: [PATCH] Bug 1787079 - Expose gfx::GetDisplayConfig().
 r=gfx-reviewers,lsalzman

We'd like to use it for changing DPI settings for the primary monitor.

Differential Revision: https://phabricator.services.mozilla.com/D156264
---
 gfx/thebes/DisplayConfigWindows.cpp |  8 --------
 gfx/thebes/DisplayConfigWindows.h   | 12 +++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gfx/thebes/DisplayConfigWindows.cpp b/gfx/thebes/DisplayConfigWindows.cpp
index 49fc13c580b7..f9696a4070fd 100644
--- a/gfx/thebes/DisplayConfigWindows.cpp
+++ b/gfx/thebes/DisplayConfigWindows.cpp
@@ -5,9 +5,6 @@
 
 #include <iostream>
 #include <windows.h>
-#include <wingdi.h>
-#include <optional>
-#include <vector>
 
 #include "DisplayConfigWindows.h"
 
@@ -16,11 +13,6 @@ namespace gfx {
 
 using namespace std;
 
-struct DisplayConfig {
-  vector<DISPLAYCONFIG_PATH_INFO> mPaths;
-  vector<DISPLAYCONFIG_MODE_INFO> mModes;
-};
-
 optional<DisplayConfig> GetDisplayConfig() {
   LONG result;
 
diff --git a/gfx/thebes/DisplayConfigWindows.h b/gfx/thebes/DisplayConfigWindows.h
index fa5fae8b22ef..62bc03cf3da2 100644
--- a/gfx/thebes/DisplayConfigWindows.h
+++ b/gfx/thebes/DisplayConfigWindows.h
@@ -6,13 +6,23 @@
 #ifndef mozilla_gfx_thebes_DisplayConfigWindows_h
 #define mozilla_gfx_thebes_DisplayConfigWindows_h
 
-#include <utility>              // for std::pair
+#include <optional>  // for std::optional
+#include <utility>   // for std::pair
+#include <vector>    // for std::vector
+#include <wingdi.h>
 #include "mozilla/gfx/Point.h"  // for IntSize
 #include "nsTArray.h"
 
 namespace mozilla {
 namespace gfx {
 
+struct DisplayConfig {
+  std::vector<DISPLAYCONFIG_PATH_INFO> mPaths;
+  std::vector<DISPLAYCONFIG_MODE_INFO> mModes;
+};
+
+std::optional<DisplayConfig> GetDisplayConfig();
+
 extern bool HasScaledResolution();
 
 typedef nsTArray<std::pair<IntSize, IntSize>> ScaledResolutionSet;