diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/JavaScriptCore/heap/CopiedSpace.h | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/JavaScriptCore/heap/CopiedSpace.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/CopiedSpace.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/heap/CopiedSpace.h b/Source/JavaScriptCore/heap/CopiedSpace.h index be3a331e8..ec394ca8f 100644 --- a/Source/JavaScriptCore/heap/CopiedSpace.h +++ b/Source/JavaScriptCore/heap/CopiedSpace.h @@ -44,7 +44,6 @@ namespace JSC { class Heap; class CopiedBlock; -class HeapBlock; class CopiedSpace { friend class SlotVisitor; @@ -101,12 +100,12 @@ private: SpinLock m_toSpaceLock; - DoublyLinkedList<HeapBlock>* m_toSpace; - DoublyLinkedList<HeapBlock>* m_fromSpace; + DoublyLinkedList<CopiedBlock>* m_toSpace; + DoublyLinkedList<CopiedBlock>* m_fromSpace; - DoublyLinkedList<HeapBlock> m_blocks1; - DoublyLinkedList<HeapBlock> m_blocks2; - DoublyLinkedList<HeapBlock> m_oversizeBlocks; + DoublyLinkedList<CopiedBlock> m_blocks1; + DoublyLinkedList<CopiedBlock> m_blocks2; + DoublyLinkedList<CopiedBlock> m_oversizeBlocks; bool m_inCopyingPhase; @@ -116,7 +115,7 @@ private: static const size_t s_maxAllocationSize = 32 * KB; static const size_t s_initialBlockNum = 16; - static const size_t s_blockMask = ~(HeapBlock::s_blockSize - 1); + static const size_t s_blockMask = ~(CopiedBlock::s_blockSize - 1); }; } // namespace JSC |