Merge mozilla-central to autoland. a=merge CLOSED TREE

mozilla-spidermonkey · Nov 6, 2019 · f8253b4 · f8253b4
2 parents de6a501 + 0f2e500
commit f8253b4
Show file tree

Hide file tree

Showing 80 changed files with 5,721 additions and 1,207 deletions.
diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
@@ -148,6 +148,8 @@ already_AddRefed<BrowsingContext> BrowsingContext::Create(
     context->mEmbedderPolicy = inherit->mEmbedderPolicy;
   }
 
+  nsContentUtils::GenerateUUIDInPlace(context->mHistoryID);
+
   Register(context);
 
   // Attach the browsing context to the tree.

diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
@@ -18,6 +18,7 @@
 #include "mozilla/dom/UserActivation.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsID.h"
 #include "nsIDocShell.h"
 #include "nsString.h"
 #include "nsTArray.h"

diff --git a/docshell/base/BrowsingContextFieldList.h b/docshell/base/BrowsingContextFieldList.h
@@ -41,4 +41,6 @@ MOZ_BC_FIELD(FeaturePolicy, RefPtr<mozilla::dom::FeaturePolicy>)
 // See nsSandboxFlags.h for the possible flags.
 MOZ_BC_FIELD(SandboxFlags, uint32_t)
 
+MOZ_BC_FIELD(HistoryID, nsID)
+
 #undef MOZ_BC_FIELD
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
@@ -154,12 +154,14 @@ JSObject* CanonicalBrowsingContext::WrapObject(
 void CanonicalBrowsingContext::Traverse(
     nsCycleCollectionTraversalCallback& cb) {
   CanonicalBrowsingContext* tmp = this;
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindowGlobals, mCurrentWindowGlobal);
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindowGlobals, mCurrentWindowGlobal,
+                                    mSessionHistory);
 }
 
 void CanonicalBrowsingContext::Unlink() {
   CanonicalBrowsingContext* tmp = this;
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindowGlobals, mCurrentWindowGlobal);
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindowGlobals, mCurrentWindowGlobal,
+                                  mSessionHistory);
 }
 
 void CanonicalBrowsingContext::NotifyStartDelayedAutoplayMedia() {

diff --git a/docshell/base/CanonicalBrowsingContext.h b/docshell/base/CanonicalBrowsingContext.h
@@ -15,6 +15,7 @@
 #include "nsWrapperCache.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
+#include "nsISHistory.h"
 
 class nsIDocShell;
 
@@ -60,6 +61,10 @@ class CanonicalBrowsingContext final : public BrowsingContext {
 
   already_AddRefed<WindowGlobalParent> GetEmbedderWindowGlobal() const;
 
+  nsISHistory* GetSessionHistory() { return mSessionHistory; }
+  void SetSessionHistory(nsISHistory* aSHistory) {
+    mSessionHistory = aSHistory;
+  }
   JSObject* WrapObject(JSContext* aCx,
                        JS::Handle<JSObject*> aGivenProto) override;
 
@@ -144,6 +149,8 @@ class CanonicalBrowsingContext final : public BrowsingContext {
 
   // The current remoteness change which is in a pending state.
   RefPtr<PendingRemotenessChange> mPendingRemotenessChange;
+
+  nsCOMPtr<nsISHistory> mSessionHistory;
 };
 
 }  // namespace dom