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/JSWithScope.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSWithScope.h') diff --git a/Source/JavaScriptCore/runtime/JSWithScope.h b/Source/JavaScriptCore/runtime/JSWithScope.h index ba2b793a9..ea879cb54 100644 --- a/Source/JavaScriptCore/runtime/JSWithScope.h +++ b/Source/JavaScriptCore/runtime/JSWithScope.h @@ -37,14 +37,14 @@ public: static JSWithScope* create(ExecState* exec, JSObject* object) { JSWithScope* withScope = new (NotNull, allocateCell(*exec->heap())) JSWithScope(exec, object); - withScope->finishCreation(exec->globalData()); + withScope->finishCreation(exec->vm()); return withScope; } static JSWithScope* create(ExecState* exec, JSObject* object, JSScope* next) { JSWithScope* withScope = new (NotNull, allocateCell(*exec->heap())) JSWithScope(exec, object, next); - withScope->finishCreation(exec->globalData()); + withScope->finishCreation(exec->vm()); return withScope; } @@ -52,9 +52,9 @@ public: static void visitChildren(JSCell*, SlotVisitor&); - static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue proto) + static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto) { - return Structure::create(globalData, globalObject, proto, TypeInfo(WithScopeType, StructureFlags), &s_info); + return Structure::create(vm, globalObject, proto, TypeInfo(WithScopeType, StructureFlags), &s_info); } static JS_EXPORTDATA const ClassInfo s_info; @@ -65,21 +65,21 @@ protected: private: JSWithScope(ExecState* exec, JSObject* object) : Base( - exec->globalData(), + exec->vm(), exec->lexicalGlobalObject()->withScopeStructure(), exec->scope() ) - , m_object(exec->globalData(), this, object) + , m_object(exec->vm(), this, object) { } JSWithScope(ExecState* exec, JSObject* object, JSScope* next) : Base( - exec->globalData(), + exec->vm(), exec->lexicalGlobalObject()->withScopeStructure(), next ) - , m_object(exec->globalData(), this, object) + , m_object(exec->vm(), this, object) { } -- cgit v1.2.1