From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/runtime/StringObject.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/JavaScriptCore/runtime/StringObject.h') diff --git a/Source/JavaScriptCore/runtime/StringObject.h b/Source/JavaScriptCore/runtime/StringObject.h index 4369eace1..6a92541c1 100644 --- a/Source/JavaScriptCore/runtime/StringObject.h +++ b/Source/JavaScriptCore/runtime/StringObject.h @@ -33,14 +33,14 @@ namespace JSC { static StringObject* create(ExecState* exec, Structure* structure) { JSString* string = jsEmptyString(exec); - StringObject* object = new (NotNull, allocateCell(*exec->heap())) StringObject(exec->globalData(), structure); - object->finishCreation(exec->globalData(), string); + StringObject* object = new (NotNull, allocateCell(*exec->heap())) StringObject(exec->vm(), structure); + object->finishCreation(exec->vm(), string); return object; } static StringObject* create(ExecState* exec, Structure* structure, JSString* string) { - StringObject* object = new (NotNull, allocateCell(*exec->heap())) StringObject(exec->globalData(), structure); - object->finishCreation(exec->globalData(), string); + StringObject* object = new (NotNull, allocateCell(*exec->heap())) StringObject(exec->vm(), structure); + object->finishCreation(exec->vm(), string); return object; } static StringObject* create(ExecState*, JSGlobalObject*, JSString*); @@ -61,15 +61,15 @@ namespace JSC { JSString* internalValue() const { return asString(JSWrapperObject::internalValue());} - static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype) + static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype) { - return Structure::create(globalData, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info); + return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info); } protected: - JS_EXPORT_PRIVATE void finishCreation(JSGlobalData&, JSString*); + JS_EXPORT_PRIVATE void finishCreation(VM&, JSString*); static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | OverridesGetPropertyNames | JSWrapperObject::StructureFlags; - JS_EXPORT_PRIVATE StringObject(JSGlobalData&, Structure*); + JS_EXPORT_PRIVATE StringObject(VM&, Structure*); }; StringObject* asStringObject(JSValue); -- cgit v1.2.1