Merge remote-tracking branch 'origin/media-works' into af-frontend-sync2

docshell/base/nsDocShell.cpp

@@ -782,6 +782,7 @@ nsDocShell::nsDocShell()
   , mUseRemoteTabs(false)
   , mDeviceSizeIsPageSize(false)
   , mWindowDraggingAllowed(false)
+  , mInFrameSwap(false)
   , mCanExecuteScripts(false)
   , mFiredUnloadEvent(false)
   , mEODForCurrentDocument(false)
@@ -14400,3 +14401,16 @@ nsDocShell::GetPaymentRequestId(nsAString& aPaymentRequestId)
   aPaymentRequestId = GetInheritedPaymentRequestId();
   return NS_OK;
 }
+
+bool
+nsDocShell::InFrameSwap()
+{
+  nsRefPtr<nsDocShell> shell = this;
+  do {
+    if (shell->mInFrameSwap) {
+      return true;
+    }
+    shell = shell->GetParentDocshell();
+  } while (shell);
+  return false;
+}