Changeset 9582 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Jul 3, 2005, 3:47:58 AM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Original patch from Mark Rowe <​[email protected]>, reviewed by me.
Fixes to patch by me, reviewed by John Sullivan.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3293

Test cases added:

• tests/mozilla/expected.html: Two tests newly pass.

• 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/lookup.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:

Original patch from Mark Rowe <​[email protected]>, reviewed by me.
Fixes to patch by me, reviewed by John Sullivan.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3293

Test cases added:

• layout-tests/fast/js/has-own-property.html: Added - tests this change.
• layout-tests/fast/js/eval-var-decl.html: Added - test depends on this change.

• khtml/ecma/kjs_css.cpp: (KJS::DOMCSSStyleDeclaration::hasOwnProperty):
• khtml/ecma/kjs_css.h:
• khtml/ecma/kjs_dom.cpp: (KJS::DOMNodeList::hasOwnProperty): (KJS::DOMElement::tryGet): (KJS::DOMNamedNodeMap::hasOwnProperty):
• khtml/ecma/kjs_dom.h:
• khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::hasOwnProperty): (KJS::HTMLDocument::tryGet): (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.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -283 +283 @@
 bool ObjectImp::hasProperty(ExecState *exec, const Identifier &propertyName) const
 {
+  if (hasOwnProperty(exec, propertyName))
+    return true;
+
+  if (_proto->dispatchType() != ObjectType) {
+    return false;
+  }
+
+  // Look in the prototype
+  return static_cast<ObjectImp *>(_proto)->hasProperty(exec, propertyName);
+}
+
+bool ObjectImp::hasProperty(ExecState *exec, unsigned propertyName) const
+{
+    if (hasOwnProperty(exec, propertyName))
+      return true;
+
+    if (_proto->dispatchType() != ObjectType) {
+      return false;
+    }
+
+    // Look in the prototype
+    return static_cast<ObjectImp *>(_proto)->hasProperty(exec, propertyName);
+}
+
+bool ObjectImp::hasOwnProperty(ExecState *exec, const Identifier &propertyName) const
+{
   if (_prop.get(propertyName))
     return true;
@@ -288 +314 @@
   // Look in the static hashtable of properties
   if (findPropertyHashEntry(propertyName))
-      return true;
+    return true;
 
   // non-standard netscape extension
@@ -294 +320 @@
     return true;
 
-  if (_proto->dispatchType() != ObjectType) {
-    return false;
-  }
-
-  // Look in the prototype
-  return static_cast<ObjectImp *>(_proto)->hasProperty(exec, propertyName);
-}
-
-bool ObjectImp::hasProperty(ExecState *exec, unsigned propertyName) const
-{
-  return hasProperty(exec, Identifier::from(propertyName));
-}
+  return false;
+}
+
+bool ObjectImp::hasOwnProperty(ExecState *exec, unsigned propertyName) const
+{
+  return hasOwnProperty(exec, Identifier::from(propertyName));
+}
+
 
 // ECMA 8.6.2.5