Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 57f573a

Browse files
committed
Backed out 18 changesets (bug 1525720) for mass failures on Windows platform 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)
1 parent 97659c0 commit 57f573a

46 files changed

Lines changed: 729 additions & 1335 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

accessible/generic/RootAccessible.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "mozilla/dom/CustomEvent.h"
2828
#include "mozilla/dom/Element.h"
2929
#include "mozilla/dom/ScriptSettings.h"
30-
#include "mozilla/dom/BrowserHost.h"
3130

3231
#include "nsIDocShellTreeItem.h"
3332
#include "nsIDocShellTreeOwner.h"
@@ -670,12 +669,12 @@ ProxyAccessible* RootAccessible::GetPrimaryRemoteTopLevelContentDoc() const {
670669
mDocumentNode->GetDocShell()->GetTreeOwner(getter_AddRefs(owner));
671670
NS_ENSURE_TRUE(owner, nullptr);
672671

673-
nsCOMPtr<nsIRemoteTab> remoteTab;
674-
owner->GetPrimaryRemoteTab(getter_AddRefs(remoteTab));
675-
if (!remoteTab) {
672+
nsCOMPtr<nsIRemoteTab> browserParent;
673+
owner->GetPrimaryRemoteTab(getter_AddRefs(browserParent));
674+
if (!browserParent) {
676675
return nullptr;
677676
}
678677

679-
auto tab = static_cast<dom::BrowserHost*>(remoteTab.get());
678+
auto tab = static_cast<dom::BrowserParent*>(browserParent.get());
680679
return tab->GetTopLevelDocAccessible();
681680
}

accessible/ipc/DocAccessibleParent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@ void DocAccessibleParent::MaybeInitWindowEmulation() {
672672
rect.MoveToX(rootRect.X() - rect.X());
673673
rect.MoveToY(rect.Y() - rootRect.Y());
674674

675-
auto browserParent = static_cast<dom::BrowserParent*>(Manager());
676-
isActive = browserParent->GetDocShellIsActive();
675+
auto tab = static_cast<dom::BrowserParent*>(Manager());
676+
tab->GetDocShellIsActive(&isActive);
677677
}
678678

679679
nsWinUtils::NativeWindowCreateProc onCreate([this](HWND aHwnd) -> void {

browser/components/sessionstore/SessionStore.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,7 @@ var SessionStoreInternal = {
23312331
// Tell our caller to redirect the load into this newly created process.
23322332
let remoteTab = aBrowser.frameLoader.remoteTab;
23332333
debug(`[process-switch]: new tabID: ${remoteTab.tabId}`);
2334-
return remoteTab.contentProcessId;
2334+
return remoteTab;
23352335
},
23362336

23372337
/**

docshell/shistory/ParentSHistory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ nsDocShell* ParentSHistory::GetDocShell() {
2626
}
2727

2828
BrowserParent* ParentSHistory::GetBrowserParent() {
29-
return mFrameLoader->GetBrowserParent();
29+
return static_cast<BrowserParent*>(mFrameLoader->GetRemoteBrowser());
3030
}
3131

3232
already_AddRefed<ChildSHistory> ParentSHistory::GetChildIfSameProcess() {

dom/base/nsContentAreaDragDrop.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,11 +552,11 @@ nsresult DragDataProducer::Produce(DataTransfer* aDataTransfer, bool* aCanDrag,
552552
if (flo) {
553553
RefPtr<nsFrameLoader> fl = flo->GetFrameLoader();
554554
if (fl) {
555-
BrowserParent* bp = fl->GetBrowserParent();
556-
if (bp) {
555+
BrowserParent* tp = static_cast<BrowserParent*>(fl->GetRemoteBrowser());
556+
if (tp) {
557557
// We have a BrowserParent, so it may have data for dnd in case the
558558
// child process started a dnd session.
559-
bp->AddInitialDnDDataTo(aDataTransfer, aPrincipal);
559+
tp->AddInitialDnDDataTo(aDataTransfer, aPrincipal);
560560
}
561561
}
562562
}

dom/base/nsDOMAttributeMap.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ class nsAttrHashKey : public PLDHashEntryHdr {
6060
typedef const nsAttrKey* KeyTypePointer;
6161

6262
explicit nsAttrHashKey(KeyTypePointer aKey) : mKey(*aKey) {}
63-
nsAttrHashKey(const nsAttrHashKey& aCopy)
64-
: PLDHashEntryHdr{}, mKey(aCopy.mKey) {}
63+
nsAttrHashKey(const nsAttrHashKey& aCopy) : mKey(aCopy.mKey) {}
6564
~nsAttrHashKey() {}
6665

6766
KeyType GetKey() const { return mKey; }

0 commit comments

Comments
 (0)