corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1580766 - Move BrowserId to nsFrameLoaderOwner, r=kmag

Browse Source 
This makes it easier to handle both <xul:browser> and <iframe mozbrowser>
frameloader swaps.

Depends on D56245

Differential Revision: https://phabricator.services.mozilla.com/D77911
This commit is contained in:
Kashav Madan
2020-06-08 21:58:47 +00:00
parent 20ed8e3608
commit 6946bdca21
6 changed files with 39 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docshell/base/BrowsingContext.cpp
View File

@@ -50,6 +50,7 @@
#include "nsGlobalWindowOuter.h"
#include "nsIObserverService.h"
#include "nsContentUtils.h"
#include "nsQueryObject.h"
#include "nsSandboxFlags.h"
#include "nsScriptError.h"
#include "nsThreadUtils.h"
@@ -487,27 +488,24 @@ void BrowsingContext::SetEmbedderElement(Element* aEmbedder) {
Transaction txn;
txn.SetEmbedderElementType(Some(aEmbedder->LocalName()));
if (RefPtr<XULFrameElement> xulFrame =
XULFrameElement::FromNode(aEmbedder)) {
// We don't care about browser Ids for chrome-type BrowsingContexts.
if (RefPtr<nsFrameLoaderOwner> owner = do_QueryObject(aEmbedder);
!IsChrome() && owner) {
uint64_t browserId = GetBrowserId();
uint64_t frameBrowserId = xulFrame->BrowserId();
uint64_t frameBrowserId = owner->GetBrowserId();
MOZ_DIAGNOSTIC_ASSERT(browserId != 0);
if (browserId != 0 && frameBrowserId == 0) {
if (frameBrowserId == 0) {
// We'll arrive here if we're a top-level BrowsingContext for a window
// or tab that was opened in a content process. There should be no
// children to update at this point. This Id was generated in
// ContentChild::ProvideWindowCommon.
MOZ_DIAGNOSTIC_ASSERT(IsTopContent());
MOZ_DIAGNOSTIC_ASSERT(Children().IsEmpty());
xulFrame->SetBrowserId(browserId);
} else if (browserId == 0 && frameBrowserId == 0) {
// We don't set a browser Id for chrome-type BrowsingContexts.
// XXX: Should we?
MOZ_DIAGNOSTIC_ASSERT(IsChrome());
owner->SetBrowserId(browserId);
} else {
// In any other scenario, we would've inherited or generated an Id in
// CreateBrowsingContext.
MOZ_DIAGNOSTIC_ASSERT(browserId != 0 && browserId == frameBrowserId);
// We would've inherited or generated an Id in CreateBrowsingContext.
MOZ_DIAGNOSTIC_ASSERT(browserId == frameBrowserId);
}
}
@@ -2403,7 +2401,7 @@ void BrowsingContext::DidSet(FieldIndex<IDX_HasSessionHistory>,
bool BrowsingContext::CanSet(FieldIndex<IDX_BrowserId>, const uint32_t& aValue,
ContentParent* aSource) {
// Should only be able to set if the ID is not already set.
return GetBrowserId() == 0 && Children().IsEmpty() && !GetParent();
return GetBrowserId() == 0 && IsTop() && Children().IsEmpty();
}
} // namespace dom