diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/JavaScriptCore/runtime/JSCell.h | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSCell.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSCell.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/runtime/JSCell.h b/Source/JavaScriptCore/runtime/JSCell.h index 7d4929d..95f4efa 100644 --- a/Source/JavaScriptCore/runtime/JSCell.h +++ b/Source/JavaScriptCore/runtime/JSCell.h @@ -25,7 +25,7 @@ #include "CallData.h" #include "ConstructData.h" -#include "Collector.h" +#include "Heap.h" #include "JSImmediate.h" #include "JSValue.h" #include "MarkStack.h" @@ -63,6 +63,7 @@ namespace JSC { friend class JSAPIValueWrapper; friend class JSZombie; friend class JSGlobalData; + friend class MarkedSpace; private: explicit JSCell(Structure*); @@ -362,7 +363,7 @@ namespace JSC { inline Heap* Heap::heap(JSCell* c) { - return cellBlock(c)->heap; + return MarkedSpace::cellBlock(c)->heap; } #if ENABLE(JSC_ZOMBIES) |