Commit 8fb2b748 authored by mhahnenberg@apple.com's avatar mhahnenberg@apple.com

Rename virtual getConstructData to getConstructDataVirtual

https://bugs.webkit.org/show_bug.cgi?id=69872

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.

* API/JSCallbackConstructor.cpp:
(JSC::JSCallbackConstructor::getConstructDataVirtual):
* API/JSCallbackConstructor.h:
* API/JSCallbackObject.h:
* API/JSCallbackObjectFunctions.h:
(JSC::::getConstructDataVirtual):
* API/JSObjectRef.cpp:
(JSObjectIsConstructor):
(JSObjectCallAsConstructor):
* JavaScriptCore.exp:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
* dfg/DFGOperations.cpp:
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION):
* runtime/ArrayConstructor.cpp:
(JSC::ArrayConstructor::getConstructDataVirtual):
* runtime/ArrayConstructor.h:
* runtime/BooleanConstructor.cpp:
(JSC::BooleanConstructor::getConstructDataVirtual):
* runtime/BooleanConstructor.h:
* runtime/DateConstructor.cpp:
(JSC::DateConstructor::getConstructDataVirtual):
* runtime/DateConstructor.h:
* runtime/Error.h:
(JSC::StrictModeTypeErrorFunction::getConstructDataVirtual):
* runtime/ErrorConstructor.cpp:
(JSC::ErrorConstructor::getConstructDataVirtual):
* runtime/ErrorConstructor.h:
* runtime/FunctionConstructor.cpp:
(JSC::FunctionConstructor::getConstructDataVirtual):
* runtime/FunctionConstructor.h:
* runtime/JSCell.cpp:
(JSC::JSCell::getConstructDataVirtual):
* runtime/JSCell.h:
(JSC::getConstructData):
* runtime/JSFunction.cpp:
(JSC::JSFunction::getConstructDataVirtual):
* runtime/JSFunction.h:
* runtime/NativeErrorConstructor.cpp:
(JSC::NativeErrorConstructor::getConstructDataVirtual):
* runtime/NativeErrorConstructor.h:
* runtime/NumberConstructor.cpp:
(JSC::NumberConstructor::getConstructDataVirtual):
* runtime/NumberConstructor.h:
* runtime/ObjectConstructor.cpp:
(JSC::ObjectConstructor::getConstructDataVirtual):
* runtime/ObjectConstructor.h:
* runtime/RegExpConstructor.cpp:
(JSC::RegExpConstructor::getConstructDataVirtual):
* runtime/RegExpConstructor.h:
* runtime/StringConstructor.cpp:
(JSC::StringConstructor::getConstructDataVirtual):
* runtime/StringConstructor.h:

Source/WebCore:

No new tests.

Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.

* WebCore.exp.in:
* bindings/js/JSAudioConstructor.cpp:
(WebCore::JSAudioConstructor::getConstructDataVirtual):
* bindings/js/JSAudioConstructor.h:
* bindings/js/JSImageConstructor.cpp:
(WebCore::JSImageConstructor::getConstructDataVirtual):
* bindings/js/JSImageConstructor.h:
* bindings/js/JSOptionConstructor.cpp:
(WebCore::JSOptionConstructor::getConstructDataVirtual):
* bindings/js/JSOptionConstructor.h:
* bindings/js/ScriptFunctionCall.cpp:
(WebCore::ScriptFunctionCall::construct):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateConstructorDeclaration):
(GenerateConstructorDefinition):
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::JSTestInterfaceConstructor::getConstructDataVirtual):
* bridge/runtime_object.cpp:
(JSC::Bindings::RuntimeObject::getConstructDataVirtual):
* bridge/runtime_object.h:

Source/WebKit/mac:

Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.

* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::construct):

Source/WebKit2:

Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.

* WebProcess/Plugins/Netscape/JSNPObject.cpp:
(WebKit::JSNPObject::getConstructDataVirtual):
* WebProcess/Plugins/Netscape/JSNPObject.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent af8a05df
......@@ -86,7 +86,7 @@ static EncodedJSValue JSC_HOST_CALL constructJSCallback(ExecState* exec)
return JSValue::encode(toJS(JSObjectMake(ctx, static_cast<JSCallbackConstructor*>(constructor)->classRef(), 0)));
}
ConstructType JSCallbackConstructor::getConstructData(ConstructData& constructData)
ConstructType JSCallbackConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -58,7 +58,7 @@ protected:
static const unsigned StructureFlags = ImplementsHasInstance | JSObject::StructureFlags;
private:
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
JSClassRef m_class;
......
......@@ -193,7 +193,7 @@ private:
virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
......
......@@ -328,7 +328,7 @@ bool JSCallbackObject<Parent>::deleteProperty(JSCell* cell, ExecState* exec, uns
}
template <class Parent>
ConstructType JSCallbackObject<Parent>::getConstructData(ConstructData& constructData)
ConstructType JSCallbackObject<Parent>::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -454,7 +454,7 @@ bool JSObjectIsConstructor(JSContextRef, JSObjectRef object)
{
JSObject* jsObject = toJS(object);
ConstructData constructData;
return jsObject->getConstructData(constructData) != ConstructTypeNone;
return jsObject->getConstructDataVirtual(constructData) != ConstructTypeNone;
}
JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
......@@ -465,7 +465,7 @@ JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size
JSObject* jsObject = toJS(object);
ConstructData constructData;
ConstructType constructType = jsObject->getConstructData(constructData);
ConstructType constructType = jsObject->getConstructDataVirtual(constructData);
if (constructType == ConstructTypeNone)
return 0;
......
2011-10-13 Mark Hahnenberg <mhahnenberg@apple.com>
Rename virtual getConstructData to getConstructDataVirtual
https://bugs.webkit.org/show_bug.cgi?id=69872
Reviewed by Geoffrey Garen.
Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.
* API/JSCallbackConstructor.cpp:
(JSC::JSCallbackConstructor::getConstructDataVirtual):
* API/JSCallbackConstructor.h:
* API/JSCallbackObject.h:
* API/JSCallbackObjectFunctions.h:
(JSC::::getConstructDataVirtual):
* API/JSObjectRef.cpp:
(JSObjectIsConstructor):
(JSObjectCallAsConstructor):
* JavaScriptCore.exp:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
* dfg/DFGOperations.cpp:
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION):
* runtime/ArrayConstructor.cpp:
(JSC::ArrayConstructor::getConstructDataVirtual):
* runtime/ArrayConstructor.h:
* runtime/BooleanConstructor.cpp:
(JSC::BooleanConstructor::getConstructDataVirtual):
* runtime/BooleanConstructor.h:
* runtime/DateConstructor.cpp:
(JSC::DateConstructor::getConstructDataVirtual):
* runtime/DateConstructor.h:
* runtime/Error.h:
(JSC::StrictModeTypeErrorFunction::getConstructDataVirtual):
* runtime/ErrorConstructor.cpp:
(JSC::ErrorConstructor::getConstructDataVirtual):
* runtime/ErrorConstructor.h:
* runtime/FunctionConstructor.cpp:
(JSC::FunctionConstructor::getConstructDataVirtual):
* runtime/FunctionConstructor.h:
* runtime/JSCell.cpp:
(JSC::JSCell::getConstructDataVirtual):
* runtime/JSCell.h:
(JSC::getConstructData):
* runtime/JSFunction.cpp:
(JSC::JSFunction::getConstructDataVirtual):
* runtime/JSFunction.h:
* runtime/NativeErrorConstructor.cpp:
(JSC::NativeErrorConstructor::getConstructDataVirtual):
* runtime/NativeErrorConstructor.h:
* runtime/NumberConstructor.cpp:
(JSC::NumberConstructor::getConstructDataVirtual):
* runtime/NumberConstructor.h:
* runtime/ObjectConstructor.cpp:
(JSC::ObjectConstructor::getConstructDataVirtual):
* runtime/ObjectConstructor.h:
* runtime/RegExpConstructor.cpp:
(JSC::RegExpConstructor::getConstructDataVirtual):
* runtime/RegExpConstructor.h:
* runtime/StringConstructor.cpp:
(JSC::StringConstructor::getConstructDataVirtual):
* runtime/StringConstructor.h:
2011-10-13 Filip Pizlo <fpizlo@apple.com>
Rubber stamped Stephanie Lewis.
......@@ -259,9 +259,9 @@ __ZN3JSC4callEPNS_9ExecStateENS_7JSValueENS_8CallTypeERKNS_8CallDataES2_RKNS_7Ar
__ZN3JSC6JSCell11getCallDataEPS0_RNS_8CallDataE
__ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
__ZN3JSC6JSCell14deletePropertyEPNS_9ExecStateEj
__ZN3JSC6JSCell16getConstructDataERNS_13ConstructDataE
__ZN3JSC6JSCell18getOwnPropertySlotEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
__ZN3JSC6JSCell18getOwnPropertySlotEPNS_9ExecStateEjRNS_12PropertySlotE
__ZN3JSC6JSCell23getConstructDataVirtualERNS_13ConstructDataE
__ZN3JSC6JSCell3putEPNS_9ExecStateERKNS_10IdentifierENS_7JSValueERNS_15PutPropertySlotE
__ZN3JSC6JSCell3putEPNS_9ExecStateEjNS_7JSValueE
__ZN3JSC6JSCell9getObjectEv
......
......@@ -190,7 +190,7 @@ EXPORTS
?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
?getConstructData@JSCell@JSC@@UAE?AW4ConstructType@2@AATConstructData@2@@Z
?getConstructDataVirtual@JSCell@JSC@@UAE?AW4ConstructType@2@AATConstructData@2@@Z
?getObject@JSCell@JSC@@QAEPAVJSObject@2@XZ
?getOwnPropertyDescriptor@JSGlobalObject@JSC@@UAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z
?getOwnPropertyDescriptor@JSObject@JSC@@UAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z
......
......@@ -161,7 +161,7 @@ JSCell* DFG_OPERATION operationCreateThis(ExecState* exec, JSCell* prototype)
#if !ASSERT_DISABLED
ConstructData constructData;
ASSERT(constructor->getConstructData(constructData) == ConstructTypeJS);
ASSERT(constructor->getConstructDataVirtual(constructData) == ConstructTypeJS);
#endif
JSGlobalData& globalData = exec->globalData();
......
......@@ -1268,7 +1268,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_create_this)
JSFunction* constructor = asFunction(callFrame->callee());
#if !ASSERT_DISABLED
ConstructData constructData;
ASSERT(constructor->getConstructData(constructData) == ConstructTypeJS);
ASSERT(constructor->getConstructDataVirtual(constructData) == ConstructTypeJS);
#endif
Structure* structure;
......@@ -2165,7 +2165,7 @@ DEFINE_STUB_FUNCTION(void*, op_construct_jitCompile)
#if !ASSERT_DISABLED
ConstructData constructData;
ASSERT(asFunction(stackFrame.callFrame->callee())->getConstructData(constructData) == ConstructTypeJS);
ASSERT(asFunction(stackFrame.callFrame->callee())->getConstructDataVirtual(constructData) == ConstructTypeJS);
#endif
return jitCompileFor(stackFrame, CodeForConstruct);
......
......@@ -97,7 +97,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithArrayConstructor(ExecState* exe
return JSValue::encode(constructArrayWithSizeQuirk(exec, args));
}
ConstructType ArrayConstructor::getConstructData(ConstructData& constructData)
ConstructType ArrayConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -56,7 +56,7 @@ namespace JSC {
virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
......
......@@ -58,7 +58,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithBooleanConstructor(ExecState* e
return JSValue::encode(constructBoolean(exec, args));
}
ConstructType BooleanConstructor::getConstructData(ConstructData& constructData)
ConstructType BooleanConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -50,7 +50,7 @@ namespace JSC {
private:
BooleanConstructor(JSGlobalObject*, Structure*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
......
......@@ -161,7 +161,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithDateConstructor(ExecState* exec
return JSValue::encode(constructDate(exec, asInternalFunction(exec->callee())->globalObject(), args));
}
ConstructType DateConstructor::getConstructData(ConstructData& constructData)
ConstructType DateConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -51,7 +51,7 @@ namespace JSC {
private:
DateConstructor(JSGlobalObject*, Structure*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
......
......@@ -98,7 +98,7 @@ namespace JSC {
return JSValue::encode(jsNull());
}
ConstructType getConstructData(ConstructData& constructData)
virtual ConstructType getConstructDataVirtual(ConstructData& constructData)
{
constructData.native.function = constructThrowTypeError;
return ConstructTypeHost;
......
......@@ -53,7 +53,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithErrorConstructor(ExecState* exe
return JSValue::encode(ErrorInstance::create(exec, errorStructure, message));
}
ConstructType ErrorConstructor::getConstructData(ConstructData& constructData)
ConstructType ErrorConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -51,7 +51,7 @@ namespace JSC {
private:
ErrorConstructor(JSGlobalObject*, Structure*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
......
......@@ -59,7 +59,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithFunctionConstructor(ExecState*
return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args));
}
ConstructType FunctionConstructor::getConstructData(ConstructData& constructData)
ConstructType FunctionConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -48,7 +48,7 @@ namespace JSC {
private:
FunctionConstructor(JSGlobalObject*, Structure*);
void finishCreation(ExecState*, FunctionPrototype*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
......
......@@ -59,7 +59,7 @@ CallType JSCell::getCallData(JSCell*, CallData&)
return CallTypeNone;
}
ConstructType JSCell::getConstructData(ConstructData&)
ConstructType JSCell::getConstructDataVirtual(ConstructData&)
{
return ConstructTypeNone;
}
......
......@@ -74,7 +74,7 @@ namespace JSC {
const JSObject* getObject() const; // NULL if not an object
static CallType getCallData(JSCell*, CallData&);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
// Basic conversions.
......@@ -237,7 +237,7 @@ namespace JSC {
inline ConstructType getConstructData(JSValue value, ConstructData& constructData)
{
ConstructType result = value.isCell() ? value.asCell()->getConstructData(constructData) : ConstructTypeNone;
ConstructType result = value.isCell() ? value.asCell()->getConstructDataVirtual(constructData) : ConstructTypeNone;
ASSERT(result == ConstructTypeNone || value.isValidCallee());
return result;
}
......
......@@ -348,7 +348,7 @@ bool JSFunction::deleteProperty(JSCell* cell, ExecState* exec, const Identifier&
return Base::deleteProperty(thisObject, exec, propertyName);
}
ConstructType JSFunction::getConstructData(ConstructData& constructData)
ConstructType JSFunction::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -108,7 +108,7 @@ namespace JSC {
NativeFunction nativeFunction();
NativeFunction nativeConstructor();
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
......
......@@ -56,7 +56,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithNativeErrorConstructor(ExecStat
return JSValue::encode(ErrorInstance::create(exec, errorStructure, message));
}
ConstructType NativeErrorConstructor::getConstructData(ConstructData& constructData)
ConstructType NativeErrorConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -68,7 +68,7 @@ namespace JSC {
private:
NativeErrorConstructor(JSGlobalObject*, Structure*);
static const unsigned StructureFlags = OverridesVisitChildren | InternalFunction::StructureFlags;
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
static void visitChildren(JSCell*, SlotVisitor&);
......
......@@ -120,7 +120,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithNumberConstructor(ExecState* ex
return JSValue::encode(object);
}
ConstructType NumberConstructor::getConstructData(ConstructData& constructData)
ConstructType NumberConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -58,7 +58,7 @@ namespace JSC {
private:
NumberConstructor(JSGlobalObject*, Structure*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
......
......@@ -119,7 +119,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithObjectConstructor(ExecState* ex
return JSValue::encode(constructObject(exec, asInternalFunction(exec->callee())->globalObject(), args));
}
ConstructType ObjectConstructor::getConstructData(ConstructData& constructData)
ConstructType ObjectConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -55,7 +55,7 @@ namespace JSC {
private:
ObjectConstructor(JSGlobalObject*, Structure*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
......
......@@ -354,7 +354,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithRegExpConstructor(ExecState* ex
return JSValue::encode(constructRegExp(exec, asInternalFunction(exec->callee())->globalObject(), args, true));
}
ConstructType RegExpConstructor::getConstructData(ConstructData& constructData)
ConstructType RegExpConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -100,7 +100,7 @@ namespace JSC {
private:
RegExpConstructor(JSGlobalObject*, Structure*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
......
......@@ -101,7 +101,7 @@ static EncodedJSValue JSC_HOST_CALL constructWithStringConstructor(ExecState* ex
return JSValue::encode(StringObject::create(exec, globalObject->stringObjectStructure(), exec->argument(0).toString(exec)));
}
ConstructType StringConstructor::getConstructData(ConstructData& constructData)
ConstructType StringConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -51,7 +51,7 @@ namespace JSC {
private:
StringConstructor(JSGlobalObject*, Structure*);
void finishCreation(ExecState*, StringPrototype*);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
......
2011-10-13 Mark Hahnenberg <mhahnenberg@apple.com>
Rename virtual getConstructData to getConstructDataVirtual
https://bugs.webkit.org/show_bug.cgi?id=69872
Reviewed by Geoffrey Garen.
No new tests.
Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.
* WebCore.exp.in:
* bindings/js/JSAudioConstructor.cpp:
(WebCore::JSAudioConstructor::getConstructDataVirtual):
* bindings/js/JSAudioConstructor.h:
* bindings/js/JSImageConstructor.cpp:
(WebCore::JSImageConstructor::getConstructDataVirtual):
* bindings/js/JSImageConstructor.h:
* bindings/js/JSOptionConstructor.cpp:
(WebCore::JSOptionConstructor::getConstructDataVirtual):
* bindings/js/JSOptionConstructor.h:
* bindings/js/ScriptFunctionCall.cpp:
(WebCore::ScriptFunctionCall::construct):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateConstructorDeclaration):
(GenerateConstructorDefinition):
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::JSTestInterfaceConstructor::getConstructDataVirtual):
* bridge/runtime_object.cpp:
(JSC::Bindings::RuntimeObject::getConstructDataVirtual):
* bridge/runtime_object.h:
2011-10-13 Simon Fraser <simon.fraser@apple.com>
Remove #include of <QuartzCore/QuartzCore.h> in a widely-used header.
......@@ -1691,9 +1691,9 @@ __ZN3JSC8Bindings10RootObjectD1Ev
__ZN3JSC8Bindings13RuntimeObject11getCallDataEPNS_6JSCellERNS_8CallDataE
__ZN3JSC8Bindings13RuntimeObject14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
__ZN3JSC8Bindings13RuntimeObject14finishCreationEPNS_14JSGlobalObjectE
__ZN3JSC8Bindings13RuntimeObject16getConstructDataERNS_13ConstructDataE
__ZN3JSC8Bindings13RuntimeObject18getOwnPropertySlotEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
__ZN3JSC8Bindings13RuntimeObject19getOwnPropertyNamesEPNS_9ExecStateERNS_17PropertyNameArrayENS_15EnumerationModeE
__ZN3JSC8Bindings13RuntimeObject23getConstructDataVirtualERNS_13ConstructDataE
__ZN3JSC8Bindings13RuntimeObject24getOwnPropertyDescriptorEPNS_9ExecStateERKNS_10IdentifierERNS_18PropertyDescriptorE
__ZN3JSC8Bindings13RuntimeObject3putEPNS_9ExecStateERKNS_10IdentifierENS_7JSValueERNS_15PutPropertySlotE
__ZN3JSC8Bindings13RuntimeObject6s_infoE
......
......@@ -75,7 +75,7 @@ static EncodedJSValue JSC_HOST_CALL constructAudio(ExecState* exec)
HTMLAudioElement::createForJSConstructor(document, src))));
}
ConstructType JSAudioConstructor::getConstructData(ConstructData& constructData)
ConstructType JSAudioConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -55,7 +55,7 @@ namespace WebCore {
private:
JSAudioConstructor(JSC::Structure*, JSDOMGlobalObject*);
void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
virtual JSC::ConstructType getConstructData(JSC::ConstructData&);
virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
};
......
......@@ -74,7 +74,7 @@ static EncodedJSValue JSC_HOST_CALL constructImage(ExecState* exec)
HTMLImageElement::createForJSConstructor(document, optionalWidth, optionalHeight))));
}
ConstructType JSImageConstructor::getConstructData(ConstructData& constructData)
ConstructType JSImageConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -46,7 +46,7 @@ namespace WebCore {
private:
JSImageConstructor(JSC::Structure*, JSDOMGlobalObject*);
void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
virtual JSC::ConstructType getConstructData(JSC::ConstructData&);
virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
};
......
......@@ -75,7 +75,7 @@ static EncodedJSValue JSC_HOST_CALL constructHTMLOptionElement(ExecState* exec)
return JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(), element.release())));
}
ConstructType JSOptionConstructor::getConstructData(ConstructData& constructData)
ConstructType JSOptionConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -47,7 +47,7 @@ namespace WebCore {
private:
JSOptionConstructor(JSC::Structure*, JSDOMGlobalObject*);
void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
virtual JSC::ConstructType getConstructData(JSC::ConstructData&);
virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
};
......
......@@ -175,7 +175,7 @@ ScriptObject ScriptFunctionCall::construct(bool& hadException, bool reportExcept
}
ConstructData constructData;
ConstructType constructType = constructor->getConstructData(constructData);
ConstructType constructType = constructor->getConstructDataVirtual(constructData);
if (constructType == ConstructTypeNone)
return ScriptObject();
......
......@@ -3170,7 +3170,7 @@ sub GenerateConstructorDeclaration
if ($canConstruct) {
push(@$outputArray, " static JSC::EncodedJSValue JSC_HOST_CALL construct${className}(JSC::ExecState*);\n");
push(@$outputArray, " virtual JSC::ConstructType getConstructData(JSC::ConstructData&);\n");
push(@$outputArray, " virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);\n");
push(@$outputArray, " static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);\n");
}
push(@$outputArray, "};\n\n");
......@@ -3236,7 +3236,7 @@ sub GenerateConstructorDefinition
push(@$outputArray, "}\n\n");
}
push(@$outputArray, "ConstructType ${constructorClassName}::getConstructData(ConstructData& constructData)\n");
push(@$outputArray, "ConstructType ${constructorClassName}::getConstructDataVirtual(ConstructData& constructData)\n");
push(@$outputArray, "{\n");
push(@$outputArray, " return getConstructData(this, constructData);\n");
push(@$outputArray, "}\n\n");
......
......@@ -96,7 +96,7 @@ public:
protected:
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::ImplementsHasInstance | DOMConstructorObject::StructureFlags;
static JSC::EncodedJSValue JSC_HOST_CALL constructJSTestInterface(JSC::ExecState*);
virtual JSC::ConstructType getConstructData(JSC::ConstructData&);
virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
};
......@@ -132,7 +132,7 @@ EncodedJSValue JSC_HOST_CALL JSTestInterfaceConstructor::constructJSTestInterfac
return JSValue::encode(asObject(toJS(exec, static_cast<JSTestInterfaceConstructor*>(exec->callee())->globalObject(), TestInterface::create(context))));
}
ConstructType JSTestInterfaceConstructor::getConstructData(ConstructData& constructData)
ConstructType JSTestInterfaceConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -304,7 +304,7 @@ static EncodedJSValue JSC_HOST_CALL callRuntimeConstructor(ExecState* exec)
return JSValue::encode(result.isObject() ? static_cast<JSObject*>(result.asCell()) : constructor);
}
ConstructType RuntimeObject::getConstructData(ConstructData& constructData)
ConstructType RuntimeObject::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
......
......@@ -54,7 +54,7 @@ public:
static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
static CallType getCallData(JSCell*, CallData&);
virtual ConstructType getConstructData(ConstructData&);
virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
......
2011-10-13 Mark Hahnenberg <mhahnenberg@apple.com>
Rename virtual getConstructData to getConstructDataVirtual
https://bugs.webkit.org/show_bug.cgi?id=69872
Reviewed by Geoffrey Garen.
Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::construct):
2011-10-13 Beth Dakin <bdakin@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=70050
......
......@@ -978,7 +978,7 @@ bool NetscapePluginInstanceProxy::construct(uint32_t objectID, data_t argumentsD
JSLock lock(SilenceAssertionsOnly);
ConstructData constructData;
ConstructType constructType = object->getConstructData(constructData);
ConstructType constructType = object->getConstructDataVirtual(constructData);
if (constructType == ConstructTypeNone)
return false;
......
2011-10-13 Mark Hahnenberg <mhahnenberg@apple.com>
Rename virtual getConstructData to getConstructDataVirtual
https://bugs.webkit.org/show_bug.cgi?id=69872
Reviewed by Geoffrey Garen.
Renamed virtual getConstructData functions to getConstructDataVirtual to
avoid conflicts when we add static getConstructData to the MethodTable.
* WebProcess/Plugins/Netscape/JSNPObject.cpp:
(WebKit::JSNPObject::getConstructDataVirtual):
* WebProcess/Plugins/Netscape/JSNPObject.h: