| 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 46b0cdc848352797175c5fa0c95d4e1866ea3664..560c5c4ab4936db65f0d06f2caeced5707564e35 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| @@ -632,7 +632,7 @@ void V8DebuggerAgentImpl::restartFrame(ErrorString* errorString,
|
| Maybe<StackTrace>* asyncStackTrace)
|
| {
|
| if (!isPaused() || m_currentCallStack.IsEmpty()) {
|
| - *errorString = "Attempt to access callframe when debugger is not on pause";
|
| + *errorString = "Attempt to access call frame when debugger is not on pause";
|
| return;
|
| }
|
| OwnPtr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(errorString, callFrameId);
|
| @@ -706,9 +706,11 @@ void V8DebuggerAgentImpl::getGeneratorObjectDetails(ErrorString* errorString, co
|
| v8::Context::Scope contextScope(context);
|
|
|
| v8::Local<v8::Object> object;
|
| - v8::Local<v8::Value> value = injectedScript->findObject(*remoteId);
|
| - if (value.IsEmpty() || !value->IsObject() || !value->ToObject(context).ToLocal(&object)) {
|
| - *errorString = "Could not find object with given id";
|
| + v8::Local<v8::Value> value;
|
| + if (!injectedScript->findObject(errorString, *remoteId, &value))
|
| + return;
|
| + if (!value->IsObject() || !value->ToObject(context).ToLocal(&object)) {
|
| + *errorString = "Value with given id is not an Object";
|
| return;
|
| }
|
|
|
|
|