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/runtime/JSScope.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
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/runtime/JSScope.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSScope.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/JavaScriptCore/runtime/JSScope.h b/Source/JavaScriptCore/runtime/JSScope.h index a9a9dd8d8..95db8ad56 100644 --- a/Source/JavaScriptCore/runtime/JSScope.h +++ b/Source/JavaScriptCore/runtime/JSScope.h @@ -59,11 +59,11 @@ public: int localDepth(); JSGlobalObject* globalObject(); - JSGlobalData* globalData(); + VM* vm(); JSObject* globalThis(); protected: - JSScope(JSGlobalData&, Structure*, JSScope* next); + JSScope(VM&, Structure*, JSScope* next); static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags; private: @@ -80,9 +80,9 @@ private: template <ReturnValues> static JSObject* resolveContainingScope(CallFrame*, const Identifier&, PropertySlot&, ResolveOperations*, PutToBaseOperation*, bool isStrict); }; -inline JSScope::JSScope(JSGlobalData& globalData, Structure* structure, JSScope* next) - : Base(globalData, structure) - , m_next(globalData, this, next, WriteBarrier<JSScope>::MayBeNull) +inline JSScope::JSScope(VM& vm, Structure* structure, JSScope* next) + : Base(vm, structure) + , m_next(vm, this, next, WriteBarrier<JSScope>::MayBeNull) { } @@ -127,9 +127,9 @@ inline JSGlobalObject* JSScope::globalObject() return structure()->globalObject(); } -inline JSGlobalData* JSScope::globalData() +inline VM* JSScope::vm() { - return Heap::heap(this)->globalData(); + return Heap::heap(this)->vm(); } inline Register& Register::operator=(JSScope* scope) @@ -143,10 +143,10 @@ inline JSScope* Register::scope() const return jsCast<JSScope*>(jsValue()); } -inline JSGlobalData& ExecState::globalData() const +inline VM& ExecState::vm() const { - ASSERT(scope()->globalData()); - return *scope()->globalData(); + ASSERT(scope()->vm()); + return *scope()->vm(); } inline JSGlobalObject* ExecState::lexicalGlobalObject() const |