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
diff --git a/Source/JavaScriptCore/API/JSCallbackConstructor.cpp b/Source/JavaScriptCore/API/JSCallbackConstructor.cpp
index 966d34a..cb4be41 100644
--- a/Source/JavaScriptCore/API/JSCallbackConstructor.cpp
+++ b/Source/JavaScriptCore/API/JSCallbackConstructor.cpp
@@ -86,7 +86,7 @@
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);
}
diff --git a/Source/JavaScriptCore/API/JSCallbackConstructor.h b/Source/JavaScriptCore/API/JSCallbackConstructor.h
index 46ea820..e3176c6 100644
--- a/Source/JavaScriptCore/API/JSCallbackConstructor.h
+++ b/Source/JavaScriptCore/API/JSCallbackConstructor.h
@@ -58,7 +58,7 @@
static const unsigned StructureFlags = ImplementsHasInstance | JSObject::StructureFlags;
private:
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
JSClassRef m_class;
diff --git a/Source/JavaScriptCore/API/JSCallbackObject.h b/Source/JavaScriptCore/API/JSCallbackObject.h
index d46f231..022f2a8 100644
--- a/Source/JavaScriptCore/API/JSCallbackObject.h
+++ b/Source/JavaScriptCore/API/JSCallbackObject.h
@@ -193,7 +193,7 @@
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&);
diff --git a/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h b/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
index 6bd8c31..80de1e0 100644
--- a/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
+++ b/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
@@ -328,7 +328,7 @@
}
template <class Parent>
-ConstructType JSCallbackObject<Parent>::getConstructData(ConstructData& constructData)
+ConstructType JSCallbackObject<Parent>::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/API/JSObjectRef.cpp b/Source/JavaScriptCore/API/JSObjectRef.cpp
index 4cc66a4d..5fcbb83 100644
--- a/Source/JavaScriptCore/API/JSObjectRef.cpp
+++ b/Source/JavaScriptCore/API/JSObjectRef.cpp
@@ -454,7 +454,7 @@
{
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 @@
JSObject* jsObject = toJS(object);
ConstructData constructData;
- ConstructType constructType = jsObject->getConstructData(constructData);
+ ConstructType constructType = jsObject->getConstructDataVirtual(constructData);
if (constructType == ConstructTypeNone)
return 0;
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 929f7fc..a5c7b4f 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,67 @@
+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.
diff --git a/Source/JavaScriptCore/JavaScriptCore.exp b/Source/JavaScriptCore/JavaScriptCore.exp
index faa5ec2..5b2efc5 100644
--- a/Source/JavaScriptCore/JavaScriptCore.exp
+++ b/Source/JavaScriptCore/JavaScriptCore.exp
@@ -259,9 +259,9 @@
__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
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
index 973bc38..ce470cf 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -190,7 +190,7 @@
?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
diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp
index b14848e..ffa5bbd 100644
--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp
@@ -161,7 +161,7 @@
#if !ASSERT_DISABLED
ConstructData constructData;
- ASSERT(constructor->getConstructData(constructData) == ConstructTypeJS);
+ ASSERT(constructor->getConstructDataVirtual(constructData) == ConstructTypeJS);
#endif
JSGlobalData& globalData = exec->globalData();
diff --git a/Source/JavaScriptCore/jit/JITStubs.cpp b/Source/JavaScriptCore/jit/JITStubs.cpp
index a930f58..832dded 100644
--- a/Source/JavaScriptCore/jit/JITStubs.cpp
+++ b/Source/JavaScriptCore/jit/JITStubs.cpp
@@ -1268,7 +1268,7 @@
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 @@
#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);
diff --git a/Source/JavaScriptCore/runtime/ArrayConstructor.cpp b/Source/JavaScriptCore/runtime/ArrayConstructor.cpp
index f554e41..d4d77f2 100644
--- a/Source/JavaScriptCore/runtime/ArrayConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayConstructor.cpp
@@ -97,7 +97,7 @@
return JSValue::encode(constructArrayWithSizeQuirk(exec, args));
}
-ConstructType ArrayConstructor::getConstructData(ConstructData& constructData)
+ConstructType ArrayConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/ArrayConstructor.h b/Source/JavaScriptCore/runtime/ArrayConstructor.h
index 0ea3e42..9304599 100644
--- a/Source/JavaScriptCore/runtime/ArrayConstructor.h
+++ b/Source/JavaScriptCore/runtime/ArrayConstructor.h
@@ -56,7 +56,7 @@
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&);
};
diff --git a/Source/JavaScriptCore/runtime/BooleanConstructor.cpp b/Source/JavaScriptCore/runtime/BooleanConstructor.cpp
index 1a4152c..ab6169d 100644
--- a/Source/JavaScriptCore/runtime/BooleanConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/BooleanConstructor.cpp
@@ -58,7 +58,7 @@
return JSValue::encode(constructBoolean(exec, args));
}
-ConstructType BooleanConstructor::getConstructData(ConstructData& constructData)
+ConstructType BooleanConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/BooleanConstructor.h b/Source/JavaScriptCore/runtime/BooleanConstructor.h
index 8d10f09..6703fd7 100644
--- a/Source/JavaScriptCore/runtime/BooleanConstructor.h
+++ b/Source/JavaScriptCore/runtime/BooleanConstructor.h
@@ -50,7 +50,7 @@
private:
BooleanConstructor(JSGlobalObject*, Structure*);
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
diff --git a/Source/JavaScriptCore/runtime/DateConstructor.cpp b/Source/JavaScriptCore/runtime/DateConstructor.cpp
index f440a64..8ce0b11 100644
--- a/Source/JavaScriptCore/runtime/DateConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/DateConstructor.cpp
@@ -161,7 +161,7 @@
return JSValue::encode(constructDate(exec, asInternalFunction(exec->callee())->globalObject(), args));
}
-ConstructType DateConstructor::getConstructData(ConstructData& constructData)
+ConstructType DateConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/DateConstructor.h b/Source/JavaScriptCore/runtime/DateConstructor.h
index f837d66..9c4ffc4 100644
--- a/Source/JavaScriptCore/runtime/DateConstructor.h
+++ b/Source/JavaScriptCore/runtime/DateConstructor.h
@@ -51,7 +51,7 @@
private:
DateConstructor(JSGlobalObject*, Structure*);
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
diff --git a/Source/JavaScriptCore/runtime/Error.h b/Source/JavaScriptCore/runtime/Error.h
index c340e6c..5180ffa 100644
--- a/Source/JavaScriptCore/runtime/Error.h
+++ b/Source/JavaScriptCore/runtime/Error.h
@@ -98,7 +98,7 @@
return JSValue::encode(jsNull());
}
- ConstructType getConstructData(ConstructData& constructData)
+ virtual ConstructType getConstructDataVirtual(ConstructData& constructData)
{
constructData.native.function = constructThrowTypeError;
return ConstructTypeHost;
diff --git a/Source/JavaScriptCore/runtime/ErrorConstructor.cpp b/Source/JavaScriptCore/runtime/ErrorConstructor.cpp
index 81e46dd..08a75f8 100644
--- a/Source/JavaScriptCore/runtime/ErrorConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/ErrorConstructor.cpp
@@ -53,7 +53,7 @@
return JSValue::encode(ErrorInstance::create(exec, errorStructure, message));
}
-ConstructType ErrorConstructor::getConstructData(ConstructData& constructData)
+ConstructType ErrorConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/ErrorConstructor.h b/Source/JavaScriptCore/runtime/ErrorConstructor.h
index b9b9d37..af3fadf 100644
--- a/Source/JavaScriptCore/runtime/ErrorConstructor.h
+++ b/Source/JavaScriptCore/runtime/ErrorConstructor.h
@@ -51,7 +51,7 @@
private:
ErrorConstructor(JSGlobalObject*, Structure*);
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
diff --git a/Source/JavaScriptCore/runtime/FunctionConstructor.cpp b/Source/JavaScriptCore/runtime/FunctionConstructor.cpp
index c3eda09..4a17bad 100644
--- a/Source/JavaScriptCore/runtime/FunctionConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/FunctionConstructor.cpp
@@ -59,7 +59,7 @@
return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args));
}
-ConstructType FunctionConstructor::getConstructData(ConstructData& constructData)
+ConstructType FunctionConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/FunctionConstructor.h b/Source/JavaScriptCore/runtime/FunctionConstructor.h
index e88a9dc..0a737fb 100644
--- a/Source/JavaScriptCore/runtime/FunctionConstructor.h
+++ b/Source/JavaScriptCore/runtime/FunctionConstructor.h
@@ -48,7 +48,7 @@
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&);
};
diff --git a/Source/JavaScriptCore/runtime/JSCell.cpp b/Source/JavaScriptCore/runtime/JSCell.cpp
index fe0c527..0ac364f 100644
--- a/Source/JavaScriptCore/runtime/JSCell.cpp
+++ b/Source/JavaScriptCore/runtime/JSCell.cpp
@@ -59,7 +59,7 @@
return CallTypeNone;
}
-ConstructType JSCell::getConstructData(ConstructData&)
+ConstructType JSCell::getConstructDataVirtual(ConstructData&)
{
return ConstructTypeNone;
}
diff --git a/Source/JavaScriptCore/runtime/JSCell.h b/Source/JavaScriptCore/runtime/JSCell.h
index 83619bd..044f64f 100644
--- a/Source/JavaScriptCore/runtime/JSCell.h
+++ b/Source/JavaScriptCore/runtime/JSCell.h
@@ -74,7 +74,7 @@
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 @@
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;
}
diff --git a/Source/JavaScriptCore/runtime/JSFunction.cpp b/Source/JavaScriptCore/runtime/JSFunction.cpp
index 4933304..34b8b6d 100644
--- a/Source/JavaScriptCore/runtime/JSFunction.cpp
+++ b/Source/JavaScriptCore/runtime/JSFunction.cpp
@@ -348,7 +348,7 @@
return Base::deleteProperty(thisObject, exec, propertyName);
}
-ConstructType JSFunction::getConstructData(ConstructData& constructData)
+ConstructType JSFunction::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/JSFunction.h b/Source/JavaScriptCore/runtime/JSFunction.h
index 9b9da9c..7f516f6 100644
--- a/Source/JavaScriptCore/runtime/JSFunction.h
+++ b/Source/JavaScriptCore/runtime/JSFunction.h
@@ -108,7 +108,7 @@
NativeFunction nativeFunction();
NativeFunction nativeConstructor();
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
diff --git a/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp b/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp
index e813ed4..b3858da 100644
--- a/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp
@@ -56,7 +56,7 @@
return JSValue::encode(ErrorInstance::create(exec, errorStructure, message));
}
-ConstructType NativeErrorConstructor::getConstructData(ConstructData& constructData)
+ConstructType NativeErrorConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/NativeErrorConstructor.h b/Source/JavaScriptCore/runtime/NativeErrorConstructor.h
index d6e573f..6a82b51 100644
--- a/Source/JavaScriptCore/runtime/NativeErrorConstructor.h
+++ b/Source/JavaScriptCore/runtime/NativeErrorConstructor.h
@@ -68,7 +68,7 @@
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&);
diff --git a/Source/JavaScriptCore/runtime/NumberConstructor.cpp b/Source/JavaScriptCore/runtime/NumberConstructor.cpp
index 3c65e9f..1c6e453 100644
--- a/Source/JavaScriptCore/runtime/NumberConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/NumberConstructor.cpp
@@ -120,7 +120,7 @@
return JSValue::encode(object);
}
-ConstructType NumberConstructor::getConstructData(ConstructData& constructData)
+ConstructType NumberConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/NumberConstructor.h b/Source/JavaScriptCore/runtime/NumberConstructor.h
index 7056ddf..cb866f0 100644
--- a/Source/JavaScriptCore/runtime/NumberConstructor.h
+++ b/Source/JavaScriptCore/runtime/NumberConstructor.h
@@ -58,7 +58,7 @@
private:
NumberConstructor(JSGlobalObject*, Structure*);
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
diff --git a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
index 90edfa5..2b059b5 100644
--- a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
@@ -119,7 +119,7 @@
return JSValue::encode(constructObject(exec, asInternalFunction(exec->callee())->globalObject(), args));
}
-ConstructType ObjectConstructor::getConstructData(ConstructData& constructData)
+ConstructType ObjectConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/JavaScriptCore/runtime/ObjectConstructor.h b/Source/JavaScriptCore/runtime/ObjectConstructor.h
index 222159f..5cd28a6 100644
--- a/Source/JavaScriptCore/runtime/ObjectConstructor.h
+++ b/Source/JavaScriptCore/runtime/ObjectConstructor.h
@@ -55,7 +55,7 @@
private:
ObjectConstructor(JSGlobalObject*, Structure*);
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
};
diff --git a/Source/JavaScriptCore/runtime/RegExpConstructor.cpp b/Source/JavaScriptCore/runtime/RegExpConstructor.cpp
index 40d4914..d3e448f 100644
--- a/Source/JavaScriptCore/runtime/RegExpConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/RegExpConstructor.cpp
@@ -354,7 +354,7 @@
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);
}
diff --git a/Source/JavaScriptCore/runtime/RegExpConstructor.h b/Source/JavaScriptCore/runtime/RegExpConstructor.h
index 5e13176..2256cb0 100644
--- a/Source/JavaScriptCore/runtime/RegExpConstructor.h
+++ b/Source/JavaScriptCore/runtime/RegExpConstructor.h
@@ -100,7 +100,7 @@
private:
RegExpConstructor(JSGlobalObject*, Structure*);
- virtual ConstructType getConstructData(ConstructData&);
+ virtual ConstructType getConstructDataVirtual(ConstructData&);
static ConstructType getConstructData(JSCell*, ConstructData&);
static CallType getCallData(JSCell*, CallData&);
diff --git a/Source/JavaScriptCore/runtime/StringConstructor.cpp b/Source/JavaScriptCore/runtime/StringConstructor.cpp
index f39dd7a..5de3751 100644
--- a/Source/JavaScriptCore/runtime/StringConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/StringConstructor.cpp
@@ -101,7 +101,7 @@
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);
}
diff --git a/Source/JavaScriptCore/runtime/StringConstructor.h b/Source/JavaScriptCore/runtime/StringConstructor.h
index a719148..feab188 100644
--- a/Source/JavaScriptCore/runtime/StringConstructor.h
+++ b/Source/JavaScriptCore/runtime/StringConstructor.h
@@ -51,7 +51,7 @@
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&);
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index db5340b..bdfce33 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+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.
diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index e473ba9..938cd81 100644
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1691,9 +1691,9 @@
__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
diff --git a/Source/WebCore/bindings/js/JSAudioConstructor.cpp b/Source/WebCore/bindings/js/JSAudioConstructor.cpp
index 3acc0bb..756039f 100644
--- a/Source/WebCore/bindings/js/JSAudioConstructor.cpp
+++ b/Source/WebCore/bindings/js/JSAudioConstructor.cpp
@@ -75,7 +75,7 @@
HTMLAudioElement::createForJSConstructor(document, src))));
}
-ConstructType JSAudioConstructor::getConstructData(ConstructData& constructData)
+ConstructType JSAudioConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/WebCore/bindings/js/JSAudioConstructor.h b/Source/WebCore/bindings/js/JSAudioConstructor.h
index 3be45e3..07ec3d56 100644
--- a/Source/WebCore/bindings/js/JSAudioConstructor.h
+++ b/Source/WebCore/bindings/js/JSAudioConstructor.h
@@ -55,7 +55,7 @@
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&);
};
diff --git a/Source/WebCore/bindings/js/JSImageConstructor.cpp b/Source/WebCore/bindings/js/JSImageConstructor.cpp
index 1914786..a87502a 100644
--- a/Source/WebCore/bindings/js/JSImageConstructor.cpp
+++ b/Source/WebCore/bindings/js/JSImageConstructor.cpp
@@ -74,7 +74,7 @@
HTMLImageElement::createForJSConstructor(document, optionalWidth, optionalHeight))));
}
-ConstructType JSImageConstructor::getConstructData(ConstructData& constructData)
+ConstructType JSImageConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/WebCore/bindings/js/JSImageConstructor.h b/Source/WebCore/bindings/js/JSImageConstructor.h
index ab3fd31..395b616 100644
--- a/Source/WebCore/bindings/js/JSImageConstructor.h
+++ b/Source/WebCore/bindings/js/JSImageConstructor.h
@@ -46,7 +46,7 @@
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&);
};
diff --git a/Source/WebCore/bindings/js/JSOptionConstructor.cpp b/Source/WebCore/bindings/js/JSOptionConstructor.cpp
index 022a3cd..980f9a6 100644
--- a/Source/WebCore/bindings/js/JSOptionConstructor.cpp
+++ b/Source/WebCore/bindings/js/JSOptionConstructor.cpp
@@ -75,7 +75,7 @@
return JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(), element.release())));
}
-ConstructType JSOptionConstructor::getConstructData(ConstructData& constructData)
+ConstructType JSOptionConstructor::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/WebCore/bindings/js/JSOptionConstructor.h b/Source/WebCore/bindings/js/JSOptionConstructor.h
index 01b8ecb..f961a88 100644
--- a/Source/WebCore/bindings/js/JSOptionConstructor.h
+++ b/Source/WebCore/bindings/js/JSOptionConstructor.h
@@ -47,7 +47,7 @@
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&);
};
diff --git a/Source/WebCore/bindings/js/ScriptFunctionCall.cpp b/Source/WebCore/bindings/js/ScriptFunctionCall.cpp
index 518a787..19099a9 100644
--- a/Source/WebCore/bindings/js/ScriptFunctionCall.cpp
+++ b/Source/WebCore/bindings/js/ScriptFunctionCall.cpp
@@ -175,7 +175,7 @@
}
ConstructData constructData;
- ConstructType constructType = constructor->getConstructData(constructData);
+ ConstructType constructType = constructor->getConstructDataVirtual(constructData);
if (constructType == ConstructTypeNone)
return ScriptObject();
diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 2d81347..a4a185d 100644
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -3170,7 +3170,7 @@
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 @@
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");
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
index da9911e..bbe606bd 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
@@ -96,7 +96,7 @@
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 @@
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);
}
diff --git a/Source/WebCore/bridge/runtime_object.cpp b/Source/WebCore/bridge/runtime_object.cpp
index 1338cf8..f7f3068 100644
--- a/Source/WebCore/bridge/runtime_object.cpp
+++ b/Source/WebCore/bridge/runtime_object.cpp
@@ -304,7 +304,7 @@
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);
}
diff --git a/Source/WebCore/bridge/runtime_object.h b/Source/WebCore/bridge/runtime_object.h
index 066d773..0c6a915 100644
--- a/Source/WebCore/bridge/runtime_object.h
+++ b/Source/WebCore/bridge/runtime_object.h
@@ -54,7 +54,7 @@
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);
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 67885a7..9e39e2a 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+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
diff --git a/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm b/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
index 6627203..5c50f8d 100644
--- a/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+++ b/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
@@ -978,7 +978,7 @@
JSLock lock(SilenceAssertionsOnly);
ConstructData constructData;
- ConstructType constructType = object->getConstructData(constructData);
+ ConstructType constructType = object->getConstructDataVirtual(constructData);
if (constructType == ConstructTypeNone)
return false;
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index bac2f07..cf189bf 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+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:
+
2011-10-13 Sam Weinig <sam@webkit.org>
Another SnowLeopard build fix.
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
index 53f5860..ec5ee2b 100644
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
@@ -236,7 +236,7 @@
return JSValue::encode(static_cast<JSNPObject*>(constructor)->callConstructor(exec));
}
-ConstructType JSNPObject::getConstructData(ConstructData& constructData)
+ConstructType JSNPObject::getConstructDataVirtual(ConstructData& constructData)
{
return getConstructData(this, constructData);
}
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
index 23ffc8f..08643f7 100644
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
@@ -80,7 +80,7 @@
}
static JSC::CallType getCallData(JSC::JSCell*, JSC::CallData&);
- virtual JSC::ConstructType getConstructData(JSC::ConstructData&);
+ virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
