| Index: third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
|
| index 561d28e39cd2632c3f4787009a9ad248ebdb2614..4dcdb8177ec21b16fdfdf722629bba98c27c976b 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
|
| @@ -36,7 +36,8 @@
|
| : m_isolate(context->GetIsolate()),
|
| m_context(m_isolate, context),
|
| m_world(world),
|
| - m_perContextData(V8PerContextData::create(context)) {
|
| + m_perContextData(V8PerContextData::create(context))
|
| +{
|
| DCHECK(m_world);
|
| m_context.setWeak(this, &contextCollectedCallback);
|
| context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this);
|
| @@ -50,6 +51,9 @@
|
| void ScriptState::detachGlobalObject() {
|
| ASSERT(!m_context.isEmpty());
|
| context()->DetachGlobal();
|
| +#if DCHECK_IS_ON()
|
| + m_globalObjectDetached = true;
|
| +#endif
|
| }
|
|
|
| void ScriptState::disposePerContextData() {
|
|
|