Chromium Code Reviews| Index: third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp |
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp |
| index 133c086906267601c25cf8e1f172af0d5540d6d7..a29d6c3e4f37da86149aa58606a71ee2a6fa03ba 100644 |
| --- a/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp |
| +++ b/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp |
| @@ -90,7 +90,7 @@ void InspectorRuntimeAgent::restore() |
| void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* optExecutionContextId, const bool* const returnByValue, const bool* generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>& exceptionDetails) |
| { |
| - int executionContextId = optExecutionContextId ? *optExecutionContextId : m_injectedScriptManager->injectedScriptFor(defaultScriptState()).contextId(); |
| + int executionContextId = optExecutionContextId ? *optExecutionContextId : defaultScriptState()->contextIdInDebugger(); |
|
pfeldman
2016/01/24 07:34:19
This is a change to semantics - injected script is
|
| MuteConsoleScope<InspectorRuntimeAgent> muteScope; |
| if (asBool(doNotPauseOnExceptionsAndMuteConsole)) |
| muteScope.enter(this); |