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

Timestamp:

Jun 21, 2005, 5:48:49 PM (20 years ago)

Author:

adele

Message:

JavaScriptCore:

rolling out fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3293, since it caused layout test failures.
fast/forms/element-by-name
fast/loader/loadInProgress

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

WebCore:

rolling out fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3293, since it caused layout test failures.
fast/forms/element-by-name
fast/loader/loadInProgress

• ChangeLog:
• khtml/ecma/kjs_binding.h:
• khtml/ecma/kjs_css.cpp: (KJS::DOMCSSStyleDeclaration::hasProperty):
• khtml/ecma/kjs_css.h:
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNodeList::hasProperty): (KJS::DOMNamedNodeMap::hasProperty):
• khtml/ecma/kjs_dom.h:
• khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::hasProperty): (KJS::KJS::HTMLElement::hasProperty): (KJS::KJS::HTMLCollection::hasProperty):
• khtml/ecma/kjs_html.h:
• khtml/ecma/kjs_window.cpp: (KJS::Window::hasProperty): (KJS::Konqueror::hasProperty):
• khtml/ecma/kjs_window.h:
• layout-tests/fast/js/eval-var-decl-expected.txt: Removed. This test used hasOwnProperty
• layout-tests/fast/js/eval-var-decl.html: Removed. This test used hasOwnProperty
• layout-tests/fast/js/hasOwnProperty-expected.txt: Removed.
• layout-tests/fast/js/hasOwnProperty.html: Removed.

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.
      *
@@ -526 +514 @@
      * @see Object::hasProperty()
      */
-    bool hasProperty(ExecState *exec,
+    virtual bool hasProperty(ExecState *exec,
                              const Identifier &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;
+    virtual bool hasProperty(ExecState *exec, unsigned propertyName) const;
 
     /**
@@ -710 +694 @@
     { 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); }