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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp

Issue 1442953002: Oilpan: turn MuteConsoleScope into a stack allocated object. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix init Created 5 years, 1 month 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
index 86d58872d06c2c95d3c8e0d49e6396337997d230..fae4fff7174ad4ef1fe669d0626f14ac8d5cb394 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
@@ -37,7 +37,6 @@
#include "core/inspector/ScriptAsyncCallStack.h"
#include "core/inspector/v8/V8Debugger.h"
#include "platform/ScriptForbiddenScope.h"
-#include "wtf/Optional.h"
namespace blink {
@@ -187,9 +186,9 @@ void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, cons
void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& inCallFrameId, const String& inExpression, const String* inObjectGroup, const bool* inIncludeCommandLineAPI, const bool* inDoNotPauseOnExceptionsAndMuteConsole, const bool* inReturnByValue, const bool* inGeneratePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& outResult, TypeBuilder::OptOutput<bool>* optOutWasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>& optOutExceptionDetails)
{
- Optional<MuteConsoleScope<InspectorDebuggerAgent>> muteScope;
+ MuteConsoleScope<InspectorDebuggerAgent> muteScope;
if (asBool(inDoNotPauseOnExceptionsAndMuteConsole))
- muteScope.emplace(this);
+ muteScope.enter(this);
m_v8DebuggerAgent->evaluateOnCallFrame(errorString, inCallFrameId, inExpression, inObjectGroup, inIncludeCommandLineAPI, inDoNotPauseOnExceptionsAndMuteConsole, inReturnByValue, inGeneratePreview, outResult, optOutWasThrown, optOutExceptionDetails);
}
@@ -200,9 +199,9 @@ void InspectorDebuggerAgent::compileScript(ErrorString* errorString, const Strin
void InspectorDebuggerAgent::runScript(ErrorString* errorString, const String& inScriptId, int inExecutionContextId, const String* inObjectGroup, const bool* inDoNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& outResult, RefPtr<TypeBuilder::Debugger::ExceptionDetails>& optOutExceptionDetails)
{
- Optional<MuteConsoleScope<InspectorDebuggerAgent>> muteScope;
+ MuteConsoleScope<InspectorDebuggerAgent> muteScope;
if (asBool(inDoNotPauseOnExceptionsAndMuteConsole))
- muteScope.emplace(this);
+ muteScope.enter(this);
m_v8DebuggerAgent->runScript(errorString, inScriptId, inExecutionContextId, inObjectGroup, inDoNotPauseOnExceptionsAndMuteConsole, outResult, optOutExceptionDetails);
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698