| 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 bd6dd4f6bdb8046cac7ed7ee97a2611bb4a741f4..2cb6a9228949746befcadf34f88150f3df8349e8 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
|
| @@ -98,7 +98,7 @@ private:
|
| ProtocolPromiseHandler<Callback>* handler = static_cast<ProtocolPromiseHandler<Callback>*>(info.Data().As<v8::External>()->Value());
|
| DCHECK(handler);
|
| v8::Local<v8::Value> value = info.Length() > 0 ? info[0] : v8::Local<v8::Value>::Cast(v8::Undefined(info.GetIsolate()));
|
| - handler->m_callback->sendSuccess(handler->wrapObject(value), Maybe<bool>(), Maybe<protocol::Runtime::ExceptionDetails>());
|
| + handler->m_callback->sendSuccess(handler->wrapObject(value), Maybe<protocol::Runtime::ExceptionDetails>());
|
| }
|
|
|
| static void catchCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| @@ -118,7 +118,7 @@ private:
|
| .setStackTrace(stack->buildInspectorObjectImpl())
|
| .build();
|
| }
|
| - handler->m_callback->sendSuccess(handler->wrapObject(value), true, std::move(exceptionDetails));
|
| + handler->m_callback->sendSuccess(handler->wrapObject(value), std::move(exceptionDetails));
|
| }
|
|
|
| ProtocolPromiseHandler(V8InspectorImpl* inspector, int contextGroupId, int executionContextId, const String16& objectGroup, bool returnByValue, bool generatePreview, std::unique_ptr<Callback> callback)
|
| @@ -175,7 +175,6 @@ template<typename Callback>
|
| bool wrapEvaluateResultAsync(InjectedScript* injectedScript, v8::MaybeLocal<v8::Value> maybeResultValue, const v8::TryCatch& tryCatch, const String16& objectGroup, bool returnByValue, bool generatePreview, Callback* callback)
|
| {
|
| std::unique_ptr<RemoteObject> result;
|
| - Maybe<bool> wasThrown;
|
| Maybe<protocol::Runtime::ExceptionDetails> exceptionDetails;
|
|
|
| ErrorString errorString;
|
| @@ -186,10 +185,9 @@ bool wrapEvaluateResultAsync(InjectedScript* injectedScript, v8::MaybeLocal<v8::
|
| returnByValue,
|
| generatePreview,
|
| &result,
|
| - &wasThrown,
|
| &exceptionDetails);
|
| if (errorString.isEmpty()) {
|
| - callback->sendSuccess(std::move(result), wasThrown, exceptionDetails);
|
| + callback->sendSuccess(std::move(result), exceptionDetails);
|
| return true;
|
| }
|
| callback->sendFailure(errorString);
|
|
|