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

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

Issue 2249663003: Revert of [DevTools] Rename entities in js_protocol, remove deprecated ones. (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/V8RuntimeAgentImpl.cpp
diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
index e786fb3b0796bef8607652ade8713693553b24e0..b88015f2c10454af14469f0c9a35efb42ba7ff8c 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
+++ b/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
@@ -229,7 +229,7 @@
const String16& expression,
const Maybe<String16>& objectGroup,
const Maybe<bool>& includeCommandLineAPI,
- const Maybe<bool>& silent,
+ const Maybe<bool>& doNotPauseOnExceptionsAndMuteConsole,
const Maybe<int>& executionContextId,
const Maybe<bool>& returnByValue,
const Maybe<bool>& generatePreview,
@@ -250,7 +250,7 @@
return;
}
- if (silent.fromMaybe(false))
+ if (doNotPauseOnExceptionsAndMuteConsole.fromMaybe(false))
scope.ignoreExceptionsAndMuteConsole();
if (userGesture.fromMaybe(false))
scope.pretendUserGesture();
@@ -325,7 +325,7 @@
const String16& objectId,
const String16& expression,
const Maybe<protocol::Array<protocol::Runtime::CallArgument>>& optionalArguments,
- const Maybe<bool>& silent,
+ const Maybe<bool>& doNotPauseOnExceptionsAndMuteConsole,
const Maybe<bool>& returnByValue,
const Maybe<bool>& generatePreview,
const Maybe<bool>& userGesture,
@@ -355,7 +355,7 @@
}
}
- if (silent.fromMaybe(false))
+ if (doNotPauseOnExceptionsAndMuteConsole.fromMaybe(false))
scope.ignoreExceptionsAndMuteConsole();
if (userGesture.fromMaybe(false))
scope.pretendUserGesture();
@@ -465,9 +465,9 @@
m_session->releaseObjectGroup(objectGroup);
}
-void V8RuntimeAgentImpl::runIfWaitingForDebugger(ErrorString* errorString)
-{
- m_inspector->client()->runIfWaitingForDebugger(m_session->contextGroupId());
+void V8RuntimeAgentImpl::run(ErrorString* errorString)
+{
+ m_inspector->client()->resumeStartup(m_session->contextGroupId());
}
void V8RuntimeAgentImpl::setCustomObjectFormatterEnabled(ErrorString*, bool enabled)
@@ -528,7 +528,7 @@
const String16& scriptId,
const Maybe<int>& executionContextId,
const Maybe<String16>& objectGroup,
- const Maybe<bool>& silent,
+ const Maybe<bool>& doNotPauseOnExceptionsAndMuteConsole,
const Maybe<bool>& includeCommandLineAPI,
const Maybe<bool>& returnByValue,
const Maybe<bool>& generatePreview,
@@ -559,7 +559,7 @@
return;
}
- if (silent.fromMaybe(false))
+ if (doNotPauseOnExceptionsAndMuteConsole.fromMaybe(false))
scope.ignoreExceptionsAndMuteConsole();
std::unique_ptr<v8::Global<v8::Script>> scriptWrapper = std::move(it->second);

Powered by Google App Engine
This is Rietveld 408576698