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

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

Issue 2154623002: [DevTools] Make most fields of ExceptionDetails non-optional. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/InjectedScript.cpp
diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp b/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp
index 8a1402974fdef4a478388df20bc7548789db7472..0da6e2cf11cf96f73699bed5efe273321bd7297b 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp
+++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp
@@ -307,20 +307,16 @@ v8::MaybeLocal<v8::Value> InjectedScript::resolveCallArgument(ErrorString* error
std::unique_ptr<protocol::Runtime::ExceptionDetails> InjectedScript::createExceptionDetails(v8::Local<v8::Message> message)
{
- std::unique_ptr<protocol::Runtime::ExceptionDetails> exceptionDetailsObject = protocol::Runtime::ExceptionDetails::create().setText(toProtocolString(message->Get())).build();
- exceptionDetailsObject->setUrl(toProtocolStringWithTypeCheck(message->GetScriptResourceName()));
- exceptionDetailsObject->setScriptId(String16::fromInteger(message->GetScriptOrigin().ScriptID()->Value()));
-
- v8::Maybe<int> lineNumber = message->GetLineNumber(m_context->context());
- if (lineNumber.IsJust())
- exceptionDetailsObject->setLineNumber(lineNumber.FromJust() - 1);
- v8::Maybe<int> columnNumber = message->GetStartColumn(m_context->context());
- if (columnNumber.IsJust())
- exceptionDetailsObject->setColumnNumber(columnNumber.FromJust());
+ std::unique_ptr<protocol::Runtime::ExceptionDetails> exceptionDetailsObject = protocol::Runtime::ExceptionDetails::create()
+ .setText(toProtocolString(message->Get()))
+ .setScriptId(String16::fromInteger(message->GetScriptOrigin().ScriptID()->Value()))
+ .setLineNumber(message->GetLineNumber(m_context->context()).FromMaybe(1) - 1)
+ .setColumnNumber(message->GetStartColumn(m_context->context()).FromMaybe(0))
+ .build();
v8::Local<v8::StackTrace> stackTrace = message->GetStackTrace();
if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
- exceptionDetailsObject->setStack(m_context->debugger()->createStackTrace(stackTrace)->buildInspectorObject());
+ exceptionDetailsObject->setStackTrace(m_context->debugger()->createStackTrace(stackTrace)->buildInspectorObject());
return exceptionDetailsObject;
}

Powered by Google App Engine
This is Rietveld 408576698