diff options
author | bors-servo <metajack+bors@gmail.com> | 2014-10-25 11:42:38 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2014-10-25 11:42:38 -0600 |
commit | 7ba02bb11d2d9275949cb7522c5fcbc4ebcd23d1 (patch) | |
tree | 42c63c432f0c9ad2e41de10b2a77b0ecfecc8e37 /components/script | |
parent | 0c12f630e6352fc2aa00b638d014b2505f68af1f (diff) | |
parent | 75d41c2146ed9a453ce1f69d5e37b72e0e233493 (diff) | |
download | servo-7ba02bb11d2d9275949cb7522c5fcbc4ebcd23d1.tar.gz servo-7ba02bb11d2d9275949cb7522c5fcbc4ebcd23d1.zip |
auto merge of #3812 : mukilan/servo/lenient-this, r=Ms2ger
Closes issue #3760
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 14 | ||||
-rw-r--r-- | components/script/dom/webidls/Document.webidl | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index a6e4fcd6ebc..883b7448d61 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2526,9 +2526,9 @@ class CGGenericGetter(CGAbstractBindingMethod): if lenientThis: name = "genericLenientGetter" unwrapFailureCode = ( - "MOZ_ASSERT(!JS_IsExceptionPending(cx));\n" - "JS_SET_RVAL(cx, vp, JS::UndefinedValue());\n" - "return true;") + "assert!(JS_IsExceptionPending(cx) == 0);\n" + "*vp = UndefinedValue();\n" + "return 1;") else: name = "genericGetter" unwrapFailureCode = None @@ -2600,8 +2600,8 @@ class CGGenericSetter(CGAbstractBindingMethod): if lenientThis: name = "genericLenientSetter" unwrapFailureCode = ( - "MOZ_ASSERT(!JS_IsExceptionPending(cx));\n" - "return true;") + "assert!(JS_IsExceptionPending(cx) == 0);\n" + "return 1;") else: name = "genericSetter" unwrapFailureCode = None @@ -4136,11 +4136,11 @@ class CGDescriptor(CGThing): if hasGetter: cgThings.append(CGGenericGetter(descriptor)) if hasLenientGetter: - pass + cgThings.append(CGGenericGetter(descriptor, lenientThis=True)) if hasSetter: cgThings.append(CGGenericSetter(descriptor)) if hasLenientSetter: - pass + cgThings.append(CGGenericSetter(descriptor, lenientThis=True)) if descriptor.concrete: cgThings.append(CGClassFinalizeHook(descriptor)) diff --git a/components/script/dom/webidls/Document.webidl b/components/script/dom/webidls/Document.webidl index 9ca633a8ba4..111a37b9531 100644 --- a/components/script/dom/webidls/Document.webidl +++ b/components/script/dom/webidls/Document.webidl @@ -79,6 +79,6 @@ partial interface Document { NodeList getElementsByName(DOMString elementName); // special event handler IDL attributes that only apply to Document objects - /*[LenientThis]*/ attribute EventHandler onreadystatechange; + [LenientThis] attribute EventHandler onreadystatechange; }; Document implements GlobalEventHandlers; |