wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 834266 - Use XPCNativeWrapper to compare elements, r=mdas

Browse Source
This commit is contained in:
Jonathan Griffin 2013-02-04 11:40:51 -08:00
parent de78f0320c
commit 619bdafc99
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/marionette/marionette-elements.js
View File

@ -97,8 +97,8 @@ ElementManager.prototype = {
if (!el) {
throw new ElementException("Element has not been seen before", 17, null);
}
el = el;
if (!(el.ownerDocument.isEqualNode(win.document))) {
// use XPCNativeWrapper to compare elements; see bug 834266
if (!(XPCNativeWrapper(el).ownerDocument == XPCNativeWrapper(win).document)) {
throw new ElementException("Stale element reference", 10, null);
}
return el;

11
testing/marionette/marionette-listener.js
View File

@ -1162,9 +1162,16 @@ function switchToFrame(msg) {
}
if (msg.json.element != undefined) {
if (elementManager.seenItems[msg.json.element] != undefined) {
let wantedFrame = elementManager.getKnownElement(msg.json.element, curWindow); //HTMLIFrameElement
let wantedFrame;
try {
wantedFrame = elementManager.getKnownElement(msg.json.element, curWindow); //HTMLIFrameElement
}
catch(e) {
sendError(e.message, e.code, e.stack, command_id);
}
for (let i = 0; i < frames.length; i++) {
if (frames[i].isEqualNode(wantedFrame)) {
// use XPCNativeWrapper to compare elements; see bug 834266
if (XPCNativeWrapper(frames[i]) == XPCNativeWrapper(wantedFrame)) {
curWindow = frames[i];
foundFrame = i;
}