Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96405 => 96406)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-30 17:59:15 UTC (rev 96406)
@@ -1,3 +1,16 @@
+2011-09-30 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ Add getCallData to MethodTable in ClassInfo
+ https://bugs.webkit.org/show_bug.cgi?id=69024
+
+ Reviewed by Sam Weinig.
+
+ * _javascript_Core.exp:
+ * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
+ Added the getCallData to the MethodTable in the ClassInfo struct.
+ * runtime/ClassInfo.h:
+
2011-09-29 Yuqiang Xian <yuqiang.x...@intel.com>
Add op_call/op_constructor support to JSVALUE32_64 DFG JIT
Modified: trunk/Source/_javascript_Core/_javascript_Core.exp (96405 => 96406)
--- trunk/Source/_javascript_Core/_javascript_Core.exp 2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/_javascript_Core.exp 2011-09-30 17:59:15 UTC (rev 96406)
@@ -251,6 +251,7 @@
__ZN3JSC4Yarr11byteCompileERNS0_11YarrPatternEPN3WTF20BumpPointerAllocatorE
__ZN3JSC4Yarr9interpretEPNS0_15BytecodePatternERKNS_7UStringEjjPi
__ZN3JSC4callEPNS_9ExecStateENS_7JSValueENS_8CallTypeERKNS_8CallDataES2_RKNS_7ArgListE
+__ZN3JSC6JSCell11getCallDataEPS0_RNS_8CallDataE
__ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
__ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateEj
__ZN3JSC6JSCell16getConstructDataERNS_13ConstructDataE
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (96405 => 96406)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2011-09-30 17:59:15 UTC (rev 96406)
@@ -187,6 +187,7 @@
?functionName@DebuggerCallFrame@JSC@@QBEPBVUString@2@XZ
?get@Structure@JSC@@QAEIAAVJSGlobalData@2@ABVIdentifier@2@AAIAAPAVJSCell@2@@Z
?get@Structure@JSC@@QAEIAAVJSGlobalData@2@PAVStringImpl@WTF@@AAIAAPAVJSCell@2@@Z
+ ?getCallData@JSCell@JSC@@SA?AW4CallType@2@PAV12@AATCallData@2@@Z
?getCallDataVirtual@JSCell@JSC@@UAE?AW4CallType@2@AATCallData@2@@Z
?getConstructData@JSCell@JSC@@UAE?AW4ConstructType@2@AATConstructData@2@@Z
?getObject@JSCell@JSC@@QAEPAVJSObject@2@XZ
Modified: trunk/Source/_javascript_Core/runtime/ClassInfo.h (96405 => 96406)
--- trunk/Source/_javascript_Core/runtime/ClassInfo.h 2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/_javascript_Core/runtime/ClassInfo.h 2011-09-30 17:59:15 UTC (rev 96406)
@@ -33,10 +33,14 @@
struct MethodTable {
typedef void (*VisitChildrenFunctionPtr)(JSCell*, SlotVisitor&);
VisitChildrenFunctionPtr visitChildren;
+
+ typedef CallType (*GetCallDataFunctionPtr)(JSCell*, CallData&);
+ GetCallDataFunctionPtr getCallData;
};
#define CREATE_METHOD_TABLE(ClassName) { \
- &ClassName::visitChildren \
+ &ClassName::visitChildren, \
+ &ClassName::getCallData \
}
struct ClassInfo {
Modified: trunk/Source/WebCore/ChangeLog (96405 => 96406)
--- trunk/Source/WebCore/ChangeLog 2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/WebCore/ChangeLog 2011-09-30 17:59:15 UTC (rev 96406)
@@ -1,3 +1,19 @@
+2011-09-30 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ Add getCallData to MethodTable in ClassInfo
+ https://bugs.webkit.org/show_bug.cgi?id=69024
+
+ Reviewed by Sam Weinig.
+
+ No new tests.
+
+ * WebCore.exp.in:
+
+ Changed getCallData from private to protected to allow subclasses who
+ don't override getCallData themselves to reference it in their own
+ method tables when calling the CREATE_METHOD_TABLE macro.
+ * bridge/runtime_method.h:
+
2011-09-30 Ned Holbrook <nholbr...@apple.com>
Complex spaces with synthetic bold are too wide
Modified: trunk/Source/WebCore/WebCore.exp.in (96405 => 96406)
--- trunk/Source/WebCore/WebCore.exp.in 2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-09-30 17:59:15 UTC (rev 96406)
@@ -1645,6 +1645,7 @@
#endif
#if USE(PLUGIN_HOST_PROCESS)
+__ZN3JSC13RuntimeMethod11getCallDataEPNS_6JSCellERNS_8CallDataE
__ZN3JSC13RuntimeMethod14finishCreationERNS_12JSGlobalDataERKNS_10IdentifierE
__ZN3JSC13RuntimeMethod18getCallDataVirtualERNS_8CallDataE
__ZN3JSC13RuntimeMethod18getOwnPropertySlotEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
@@ -1652,6 +1653,7 @@
__ZN3JSC13RuntimeMethod6s_infoE
__ZN3JSC13RuntimeMethodC2EPNS_14JSGlobalObjectEPNS_9StructureERN3WTF6VectorIPNS_8Bindings6MethodELm0EEE
__ZN3JSC8Bindings10RootObjectD1Ev
+__ZN3JSC8Bindings13RuntimeObject11getCallDataEPNS_6JSCellERNS_8CallDataE
__ZN3JSC8Bindings13RuntimeObject14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
__ZN3JSC8Bindings13RuntimeObject14finishCreationEPNS_14JSGlobalObjectE
__ZN3JSC8Bindings13RuntimeObject16getConstructDataERNS_13ConstructDataE
Modified: trunk/Source/WebCore/bridge/runtime_method.h (96405 => 96406)
--- trunk/Source/WebCore/bridge/runtime_method.h 2011-09-30 17:26:14 UTC (rev 96405)
+++ trunk/Source/WebCore/bridge/runtime_method.h 2011-09-30 17:59:15 UTC (rev 96406)
@@ -62,13 +62,13 @@
RuntimeMethod(JSGlobalObject*, Structure*, Bindings::MethodList&);
void finishCreation(JSGlobalData&, const Identifier&);
static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InternalFunction::StructureFlags;
+ virtual CallType getCallDataVirtual(CallData&);
+ static CallType getCallData(JSCell*, CallData&);
private:
static JSValue lengthGetter(ExecState*, JSValue, const Identifier&);
virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
- virtual CallType getCallDataVirtual(CallData&);
- static CallType getCallData(JSCell*, CallData&);
OwnPtr<Bindings::MethodList> _methodList;
};
