Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(firefox): expose internal request cause along with external one (#2383)

Browse source
This commit is contained in:
Andrey Lushnikov 2020-05-28 09:23:14 -07:00 committed by GitHub
parent 3f97a9fb69
commit 0ed052f9e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/firefox/BUILD_NUMBER
View file

@ -1 +1 @@
1097 1098

11
browser_patches/firefox/patches/bootstrap.diff
View file

@ -1466,10 +1466,10 @@ index 0000000000000000000000000000000000000000..2b1fe7fa712ae210af3ebbccda084041
+ +
diff --git a/juggler/NetworkObserver.js b/juggler/NetworkObserver.js diff --git a/juggler/NetworkObserver.js b/juggler/NetworkObserver.js
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..f803071bea317e4d3ce7341573622f6bddaaf547 index 0000000000000000000000000000000000000000..5a9c3232769729fc127c43b24e88713042e577c3
--- /dev/null --- /dev/null
+++ b/juggler/NetworkObserver.js +++ b/juggler/NetworkObserver.js
@@ -0,0 +1,794 @@ @@ -0,0 +1,796 @@
+"use strict"; +"use strict";
+ +
+const {EventEmitter} = ChromeUtils.import('resource://gre/modules/EventEmitter.jsm'); +const {EventEmitter} = ChromeUtils.import('resource://gre/modules/EventEmitter.jsm');
@ -1843,6 +1843,7 @@ index 0000000000000000000000000000000000000000..f803071bea317e4d3ce7341573622f6b
+ if (!pageNetwork) + if (!pageNetwork)
+ return; + return;
+ const causeType = httpChannel.loadInfo ? httpChannel.loadInfo.externalContentPolicyType : Ci.nsIContentPolicy.TYPE_OTHER; + const causeType = httpChannel.loadInfo ? httpChannel.loadInfo.externalContentPolicyType : Ci.nsIContentPolicy.TYPE_OTHER;
+ const internalCauseType = httpChannel.loadInfo ? httpChannel.loadInfo.internalContentPolicyType : Ci.nsIContentPolicy.TYPE_OTHER;
+ const requestId = this._requestId(httpChannel); + const requestId = this._requestId(httpChannel);
+ const redirectedFrom = this._redirectMap.get(requestId); + const redirectedFrom = this._redirectMap.get(requestId);
+ this._redirectMap.delete(requestId); + this._redirectMap.delete(requestId);
@ -1856,6 +1857,7 @@ index 0000000000000000000000000000000000000000..f803071bea317e4d3ce7341573622f6b
+ method: httpChannel.requestMethod, + method: httpChannel.requestMethod,
+ navigationId: httpChannel.isMainDocumentChannel ? this._requestIdBeforeAuthentication(httpChannel) || this._requestId(httpChannel) : undefined, + navigationId: httpChannel.isMainDocumentChannel ? this._requestIdBeforeAuthentication(httpChannel) || this._requestId(httpChannel) : undefined,
+ cause: causeTypeToString(causeType), + cause: causeTypeToString(causeType),
+ internalCause: causeTypeToString(internalCauseType),
+ }); + });
+ } + }
+ +
@ -6822,10 +6824,10 @@ index 0000000000000000000000000000000000000000..78b6601b91d0b7fcda61114e6846aa07
+this.EXPORTED_SYMBOLS = ['t', 'checkScheme']; +this.EXPORTED_SYMBOLS = ['t', 'checkScheme'];
diff --git a/juggler/protocol/Protocol.js b/juggler/protocol/Protocol.js diff --git a/juggler/protocol/Protocol.js b/juggler/protocol/Protocol.js
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..e6bb9a8d5b553531a2ee22e27e693dd0569bda22 index 0000000000000000000000000000000000000000..71649c3462f82d8b327b5913570612a3d99495b8
--- /dev/null --- /dev/null
+++ b/juggler/protocol/Protocol.js +++ b/juggler/protocol/Protocol.js
@@ -0,0 +1,845 @@ @@ -0,0 +1,846 @@
+const {t, checkScheme} = ChromeUtils.import('chrome://juggler/content/protocol/PrimitiveTypes.js'); +const {t, checkScheme} = ChromeUtils.import('chrome://juggler/content/protocol/PrimitiveTypes.js');
+ +
+// Protocol-specific types. +// Protocol-specific types.
@ -7231,6 +7233,7 @@ index 0000000000000000000000000000000000000000..e6bb9a8d5b553531a2ee22e27e693dd0
+ method: t.String, + method: t.String,
+ navigationId: t.Optional(t.String), + navigationId: t.Optional(t.String),
+ cause: t.String, + cause: t.String,
+ internalCause: t.String,
+ }, + },
+ 'responseReceived': { + 'responseReceived': {
+ securityDetails: t.Nullable(networkTypes.SecurityDetails), + securityDetails: t.Nullable(networkTypes.SecurityDetails),