nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1644349 - [remote] Remove usage of windowIdToFrameIdMap in the Network observer. r=remote-protocol-reviewers,maja_zf

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D82691
This commit is contained in:
Henrik Skupin 2020-07-08 19:55:45 +00:00
parent 84e027594f
commit 74a6bd97cd
1 changed files with 6 additions and 28 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

34
remote/observers/NetworkObserver.jsm
View file

@ -54,7 +54,6 @@ class NetworkObserver {
ChannelEventSinkFactory.getService().registerCollector(this);
this._redirectMap = new Map();
this._windowIdToFrameIdMap = new Map();
// Request interception state.
this._browserSuspendedChannels = new Map();
@ -237,7 +236,7 @@ class NetworkObserver {
isNavigationRequest: httpChannel.isMainDocumentChannel,
cause: causeType,
causeString: causeTypeToString(causeType),
frameId: this.frameId(httpChannel, causeType),
frameId: this.frameId(httpChannel),
// clients expect loaderId == requestId for document navigation
loaderId: [
Ci.nsIContentPolicy.TYPE_DOCUMENT,
@ -268,6 +267,7 @@ class NetworkObserver {
} catch (e) {
// remoteAddress is not defined for cached requests.
}
this.emit("response", httpChannel, {
requestId: requestId(httpChannel),
securityDetails: getSecurityDetails(httpChannel),
@ -280,7 +280,7 @@ class NetworkObserver {
statusText: httpChannel.responseStatusText,
cause: causeType,
causeString: causeTypeToString(causeType),
frameId: this.frameId(httpChannel, causeType),
frameId: this.frameId(httpChannel),
// clients expect loaderId == requestId for document navigation
loaderId: [
Ci.nsIContentPolicy.TYPE_DOCUMENT,
@ -348,32 +348,10 @@ class NetworkObserver {
/**
* Returns the frameId of the current httpChannel.
*
* Only Document and Subdocument requests contain a reference
* to the browsing context, and as such the id, which is used
* as frameId. To be able to send a frameId for resource requests
* a map has to be kept up-to-date to retrieve that id from the
* window id. Hereby window ids are unique for all requests
* belonging to the same frame, but differ between frames.
*/
frameId(httpChannel, causeType) {
const loadContext = getLoadContext(httpChannel);
const wrappedChannel = ChannelWrapper.get(httpChannel);
// Document requests indicate a fresh navigation cycle.
// As such cleanup all the old window id references.
if (causeType == Ci.nsIContentPolicy.TYPE_DOCUMENT) {
this._windowIdToFrameIdMap.clear();
}
let frameId = loadContext.id;
if (frameId) {
this._windowIdToFrameIdMap.set(wrappedChannel.windowId, frameId);
} else {
frameId = this._windowIdToFrameIdMap.get(wrappedChannel.windowId);
}
return frameId;
frameId(httpChannel) {
const loadInfo = httpChannel.loadInfo;
return loadInfo.frameBrowsingContext?.id || loadInfo.browsingContext.id;
}
}