diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-23 17:03:15 +0200 |
| commit | a73d1c176f2f3e0458861de8590dc20321a501ae (patch) | |
| tree | d897fc5974797c3cb300d7f5916f258df765401f /Source/JavaScriptCore/heap/Heap.h | |
| parent | c311cf639cc1d6570d67b0a80a8ba04dc992a658 (diff) | |
| download | qtwebkit-a73d1c176f2f3e0458861de8590dc20321a501ae.tar.gz | |
Imported WebKit commit a5ae8a56a48e44ebfb9b81aaa5488affaffdb175 (http://svn.webkit.org/repository/webkit/trunk@126420)
New snapshot with OS X 10.6 build fix
Diffstat (limited to 'Source/JavaScriptCore/heap/Heap.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/Heap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/heap/Heap.h b/Source/JavaScriptCore/heap/Heap.h index f3474f2ea..6f13afb72 100644 --- a/Source/JavaScriptCore/heap/Heap.h +++ b/Source/JavaScriptCore/heap/Heap.h @@ -24,6 +24,7 @@ #include "BlockAllocator.h" #include "DFGCodeBlocks.h" +#include "GCThreadSharedData.h" #include "HandleSet.h" #include "HandleStack.h" #include "JITStubRoutineSet.h" @@ -74,7 +75,7 @@ namespace JSC { WTF_MAKE_NONCOPYABLE(Heap); public: friend class JIT; - friend class MarkStackThreadSharedData; + friend class GCThreadSharedData; static Heap* heap(const JSValue); // 0 for immediate values static Heap* heap(const JSCell*); @@ -231,7 +232,7 @@ namespace JSC { MachineThreads m_machineThreads; - MarkStackThreadSharedData m_sharedData; + GCThreadSharedData m_sharedData; SlotVisitor m_slotVisitor; HandleSet m_handleSet; |