aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-09-22 01:36:25 -0500
committerGitHub <noreply@github.com>2016-09-22 01:36:25 -0500
commit73b296350927bad6d526cce21434ce68a75216fa (patch)
tree491e8ac7a7c80bf8bbcc0c7f0923a38b4aa4f308 /components/script/dom/bindings
parent614e9ca840baacfa427ec78db99258a83b75e135 (diff)
parent3488d15022802eb41572415a880d18d9abfaffb6 (diff)
downloadservo-73b296350927bad6d526cce21434ce68a75216fa.tar.gz
servo-73b296350927bad6d526cce21434ce68a75216fa.zip
Auto merge of #13333 - splav:JS-setters-fix#13327, r=jdm
fix JS IndexedGetter and NamedSetter bindings generation <!-- Please describe your changes on the following line: --> Fix JS IndexedGetter and NamedSetter bindings generation. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13327 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because the test will be in PR for #13129 as currently these setters are used by nobody. <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13333) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings')
-rw-r--r--components/script/dom/bindings/codegen/CodegenRust.py20
1 files changed, 7 insertions, 13 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index ca7901a56e3..7dc3e5eb3f0 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4842,13 +4842,12 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
" let this = UnwrapProxy(proxy);\n" +
" let this = &*this;\n" +
CGIndenter(CGProxyIndexedSetter(self.descriptor)).define() +
- " return true;\n" +
+ " return (*opresult).succeed();\n" +
"}\n")
elif self.descriptor.operations['IndexedGetter']:
set += ("if get_array_index_from_id(cx, id).is_some() {\n" +
- " return false;\n" +
- " //return ThrowErrorMessage(cx, MSG_NO_PROPERTY_SETTER, \"%s\");\n" +
- "}\n") % self.descriptor.name
+ " return (*opresult).failNoIndexedSetter();\n" +
+ "}\n")
namedSetter = self.descriptor.operations['NamedSetter']
if namedSetter:
@@ -4864,15 +4863,10 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod):
else:
set += ("if RUST_JSID_IS_STRING(id) {\n" +
CGIndenter(CGProxyNamedGetter(self.descriptor)).define() +
- " if (found) {\n"
- # TODO(Issue 5876)
- " //return js::IsInNonStrictPropertySet(cx)\n" +
- " // ? opresult.succeed()\n" +
- " // : ThrowErrorMessage(cx, MSG_NO_NAMED_SETTER, \"${name}\");\n" +
- " return (*opresult).succeed();\n" +
- " }\n" +
- " return (*opresult).succeed();\n"
- "}\n") % (self.descriptor.name, self.descriptor.name)
+ " if result.is_some() {\n"
+ " return (*opresult).failNoNamedSetter();\n"
+ " }\n"
+ "}\n")
set += "return proxyhandler::define_property(%s);" % ", ".join(a.name for a in self.args)
return set