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/heap/WeakSet.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/heap/WeakSet.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/WeakSet.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/heap/WeakSet.h b/Source/JavaScriptCore/heap/WeakSet.h index 06514eb69..580cbe7a9 100644 --- a/Source/JavaScriptCore/heap/WeakSet.h +++ b/Source/JavaScriptCore/heap/WeakSet.h @@ -38,12 +38,12 @@ public: static WeakImpl* allocate(JSValue, WeakHandleOwner* = 0, void* context = 0); static void deallocate(WeakImpl*); - WeakSet(JSGlobalData*); + WeakSet(VM*); ~WeakSet(); void lastChanceToFinalize(); Heap* heap() const; - JSGlobalData* globalData() const; + VM* vm() const; bool isEmpty() const; @@ -62,19 +62,19 @@ private: WeakBlock::FreeCell* m_allocator; WeakBlock* m_nextAllocator; DoublyLinkedList<WeakBlock> m_blocks; - JSGlobalData* m_globalData; + VM* m_vm; }; -inline WeakSet::WeakSet(JSGlobalData* globalData) +inline WeakSet::WeakSet(VM* vm) : m_allocator(0) , m_nextAllocator(0) - , m_globalData(globalData) + , m_vm(vm) { } -inline JSGlobalData* WeakSet::globalData() const +inline VM* WeakSet::vm() const { - return m_globalData; + return m_vm; } inline bool WeakSet::isEmpty() const |