From d081fe1bc6e4ad6874ce8322fa8f60a074d092b7 Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@hyperbola.info>
Date: Sat, 11 Jul 2020 10:57:01 -0400
Subject: [PATCH 1/2] Issue #618 - Remove eager instantiation - Debug follow up

The added debug assertion did not take into account microtask refactoring done in BZ 1405821.
Resulting in error: no member named 'IsInMicroTask' in 'nsContentUtils'.

This resolves the error.
---
 dom/base/nsJSUtils.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
index 65965d74bf..2601ffd87f 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -315,7 +315,8 @@ nsJSUtils::ModuleInstantiate(JSContext* aCx, JS::Handle<JSObject*> aModule)
 
   MOZ_ASSERT(aCx == nsContentUtils::GetCurrentJSContext());
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(nsContentUtils::IsInMicroTask());
+  MOZ_ASSERT(CycleCollectedJSContext::Get() &&
+             CycleCollectedJSContext::Get()->MicroTaskLevel());
 
   NS_ENSURE_TRUE(xpc::Scriptability::Get(aModule).Allowed(), NS_OK);
 

From 8df44f932008fd2b286597a0068a4d7c612944cf Mon Sep 17 00:00:00 2001
From: Pale Moon <git-repo@palemoon.org>
Date: Fri, 10 Jul 2020 15:19:27 +0200
Subject: [PATCH 2/2] [Pale-Moon] Issue #1811 - Indicate our per-monitor
 DPI-awareness to the O.S.

This resolves #1811
---
 application/palemoon/app/palemoon.exe.manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/palemoon/app/palemoon.exe.manifest b/application/palemoon/app/palemoon.exe.manifest
index 465effa449..c4f0ef8f01 100644
--- a/application/palemoon/app/palemoon.exe.manifest
+++ b/application/palemoon/app/palemoon.exe.manifest
@@ -28,7 +28,7 @@
 </ms_asmv3:trustInfo>
   <ms_asmv3:application xmlns:ms_asmv3="urn:schemas-microsoft-com:asm.v3">
     <ms_asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true</dpiAware>
+      <dpiAware>True/PM</dpiAware>
     </ms_asmv3:windowsSettings>
   </ms_asmv3:application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">