diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/debugger/DebuggerActivation.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/debugger/DebuggerActivation.h')
| -rw-r--r-- | Source/JavaScriptCore/debugger/DebuggerActivation.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/debugger/DebuggerActivation.h b/Source/JavaScriptCore/debugger/DebuggerActivation.h index c934407fc..a33d6ddb2 100644 --- a/Source/JavaScriptCore/debugger/DebuggerActivation.h +++ b/Source/JavaScriptCore/debugger/DebuggerActivation.h @@ -34,10 +34,10 @@ namespace JSC { public: typedef JSNonFinalObject Base; - static DebuggerActivation* create(JSGlobalData& globalData, JSObject* object) + static DebuggerActivation* create(VM& vm, JSObject* object) { - DebuggerActivation* activation = new (NotNull, allocateCell<DebuggerActivation>(globalData.heap)) DebuggerActivation(globalData); - activation->finishCreation(globalData, object); + DebuggerActivation* activation = new (NotNull, allocateCell<DebuggerActivation>(vm.heap)) DebuggerActivation(vm); + activation->finishCreation(vm, object); return activation; } @@ -53,18 +53,18 @@ namespace JSC { JS_EXPORTDATA static const ClassInfo s_info; - 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: static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | JSObject::StructureFlags; - JS_EXPORT_PRIVATE void finishCreation(JSGlobalData&, JSObject* activation); + JS_EXPORT_PRIVATE void finishCreation(VM&, JSObject* activation); private: - JS_EXPORT_PRIVATE DebuggerActivation(JSGlobalData&); + JS_EXPORT_PRIVATE DebuggerActivation(VM&); WriteBarrier<JSActivation> m_activation; }; |