| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "bindings/core/v8/ScriptState.h" | 5 #include "bindings/core/v8/ScriptState.h" | 
| 6 | 6 | 
| 7 #include "bindings/core/v8/V8Binding.h" | 7 #include "bindings/core/v8/V8Binding.h" | 
| 8 #include "core/dom/ExecutionContext.h" | 8 #include "core/dom/ExecutionContext.h" | 
| 9 #include "core/frame/LocalDOMWindow.h" | 9 #include "core/frame/LocalDOMWindow.h" | 
| 10 #include "core/frame/LocalFrame.h" | 10 #include "core/frame/LocalFrame.h" | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 29     const v8::WeakCallbackInfo<ScriptState>& data) { | 29     const v8::WeakCallbackInfo<ScriptState>& data) { | 
| 30   data.GetParameter()->clearContext(); | 30   data.GetParameter()->clearContext(); | 
| 31   data.SetSecondPassCallback(derefCallback); | 31   data.SetSecondPassCallback(derefCallback); | 
| 32 } | 32 } | 
| 33 | 33 | 
| 34 ScriptState::ScriptState(v8::Local<v8::Context> context, | 34 ScriptState::ScriptState(v8::Local<v8::Context> context, | 
| 35                          PassRefPtr<DOMWrapperWorld> world) | 35                          PassRefPtr<DOMWrapperWorld> world) | 
| 36     : m_isolate(context->GetIsolate()), | 36     : m_isolate(context->GetIsolate()), | 
| 37       m_context(m_isolate, context), | 37       m_context(m_isolate, context), | 
| 38       m_world(world), | 38       m_world(world), | 
| 39       m_perContextData(V8PerContextData::create(context)) | 39       m_perContextData(V8PerContextData::create(context)) { | 
| 40 { |  | 
| 41   DCHECK(m_world); | 40   DCHECK(m_world); | 
| 42   m_context.setWeak(this, &contextCollectedCallback); | 41   m_context.setWeak(this, &contextCollectedCallback); | 
| 43   context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this); | 42   context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this); | 
| 44 } | 43 } | 
| 45 | 44 | 
| 46 ScriptState::~ScriptState() { | 45 ScriptState::~ScriptState() { | 
| 47   ASSERT(!m_perContextData); | 46   ASSERT(!m_perContextData); | 
| 48   ASSERT(m_context.isEmpty()); | 47   ASSERT(m_context.isEmpty()); | 
| 49 } | 48 } | 
| 50 | 49 | 
| 51 void ScriptState::detachGlobalObject() { | 50 void ScriptState::detachGlobalObject() { | 
| 52   ASSERT(!m_context.isEmpty()); | 51   ASSERT(!m_context.isEmpty()); | 
| 53   context()->DetachGlobal(); | 52   context()->DetachGlobal(); | 
| 54 #if DCHECK_IS_ON() |  | 
| 55   m_globalObjectDetached = true; |  | 
| 56 #endif |  | 
| 57 } | 53 } | 
| 58 | 54 | 
| 59 void ScriptState::disposePerContextData() { | 55 void ScriptState::disposePerContextData() { | 
| 60   m_perContextData = nullptr; | 56   m_perContextData = nullptr; | 
| 61 } | 57 } | 
| 62 | 58 | 
| 63 ScriptValue ScriptState::getFromExtrasExports(const char* name) { | 59 ScriptValue ScriptState::getFromExtrasExports(const char* name) { | 
| 64   v8::HandleScope handleScope(m_isolate); | 60   v8::HandleScope handleScope(m_isolate); | 
| 65   v8::Local<v8::Value> v8Value; | 61   v8::Local<v8::Value> v8Value; | 
| 66   if (!context() | 62   if (!context() | 
| (...skipping 27 matching lines...) Expand all  Loading... | 
| 94   v8::HandleScope handleScope(toIsolate(frame)); | 90   v8::HandleScope handleScope(toIsolate(frame)); | 
| 95   v8::Local<v8::Context> context = toV8Context(frame, world); | 91   v8::Local<v8::Context> context = toV8Context(frame, world); | 
| 96   if (context.IsEmpty()) | 92   if (context.IsEmpty()) | 
| 97     return nullptr; | 93     return nullptr; | 
| 98   ScriptState* scriptState = ScriptState::from(context); | 94   ScriptState* scriptState = ScriptState::from(context); | 
| 99   ASSERT(scriptState->contextIsValid()); | 95   ASSERT(scriptState->contextIsValid()); | 
| 100   return scriptState; | 96   return scriptState; | 
| 101 } | 97 } | 
| 102 | 98 | 
| 103 }  // namespace blink | 99 }  // namespace blink | 
| OLD | NEW | 
|---|