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/CopiedSpaceInlines.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/CopiedSpaceInlines.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/CopiedSpaceInlines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/heap/CopiedSpaceInlines.h b/Source/JavaScriptCore/heap/CopiedSpaceInlines.h index 6087cf4c2..47f2414f3 100644 --- a/Source/JavaScriptCore/heap/CopiedSpaceInlines.h +++ b/Source/JavaScriptCore/heap/CopiedSpaceInlines.h @@ -30,7 +30,7 @@ #include "CopiedSpace.h" #include "Heap.h" #include "HeapBlock.h" -#include "JSGlobalData.h" +#include "VM.h" #include <wtf/CheckedBoolean.h> namespace JSC { @@ -150,7 +150,7 @@ inline void CopiedSpace::allocateBlock() inline CheckedBoolean CopiedSpace::tryAllocate(size_t bytes, void** outPtr) { - ASSERT(!m_heap->globalData()->isInitializingObject()); + ASSERT(!m_heap->vm()->isInitializingObject()); if (!m_allocator.tryAllocate(bytes, outPtr)) return tryAllocateSlowCase(bytes, outPtr); |