diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/JavaScriptCore/collector/handles/HandleHeap.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/JavaScriptCore/collector/handles/HandleHeap.h')
| -rw-r--r-- | Source/JavaScriptCore/collector/handles/HandleHeap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/collector/handles/HandleHeap.h b/Source/JavaScriptCore/collector/handles/HandleHeap.h index 4bb9b00..ed462d4 100644 --- a/Source/JavaScriptCore/collector/handles/HandleHeap.h +++ b/Source/JavaScriptCore/collector/handles/HandleHeap.h @@ -36,7 +36,7 @@ namespace JSC { class HandleHeap; class JSGlobalData; class JSValue; -class MarkStack; +class HeapRootMarker; class Finalizer { public: @@ -56,7 +56,7 @@ public: void makeWeak(HandleSlot, Finalizer*, void* context); void makeSelfDestroying(HandleSlot, Finalizer*, void* context); - void markStrongHandles(MarkStack&); + void markStrongHandles(HeapRootMarker&); void updateAfterMark(); // Should only be called during teardown. |