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/GCThreadSharedData.cpp | |
| 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/GCThreadSharedData.cpp')
| -rw-r--r-- | Source/JavaScriptCore/heap/GCThreadSharedData.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/heap/GCThreadSharedData.cpp b/Source/JavaScriptCore/heap/GCThreadSharedData.cpp index 5d2e908f1..b39ab5763 100644 --- a/Source/JavaScriptCore/heap/GCThreadSharedData.cpp +++ b/Source/JavaScriptCore/heap/GCThreadSharedData.cpp @@ -29,7 +29,7 @@ #include "CopyVisitor.h" #include "CopyVisitorInlines.h" #include "GCThread.h" -#include "JSGlobalData.h" +#include "VM.h" #include "MarkStack.h" #include "SlotVisitor.h" #include "SlotVisitorInlines.h" @@ -52,11 +52,11 @@ size_t GCThreadSharedData::childVisitCount() } #endif -GCThreadSharedData::GCThreadSharedData(JSGlobalData* globalData) - : m_globalData(globalData) - , m_copiedSpace(&globalData->heap.m_storageSpace) - , m_shouldHashConst(false) - , m_sharedMarkStack(globalData->heap.blockAllocator()) +GCThreadSharedData::GCThreadSharedData(VM* vm) + : m_vm(vm) + , m_copiedSpace(&vm->heap.m_storageSpace) + , m_shouldHashCons(false) + , m_sharedMarkStack(vm->heap.blockAllocator()) , m_numberOfActiveParallelMarkers(0) , m_parallelMarkersShouldExit(false) , m_copyIndex(0) @@ -115,9 +115,9 @@ void GCThreadSharedData::reset() #endif m_weakReferenceHarvesters.removeAll(); - if (m_shouldHashConst) { - m_globalData->resetNewStringsSinceLastHashConst(); - m_shouldHashConst = false; + if (m_shouldHashCons) { + m_vm->resetNewStringsSinceLastHashCons(); + m_shouldHashCons = false; } } |