Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 20:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 814022 (Make instanceof for new DOM bindings work across scopes). r=bz.

Browse Source
This commit is contained in:
Peter Van der Beken 2012-11-19 11:59:13 +01:00
parent 1536b03502
commit dd5db5a970
12 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js
View File

@ -350,10 +350,10 @@ function prepareVariables(aCallback)
is(globalScopeItem.expanded, false,
"The globalScope expanded getter should return false");
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebugger);
is(innerScopeItem.expanded, true,
"The innerScope expanded getter should return true");
@ -417,7 +417,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
locationItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(locationItem.expanded, true,
"The local scope 'this.window.document.location' should be expanded now");
@ -428,7 +428,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
documentItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(documentItem.expanded, true,
"The local scope 'this.window.document' should be expanded now");
@ -439,7 +439,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
windowItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(windowItem.expanded, true,
"The local scope 'this.window' should be expanded now");
@ -450,7 +450,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
thisItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(thisItem.expanded, true,
"The local scope 'this' should be expanded now");

16
browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js
View File

@ -312,10 +312,10 @@ function prepareVariables(aCallback)
is(globalScopeItem.expanded, false,
"The globalScope expanded getter should return false");
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebugger);
is(innerScopeItem.expanded, true,
"The innerScope expanded getter should return true");
@ -379,7 +379,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
locationItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(locationItem.expanded, true,
"The local scope 'this.window.document.location' should be expanded now");
@ -390,7 +390,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
documentItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(documentItem.expanded, true,
"The local scope 'this.window.document' should be expanded now");
@ -401,7 +401,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
windowItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(windowItem.expanded, true,
"The local scope 'this.window' should be expanded now");
@ -412,7 +412,7 @@ function prepareVariables(aCallback)
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
thisItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(thisItem.expanded, true,
"The local scope 'this' should be expanded now");

8
browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js
View File

@ -244,10 +244,10 @@ function prepareVariables(aCallback)
let globalScopeItem = gDebugger.DebuggerView.Variables._currHierarchy.get(
globalScope.querySelector(".name").getAttribute("value"));
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebugger);
executeSoon(function() {
aCallback();

8
browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js
View File

@ -204,10 +204,10 @@ function prepareVariables(aCallback)
let globalScopeItem = gDebugger.DebuggerView.Variables._currHierarchy.get(
globalScope.querySelector(".name").getAttribute("value"));
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebugger);
executeSoon(function() {
aCallback();

8
browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js
View File

@ -274,10 +274,10 @@ function prepareVariables(aCallback)
let globalScopeItem = gDebugger.DebuggerView.Variables._currHierarchy.get(
globalScope.querySelector(".name").getAttribute("value"));
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebugger);
executeSoon(function() {
aCallback();

18
browser/devtools/debugger/test/browser_dbg_propertyview-reexpand.js
View File

@ -147,10 +147,10 @@ function testVariablesExpand()
"The globalScope expanded getter should return false");
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebuggee);
EventUtils.sendMouseEvent({ type: "mousedown" }, mathScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, testScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, loadScope.querySelector(".arrow"), gDebugger);
EventUtils.sendMouseEvent({ type: "mousedown" }, globalScope.querySelector(".arrow"), gDebugger);
is(innerScope.querySelector(".arrow").hasAttribute("open"), true,
@ -327,7 +327,7 @@ function testVariablesExpand()
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
gDebugger.document.querySelector("#step-in"),
gDebugger.window);
gDebugger);
});
}}, 0);
}, false);
@ -335,7 +335,7 @@ function testVariablesExpand()
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
locationItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(locationItem.expanded, true,
"The local scope 'this.window.document.location' should be expanded now");
@ -346,7 +346,7 @@ function testVariablesExpand()
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
documentItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(documentItem.expanded, true,
"The local scope 'this.window.document' should be expanded now");
@ -357,7 +357,7 @@ function testVariablesExpand()
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
windowItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(windowItem.expanded, true,
"The local scope 'this.window' should be expanded now");
@ -368,7 +368,7 @@ function testVariablesExpand()
executeSoon(function() {
EventUtils.sendMouseEvent({ type: "mousedown" },
thisItem.target.querySelector(".arrow"),
gDebuggee.window);
gDebugger);
is(thisItem.expanded, true,
"The local scope 'this' should be expanded now");

2
browser/devtools/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js
View File

@ -35,7 +35,7 @@ function testErrorsAfterPageReload(aEvent) {
let button = content.document.querySelector("button").wrappedJSObject;
ok(button, "button found");
EventUtils.sendMouseEvent({type: "click"}, button, content);
EventUtils.sendMouseEvent({type: "click"}, button, content.wrappedJSObject);
}
var consoleObserver = {

2
browser/devtools/webconsole/test/browser_webconsole_view_source.js
View File

@ -20,7 +20,7 @@ function testViewSource(hud) {
ok(button, "we have the button on the page");
expectUncaughtException();
EventUtils.sendMouseEvent({ type: "click" }, button, content);
EventUtils.sendMouseEvent({ type: "click" }, button, XPCNativeWrapper.unwrap(content));
waitForSuccess({
name: "find the location node",

1
dom/bindings/Codegen.py
View File

@ -987,6 +987,7 @@ class CGClassHasInstanceHook(CGAbstractStaticMethod):
return false;
}
// FIXME Limit this to chrome by checking xpc::AccessCheck::isChrome(obj).
nsISupports* native =
nsContentUtils::XPConnect()->GetNativeOfWrapper(cx, instance);
nsCOMPtr<%s> qiResult = do_QueryInterface(native);

34
js/xpconnect/src/XPCJSID.cpp
View File

@ -10,6 +10,7 @@
#include "mozilla/dom/DOMJSClass.h"
#include "mozilla/dom/BindingUtils.h"
#include "mozilla/Attributes.h"
#include "XPCWrapper.h"
/***************************************************************************/
// nsJSID
@ -479,24 +480,27 @@ nsJSIID::HasInstance(nsIXPConnectWrappedNative *wrapper,
#endif
if (!MorphSlimWrapper(cx, obj))
return NS_ERROR_FAILURE;
}
} else {
JSObject* unsafeObj =
XPCWrapper::Unwrap(cx, obj, /* stopAtOuter = */ false);
JSObject* cur = unsafeObj ? unsafeObj : obj;
nsISupports *identity;
if (mozilla::dom::UnwrapDOMObjectToISupports(cur, identity)) {
nsCOMPtr<nsIClassInfo> ci = do_QueryInterface(identity);
if (!ci) {
// No classinfo means we're not implementing interfaces and all
return NS_OK;
}
nsISupports *identity;
if (mozilla::dom::UnwrapDOMObjectToISupports(obj, identity)) {
nsCOMPtr<nsIClassInfo> ci = do_QueryInterface(identity);
if (!ci) {
// No classinfo means we're not implementing interfaces and all
XPCCallContext ccx(JS_CALLER, cx);
AutoMarkingNativeSetPtr set(ccx);
set = XPCNativeSet::GetNewOrUsed(ccx, ci);
if (!set)
return NS_ERROR_FAILURE;
*bp = set->HasInterfaceWithAncestor(iid);
return NS_OK;
}
XPCCallContext ccx(JS_CALLER, cx);
AutoMarkingNativeSetPtr set(ccx);
set = XPCNativeSet::GetNewOrUsed(ccx, ci);
if (!set)
return NS_ERROR_FAILURE;
*bp = set->HasInterfaceWithAncestor(iid);
return NS_OK;
}
XPCWrappedNative* other_wrapper =

5
js/xpconnect/src/nsXPConnect.cpp
View File

@ -1383,8 +1383,11 @@ nsXPConnect::GetNativeOfWrapper(JSContext * aJSContext,
if (obj2)
return (nsISupports*)xpc_GetJSPrivate(obj2);
JSObject* unsafeObj =
XPCWrapper::Unwrap(aJSContext, aJSObj, /* stopAtOuter = */ false);
JSObject* cur = unsafeObj ? unsafeObj : aJSObj;
nsISupports* supports = nullptr;
mozilla::dom::UnwrapDOMObjectToISupports(aJSObj, supports);
mozilla::dom::UnwrapDOMObjectToISupports(cur, supports);
nsCOMPtr<nsISupports> canonical = do_QueryInterface(supports);
return canonical;
}

2
testing/mochitest/tests/SimpleTest/EventUtils.js
View File

@ -48,7 +48,7 @@ function sendMouseEvent(aEvent, aTarget, aWindow) {
aWindow = window;
}
if (!(aTarget instanceof Element)) {
if (!(aTarget instanceof aWindow.Element)) {
aTarget = aWindow.document.getElementById(aTarget);
}