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/JSNameScope.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSNameScope.h') diff --git a/Source/JavaScriptCore/runtime/JSNameScope.h b/Source/JavaScriptCore/runtime/JSNameScope.h index e67370d92..43763296c 100644 --- a/Source/JavaScriptCore/runtime/JSNameScope.h +++ b/Source/JavaScriptCore/runtime/JSNameScope.h @@ -56,15 +56,15 @@ public: static bool getOwnPropertySlot(JSCell*, ExecState*, PropertyName, PropertySlot&); static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&); - static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue proto) { return Structure::create(globalData, globalObject, proto, TypeInfo(NameScopeObjectType, StructureFlags), &s_info); } + static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto) { return Structure::create(vm, globalObject, proto, TypeInfo(NameScopeObjectType, StructureFlags), &s_info); } static const ClassInfo s_info; protected: void finishCreation(ExecState* exec, const Identifier& identifier, JSValue value, unsigned attributes) { - Base::finishCreation(exec->globalData()); - m_registerStore.set(exec->globalData(), this, value); + Base::finishCreation(exec->vm()); + m_registerStore.set(exec->vm(), this, value); symbolTable()->add(identifier.impl(), SymbolTableEntry(-1, attributes)); } @@ -73,7 +73,7 @@ protected: private: JSNameScope(ExecState* exec, JSScope* next) : Base( - exec->globalData(), + exec->vm(), exec->lexicalGlobalObject()->nameScopeStructure(), reinterpret_cast(&m_registerStore + 1), next -- cgit v1.2.1