tor-browser

commit 4998e85111b68faae1379f1de33d4e4a45d17dae
parent 825853242aa076cbb404200767c2cf05c1f07cca
Author: Tooru Fujisawa <arai_a@mac.com>
Date:   Thu, 23 Oct 2025 04:16:55 +0000

Bug 1991629 - Reorder ScriptHashKey fields. r=bthrall

Differential Revision: https://phabricator.services.mozilla.com/D267362

Diffstat:
M
dom/script/SharedScriptCache.cpp
 | 
8
++++----
M
dom/script/SharedScriptCache.h
 | 
24
++++++++++++------------

2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dom/script/SharedScriptCache.cpp b/dom/script/SharedScriptCache.cpp
@@ -24,14 +24,14 @@ ScriptHashKey::ScriptHashKey(
     const JS::loader::ScriptFetchOptions* aFetchOptions,
     const nsCOMPtr<nsIURI> aURI)
     : PLDHashEntryHdr(),
+      mKind(aRequest->mKind),
+      mCORSMode(aFetchOptions->mCORSMode),
+      mIsLinkRelPreload(aRequest->GetScriptLoadContext()->IsPreload()),
       mURI(aURI),
       mLoaderPrincipal(aLoader->LoaderPrincipal()),
       mPartitionPrincipal(aLoader->PartitionedPrincipal()),
-      mCORSMode(aFetchOptions->mCORSMode),
       mSRIMetadata(aRequest->mIntegrity),
-      mKind(aRequest->mKind),
-      mNonce(aFetchOptions->mNonce),
-      mIsLinkRelPreload(aRequest->GetScriptLoadContext()->IsPreload()) {
+      mNonce(aFetchOptions->mNonce) {
   if (mKind == JS::loader::ScriptKind::eClassic) {
     if (aRequest->GetScriptLoadContext()->HasScriptElement()) {
       aRequest->GetScriptLoadContext()->GetHintCharset(mHintCharset);
diff --git a/dom/script/SharedScriptCache.h b/dom/script/SharedScriptCache.h
@@ -37,15 +37,15 @@ class ScriptHashKey : public PLDHashEntryHdr {
 
   explicit ScriptHashKey(const ScriptHashKey& aKey)
       : PLDHashEntryHdr(),
+        mKind(aKey.mKind),
+        mCORSMode(aKey.mCORSMode),
+        mIsLinkRelPreload(aKey.mIsLinkRelPreload),
         mURI(aKey.mURI),
         mLoaderPrincipal(aKey.mLoaderPrincipal),
         mPartitionPrincipal(aKey.mPartitionPrincipal),
-        mCORSMode(aKey.mCORSMode),
         mSRIMetadata(aKey.mSRIMetadata),
-        mKind(aKey.mKind),
         mNonce(aKey.mNonce),
-        mHintCharset(aKey.mHintCharset),
-        mIsLinkRelPreload(aKey.mIsLinkRelPreload) {
+        mHintCharset(aKey.mHintCharset) {
     MOZ_COUNT_CTOR(ScriptHashKey);
   }
 
@@ -53,15 +53,15 @@ class ScriptHashKey : public PLDHashEntryHdr {
 
   ScriptHashKey(ScriptHashKey&& aKey)
       : PLDHashEntryHdr(),
+        mKind(std::move(aKey.mKind)),
+        mCORSMode(std::move(aKey.mCORSMode)),
+        mIsLinkRelPreload(std::move(aKey.mIsLinkRelPreload)),
         mURI(std::move(aKey.mURI)),
         mLoaderPrincipal(std::move(aKey.mLoaderPrincipal)),
         mPartitionPrincipal(std::move(aKey.mPartitionPrincipal)),
-        mCORSMode(std::move(aKey.mCORSMode)),
         mSRIMetadata(std::move(aKey.mSRIMetadata)),
-        mKind(std::move(aKey.mKind)),
         mNonce(std::move(aKey.mNonce)),
-        mHintCharset(std::move(aKey.mHintCharset)),
-        mIsLinkRelPreload(std::move(aKey.mIsLinkRelPreload)) {
+        mHintCharset(std::move(aKey.mHintCharset)) {
     MOZ_COUNT_CTOR(ScriptHashKey);
   }
 
@@ -98,12 +98,14 @@ class ScriptHashKey : public PLDHashEntryHdr {
   enum { ALLOW_MEMMOVE = true };
 
  protected:
+  const JS::loader::ScriptKind mKind;
+  const CORSMode mCORSMode;
+  const bool mIsLinkRelPreload;
+
   const nsCOMPtr<nsIURI> mURI;
   const nsCOMPtr<nsIPrincipal> mLoaderPrincipal;
   const nsCOMPtr<nsIPrincipal> mPartitionPrincipal;
-  const CORSMode mCORSMode;
   const SRIMetadata mSRIMetadata;
-  const JS::loader::ScriptKind mKind;
   const nsString mNonce;
 
   // charset attribute for classic script.
@@ -116,8 +118,6 @@ class ScriptHashKey : public PLDHashEntryHdr {
   // top-level document's host
   //   maybe part of principal?
   //   what if it's inside frame in different host?
-
-  const bool mIsLinkRelPreload;
 };
 
 class ScriptLoadData final