Commit 4df4765f authored by ggaren@apple.com's avatar ggaren@apple.com

2011-03-15 Geoffrey Garen <ggaren@apple.com>

        Reviewed by Oliver Hunt.

        Removed another deprecatedAppend
        https://bugs.webkit.org/show_bug.cgi?id=56429

        * collector/handles/HandleHeap.cpp:
        (JSC::HandleHeap::markStrongHandles):
        * collector/handles/HandleHeap.h: Use HeapRootMarker, since handles are
        marked directly by the Heap.

        * runtime/Heap.cpp:
        (JSC::Heap::markRoots): Ditto.


git-svn-id: svn://svn.chromium.org/blink/trunk@81196 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 27c502b3
2011-03-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Oliver Hunt.
Removed another deprecatedAppend
https://bugs.webkit.org/show_bug.cgi?id=56429
* collector/handles/HandleHeap.cpp:
(JSC::HandleHeap::markStrongHandles):
* collector/handles/HandleHeap.h: Use HeapRootMarker, since handles are
marked directly by the Heap.
* runtime/Heap.cpp:
(JSC::Heap::markRoots): Ditto.
2011-03-15 Geoffrey Garen <ggaren@apple.com> 2011-03-15 Geoffrey Garen <ggaren@apple.com>
Reviewed by Oliver Hunt. Reviewed by Oliver Hunt.
......
...@@ -51,11 +51,11 @@ void HandleHeap::grow() ...@@ -51,11 +51,11 @@ void HandleHeap::grow()
} }
} }
void HandleHeap::markStrongHandles(MarkStack& markStack) void HandleHeap::markStrongHandles(HeapRootMarker& heapRootMarker)
{ {
Node* end = m_strongList.end(); Node* end = m_strongList.end();
for (Node* node = m_strongList.begin(); node != end; node = node->next()) for (Node* node = m_strongList.begin(); node != end; node = node->next())
markStack.deprecatedAppend(node->slot()); heapRootMarker.mark(node->slot());
} }
void HandleHeap::updateAfterMark() void HandleHeap::updateAfterMark()
......
...@@ -36,7 +36,7 @@ namespace JSC { ...@@ -36,7 +36,7 @@ namespace JSC {
class HandleHeap; class HandleHeap;
class JSGlobalData; class JSGlobalData;
class JSValue; class JSValue;
class MarkStack; class HeapRootMarker;
class Finalizer { class Finalizer {
public: public:
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
void makeWeak(HandleSlot, Finalizer*, void* context); void makeWeak(HandleSlot, Finalizer*, void* context);
void makeSelfDestroying(HandleSlot, Finalizer*, void* context); void makeSelfDestroying(HandleSlot, Finalizer*, void* context);
void markStrongHandles(MarkStack&); void markStrongHandles(HeapRootMarker&);
void updateAfterMark(); void updateAfterMark();
// Should only be called during teardown. // Should only be called during teardown.
......
...@@ -232,7 +232,7 @@ void Heap::markRoots() ...@@ -232,7 +232,7 @@ void Heap::markRoots()
heapRootMarker.mark(&m_globalData->exception); heapRootMarker.mark(&m_globalData->exception);
markStack.drain(); markStack.drain();
m_handleHeap.markStrongHandles(markStack); m_handleHeap.markStrongHandles(heapRootMarker);
m_handleStack.mark(heapRootMarker); m_handleStack.mark(heapRootMarker);
// Mark the small strings cache last, since it will clear itself if nothing // Mark the small strings cache last, since it will clear itself if nothing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment