Backed out 18 changesets (bug 1525720) for mass failures on Windows p…

…latform e.g ProcessPriorityManager.cpp on a CLOSED TREE. Backed out changeset 1f2e86c2d691 (bug 1525720) Backed out changeset 9b79caa460a0 (bug 1525720) Backed out changeset e65cb2d4c5a5 (bug 1525720) Backed out changeset 99f971a02d87 (bug 1525720) Backed out changeset d25963c72ff7 (bug 1525720) Backed out changeset 810b73719871 (bug 1525720) Backed out changeset ee10a8254481 (bug 1525720) Backed out changeset 1bcf9f586c55 (bug 1525720) Backed out changeset d3b2ac8d5ca4 (bug 1525720) Backed out changeset 697774dd8984 (bug 1525720) Backed out changeset eadeacbe4483 (bug 1525720) Backed out changeset 32eeee79d628 (bug 1525720) Backed out changeset 07678a2fa9e7 (bug 1525720) Backed out changeset 757b4f595cc4 (bug 1525720) Backed out changeset b255e0a84e12 (bug 1525720) Backed out changeset 9a255864f75d (bug 1525720) Backed out changeset 5f1c1b609ec1 (bug 1525720) Backed out changeset 00d83f1d02e0 (bug 1525720)
mozilla-spidermonkey · May 22, 2019 · 62743ba · 62743ba
1 parent ab7298f
commit 62743ba
Show file tree

Hide file tree

Showing 46 changed files with 729 additions and 1,335 deletions.
diff --git a/accessible/generic/RootAccessible.cpp b/accessible/generic/RootAccessible.cpp
@@ -27,7 +27,6 @@
 #include "mozilla/dom/CustomEvent.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/dom/BrowserHost.h"
 
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeOwner.h"
@@ -670,12 +669,12 @@ ProxyAccessible* RootAccessible::GetPrimaryRemoteTopLevelContentDoc() const {
   mDocumentNode->GetDocShell()->GetTreeOwner(getter_AddRefs(owner));
   NS_ENSURE_TRUE(owner, nullptr);
 
-  nsCOMPtr<nsIRemoteTab> remoteTab;
-  owner->GetPrimaryRemoteTab(getter_AddRefs(remoteTab));
-  if (!remoteTab) {
+  nsCOMPtr<nsIRemoteTab> browserParent;
+  owner->GetPrimaryRemoteTab(getter_AddRefs(browserParent));
+  if (!browserParent) {
     return nullptr;
   }
 
-  auto tab = static_cast<dom::BrowserHost*>(remoteTab.get());
+  auto tab = static_cast<dom::BrowserParent*>(browserParent.get());
   return tab->GetTopLevelDocAccessible();
 }
diff --git a/accessible/ipc/DocAccessibleParent.cpp b/accessible/ipc/DocAccessibleParent.cpp
@@ -672,8 +672,8 @@ void DocAccessibleParent::MaybeInitWindowEmulation() {
     rect.MoveToX(rootRect.X() - rect.X());
     rect.MoveToY(rect.Y() - rootRect.Y());
 
-    auto browserParent = static_cast<dom::BrowserParent*>(Manager());
-    isActive = browserParent->GetDocShellIsActive();
+    auto tab = static_cast<dom::BrowserParent*>(Manager());
+    tab->GetDocShellIsActive(&isActive);
   }
 
   nsWinUtils::NativeWindowCreateProc onCreate([this](HWND aHwnd) -> void {

diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
@@ -2331,7 +2331,7 @@ var SessionStoreInternal = {
     // Tell our caller to redirect the load into this newly created process.
     let remoteTab = aBrowser.frameLoader.remoteTab;
     debug(`[process-switch]: new tabID: ${remoteTab.tabId}`);
-    return remoteTab.contentProcessId;
+    return remoteTab;
   },
 
   /**

diff --git a/docshell/shistory/ParentSHistory.cpp b/docshell/shistory/ParentSHistory.cpp
@@ -26,7 +26,7 @@ nsDocShell* ParentSHistory::GetDocShell() {
 }
 
 BrowserParent* ParentSHistory::GetBrowserParent() {
-  return mFrameLoader->GetBrowserParent();
+  return static_cast<BrowserParent*>(mFrameLoader->GetRemoteBrowser());
 }
 
 already_AddRefed<ChildSHistory> ParentSHistory::GetChildIfSameProcess() {

diff --git a/dom/base/nsContentAreaDragDrop.cpp b/dom/base/nsContentAreaDragDrop.cpp
@@ -552,11 +552,11 @@ nsresult DragDataProducer::Produce(DataTransfer* aDataTransfer, bool* aCanDrag,
     if (flo) {
       RefPtr<nsFrameLoader> fl = flo->GetFrameLoader();
       if (fl) {
-        BrowserParent* bp = fl->GetBrowserParent();
-        if (bp) {
+        BrowserParent* tp = static_cast<BrowserParent*>(fl->GetRemoteBrowser());
+        if (tp) {
           // We have a BrowserParent, so it may have data for dnd in case the
           // child process started a dnd session.
-          bp->AddInitialDnDDataTo(aDataTransfer, aPrincipal);
+          tp->AddInitialDnDDataTo(aDataTransfer, aPrincipal);
         }
       }
     }

diff --git a/dom/base/nsDOMAttributeMap.h b/dom/base/nsDOMAttributeMap.h
@@ -60,8 +60,7 @@ class nsAttrHashKey : public PLDHashEntryHdr {
   typedef const nsAttrKey* KeyTypePointer;
 
   explicit nsAttrHashKey(KeyTypePointer aKey) : mKey(*aKey) {}
-  nsAttrHashKey(const nsAttrHashKey& aCopy)
-      : PLDHashEntryHdr{}, mKey(aCopy.mKey) {}
+  nsAttrHashKey(const nsAttrHashKey& aCopy) : mKey(aCopy.mKey) {}
   ~nsAttrHashKey() {}
 
   KeyType GetKey() const { return mKey; }