| Index: third_party/WebKit/Source/platform/v8_inspector/InspectedContext.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/InspectedContext.cpp b/third_party/WebKit/Source/platform/v8_inspector/InspectedContext.cpp
|
| index bf418196b7a958c93b0ee8e3d05527a8ea80eb93..3d51e945d8db43bb2bd59100be484502d14bc97c 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/InspectedContext.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/InspectedContext.cpp
|
| @@ -6,10 +6,10 @@
|
|
|
| #include "platform/v8_inspector/InjectedScript.h"
|
| #include "platform/v8_inspector/V8Console.h"
|
| -#include "platform/v8_inspector/V8DebuggerImpl.h"
|
| +#include "platform/v8_inspector/V8InspectorImpl.h"
|
| #include "platform/v8_inspector/V8StringUtil.h"
|
| #include "platform/v8_inspector/public/V8ContextInfo.h"
|
| -#include "platform/v8_inspector/public/V8DebuggerClient.h"
|
| +#include "platform/v8_inspector/public/V8InspectorClient.h"
|
|
|
| namespace blink {
|
|
|
| @@ -20,7 +20,7 @@ void InspectedContext::weakCallback(const v8::WeakCallbackInfo<InspectedContext>
|
| context->m_context.Reset();
|
| data.SetSecondPassCallback(&InspectedContext::weakCallback);
|
| } else {
|
| - context->m_debugger->discardInspectedContext(context->m_contextGroupId, context->m_contextId);
|
| + context->m_inspector->discardInspectedContext(context->m_contextGroupId, context->m_contextId);
|
| }
|
| }
|
|
|
| @@ -29,8 +29,8 @@ void InspectedContext::consoleWeakCallback(const v8::WeakCallbackInfo<InspectedC
|
| data.GetParameter()->m_console.Reset();
|
| }
|
|
|
| -InspectedContext::InspectedContext(V8DebuggerImpl* debugger, const V8ContextInfo& info, int contextId)
|
| - : m_debugger(debugger)
|
| +InspectedContext::InspectedContext(V8InspectorImpl* inspector, const V8ContextInfo& info, int contextId)
|
| + : m_inspector(inspector)
|
| , m_context(info.context->GetIsolate(), info.context)
|
| , m_contextId(contextId)
|
| , m_contextGroupId(info.contextGroupId)
|
| @@ -42,7 +42,7 @@ InspectedContext::InspectedContext(V8DebuggerImpl* debugger, const V8ContextInfo
|
| {
|
| m_context.SetWeak(this, &InspectedContext::weakCallback, v8::WeakCallbackType::kParameter);
|
|
|
| - v8::Isolate* isolate = m_debugger->isolate();
|
| + v8::Isolate* isolate = m_inspector->isolate();
|
| v8::Local<v8::Object> global = info.context->Global();
|
| v8::Local<v8::Object> console = V8Console::createConsole(this, info.hasMemoryOnConsole);
|
| if (!global->Set(info.context, toV8StringInternalized(isolate, "console"), console).FromMaybe(false))
|
| @@ -66,7 +66,7 @@ v8::Local<v8::Context> InspectedContext::context() const
|
|
|
| v8::Isolate* InspectedContext::isolate() const
|
| {
|
| - return m_debugger->isolate();
|
| + return m_inspector->isolate();
|
| }
|
|
|
| void InspectedContext::createInjectedScript()
|
|
|