| 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/v8_inspector/InspectedContext.h" | 5 #include "platform/v8_inspector/InspectedContext.h" |
| 6 | 6 |
| 7 #include "platform/v8_inspector/InjectedScript.h" | 7 #include "platform/v8_inspector/InjectedScript.h" |
| 8 #include "platform/v8_inspector/V8Console.h" | 8 #include "platform/v8_inspector/V8Console.h" |
| 9 #include "platform/v8_inspector/V8InspectorImpl.h" | 9 #include "platform/v8_inspector/V8InspectorImpl.h" |
| 10 #include "platform/v8_inspector/V8StringUtil.h" | 10 #include "platform/v8_inspector/V8StringUtil.h" |
| 11 #include "platform/v8_inspector/V8ValueCopier.h" |
| 11 #include "platform/v8_inspector/public/V8ContextInfo.h" | 12 #include "platform/v8_inspector/public/V8ContextInfo.h" |
| 12 #include "platform/v8_inspector/public/V8InspectorClient.h" | 13 #include "platform/v8_inspector/public/V8InspectorClient.h" |
| 13 | 14 |
| 14 namespace v8_inspector { | 15 namespace v8_inspector { |
| 15 | 16 |
| 16 void InspectedContext::weakCallback(const v8::WeakCallbackInfo<InspectedContext>
& data) | 17 void InspectedContext::weakCallback(const v8::WeakCallbackInfo<InspectedContext>
& data) |
| 17 { | 18 { |
| 18 InspectedContext* context = data.GetParameter(); | 19 InspectedContext* context = data.GetParameter(); |
| 19 if (!context->m_context.IsEmpty()) { | 20 if (!context->m_context.IsEmpty()) { |
| 20 context->m_context.Reset(); | 21 context->m_context.Reset(); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 37 , m_origin(info.origin) | 38 , m_origin(info.origin) |
| 38 , m_humanReadableName(info.humanReadableName) | 39 , m_humanReadableName(info.humanReadableName) |
| 39 , m_auxData(info.auxData) | 40 , m_auxData(info.auxData) |
| 40 , m_reported(false) | 41 , m_reported(false) |
| 41 { | 42 { |
| 42 m_context.SetWeak(this, &InspectedContext::weakCallback, v8::WeakCallbackTyp
e::kParameter); | 43 m_context.SetWeak(this, &InspectedContext::weakCallback, v8::WeakCallbackTyp
e::kParameter); |
| 43 | 44 |
| 44 v8::Isolate* isolate = m_inspector->isolate(); | 45 v8::Isolate* isolate = m_inspector->isolate(); |
| 45 v8::Local<v8::Object> global = info.context->Global(); | 46 v8::Local<v8::Object> global = info.context->Global(); |
| 46 v8::Local<v8::Object> console = V8Console::createConsole(this, info.hasMemor
yOnConsole); | 47 v8::Local<v8::Object> console = V8Console::createConsole(this, info.hasMemor
yOnConsole); |
| 47 if (!global->Set(info.context, toV8StringInternalized(isolate, "console"), c
onsole).FromMaybe(false)) | 48 if (!safeCreateDataProperty(info.context, global, toV8StringInternalized(iso
late, "console"), console).FromMaybe(false)) |
| 48 return; | 49 return; |
| 49 m_console.Reset(isolate, console); | 50 m_console.Reset(isolate, console); |
| 50 m_console.SetWeak(this, &InspectedContext::consoleWeakCallback, v8::WeakCall
backType::kParameter); | 51 m_console.SetWeak(this, &InspectedContext::consoleWeakCallback, v8::WeakCall
backType::kParameter); |
| 51 } | 52 } |
| 52 | 53 |
| 53 InspectedContext::~InspectedContext() | 54 InspectedContext::~InspectedContext() |
| 54 { | 55 { |
| 55 if (!m_context.IsEmpty() && !m_console.IsEmpty()) { | 56 if (!m_context.IsEmpty() && !m_console.IsEmpty()) { |
| 56 v8::HandleScope scope(isolate()); | 57 v8::HandleScope scope(isolate()); |
| 57 V8Console::clearInspectedContextIfNeeded(context(), m_console.Get(isolat
e())); | 58 V8Console::clearInspectedContextIfNeeded(context(), m_console.Get(isolat
e())); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 73 DCHECK(!m_injectedScript); | 74 DCHECK(!m_injectedScript); |
| 74 m_injectedScript = InjectedScript::create(this); | 75 m_injectedScript = InjectedScript::create(this); |
| 75 } | 76 } |
| 76 | 77 |
| 77 void InspectedContext::discardInjectedScript() | 78 void InspectedContext::discardInjectedScript() |
| 78 { | 79 { |
| 79 m_injectedScript.reset(); | 80 m_injectedScript.reset(); |
| 80 } | 81 } |
| 81 | 82 |
| 82 } // namespace v8_inspector | 83 } // namespace v8_inspector |
| OLD | NEW |