From b17cd2a1b23df786c1051c7c66947f6d52239510 Mon Sep 17 00:00:00 2001
From: Alex Maitland <amaitland@users.noreply.github.com>
Date: Tue, 7 Mar 2023 13:03:53 +1000
Subject: [PATCH] Core - High-DPI support is now enabled by default in
 Chromium.

- Chromium now enables DPI awareness programmatically by default
- Remove Cef.EnableHighDPISupport calls and mark as obsolete
- Remove dpiawareness entries from app.manifest

Issues #4417 #4410
---
 .../BrowserSubprocessExecutable.h                     |  4 ----
 CefSharp.BrowserSubprocess/Program.cs                 |  2 --
 CefSharp.BrowserSubprocess/app.manifest               |  6 ------
 CefSharp.Core/BrowserSubprocess/SelfHost.cs           |  7 ++-----
 CefSharp.Core/Cef.cs                                  |  1 +
 CefSharp.OffScreen.Example/app.manifest               |  6 ------
 CefSharp.WinForms.Example/Program.cs                  | 11 -----------
 CefSharp.Wpf.Example/app.manifest                     |  7 -------
 8 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h b/CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h
index 0587553c00..7d624dc590 100644
--- a/CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h
+++ b/CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h
@@ -34,7 +34,6 @@ namespace CefSharp
             /// This overload is specifically used for .Net Core. For hosting your own BrowserSubProcess
             /// it's preferable to use the Main method provided by this class.
             /// - Obtains the command line args via a call to Environment::GetCommandLineArgs
-            /// - Calls CefEnableHighDPISupport before any other processing
             /// </summary>
             /// <returns>
             /// If called for the browser process (identified by no "type" command-line value) it will return immediately
@@ -53,7 +52,6 @@ namespace CefSharp
             /// This overload is specifically used for .Net Core. For hosting your own BrowserSubProcess
             /// it's preferable to use the Main method provided by this class.
             /// - Obtains the command line args via a call to Environment::GetCommandLineArgs
-            /// - Calls CefEnableHighDPISupport before any other processing
             /// </summary>
             /// <returns>
             /// If called for the browser process (identified by no "type" command-line value) it will return immediately
@@ -62,8 +60,6 @@ namespace CefSharp
             /// </returns
             static int MainNetCore(IntPtr arg, int argLength)
             {
-                SubProcess::EnableHighDPISupport();
-
                 auto args = Environment::GetCommandLineArgs();
 
                 auto subProcess = gcnew BrowserSubprocessExecutable();
diff --git a/CefSharp.BrowserSubprocess/Program.cs b/CefSharp.BrowserSubprocess/Program.cs
index d0ae6a14ff..6c6a75457d 100644
--- a/CefSharp.BrowserSubprocess/Program.cs
+++ b/CefSharp.BrowserSubprocess/Program.cs
@@ -20,8 +20,6 @@ public static int Main(string[] args)
         {
             Debug.WriteLine("BrowserSubprocess starting up with command line: " + string.Join("\n", args));
 
-            SubProcess.EnableHighDPISupport();
-
             //Add your own custom implementation of IRenderProcessHandler here
             IRenderProcessHandler handler = null;
 
diff --git a/CefSharp.BrowserSubprocess/app.manifest b/CefSharp.BrowserSubprocess/app.manifest
index 1814470adf..f49b4d4b7b 100644
--- a/CefSharp.BrowserSubprocess/app.manifest
+++ b/CefSharp.BrowserSubprocess/app.manifest
@@ -27,12 +27,6 @@
     </security>
   </trustInfo>
 
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true/PM</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- A list of all Windows versions that this application is designed to work with. 
diff --git a/CefSharp.Core/BrowserSubprocess/SelfHost.cs b/CefSharp.Core/BrowserSubprocess/SelfHost.cs
index ed1e44af90..76355bee00 100644
--- a/CefSharp.Core/BrowserSubprocess/SelfHost.cs
+++ b/CefSharp.Core/BrowserSubprocess/SelfHost.cs
@@ -13,6 +13,7 @@ namespace CefSharp.BrowserSubprocess
     /// <summary>
     /// SelfHost allows your application executable to be used as the BrowserSubProcess
     /// with minimal effort.
+    /// https://github.com/cefsharp/CefSharp/wiki/SelfHost-BrowserSubProcess
     /// </summary>
     /// <example>
     /// //WinForms Example
@@ -21,8 +22,6 @@ namespace CefSharp.BrowserSubprocess
     ///	  [STAThread]
     ///   public static int Main(string[] args)
     ///   {
-    ///     Cef.EnableHighDPISupport();
-    ///
     ///     var exitCode = CefSharp.BrowserSubprocess.SelfHost.Main(args);
     ///
     ///     if (exitCode >= 0)
@@ -43,7 +42,7 @@ namespace CefSharp.BrowserSubprocess
     ///   }
     /// }
     /// </example>
-public class SelfHost
+    public class SelfHost
     {
         /// <summary>
         /// This function should be called from the application entry point function (typically Program.Main)
@@ -51,8 +50,6 @@ public class SelfHost
         /// This overload is specifically used for .Net Core. For hosting your own BrowserSubProcess
         /// it's preferable to use the Main method provided by this class.
         /// - Pass in command line args
-        /// - To support High DPI Displays you should call  Cef.EnableHighDPISupport before any other processing
-        /// or add the relevant entries to your app.manifest
         /// </summary>
         /// <param name="args">command line args</param>
         /// <returns>
diff --git a/CefSharp.Core/Cef.cs b/CefSharp.Core/Cef.cs
index 714092e257..09db764bd4 100644
--- a/CefSharp.Core/Cef.cs
+++ b/CefSharp.Core/Cef.cs
@@ -427,6 +427,7 @@ public static bool ClearSchemeHandlerFactories()
         /// Older versions of Windows should be left DPI-unaware because they do not
         /// support DirectWrite and GDI fonts are kerned very badly.
         /// </summary>
+        [Obsolete("This method will be removed in M113. See https://github.com/cefsharp/CefSharp/issues/4417")]
         public static void EnableHighDPISupport()
         {
             Core.Cef.EnableHighDPISupport();
diff --git a/CefSharp.OffScreen.Example/app.manifest b/CefSharp.OffScreen.Example/app.manifest
index 3938bcc9d5..df281beea0 100644
--- a/CefSharp.OffScreen.Example/app.manifest
+++ b/CefSharp.OffScreen.Example/app.manifest
@@ -28,12 +28,6 @@
     </security>
   </trustInfo>
 
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true/PM</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- A list of all Windows versions that this application is designed to work with. 
diff --git a/CefSharp.WinForms.Example/Program.cs b/CefSharp.WinForms.Example/Program.cs
index f0d1113afa..67366a48f0 100644
--- a/CefSharp.WinForms.Example/Program.cs
+++ b/CefSharp.WinForms.Example/Program.cs
@@ -24,17 +24,6 @@ public static int Main(string[] args)
 
             if (selfHostSubProcess)
             {
-                var processType = CefSharp.Internals.CommandLineArgsParser.GetArgumentValue(args, CefSharp.Internals.CefSharpArguments.SubProcessTypeArgument);
-
-                if (processType == "gpu-process")
-                {
-                    // Enable DPI Awareness for GPU process.
-                    // Our main application is already DPI aware using WinForms specific features
-                    // **IMPORTANT** There's a mistake in the following doc https://github.com/dotnet/docs-desktop/issues/1485
-                    // https://docs.microsoft.com/en-us/dotnet/desktop/winforms/high-dpi-support-in-windows-forms
-                    Cef.EnableHighDPISupport();
-                }
-
                 var exitCode = CefSharp.BrowserSubprocess.SelfHost.Main(args);
 
                 if (exitCode >= 0)
diff --git a/CefSharp.Wpf.Example/app.manifest b/CefSharp.Wpf.Example/app.manifest
index c31155307d..1372754a8a 100644
--- a/CefSharp.Wpf.Example/app.manifest
+++ b/CefSharp.Wpf.Example/app.manifest
@@ -28,13 +28,6 @@
     </security>
   </trustInfo>
 
-  <asmv3:application>
-    <asmv3:windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- A list of all Windows versions that this application is designed to work with.