OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "platform/heap/Visitor.h" | 5 #include "platform/heap/Visitor.h" |
6 | 6 |
7 #include "platform/heap/BlinkGC.h" | 7 #include "platform/heap/BlinkGC.h" |
8 #include "platform/heap/MarkingVisitor.h" | 8 #include "platform/heap/MarkingVisitor.h" |
9 #include "platform/heap/ThreadState.h" | 9 #include "platform/heap/ThreadState.h" |
| 10 #include "wtf/PtrUtil.h" |
| 11 #include <memory> |
10 | 12 |
11 namespace blink { | 13 namespace blink { |
12 | 14 |
13 PassOwnPtr<Visitor> Visitor::create(ThreadState* state, BlinkGC::GCType gcType) | 15 std::unique_ptr<Visitor> Visitor::create(ThreadState* state, BlinkGC::GCType gcT
ype) |
14 { | 16 { |
15 switch (gcType) { | 17 switch (gcType) { |
16 case BlinkGC::GCWithSweep: | 18 case BlinkGC::GCWithSweep: |
17 case BlinkGC::GCWithoutSweep: | 19 case BlinkGC::GCWithoutSweep: |
18 return adoptPtr(new MarkingVisitor<Visitor::GlobalMarking>(state)); | 20 return wrapUnique(new MarkingVisitor<Visitor::GlobalMarking>(state)); |
19 case BlinkGC::TakeSnapshot: | 21 case BlinkGC::TakeSnapshot: |
20 return adoptPtr(new MarkingVisitor<Visitor::SnapshotMarking>(state)); | 22 return wrapUnique(new MarkingVisitor<Visitor::SnapshotMarking>(state)); |
21 case BlinkGC::ThreadTerminationGC: | 23 case BlinkGC::ThreadTerminationGC: |
22 return adoptPtr(new MarkingVisitor<Visitor::ThreadLocalMarking>(state)); | 24 return wrapUnique(new MarkingVisitor<Visitor::ThreadLocalMarking>(state)
); |
23 case BlinkGC::ThreadLocalWeakProcessing: | 25 case BlinkGC::ThreadLocalWeakProcessing: |
24 return adoptPtr(new MarkingVisitor<Visitor::WeakProcessing>(state)); | 26 return wrapUnique(new MarkingVisitor<Visitor::WeakProcessing>(state)); |
25 default: | 27 default: |
26 ASSERT_NOT_REACHED(); | 28 ASSERT_NOT_REACHED(); |
27 } | 29 } |
28 return nullptr; | 30 return nullptr; |
29 } | 31 } |
30 | 32 |
31 Visitor::Visitor(ThreadState* state, MarkingMode markingMode) | 33 Visitor::Visitor(ThreadState* state, MarkingMode markingMode) |
32 : VisitorHelper(state) | 34 : VisitorHelper(state) |
33 , m_markingMode(markingMode) | 35 , m_markingMode(markingMode) |
34 { | 36 { |
35 // See ThreadState::runScheduledGC() why we need to already be in a | 37 // See ThreadState::runScheduledGC() why we need to already be in a |
36 // GCForbiddenScope before any safe point is entered. | 38 // GCForbiddenScope before any safe point is entered. |
37 state->enterGCForbiddenScope(); | 39 state->enterGCForbiddenScope(); |
38 | 40 |
39 ASSERT(state->checkThread()); | 41 ASSERT(state->checkThread()); |
40 } | 42 } |
41 | 43 |
42 Visitor::~Visitor() | 44 Visitor::~Visitor() |
43 { | 45 { |
44 state()->leaveGCForbiddenScope(); | 46 state()->leaveGCForbiddenScope(); |
45 } | 47 } |
46 | 48 |
47 } // namespace blink | 49 } // namespace blink |
OLD | NEW |