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

browser(firefox): a different way to emit 'load' event (#4080)

Browse source 
Using WebProgressListener events works in all cases. Currently
used `pageshow` event will stop being emitted in future when loading
was stopped with `window.stop()` api.

References #3995
This commit is contained in:
Andrey Lushnikov 2020-10-07 09:22:56 -07:00 committed by GitHub
parent aafe5dac0d
commit 3b4232864d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/firefox/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1184 1185
Changed: lushnikov@chromium.org Tue Oct 6 12:04:41 PDT 2020 Changed: lushnikov@chromium.org Wed Oct 7 08:45:05 PDT 2020

5
browser_patches/firefox/juggler/content/FrameTree.js
View file

@ -196,6 +196,7 @@ class FrameTree {
const isStart = flag & Ci.nsIWebProgressListener.STATE_START; const isStart = flag & Ci.nsIWebProgressListener.STATE_START;
const isTransferring = flag & Ci.nsIWebProgressListener.STATE_TRANSFERRING; const isTransferring = flag & Ci.nsIWebProgressListener.STATE_TRANSFERRING;
const isStop = flag & Ci.nsIWebProgressListener.STATE_STOP; const isStop = flag & Ci.nsIWebProgressListener.STATE_STOP;
const isDocument = flag & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT;
if (isStart) { if (isStart) {
// Starting a new navigation. // Starting a new navigation.
@ -225,6 +226,9 @@ class FrameTree {
if (frame === this._mainFrame && status !== Cr.NS_BINDING_ABORTED) if (frame === this._mainFrame && status !== Cr.NS_BINDING_ABORTED)
this.forcePageReady(); this.forcePageReady();
} }
if (isStop && isDocument)
this.emit(FrameTree.Events.Load, frame);
} }
onFrameLocationChange(progress, request, location, flags) { onFrameLocationChange(progress, request, location, flags) {
@ -303,6 +307,7 @@ FrameTree.Events = {
NavigationAborted: 'navigationaborted', NavigationAborted: 'navigationaborted',
SameDocumentNavigation: 'samedocumentnavigation', SameDocumentNavigation: 'samedocumentnavigation',
PageReady: 'pageready', PageReady: 'pageready',
Load: 'load',
}; };
class Frame { class Frame {

8
browser_patches/firefox/juggler/content/PageAgent.js
View file

@ -163,9 +163,9 @@ class PageAgent {
helper.addObserver(this._onWindowOpenInNewContext.bind(this), 'juggler-window-open-in-new-context'), helper.addObserver(this._onWindowOpenInNewContext.bind(this), 'juggler-window-open-in-new-context'),
helper.addObserver(this._filePickerShown.bind(this), 'juggler-file-picker-shown'), helper.addObserver(this._filePickerShown.bind(this), 'juggler-file-picker-shown'),
helper.addEventListener(this._messageManager, 'DOMContentLoaded', this._onDOMContentLoaded.bind(this)), helper.addEventListener(this._messageManager, 'DOMContentLoaded', this._onDOMContentLoaded.bind(this)),
helper.addEventListener(this._messageManager, 'pageshow', this._onLoad.bind(this)),
helper.addObserver(this._onDocumentOpenLoad.bind(this), 'juggler-document-open-loaded'), helper.addObserver(this._onDocumentOpenLoad.bind(this), 'juggler-document-open-loaded'),
helper.addEventListener(this._messageManager, 'error', this._onError.bind(this)), helper.addEventListener(this._messageManager, 'error', this._onError.bind(this)),
helper.on(this._frameTree, 'load', this._onLoad.bind(this)),
helper.on(this._frameTree, 'bindingcalled', this._onBindingCalled.bind(this)), helper.on(this._frameTree, 'bindingcalled', this._onBindingCalled.bind(this)),
helper.on(this._frameTree, 'frameattached', this._onFrameAttached.bind(this)), helper.on(this._frameTree, 'frameattached', this._onFrameAttached.bind(this)),
helper.on(this._frameTree, 'framedetached', this._onFrameDetached.bind(this)), helper.on(this._frameTree, 'framedetached', this._onFrameDetached.bind(this)),
@ -389,11 +389,7 @@ class PageAgent {
}); });
} }
_onLoad(event) { _onLoad(frame) {
const docShell = event.target.ownerGlobal.docShell;
const frame = this._frameTree.frameForDocShell(docShell);
if (!frame)
return;
this._browserPage.emit('pageEventFired', { this._browserPage.emit('pageEventFired', {
frameId: frame.id(), frameId: frame.id(),
name: 'load' name: 'load'