Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1646582 - Pull the inner window id from the WindowGlobalParent, rather than passing it across PBrowser for updateForLocationChange. r=nika,Gijs

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D80131
This commit is contained in:
Matt Woodrow 2020-06-23 01:24:17 +00:00
parent f851c6be5b
commit 2ee0adfb0e
6 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/responsive/browser/tunnel.js
View File

@ -32,7 +32,6 @@ const SWAPPED_BROWSER_STATE = [
"_characterSet",
"_contentPrincipal",
"_isSyntheticDocument",
"_innerWindowID",
];
/**
@ -103,7 +102,6 @@ function tunnelToInnerBrowser(outer, inner) {
inner._documentContentType = outer._documentContentType;
inner._characterSet = outer._characterSet;
inner._isSyntheticDocument = outer._isSyntheticDocument;
inner._innerWindowID = outer._innerWindowID;
inner._remoteWebNavigation._currentURI =
outer._remoteWebNavigation._currentURI;
// mozbrowser elements do not support the `contentPrincipal` property.

2
dom/interfaces/base/nsIBrowser.idl
View File

@ -130,7 +130,6 @@ interface nsIBrowser : nsISupports
* @param aCSP the content security policy of the new document
* @param aReferrerInfo the referrer info of the new document
* @param aIsSynthetic whether or not the document is synthetic
* @param aInnerWindowID the inner window ID of the document
* @param aHasRequestContextID whether or not the the request context has a
* value (true) or null should be used (false)
* @param aRequestContextID the request context ID
@ -147,7 +146,6 @@ interface nsIBrowser : nsISupports
in nsIContentSecurityPolicy aCSP,
in nsIReferrerInfo aReferrerInfo,
in boolean aIsSynthetic,
in uint64_t aInnerWindowID,
in boolean aHasRequestContextID,
in uint64_t aRequestContextID,
in AString aContentType);

14
dom/ipc/BrowserChild.cpp
View File

@ -3747,20 +3747,6 @@ nsresult BrowserChild::PrepareProgressListenerData(
rv = aWebProgress->GetLoadType(&loadType);
NS_ENSURE_SUCCESS(rv, rv);
aWebProgressData->loadType() = loadType;
// The DOM Window ID getters here may throw if the inner or outer windows
// aren't created yet or are destroyed at the time we're making this call
// but that isn't fatal so ignore the exceptions here.
nsCOMPtr<mozIDOMWindowProxy> window;
rv = aWebProgress->GetDOMWindow(getter_AddRefs(window));
if (NS_SUCCEEDED(rv) && window) {
if (nsCOMPtr<nsPIDOMWindowOuter> outer =
nsPIDOMWindowOuter::From(window)) {
if (nsPIDOMWindowInner* inner = outer->GetCurrentInnerWindow()) {
aWebProgressData->innerDOMWindowID() = inner->WindowID();
}
}
}
}
nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);

1
dom/ipc/BrowserParent.cpp
View File

@ -2675,7 +2675,6 @@ mozilla::ipc::IPCResult BrowserParent::RecvOnLocationChange(
aLocationChangeData->contentPartitionedPrincipal(),
aLocationChangeData->csp(), aLocationChangeData->referrerInfo(),
aLocationChangeData->isSyntheticDocument(),
aWebProgressData->innerDOMWindowID(),
aLocationChangeData->requestContextID().isSome(),
aLocationChangeData->requestContextID().valueOr(0),
aLocationChangeData->contentType());

1
dom/ipc/PBrowser.ipdl
View File

@ -106,7 +106,6 @@ struct WebProgressData
bool isTopLevel;
bool isLoadingDocument;
uint32_t loadType;
uint64_t innerDOMWindowID;
};
struct RequestData

17
toolkit/content/widgets/browser-custom-element.js
View File

@ -230,8 +230,6 @@
this._fastFind = null;
this._innerWindowID = null;
this._lastSearchString = null;
this._remoteWebNavigation = null;
@ -583,17 +581,7 @@
}
get innerWindowID() {
if (this.isRemoteBrowser) {
return this._innerWindowID;
}
try {
return this.contentWindow.windowUtils.currentInnerWindowID;
} catch (e) {
if (e.result != Cr.NS_ERROR_NOT_AVAILABLE) {
throw e;
}
return null;
}
return this.browsingContext?.currentWindowGlobal?.innerWindowId || null;
}
get browsingContext() {
@ -1198,7 +1186,6 @@
aCSP,
aReferrerInfo,
aIsSynthetic,
aInnerWindowID,
aHaveRequestContextID,
aRequestContextID,
aContentType
@ -1221,7 +1208,6 @@
this._csp = aCSP;
this._referrerInfo = aReferrerInfo;
this._isSyntheticDocument = aIsSynthetic;
this._innerWindowID = aInnerWindowID;
this._contentRequestContextID = aHaveRequestContextID
? aRequestContextID
: null;
@ -1611,7 +1597,6 @@
"_contentPrincipal",
"_contentPartitionedPrincipal",
"_isSyntheticDocument",
"_innerWindowID",
]
);
}