aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/codegen/CodegenRust.py
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-08-20 17:27:14 -0400
committerGitHub <noreply@github.com>2019-08-20 17:27:14 -0400
commit4275420a562cd7c936010a791138554ea2a33fe9 (patch)
tree6a59fa8d40f4131f142f5bf4f16104b81d60f4cd /components/script/dom/bindings/codegen/CodegenRust.py
parent17f423723c0206c934f104eb3352f39a9533aa41 (diff)
parentbf70decdd308f24bfe58cebb8f529fbc9cd22001 (diff)
downloadservo-4275420a562cd7c936010a791138554ea2a33fe9.tar.gz
servo-4275420a562cd7c936010a791138554ea2a33fe9.zip
Auto merge of #23844 - saschanaz:tojson, r=Manishearth
Support default toJSON in WebIDL <!-- Please describe your changes on the following line: --> Ported related lines from gecko. --- <!-- 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 #22781 <!-- Either: --> - [x] There are tests for these changes <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/23844) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
-rw-r--r--components/script/dom/bindings/codegen/CodegenRust.py89
1 files changed, 87 insertions, 2 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 4bea65388b6..93856508e6e 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2881,6 +2881,42 @@ class PropertyArrays():
return define
+class CGCollectJSONAttributesMethod(CGAbstractMethod):
+ """
+ Generate the CollectJSONAttributes method for an interface descriptor
+ """
+ def __init__(self, descriptor, toJSONMethod):
+ args = [Argument('SafeJSContext', 'cx'),
+ Argument('HandleObject', 'obj'),
+ Argument('*const %s' % descriptor.concreteType, 'this'),
+ Argument('&RootedGuard<*mut JSObject>', 'result')]
+ CGAbstractMethod.__init__(self, descriptor, 'CollectJSONAttributes',
+ 'bool', args, pub=True, unsafe=True)
+ self.toJSONMethod = toJSONMethod
+
+ def definition_body(self):
+ ret = ''
+ interface = self.descriptor.interface
+ for m in interface.members:
+ if m.isAttr() and not m.isStatic() and m.type.isJSONType():
+ name = m.identifier.name
+ ret += fill(
+ """
+ rooted!(in(*cx) let mut temp = UndefinedValue());
+ if !get_${name}(cx, obj, this, JSJitGetterCallArgs { _base: temp.handle_mut().into() }) {
+ return false;
+ }
+ if !JS_DefineProperty(*cx, result.handle().into(),
+ ${nameAsArray} as *const u8 as *const libc::c_char,
+ temp.handle(), JSPROP_ENUMERATE as u32) {
+ return false;
+ }
+ """,
+ name=name, nameAsArray=str_to_const_array(name))
+ ret += 'return true;\n'
+ return CGGeneric(ret)
+
+
class CGCreateInterfaceObjectsMethod(CGAbstractMethod):
"""
Generate the CreateInterfaceObjects method for an interface descriptor.
@@ -3619,6 +3655,42 @@ class CGSpecializedMethod(CGAbstractExternMethod):
return MakeNativeName(nativeName)
+class CGDefaultToJSONMethod(CGSpecializedMethod):
+ def __init__(self, descriptor, method):
+ assert method.isDefaultToJSON()
+ CGSpecializedMethod.__init__(self, descriptor, method)
+
+ def definition_body(self):
+ ret = dedent("""
+ rooted!(in(*cx) let result = JS_NewPlainObject(*cx));
+ if result.is_null() {
+ return false;
+ }
+ """)
+
+ jsonDescriptors = [self.descriptor]
+ interface = self.descriptor.interface.parent
+ while interface:
+ descriptor = self.descriptor.getDescriptor(interface.identifier.name)
+ if descriptor.hasDefaultToJSON:
+ jsonDescriptors.append(descriptor)
+ interface = interface.parent
+
+ form = """
+ if !${parentclass}CollectJSONAttributes(cx, _obj, this, &result) {
+ return false;
+ }
+ """
+
+ # Iterate the array in reverse: oldest ancestor first
+ for descriptor in jsonDescriptors[:0:-1]:
+ ret += fill(form, parentclass=toBindingNamespace(descriptor.name) + "::")
+ ret += fill(form, parentclass="")
+ ret += ('(*args).rval().set(ObjectValue(*result));\n'
+ 'return true;\n')
+ return CGGeneric(ret)
+
+
class CGStaticMethod(CGAbstractStaticBindingMethod):
"""
A class for generating the Rust code for an IDL static method.
@@ -5665,7 +5737,8 @@ class CGInterfaceTrait(CGThing):
for m in descriptor.interface.members:
if (m.isMethod() and not m.isStatic() and
not m.isMaplikeOrSetlikeOrIterableMethod() and
- (not m.isIdentifierLess() or m.isStringifier())):
+ (not m.isIdentifierLess() or m.isStringifier()) and
+ not m.isDefaultToJSON()):
name = CGSpecializedMethod.makeNativeName(descriptor, m)
infallible = 'infallible' in descriptor.getExtendedAttributes(m)
for idx, (rettype, arguments) in enumerate(m.signatures()):
@@ -5856,7 +5929,9 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
'js::jsapi::JS_HasProperty',
'js::jsapi::JS_HasPropertyById',
'js::rust::wrappers::JS_InitializePropertiesFromCompatibleNativeObject',
+ 'js::jsapi::JS_NewPlainObject',
'js::jsapi::JS_NewObject',
+ 'js::rust::RootedGuard',
'js::rust::wrappers::JS_NewObjectWithGivenProto',
'js::rust::wrappers::JS_NewObjectWithoutMetadata',
'js::rust::wrappers::ObjectIsDate',
@@ -6055,6 +6130,7 @@ class CGDescriptor(CGThing):
cgThings = []
+ defaultToJSONMethod = None
unscopableNames = []
for m in descriptor.interface.members:
if (m.isMethod() and
@@ -6062,7 +6138,9 @@ class CGDescriptor(CGThing):
if m.getExtendedAttribute("Unscopable"):
assert not m.isStatic()
unscopableNames.append(m.identifier.name)
- if m.isStatic():
+ if m.isDefaultToJSON():
+ defaultToJSONMethod = m
+ elif m.isStatic():
assert descriptor.interface.hasInterfaceObject()
cgThings.append(CGStaticMethod(descriptor, m))
elif not descriptor.interface.isCallback():
@@ -6096,6 +6174,10 @@ class CGDescriptor(CGThing):
if (not m.isStatic() and not descriptor.interface.isCallback()):
cgThings.append(CGMemberJITInfo(descriptor, m))
+ if defaultToJSONMethod:
+ cgThings.append(CGDefaultToJSONMethod(descriptor, defaultToJSONMethod))
+ cgThings.append(CGMemberJITInfo(descriptor, defaultToJSONMethod))
+
if descriptor.concrete:
cgThings.append(CGClassFinalizeHook(descriptor))
cgThings.append(CGClassTraceHook(descriptor))
@@ -6113,6 +6195,9 @@ class CGDescriptor(CGThing):
properties = PropertyArrays(descriptor)
+ if defaultToJSONMethod:
+ cgThings.append(CGCollectJSONAttributesMethod(descriptor, defaultToJSONMethod))
+
if descriptor.concrete:
if descriptor.proxy:
# cgThings.append(CGProxyIsProxy(descriptor))