Changeset 98367 in webkit

Timestamp:

Oct 25, 2011, 11:51:49 AM (15 years ago)

Author:

mhahnenberg@apple.com

Message:

Add getOwnPropertySlot to MethodTable
​https://bugs.webkit.org/show_bug.cgi?id=69807

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

• JavaScriptCore.exp:
• runtime/ClassInfo.h: Added both versions of getOwnPropertySlot to the MethodTable.
• runtime/JSCell.h: Changed getOwnPropertySlot to be protected so other classes can

reference it in their MethodTables.

Source/WebCore:

No new tests.

• bridge/runtime_method.h: Changed getOwnPropertySlot to be protected so

subclasses can reference it in their MethodTables.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore/runtime/ClassInfo.h (modified) (2 diffs)
• JavaScriptCore/runtime/JSCell.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/runtime_method.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-10-25  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Add getOwnPropertySlot to MethodTable
+        https://bugs.webkit.org/show_bug.cgi?id=69807
+
+        Reviewed by Oliver Hunt.
+
+        * JavaScriptCore.exp:
+        * runtime/ClassInfo.h: Added both versions of getOwnPropertySlot to the MethodTable.
+        * runtime/JSCell.h: Changed getOwnPropertySlot to be protected so other classes can 
+        reference it in their MethodTables.
+
 2011-10-25  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.exp

@@ -118 +118 @@
 __ZN3JSC11JSByteArray10putByIndexEPNS_6JSCellEPNS_9ExecStateEjNS_7JSValueE
 __ZN3JSC11JSByteArray15createStructureERNS_12JSGlobalDataEPNS_14JSGlobalObjectENS_7JSValueEPKNS_9ClassInfoE
+__ZN3JSC11JSByteArray18getOwnPropertySlotEPNS_6JSCellEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
+__ZN3JSC11JSByteArray25getOwnPropertySlotByIndexEPNS_6JSCellEPNS_9ExecStateEjRNS_12PropertySlotE
 __ZN3JSC11JSByteArray3putEPNS_6JSCellEPNS_9ExecStateERKNS_10IdentifierENS_7JSValueERNS_15PutPropertySlotE
 __ZN3JSC11JSByteArray6s_infoE

trunk/Source/JavaScriptCore/runtime/ClassInfo.h

@@ -53 +53 @@
         typedef bool (*DeletePropertyByIndexFunctionPtr)(JSCell*, ExecState*, unsigned);
         DeletePropertyByIndexFunctionPtr deletePropertyByIndex;
+
+        typedef bool (*GetOwnPropertySlotFunctionPtr)(JSCell*, ExecState*, const Identifier&, PropertySlot&);
+        GetOwnPropertySlotFunctionPtr getOwnPropertySlot;
+
+        typedef bool (*GetOwnPropertySlotByIndexFunctionPtr)(JSCell*, ExecState*, unsigned, PropertySlot&);
+        GetOwnPropertySlotByIndexFunctionPtr getOwnPropertySlotByIndex;
     };
 
@@ -63 +69 @@
         &ClassName::deleteProperty, \
         &ClassName::deletePropertyByIndex, \
+        &ClassName::getOwnPropertySlot, \
+        &ClassName::getOwnPropertySlotByIndex, \
     }, \
     sizeof(ClassName)

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -133 +133 @@
         void finishCreation(JSGlobalData&, Structure*, CreatingEarlyCellTag);
 
-    private:
         // Base implementation; for non-object classes implements getPropertySlot.
         virtual bool getOwnPropertySlotVirtual(ExecState*, const Identifier& propertyName, PropertySlot&);
@@ -140 +139 @@
         static bool getOwnPropertySlotByIndex(JSCell*, ExecState*, unsigned propertyName, PropertySlot&);
         
+    private:
         WriteBarrier<Structure> m_structure;
     };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-25  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Add getOwnPropertySlot to MethodTable
+        https://bugs.webkit.org/show_bug.cgi?id=69807
+
+        Reviewed by Oliver Hunt.
+
+        No new tests.
+
+        * bridge/runtime_method.h: Changed getOwnPropertySlot to be protected so 
+        subclasses can reference it in their MethodTables.
+
 2011-10-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/bridge/runtime_method.h

@@ -65 +65 @@
     static CallType getCallData(JSCell*, CallData&);
 
+    virtual bool getOwnPropertySlotVirtual(ExecState*, const Identifier&, PropertySlot&);
+    static bool getOwnPropertySlot(JSCell*, ExecState*, const Identifier&, PropertySlot&);
+
 private:
     static JSValue lengthGetter(ExecState*, JSValue, const Identifier&);
-    virtual bool getOwnPropertySlotVirtual(ExecState*, const Identifier&, PropertySlot&);
-    static bool getOwnPropertySlot(JSCell*, ExecState*, const Identifier&, PropertySlot&);
     virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);