Bug 1725145 - fixes in dom for win in non unified env. r=emilio
authorAndi-Bogdan Postelnicu <andi@mozilla.com>
Wed, 25 Aug 2021 10:46:15 +0000
changeset 589872 1008e8b72ec3c513a64d3670cc15dc8e8e8e9742
parent 589871 33ee091a5201955ac4b10a190ad30f71ad33d7c8
child 589873 cea37aa8d28036f00c95b72b28c732ffeb80dbf5
push id38735
push usernbeleuzu@mozilla.com
push dateWed, 25 Aug 2021 15:39:54 +0000
treeherdermozilla-central@55a7e8179f28 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1725145
milestone93.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1725145 - fixes in dom for win in non unified env. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D123544
dom/quota/QuotaCommon.cpp
dom/security/nsContentSecurityUtils.cpp
--- a/dom/quota/QuotaCommon.cpp
+++ b/dom/quota/QuotaCommon.cpp
@@ -102,17 +102,17 @@ void AnonymizeOriginString(nsACString& a
   }
 
   AnonymizeCString(aOriginString, start);
 }
 
 #ifdef XP_WIN
 void CacheUseDOSDevicePathSyntaxPrefValue() {
   MOZ_ASSERT(XRE_IsParentProcess());
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
 
   if (gUseDOSDevicePathSyntax == -1) {
     bool useDOSDevicePathSyntax =
         StaticPrefs::dom_quotaManager_useDOSDevicePathSyntax_DoNotUseDirectly();
     gUseDOSDevicePathSyntax = useDOSDevicePathSyntax ? 1 : 0;
   }
 }
 #endif
--- a/dom/security/nsContentSecurityUtils.cpp
+++ b/dom/security/nsContentSecurityUtils.cpp
@@ -16,16 +16,17 @@
 #include "nsIChannel.h"
 #include "nsIHttpChannel.h"
 #include "nsIMultiPartChannel.h"
 #include "nsIURI.h"
 #include "nsITransfer.h"
 #include "nsNetUtil.h"
 #include "nsSandboxFlags.h"
 #if defined(XP_WIN)
+#  include "mozilla/WinHeaderOnlyUtils.h"
 #  include "WinUtils.h"
 #  include <wininet.h>
 #endif
 
 #include "FramingChecker.h"
 #include "js/Array.h"  // JS::GetArrayLength
 #include "js/ContextOptions.h"
 #include "js/PropertyAndElement.h"  // JS_GetElement