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

browser(firefox): fix bug in Juggler with clashing method names (#1456)

Browse source
This commit is contained in:
Andrey Lushnikov 2020-03-20 19:35:58 -07:00 committed by GitHub
parent e210e5601c
commit 96c9c81581
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 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 @@
1045 1046

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

@ -2698,7 +2698,7 @@ index 0000000000000000000000000000000000000000..be70ea364f9534bb3b344f64970366c3
+ +
diff --git a/juggler/content/PageAgent.js b/juggler/content/PageAgent.js diff --git a/juggler/content/PageAgent.js b/juggler/content/PageAgent.js
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..17ddd1ac290baf820bd9aa1b6aaf629f6627dc65 index 0000000000000000000000000000000000000000..fb207d8b39bee7c1365428a171f80c438097d2bb
--- /dev/null --- /dev/null
+++ b/juggler/content/PageAgent.js +++ b/juggler/content/PageAgent.js
@@ -0,0 +1,945 @@ @@ -0,0 +1,945 @@
@ -3316,7 +3316,7 @@ index 0000000000000000000000000000000000000000..17ddd1ac290baf820bd9aa1b6aaf629f
+ if (!unsafeObject.isConnected) + if (!unsafeObject.isConnected)
+ throw new Error('Node is detached from document'); + throw new Error('Node is detached from document');
+ await this._scrollNodeIntoViewIfNeeded(unsafeObject); + await this._scrollNodeIntoViewIfNeeded(unsafeObject);
+ const box = this._getBoundingBox(unsafeObject); + const box = this._getNodeBoundingBox(unsafeObject);
+ if (rect) { + if (rect) {
+ box.x += rect.x; + box.x += rect.x;
+ box.y += rect.y; + box.y += rect.y;
@ -3350,7 +3350,7 @@ index 0000000000000000000000000000000000000000..17ddd1ac290baf820bd9aa1b6aaf629f
+ // TODO: implement. + // TODO: implement.
+ } + }
+ +
+ _getBoundingBox(unsafeObject) { + _getNodeBoundingBox(unsafeObject) {
+ if (!unsafeObject.getBoxQuads) + if (!unsafeObject.getBoxQuads)
+ throw new Error('RemoteObject is not a node'); + throw new Error('RemoteObject is not a node');
+ const quads = unsafeObject.getBoxQuads({relativeTo: this._frameTree.mainFrame().domWindow().document}); + const quads = unsafeObject.getBoxQuads({relativeTo: this._frameTree.mainFrame().domWindow().document});
@ -3375,7 +3375,7 @@ index 0000000000000000000000000000000000000000..17ddd1ac290baf820bd9aa1b6aaf629f
+ if (!frame) + if (!frame)
+ throw new Error('Failed to find frame with id = ' + frameId); + throw new Error('Failed to find frame with id = ' + frameId);
+ const unsafeObject = this._frameData.get(frame).unsafeObject(objectId); + const unsafeObject = this._frameData.get(frame).unsafeObject(objectId);
+ const box = this._getBoundingBox(unsafeObject); + const box = this._getNodeBoundingBox(unsafeObject);
+ if (!box) + if (!box)
+ return {boundingBox: null}; + return {boundingBox: null};
+ return {boundingBox: {x: box.x + frame.domWindow().scrollX, y: box.y + frame.domWindow().scrollY, width: box.width, height: box.height}}; + return {boundingBox: {x: box.x + frame.domWindow().scrollX, y: box.y + frame.domWindow().scrollY, width: box.width, height: box.height}};