Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #3812 : mukilan/servo/lenient-this, r=Ms2ger

Browse source 
Closes issue #3760
This commit is contained in:
bors-servo 2014-10-25 11:42:38 -06:00
commit 7ba02bb11d
4 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2526,9 +2526,9 @@ class CGGenericGetter(CGAbstractBindingMethod):
if lenientThis: if lenientThis:
name = "genericLenientGetter" name = "genericLenientGetter"
unwrapFailureCode = ( unwrapFailureCode = (
"MOZ_ASSERT(!JS_IsExceptionPending(cx));\n" "assert!(JS_IsExceptionPending(cx) == 0);\n"
"JS_SET_RVAL(cx, vp, JS::UndefinedValue());\n" "*vp = UndefinedValue();\n"
"return true;") "return 1;")
else: else:
name = "genericGetter" name = "genericGetter"
unwrapFailureCode = None unwrapFailureCode = None
@ -2600,8 +2600,8 @@ class CGGenericSetter(CGAbstractBindingMethod):
if lenientThis: if lenientThis:
name = "genericLenientSetter" name = "genericLenientSetter"
unwrapFailureCode = ( unwrapFailureCode = (
"MOZ_ASSERT(!JS_IsExceptionPending(cx));\n" "assert!(JS_IsExceptionPending(cx) == 0);\n"
"return true;") "return 1;")
else: else:
name = "genericSetter" name = "genericSetter"
unwrapFailureCode = None unwrapFailureCode = None
@ -4136,11 +4136,11 @@ class CGDescriptor(CGThing):
if hasGetter: if hasGetter:
cgThings.append(CGGenericGetter(descriptor)) cgThings.append(CGGenericGetter(descriptor))
if hasLenientGetter: if hasLenientGetter:
pass cgThings.append(CGGenericGetter(descriptor, lenientThis=True))
if hasSetter: if hasSetter:
cgThings.append(CGGenericSetter(descriptor)) cgThings.append(CGGenericSetter(descriptor))
if hasLenientSetter: if hasLenientSetter:
pass cgThings.append(CGGenericSetter(descriptor, lenientThis=True))
if descriptor.concrete: if descriptor.concrete:
cgThings.append(CGClassFinalizeHook(descriptor)) cgThings.append(CGClassFinalizeHook(descriptor))

2
components/script/dom/webidls/Document.webidl
View file

@ -79,6 +79,6 @@ partial interface Document {
NodeList getElementsByName(DOMString elementName); NodeList getElementsByName(DOMString elementName);
// special event handler IDL attributes that only apply to Document objects // special event handler IDL attributes that only apply to Document objects
/*[LenientThis]*/ attribute EventHandler onreadystatechange; [LenientThis] attribute EventHandler onreadystatechange;
}; };
Document implements GlobalEventHandlers; Document implements GlobalEventHandlers;

28
tests/content/test_lenient_this.html Normal file
View file

@ -0,0 +1,28 @@
<html>
<head>
<script src="harness.js"></script>
<script>
var handler = function () { };
document.onreadystatechange = handler;
var obj = {};
// test1: basic test
{
var val = Object.getOwnPropertyDescriptor(Document.prototype, "onreadystatechange").get.call(document);
is(val, handler, "test1-0, basic test");
}
// test2: Should not throw for attribute marked "[LenientThis]"
{
should_not_throw(function () {
var val = null;
val = Object.getOwnPropertyDescriptor(Document.prototype, "onreadystatechange").get.call(obj);
is(val, undefined, "test2-0, calling getter returns undefined");
is(Document.prototype.onreadystatechange, undefined, "test2-1, property access returns undefined");
});
}
finish();
</script>
</head>
</html>

3
tests/wpt/metadata/html/dom/interfaces.html.ini
View file

@ -234,6 +234,9 @@
[Document interface: attribute onratechange] [Document interface: attribute onratechange]
expected: FAIL expected: FAIL
[Document interface: attribute onreadystatechange]
expected: FAIL
[Document interface: attribute onreset] [Document interface: attribute onreset]
expected: FAIL expected: FAIL