diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-04-25 05:42:41 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-04-25 05:42:41 -0500 |
commit | 1f9de5ee2ce4dc039b01e575d60a4fee41a0b8b8 (patch) | |
tree | 95be5bec7ab69ff862c8e38429f91f579ae13a1b /components/script/dom/bindings/codegen/CodegenRust.py | |
parent | f010c8331304dcdd40f40fe844087399078532d0 (diff) | |
parent | 31a26fa384a676d896e1d924b938037016b07c91 (diff) | |
download | servo-1f9de5ee2ce4dc039b01e575d60a4fee41a0b8b8.tar.gz servo-1f9de5ee2ce4dc039b01e575d60a4fee41a0b8b8.zip |
Auto merge of #5779 - nox:css-escape, r=Ms2ger
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5779)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index aab81fa2ca3..1ef3cc0b810 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2616,7 +2616,11 @@ class CGAbstractStaticBindingMethod(CGAbstractMethod): CGAbstractMethod.__init__(self, descriptor, name, "JSBool", args, extern=True) def definition_body(self): - return self.generate_code() + preamble = CGGeneric("""\ +let global = global_object_for_js_object(JS_CALLEE(cx, vp).to_object()); +let global = global.root(); +""") + return CGList([preamble, self.generate_code()]) def generate_code(self): assert False # Override me @@ -2674,7 +2678,7 @@ class CGStaticMethod(CGAbstractStaticBindingMethod): def generate_code(self): nativeName = CGSpecializedMethod.makeNativeName(self.descriptor, self.method) - return CGMethodCall([], nativeName, True, self.descriptor, self.method) + return CGMethodCall(["global.r()"], nativeName, True, self.descriptor, self.method) class CGGenericGetter(CGAbstractBindingMethod): @@ -2748,7 +2752,7 @@ class CGStaticGetter(CGAbstractStaticBindingMethod): def generate_code(self): nativeName = CGSpecializedGetter.makeNativeName(self.descriptor, self.attr) - return CGGetterCall([], self.attr.type, nativeName, self.descriptor, + return CGGetterCall(["global.r()"], self.attr.type, nativeName, self.descriptor, self.attr) @@ -2827,7 +2831,7 @@ class CGStaticSetter(CGAbstractStaticBindingMethod): " throw_type_error(cx, \"Not enough arguments to %s setter.\");\n" " return 0;\n" "}" % self.attr.identifier.name) - call = CGSetterCall([], self.attr.type, nativeName, self.descriptor, + call = CGSetterCall(["global.r()"], self.attr.type, nativeName, self.descriptor, self.attr) return CGList([checkForArg, call]) |