Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96636 => 96637)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-04 20:37:58 UTC (rev 96637)
@@ -1,3 +1,24 @@
+2011-10-04 Sheriff Bot <webkit.review....@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 <mhahnenb...@apple.com>
Add static ClassInfo structs to classes that override JSCell::getCallData
Modified: trunk/Source/_javascript_Core/runtime/BooleanConstructor.cpp (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/BooleanConstructor.cpp 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/BooleanConstructor.cpp 2011-10-04 20:37:58 UTC (rev 96637)
@@ -28,8 +28,6 @@
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)
{
Modified: trunk/Source/_javascript_Core/runtime/BooleanConstructor.h (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/BooleanConstructor.h 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/BooleanConstructor.h 2011-10-04 20:37:58 UTC (rev 96637)
@@ -38,8 +38,6 @@
return constructor;
}
- static const ClassInfo s_info;
-
protected:
void finishCreation(ExecState*, BooleanPrototype*);
Modified: trunk/Source/_javascript_Core/runtime/Error.cpp (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/Error.cpp 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/Error.cpp 2011-10-04 20:37:58 UTC (rev 96637)
@@ -201,27 +201,23 @@
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);
Modified: trunk/Source/_javascript_Core/runtime/ErrorConstructor.cpp (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/ErrorConstructor.cpp 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/ErrorConstructor.cpp 2011-10-04 20:37:58 UTC (rev 96637)
@@ -29,8 +29,6 @@
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)
{
Modified: trunk/Source/_javascript_Core/runtime/ErrorConstructor.h (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/ErrorConstructor.h 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/ErrorConstructor.h 2011-10-04 20:37:58 UTC (rev 96637)
@@ -39,8 +39,6 @@
return constructor;
}
- static const ClassInfo s_info;
-
protected:
void finishCreation(ExecState*, ErrorPrototype*);
Modified: trunk/Source/_javascript_Core/runtime/FunctionConstructor.cpp (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/FunctionConstructor.cpp 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/FunctionConstructor.cpp 2011-10-04 20:37:58 UTC (rev 96637)
@@ -37,8 +37,6 @@
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)
{
Modified: trunk/Source/_javascript_Core/runtime/FunctionConstructor.h (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/FunctionConstructor.h 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/FunctionConstructor.h 2011-10-04 20:37:58 UTC (rev 96637)
@@ -38,8 +38,6 @@
return constructor;
}
- static const ClassInfo s_info;
-
private:
FunctionConstructor(JSGlobalObject*, Structure*);
void finishCreation(ExecState*, FunctionPrototype*);
Modified: trunk/Source/_javascript_Core/runtime/FunctionPrototype.cpp (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/FunctionPrototype.cpp 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/FunctionPrototype.cpp 2011-10-04 20:37:58 UTC (rev 96637)
@@ -39,8 +39,6 @@
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)
{
Modified: trunk/Source/_javascript_Core/runtime/FunctionPrototype.h (96636 => 96637)
--- trunk/Source/_javascript_Core/runtime/FunctionPrototype.h 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/_javascript_Core/runtime/FunctionPrototype.h 2011-10-04 20:37:58 UTC (rev 96637)
@@ -43,8 +43,6 @@
return Structure::create(globalData, globalObject, proto, TypeInfo(ObjectType, StructureFlags), &s_info);
}
- static const ClassInfo s_info;
-
protected:
void finishCreation(ExecState*, const Identifier& name);
Modified: trunk/Source/WebCore/ChangeLog (96636 => 96637)
--- trunk/Source/WebCore/ChangeLog 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/WebCore/ChangeLog 2011-10-04 20:37:58 UTC (rev 96637)
@@ -1,3 +1,15 @@
+2011-10-04 Sheriff Bot <webkit.review....@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 <carycl...@google.com>
Enable sub pixel text (Skia on Mac)
Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.cpp (96636 => 96637)
--- trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2011-10-04 20:37:58 UTC (rev 96637)
@@ -1425,8 +1425,6 @@
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 @@
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)
{
Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.h (96636 => 96637)
--- trunk/Source/WebCore/bridge/qt/qt_runtime.h 2011-10-04 20:24:35 UTC (rev 96636)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.h 2011-10-04 20:37:58 UTC (rev 96637)
@@ -170,8 +170,6 @@
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 @@
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);}
