Unreviewed, rolling out r96630.

http://trac.webkit.org/changeset/96630
https://bugs.webkit.org/show_bug.cgi?id=69368

Caused assertion failures in validateCell (Requested by
mhahnenberg on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-10-04

Source/JavaScriptCore:

* runtime/BooleanConstructor.cpp:
* runtime/BooleanConstructor.h:
* runtime/Error.cpp:
(JSC::StrictModeTypeErrorFunction::getCallDataVirtual):
(JSC::StrictModeTypeErrorFunction::getCallData):
* runtime/ErrorConstructor.cpp:
* runtime/ErrorConstructor.h:
* runtime/FunctionConstructor.cpp:
* runtime/FunctionConstructor.h:
* runtime/FunctionPrototype.cpp:
* runtime/FunctionPrototype.h:

Source/WebCore:

* bridge/qt/qt_runtime.cpp:
* bridge/qt/qt_runtime.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96637 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 984f34ea
2011-10-04 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r96630.
http://trac.webkit.org/changeset/96630
https://bugs.webkit.org/show_bug.cgi?id=69368
Caused assertion failures in validateCell (Requested by
mhahnenberg on #webkit).
* runtime/BooleanConstructor.cpp:
* runtime/BooleanConstructor.h:
* runtime/Error.cpp:
(JSC::StrictModeTypeErrorFunction::getCallDataVirtual):
(JSC::StrictModeTypeErrorFunction::getCallData):
* runtime/ErrorConstructor.cpp:
* runtime/ErrorConstructor.h:
* runtime/FunctionConstructor.cpp:
* runtime/FunctionConstructor.h:
* runtime/FunctionPrototype.cpp:
* runtime/FunctionPrototype.h:
2011-10-04 Mark Hahnenberg <mhahnenberg@apple.com>
Add static ClassInfo structs to classes that override JSCell::getCallData
......@@ -28,8 +28,6 @@ namespace JSC {
ASSERT_CLASS_FITS_IN_CELL(BooleanConstructor);
const ClassInfo BooleanConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(BooleanConstructor) };
BooleanConstructor::BooleanConstructor(JSGlobalObject* globalObject, Structure* structure)
: InternalFunction(globalObject, structure)
{
......
......@@ -38,8 +38,6 @@ namespace JSC {
return constructor;
}
static const ClassInfo s_info;
protected:
void finishCreation(ExecState*, BooleanPrototype*);
......
......@@ -201,27 +201,23 @@ public:
return JSValue::encode(jsNull());
}
virtual CallType getCallDataVirtual(CallData& callData)
CallType getCallDataVirtual(CallData& callData)
{
return getCallData(this, callData);
}
static CallType getCallData(JSCell*, CallData& callData)
CallType getCallData(JSCell*, CallData& callData)
{
callData.native.function = callThrowTypeError;
return CallTypeHost;
}
static const ClassInfo s_info;
private:
UString m_message;
};
ASSERT_CLASS_FITS_IN_CELL(StrictModeTypeErrorFunction);
const ClassInfo StrictModeTypeErrorFunction::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(StrictModeTypeErrorFunction) };
JSValue createTypeErrorFunction(ExecState* exec, const UString& message)
{
return StrictModeTypeErrorFunction::create(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->internalFunctionStructure(), message);
......
......@@ -29,8 +29,6 @@ namespace JSC {
ASSERT_CLASS_FITS_IN_CELL(ErrorConstructor);
const ClassInfo ErrorConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(ErrorConstructor) };
ErrorConstructor::ErrorConstructor(JSGlobalObject* globalObject, Structure* structure)
: InternalFunction(globalObject, structure)
{
......
......@@ -39,8 +39,6 @@ namespace JSC {
return constructor;
}
static const ClassInfo s_info;
protected:
void finishCreation(ExecState*, ErrorPrototype*);
......
......@@ -37,8 +37,6 @@ namespace JSC {
ASSERT_CLASS_FITS_IN_CELL(FunctionConstructor);
const ClassInfo FunctionConstructor::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(FunctionConstructor) };
FunctionConstructor::FunctionConstructor(JSGlobalObject* globalObject, Structure* structure)
: InternalFunction(globalObject, structure)
{
......
......@@ -38,8 +38,6 @@ namespace JSC {
return constructor;
}
static const ClassInfo s_info;
private:
FunctionConstructor(JSGlobalObject*, Structure*);
void finishCreation(ExecState*, FunctionPrototype*);
......
......@@ -39,8 +39,6 @@ static EncodedJSValue JSC_HOST_CALL functionProtoFuncApply(ExecState*);
static EncodedJSValue JSC_HOST_CALL functionProtoFuncCall(ExecState*);
static EncodedJSValue JSC_HOST_CALL functionProtoFuncBind(ExecState*);
const ClassInfo FunctionPrototype::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(FunctionPrototype) };
FunctionPrototype::FunctionPrototype(JSGlobalObject* globalObject, Structure* structure)
: InternalFunction(globalObject, structure)
{
......
......@@ -43,8 +43,6 @@ namespace JSC {
return Structure::create(globalData, globalObject, proto, TypeInfo(ObjectType, StructureFlags), &s_info);
}
static const ClassInfo s_info;
protected:
void finishCreation(ExecState*, const Identifier& name);
......
2011-10-04 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r96630.
http://trac.webkit.org/changeset/96630
https://bugs.webkit.org/show_bug.cgi?id=69368
Caused assertion failures in validateCell (Requested by
mhahnenberg on #webkit).
* bridge/qt/qt_runtime.cpp:
* bridge/qt/qt_runtime.h:
2011-10-04 Cary Clark <caryclark@google.com>
Enable sub pixel text (Skia on Mac)
......@@ -1425,8 +1425,6 @@ static int findSignalIndex(const QMetaObject* meta, int initialIndex, QByteArray
return index;
}
const ClassInfo QtRuntimeMetaMethod::s_info = { "QtRuntimeMethod", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(QtRuntimeMetaMethod) };
QtRuntimeMetaMethod::QtRuntimeMetaMethod(ExecState* exec, Structure* structure, const Identifier& identifier)
: QtRuntimeMethod (new QtRuntimeMetaMethodData(), exec, structure, identifier)
{
......@@ -1582,8 +1580,6 @@ JSValue QtRuntimeMetaMethod::disconnectGetter(ExecState* exec, JSValue slotBase,
QMultiMap<QObject*, QtConnectionObject*> QtRuntimeConnectionMethod::connections;
const ClassInfo QtRuntimeConnectionMethod::s_info = { "QtRuntimeMethod", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(QtRuntimeConnectionMethod) };
QtRuntimeConnectionMethod::QtRuntimeConnectionMethod(ExecState* exec, Structure* structure, const Identifier& identifier)
: QtRuntimeMethod (new QtRuntimeConnectionMethodData(), exec, structure, identifier)
{
......
......@@ -170,8 +170,6 @@ public:
static void visitChildren(JSCell*, SlotVisitor&);
static const ClassInfo s_info;
protected:
QtRuntimeMetaMethodData* d_func() const {return reinterpret_cast<QtRuntimeMetaMethodData*>(d_ptr);}
......@@ -203,8 +201,6 @@ public:
virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
static const ClassInfo s_info;
protected:
QtRuntimeConnectionMethodData* d_func() const {return reinterpret_cast<QtRuntimeConnectionMethodData*>(d_ptr);}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment