Chromium Code Reviews| Index: third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp |
| diff --git a/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp b/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp |
| index aceecc241d5503944ab7ed0a63606f743e6c4e10..aacf33ea4c3f365316a46f76595f585cb356b544 100644 |
| --- a/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp |
| +++ b/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp |
| @@ -30,7 +30,6 @@ |
| #include "core/inspector/v8/V8RuntimeAgentImpl.h" |
| -#include "bindings/core/v8/ScriptState.h" |
| #include "core/inspector/InjectedScript.h" |
| #include "core/inspector/InjectedScriptManager.h" |
| #include "core/inspector/RemoteObjectId.h" |
| @@ -207,11 +206,12 @@ void V8RuntimeAgentImpl::disable(ErrorString* errorString) |
| m_enabled = false; |
| } |
| -void V8RuntimeAgentImpl::reportExecutionContextCreated(ScriptState* scriptState, const String& type, const String& origin, const String& humanReadableName, const String& frameId) |
| +void V8RuntimeAgentImpl::reportExecutionContextCreated(v8::Local<v8::Context> context, const String& type, const String& origin, const String& humanReadableName, const String& frameId) |
| { |
| if (!m_enabled) |
| return; |
| - InjectedScript* injectedScript = injectedScriptManager()->injectedScriptFor(scriptState); |
| + v8::HandleScope handles(context->GetIsolate()); |
|
dgozman
2016/01/27 02:36:37
unnecessary one
pfeldman
2016/01/27 16:56:20
Done.
pfeldman
2016/01/27 16:56:20
Done.
|
| + InjectedScript* injectedScript = injectedScriptManager()->injectedScriptFor(context); |
| if (!injectedScript) |
| return; |
| RefPtr<ExecutionContextDescription> description = ExecutionContextDescription::create() |
| @@ -225,9 +225,9 @@ void V8RuntimeAgentImpl::reportExecutionContextCreated(ScriptState* scriptState, |
| } |
| -void V8RuntimeAgentImpl::reportExecutionContextDestroyed(ScriptState* scriptState) |
| +void V8RuntimeAgentImpl::reportExecutionContextDestroyed(v8::Local<v8::Context> context) |
| { |
| - int contextId = injectedScriptManager()->discardInjectedScriptFor(scriptState); |
| + int contextId = injectedScriptManager()->discardInjectedScriptFor(context); |
| if (m_enabled) |
| m_frontend->executionContextDestroyed(contextId); |
| } |