Changeset 9455 in webkit for trunk/JavaScriptCore/kjs/function.cpp

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/function.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -238 +238 @@
 }
 
-bool FunctionImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
+bool FunctionImp::hasProperty(ExecState *exec, const Identifier &propertyName) const
 {
     if (propertyName == argumentsPropertyName || propertyName == lengthPropertyName)
         return true;
-    return InternalFunctionImp::hasOwnProperty(exec, propertyName);
+    return InternalFunctionImp::hasProperty(exec, propertyName);
 }
 
@@ -358 +358 @@
 }
 
-bool ActivationImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
+bool ActivationImp::hasProperty(ExecState *exec, const Identifier &propertyName) const
 {
     if (propertyName == argumentsPropertyName)
         return true;
-    return ObjectImp::hasOwnProperty(exec, propertyName);
+    return ObjectImp::hasProperty(exec, propertyName);
 }