Skip to content
Permalink
Browse files

Bug 1136378 - Use a browser's outerWindowId property rather than a CP…

…OW to identify marionette's content listeners.;r=mconley
  • Loading branch information...
rmottola committed Aug 20, 2019
1 parent 8b2f433 commit 0c7174cc06cd4ec89ecf7005a2e9197d50663d34
Showing with 5 additions and 10 deletions.
  1. +5 −10 testing/marionette/marionette-server.js
@@ -1454,16 +1454,11 @@ MarionetteServerConnection.prototype = {
return this._browserIds.get(permKey);
}

let contentWindow = browser.contentWindowAsCPOW;
if (contentWindow !== null && !Cu.isDeadWrapper(contentWindow)) {
let winId = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils)
.outerWindowID;
if (winId) {
winId += "";
this._browserIds.set(permKey, winId);
return winId;
}
let winId = browser.outerWindowID;
if (winId) {
winId += "";
this._browserIds.set(permKey, winId);
return winId;
}
return null;
},

0 comments on commit 0c7174c

Please sign in to comment.
You can’t perform that action at this time.