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 00eac3118350154ea1e2049eb2ec05eb92006107..0682ab6162b944ad154632ea0b226ee66e9d455c 100644 |
--- a/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp |
+++ b/third_party/WebKit/Source/core/inspector/v8/V8RuntimeAgentImpl.cpp |
@@ -33,7 +33,6 @@ |
#include "bindings/core/v8/ScriptState.h" |
#include "core/inspector/InjectedScript.h" |
#include "core/inspector/InjectedScriptManager.h" |
-#include "core/inspector/InspectorState.h" |
#include "core/inspector/RemoteObjectId.h" |
#include "core/inspector/v8/IgnoreExceptionsScope.h" |
#include "core/inspector/v8/V8Debugger.h" |
@@ -171,7 +170,7 @@ void V8RuntimeAgentImpl::setCustomObjectFormatterEnabled(ErrorString*, bool enab |
injectedScriptManager()->setCustomObjectFormatterEnabled(enabled); |
} |
-void V8RuntimeAgentImpl::setInspectorState(InspectorState* state) |
+void V8RuntimeAgentImpl::setInspectorState(PassRefPtr<JSONObject> state) |
{ |
m_state = state; |
} |
@@ -194,7 +193,9 @@ void V8RuntimeAgentImpl::restore() |
m_frontend->executionContextsCleared(); |
String error; |
enable(&error); |
- if (m_state->getBoolean(V8RuntimeAgentImplState::customObjectFormatterEnabled)) |
+ bool customObjectFormatterEnabled = false; |
+ m_state->getBoolean(V8RuntimeAgentImplState::customObjectFormatterEnabled, &customObjectFormatterEnabled); |
+ if (customObjectFormatterEnabled) |
injectedScriptManager()->setCustomObjectFormatterEnabled(true); |
} |