fixed is_satisfied condition

servo · Mar 29, 2020 · d8c1dc6 · d8c1dc6
1 parent fa8afbb
commit d8c1dc6
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2976,22 +2976,24 @@ def definition_body(self):
                 ret_conditions = 'vec![' + ",".join(conditions) + "]"
                 ret += fill(
                     """
+                    let incumbent_global = GlobalScope::incumbent().expect("no incumbent global");
+                    let global = incumbent_global.reflector().get_jsobject();
                     let conditions = ${conditions};
-                    if !conditions.iter().any(|c|
+                    let is_satisfied = conditions.iter().any(|c|
                          c.is_satisfied(
                            SafeJSContext::from_ptr(cx),
                            HandleObject::from_raw(obj),
-                           HandleObject::from_raw(obj))) {
-                      return false;
-                    }
-                    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;
+                           global));
+                    if is_satisfied {
+                      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), conditions=ret_conditions)