Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1136)

Unified Diff: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp

Issue 2251343003: [DevTools] Generate separate copies of inspector_protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
index 0afbd02bd569cfd2814008243531315ed203e518..53003e80d084ca4829c24019a8689d976a57e5f3 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
+++ b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
@@ -21,17 +21,17 @@
#include <algorithm>
-using blink::protocol::Array;
-using blink::protocol::Maybe;
-using blink::protocol::Debugger::BreakpointId;
-using blink::protocol::Debugger::CallFrame;
-using blink::protocol::Runtime::ExceptionDetails;
-using blink::protocol::Runtime::ScriptId;
-using blink::protocol::Runtime::StackTrace;
-using blink::protocol::Runtime::RemoteObject;
-
namespace v8_inspector {
+using protocol::Array;
+using protocol::Maybe;
+using protocol::Debugger::BreakpointId;
+using protocol::Debugger::CallFrame;
+using protocol::Runtime::ExceptionDetails;
+using protocol::Runtime::ScriptId;
+using protocol::Runtime::StackTrace;
+using protocol::Runtime::RemoteObject;
+
namespace DebuggerAgentState {
static const char javaScriptBreakpoints[] = "javaScriptBreakopints";
static const char pauseOnExceptionsState[] = "pauseOnExceptionsState";
@@ -880,7 +880,7 @@ void V8DebuggerAgentImpl::changeJavaScriptRecursionLevel(int step)
if (m_scheduledDebuggerStep == StepOut) {
m_recursionLevelForStepOut += step;
if (!m_recursionLevelForStepOut) {
- // When StepOut crosses a task boundary (i.e. js -> blink_c++) from where it was requested,
+ // When StepOut crosses a task boundary (i.e. js -> c++) from where it was requested,
// switch stepping to step into a next JS task, as if we exited to a blackboxed framework.
m_scheduledDebuggerStep = StepInto;
m_skipNextDebuggerStepOut = false;
@@ -984,7 +984,7 @@ void V8DebuggerAgentImpl::didParseSource(std::unique_ptr<V8DebuggerScript> scrip
std::unique_ptr<protocol::DictionaryValue> executionContextAuxData;
if (!script->executionContextAuxData().isEmpty())
- executionContextAuxData = protocol::DictionaryValue::cast(parseJSON(script->executionContextAuxData()));
+ executionContextAuxData = protocol::DictionaryValue::cast(protocol::parseJSON(script->executionContextAuxData()));
bool isLiveEdit = script->isLiveEdit();
bool hasSourceURL = script->hasSourceURL();
String16 scriptId = script->scriptId();

Powered by Google App Engine
This is Rietveld 408576698