Changeset 9441 in webkit for trunk/JavaScriptCore/kjs/object.h

Timestamp:

Jun 20, 2005, 2:59:39 PM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Patch from Mark Rowe <​[email protected]>, reviewed by me.

• fixed ​http://bugzilla.opendarwin.org/attachment.cgi?id=2483

Test cases added:

• tests/mozilla/expected.html: Updated for two fixed tests.
• also added a layout test

• bindings/objc/objc_runtime.h:
• bindings/objc/objc_runtime.mm: (ObjcFallbackObjectImp::hasOwnProperty):
• bindings/runtime_array.cpp: (RuntimeArrayImp::hasOwnProperty):
• bindings/runtime_array.h:
• bindings/runtime_object.cpp: (RuntimeObjectImp::hasOwnProperty):
• bindings/runtime_object.h:
• kjs/array_instance.h:
• kjs/array_object.cpp: (ArrayInstanceImp::hasOwnProperty):
• kjs/function.cpp: (KJS::FunctionImp::hasOwnProperty): (KJS::ActivationImp::hasOwnProperty):
• kjs/function.h:
• kjs/object.cpp: (KJS::ObjectImp::hasProperty): (KJS::ObjectImp::hasOwnProperty):
• kjs/object.h: (KJS::Object::hasOwnProperty):
• kjs/object_object.cpp: (ObjectPrototypeImp::ObjectPrototypeImp): (ObjectProtoFuncImp::call):
• kjs/object_object.h: (KJS::ObjectProtoFuncImp::):
• kjs/string_object.cpp: (StringInstanceImp::hasOwnProperty):
• kjs/string_object.h:

WebCore:

Patch from Mark Rowe <​[email protected]>, reviewed by me.

• fixed ​http://bugzilla.opendarwin.org/attachment.cgi?id=2483

Test cases added:

• layout-tests/fast/js/hasOwnProperty-expected.txt: Added.
• layout-tests/fast/js/hasOwnProperty.html: Added.
• also fixed two mozilla JS tests

• khtml/ecma/kjs_binding.h:
• khtml/ecma/kjs_css.cpp: (KJS::DOMCSSStyleDeclaration::hasOwnProperty):
• khtml/ecma/kjs_css.h:
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNodeList::hasOwnProperty): (KJS::DOMNamedNodeMap::hasOwnProperty):
• khtml/ecma/kjs_dom.h:
• khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::hasOwnProperty): (KJS::KJS::HTMLElement::hasOwnProperty): (KJS::KJS::HTMLCollection::hasOwnProperty):
• khtml/ecma/kjs_html.h:
• khtml/ecma/kjs_window.cpp: (KJS::Window::hasOwnProperty): (KJS::Konqueror::hasOwnProperty):
• khtml/ecma/kjs_window.h:

File:

• trunk/JavaScriptCore/kjs/object.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/object.h

@@ -183 +183 @@
 
     /**
+     * Checks to see whether the object has a property with the specified name.
+     *
+     * See ECMA 15.2.4.5
+     *
+     * @param exec The current execution state
+     * @param propertyName The name of the property to check for
+     * @return true if the object has the property, otherwise false
+     */
+    bool hasOwnProperty(ExecState *exec, const Identifier &propertyName) const;
+    bool hasOwnProperty(ExecState *exec, unsigned propertyName) const;
+
+    /**
      * Removes the specified property from the object.
      *
@@ -514 +526 @@
      * @see Object::hasProperty()
      */
-    virtual bool hasProperty(ExecState *exec,
+    bool hasProperty(ExecState *exec,
                              const Identifier &propertyName) const;
-    virtual bool hasProperty(ExecState *exec, unsigned propertyName) const;
+    bool hasProperty(ExecState *exec, unsigned propertyName) const;
+
+    virtual bool hasOwnProperty(ExecState *exec,
+                     const Identifier &propertyName) const;
+    virtual bool hasOwnProperty(ExecState *exec, unsigned propertyName) const;
 
     /**
@@ -694 +710 @@
     { return imp()->hasProperty(exec, propertyName); }
 
+  inline bool Object::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
+    { return imp()->hasOwnProperty(exec, propertyName); }
+
+  inline bool Object::hasOwnProperty(ExecState *exec, unsigned propertyName) const
+    { return imp()->hasOwnProperty(exec, propertyName); }
+
   inline bool Object::deleteProperty(ExecState *exec, const Identifier &propertyName)
     { return imp()->deleteProperty(exec,propertyName); }