| Index: third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp
|
| index 3776da9353286a286c5197bb1fc6e90e04bada56..7227fa533e425aa3c465876f91d633cd011242cc 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptWrappableVisitor.cpp
|
| @@ -30,7 +30,7 @@ void ScriptWrappableVisitor::TracePrologue() {
|
| // This CHECK ensures that wrapper tracing is not started from scopes
|
| // that forbid GC execution, e.g., constructors.
|
| CHECK(ThreadState::current());
|
| - CHECK(!ThreadState::current()->isGCForbidden());
|
| + CHECK(!ThreadState::current()->isWrapperTracingForbidden());
|
| performCleanup();
|
|
|
| CHECK(!m_tracingInProgress);
|
| @@ -43,13 +43,13 @@ void ScriptWrappableVisitor::TracePrologue() {
|
|
|
| void ScriptWrappableVisitor::EnterFinalPause() {
|
| CHECK(ThreadState::current());
|
| - CHECK(!ThreadState::current()->isGCForbidden());
|
| + CHECK(!ThreadState::current()->isWrapperTracingForbidden());
|
| ActiveScriptWrappable::traceActiveScriptWrappables(m_isolate, this);
|
| }
|
|
|
| void ScriptWrappableVisitor::TraceEpilogue() {
|
| CHECK(ThreadState::current());
|
| - CHECK(!ThreadState::current()->isGCForbidden());
|
| + CHECK(!ThreadState::current()->isWrapperTracingForbidden());
|
| DCHECK(m_markingDeque.isEmpty());
|
| #if DCHECK_IS_ON()
|
| ScriptWrappableVisitorVerifier verifier;
|
| @@ -185,7 +185,7 @@ bool ScriptWrappableVisitor::AdvanceTracing(
|
| // perform a GC. This makes sure that TraceTraits and friends find
|
| // themselves in a well-defined environment, e.g., properly set up vtables.
|
| CHECK(ThreadState::current());
|
| - CHECK(!ThreadState::current()->isGCForbidden());
|
| + CHECK(!ThreadState::current()->isWrapperTracingForbidden());
|
| CHECK(m_tracingInProgress);
|
| WTF::AutoReset<bool>(&m_advancingTracing, true);
|
| while (actions.force_completion ==
|
|
|