Changeset 13150 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Mar 5, 2006, 7:58:15 PM (19 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Maciej.

• JSC support for the fix for <rdar://problem/4467143> JavaScript enumeration of HTML element properties skips DOM node properties

• kjs/lookup.h: (1) Added the KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE macro. The class definiton macro needs to know about the prototype's prototype so that the class constructor properly sets it. (2) Removed the KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT macro. The class implementation macro does not need to know about the prototype's prototype, since getOwnPropertySlot should only look in the current object's property map, and not its prototype's.

LayoutTests:

Reviewed by Maciej.

• Layout test for <rdar://problem/4467143> JavaScript enumeration of HTML element properties skips DOM node properties

• fast/dom/prototype-chain-expected.txt: Added.
• fast/dom/prototype-chain.html: Added.

WebCore:

Reviewed by Maciej.

• Second cut at fixing <rdar://problem/4467143> JavaScript enumeration of HTML element properties skips DOM node properties

The approach here is for prototypes, in their constructor methods,
to set their own prototypes, preserving the prototype
chain in cases of multiple levels of inheritance. (Previously, our
code assumed that a prototype never had a prototype of its own,
and always used an empty object as a prototype's prototype).

• bindings/scripts/CodeGeneratorJS.pm: Use the new DEFINE_PROTOTYPE_WITH_PROTOTYPE macro in place of the KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT macro.
• khtml/ecma/kjs_dom.cpp: Ditto.
• khtml/ecma/kjs_dom.h: Ditto.
• khtml/ecma/kjs_events.cpp: Ditto.

Touched these files to force a rebuild:

• bindings/js/JSDOMCore.cpp:
• bindings/js/JSDOMEvents.cpp:
• dom/Attr.idl:
• dom/CharacterData.idl:
• dom/DOMImplementation.idl:
• dom/DocumentType.idl:
• dom/Element.idl:
• dom/Entity.idl:
• dom/MutationEvent.idl:
• dom/Notation.idl:
• dom/ProcessingInstruction.idl:
• dom/Text.idl:
• dom/WheelEvent.idl:

File:

• trunk/JavaScriptCore/kjs/lookup.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/lookup.h

@@ -296 +296 @@
  * and use DOMNodeProto::self(exec) as prototype in the DOMNode constructor.
  * If the prototype has a "parent prototype", e.g. DOMElementProto falls back on DOMNodeProto,
- * then the last line will use IMPLEMENT_PROTOTYPE_WITH_PARENT, with DOMNodeProto as last argument.
+ * then the first line will use KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE, with DOMNodeProto as the second argument.
  */
 
@@ -306 +306 @@
 #endif
 
+// These macros assume that a prototype's only properties are functions
 #define KJS_DEFINE_PROTOTYPE(ClassProto) \
   class ClassProto : public KJS::JSObject { \
@@ -316 +317 @@
   protected: \
     ClassProto(KJS::ExecState *exec) \
-      : JSObject(exec->lexicalInterpreter()->builtinObjectPrototype()) { } \
+      : KJS::JSObject(exec->lexicalInterpreter()->builtinObjectPrototype()) { } \
     \
   };
 
-#define KJS_IMPLEMENT_PROTOTYPE(ClassName, ClassProto,ClassFunc) \
+#define KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(ClassProto, ClassProtoProto) \
+    class ClassProto : public KJS::JSObject { \
+        friend KJS::JSObject* KJS_GCC_ROOT_NS_HACK cacheGlobalObject<ClassProto>(KJS::ExecState* exec, const KJS::Identifier& propertyName); \
+    public: \
+        static KJS::JSObject* self(KJS::ExecState* exec); \
+        virtual const KJS::ClassInfo* classInfo() const { return &info; } \
+        static const KJS::ClassInfo info; \
+        bool getOwnPropertySlot(KJS::ExecState*, const KJS::Identifier&, KJS::PropertySlot&); \
+    protected: \
+        ClassProto(KJS::ExecState* exec) \
+            : KJS::JSObject(ClassProtoProto::self(exec)) { } \
+    \
+    };
+
+#define KJS_IMPLEMENT_PROTOTYPE(ClassName, ClassProto, ClassFunc) \
     const ClassInfo ClassProto::info = { ClassName, 0, &ClassProto##Table, 0 }; \
     JSObject *ClassProto::self(ExecState *exec) \
@@ -328 +343 @@
     bool ClassProto::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot) \
     { \
-      return getStaticFunctionSlot<ClassFunc,JSObject>(exec, &ClassProto##Table, this, propertyName, slot); \
-    }
-
-#define KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassName, ClassProto,ClassFunc,ParentProto)  \
-    const ClassInfo ClassProto::info = { ClassName, 0, &ClassProto##Table, 0 }; \
-    JSObject *ClassProto::self(ExecState *exec) \
-    { \
-        return ::cacheGlobalObject<ClassProto>(exec, "[[" ClassName ".prototype]]"); \
-    } \
-    bool ClassProto::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot) \
-    { \
-      if (getStaticFunctionSlot<ClassFunc,JSObject>(exec, &ClassProto##Table, this, propertyName, slot)) \
-          return true; \
-      return ParentProto::self(exec)->getOwnPropertySlot(exec, propertyName, slot); \
+      return getStaticFunctionSlot<ClassFunc, JSObject>(exec, &ClassProto##Table, this, propertyName, slot); \
     }