From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/runtime/StrictEvalActivation.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'Source/JavaScriptCore/runtime/StrictEvalActivation.h') diff --git a/Source/JavaScriptCore/runtime/StrictEvalActivation.h b/Source/JavaScriptCore/runtime/StrictEvalActivation.h index df490d5e7..13157f68a 100644 --- a/Source/JavaScriptCore/runtime/StrictEvalActivation.h +++ b/Source/JavaScriptCore/runtime/StrictEvalActivation.h @@ -33,29 +33,27 @@ namespace JSC { class StrictEvalActivation : public JSScope { public: typedef JSScope Base; + static const unsigned StructureFlags = Base::StructureFlags | IsEnvironmentRecord; - static StrictEvalActivation* create(ExecState* exec) + static StrictEvalActivation* create(ExecState* exec, JSScope* currentScope) { - StrictEvalActivation* activation = new (NotNull, allocateCell(*exec->heap())) StrictEvalActivation(exec); - activation->finishCreation(exec->vm()); - return activation; + StrictEvalActivation* lexicalEnvironment = new (NotNull, allocateCell(*exec->heap())) StrictEvalActivation(exec, currentScope); + lexicalEnvironment->finishCreation(exec->vm()); + return lexicalEnvironment; } static bool deleteProperty(JSCell*, ExecState*, PropertyName); - static JSObject* toThisObject(JSCell*, ExecState*); + static JSValue toThis(JSCell*, ExecState*, ECMAMode); static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype) { - return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info); + return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info()); } - static const ClassInfo s_info; - -protected: - static const unsigned StructureFlags = IsEnvironmentRecord | Base::StructureFlags; + DECLARE_INFO; private: - StrictEvalActivation(ExecState*); + StrictEvalActivation(ExecState*, JSScope*); }; } // namespace JSC -- cgit v1.2.1