Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 10 insertions, 10 deletions

diff --git a/docshell/shistory/nsISHEntry.idl b/docshell/shistory/nsISHEntry.idl
index 1d7427f581..6f682758d4 100644
--- a/docshell/shistory/nsISHEntry.idl
+++ b/docshell/shistory/nsISHEntry.idl
@@ -331,14 +331,14 @@ interface nsISHEntry : nsISupports
                            in nsIURI originalURI,
                            in nsIURI resultPrincipalURI,
                            in nsIURI unstrippedURI,
-                           in bool loadReplace,
+                           in boolean loadReplace,
                            in nsIReferrerInfo referrerInfo,
                            in AString srcdoc,
-                           in bool srcdocEntry,
+                           in boolean srcdocEntry,
                            in nsIURI baseURI,
-                           in bool saveLayoutState,
-                           in bool expired,
-                           in bool userActivation);
+                           in boolean saveLayoutState,
+                           in boolean expired,
+                           in boolean userActivation);
 
     nsISHEntry clone();
 
@@ -413,7 +413,7 @@ interface nsISHEntry : nsISupports
      * Add a new child SHEntry. If offset is -1 adds to the end of the list.
      */
     void AddChild(in nsISHEntry aChild, in long aOffset,
-                  [optional,default(false)] in bool aUseRemoteSubframes);
+                  [optional,default(false)] in boolean aUseRemoteSubframes);
 
     /**
      * Remove a child SHEntry.
diff --git a/docshell/shistory/nsISHistory.idl b/docshell/shistory/nsISHistory.idl
index 9ca237c670..ffdd1ff788 100644
--- a/docshell/shistory/nsISHistory.idl
+++ b/docshell/shistory/nsISHistory.idl
@@ -273,19 +273,19 @@ interface nsISHistory: nsISupports
 
   [notxpcom] void EnsureCorrectEntryAtCurrIndex(in nsISHEntry aEntry);
 
-  [notxpcom] void EvictDocumentViewersOrReplaceEntry(in nsISHEntry aNewSHEntry, in bool aReplace);
+  [notxpcom] void EvictDocumentViewersOrReplaceEntry(in nsISHEntry aNewSHEntry, in boolean aReplace);
 
   nsISHEntry createEntry();
 
-  [noscript] void AddToRootSessionHistory(in bool aCloneChildren, in nsISHEntry aOSHE,
+  [noscript] void AddToRootSessionHistory(in boolean aCloneChildren, in nsISHEntry aOSHE,
                                           in BrowsingContext aRootBC, in nsISHEntry aEntry,
                                           in unsigned long aLoadType,
-                                          in bool aShouldPersist,
+                                          in boolean aShouldPersist,
                                           out MaybeInt32 aPreviousEntryIndex,
                                           out MaybeInt32 aLoadedEntryIndex);
 
   [noscript] void AddChildSHEntryHelper(in nsISHEntry aCloneRef, in nsISHEntry aNewEntry,
-                                        in BrowsingContext aRootBC, in bool aCloneChildren);
+                                        in BrowsingContext aRootBC, in boolean aCloneChildren);
 
   [noscript, notxpcom] boolean isEmptyOrHasEntriesForSingleTopLevelPage();
 };