| Index: third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/TraceTraits.h b/third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| index fe2665f326764619c90169dad99ffba939feedc1..7cb60406c1b87b99bdb3338eb70c8913ea553eba 100644
|
| --- a/third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| +++ b/third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| @@ -220,9 +220,10 @@ class TraceTrait<const T> : public TraceTrait<T> {};
|
| template <typename T>
|
| void TraceTrait<T>::trace(Visitor* visitor, void* self) {
|
| static_assert(WTF::IsTraceable<T>::value, "T should not be traced");
|
| - if (visitor->getMarkingMode() == Visitor::GlobalMarking) {
|
| + if (visitor->isGlobalMarking()) {
|
| // Switch to inlined global marking dispatch.
|
| - static_cast<T*>(self)->trace(InlinedGlobalMarkingVisitor(visitor->state()));
|
| + static_cast<T*>(self)->trace(InlinedGlobalMarkingVisitor(
|
| + visitor->state(), visitor->getMarkingMode()));
|
| } else {
|
| static_cast<T*>(self)->trace(visitor);
|
| }
|
|
|