mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 810517 - Check for valid listenerWindow, r=mdas
This commit is contained in:
parent
333e195e54
commit
93fe1c72cb
@ -1655,13 +1655,15 @@ MarionetteDriverActor.prototype = {
|
|||||||
.getInterface(Ci.nsIDOMWindowUtils)
|
.getInterface(Ci.nsIDOMWindowUtils)
|
||||||
.getOuterWindowWithId(message.json.value);
|
.getOuterWindowWithId(message.json.value);
|
||||||
|
|
||||||
if ((listenerWindow.location.href != message.json.href) &&
|
if (!listenerWindow || (listenerWindow.location.href != message.json.href) &&
|
||||||
(this.currentRemoteFrame !== null)) {
|
(this.currentRemoteFrame !== null)) {
|
||||||
// If there is a mismatch between the calculated href and the one
|
// The outerWindowID from an OOP frame will not be meaningful to
|
||||||
// sent from the frame script, it means that the frame script is
|
// the parent process here, since each process maintains its own
|
||||||
// running in a separate process. Currently this only happens
|
// independent window list. So, it will either be null (!listenerWindow)
|
||||||
|
// or it will point to some random window, which will hopefully
|
||||||
|
// cause an href mistmach. Currently this only happens
|
||||||
// in B2G for OOP frames registered in Marionette:switchToFrame, so
|
// in B2G for OOP frames registered in Marionette:switchToFrame, so
|
||||||
// we'll acknowledge the switchToFrame message here.
|
// we'll acknowledge the switchToFrame message here.
|
||||||
// XXX: Should have a better way of determining that this message
|
// XXX: Should have a better way of determining that this message
|
||||||
// is from a remote frame.
|
// is from a remote frame.
|
||||||
this.sendOk();
|
this.sendOk();
|
||||||
|
Loading…
Reference in New Issue
Block a user