| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 message.IsEmpty() | 369 message.IsEmpty() |
| 370 ? 0 | 370 ? 0 |
| 371 : message->GetLineNumber(m_context->context()).FromMaybe(1) - | 371 : message->GetLineNumber(m_context->context()).FromMaybe(1) - |
| 372 1) | 372 1) |
| 373 .setColumnNumber( | 373 .setColumnNumber( |
| 374 message.IsEmpty() | 374 message.IsEmpty() |
| 375 ? 0 | 375 ? 0 |
| 376 : message->GetStartColumn(m_context->context()).FromMaybe(0)) | 376 : message->GetStartColumn(m_context->context()).FromMaybe(0)) |
| 377 .build(); | 377 .build(); |
| 378 if (!message.IsEmpty()) { | 378 if (!message.IsEmpty()) { |
| 379 exceptionDetails->setScriptId(String16::fromInteger( | 379 exceptionDetails->setScriptId( |
| 380 static_cast<int>(message->GetScriptOrigin().ScriptID()->Value()))); | 380 String16::fromInteger(message->GetScriptOrigin().ScriptID()->Value())); |
| 381 v8::Local<v8::StackTrace> stackTrace = message->GetStackTrace(); | 381 v8::Local<v8::StackTrace> stackTrace = message->GetStackTrace(); |
| 382 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) | 382 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) |
| 383 exceptionDetails->setStackTrace(m_context->inspector() | 383 exceptionDetails->setStackTrace(m_context->inspector() |
| 384 ->debugger() | 384 ->debugger() |
| 385 ->createStackTrace(stackTrace) | 385 ->createStackTrace(stackTrace) |
| 386 ->buildInspectorObjectImpl()); | 386 ->buildInspectorObjectImpl()); |
| 387 } | 387 } |
| 388 if (!exception.IsEmpty()) { | 388 if (!exception.IsEmpty()) { |
| 389 std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = wrapObject( | 389 std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = wrapObject( |
| 390 errorString, exception, objectGroup, false /* forceValueType */, | 390 errorString, exception, objectGroup, false /* forceValueType */, |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 void InjectedScript::CallFrameScope::findInjectedScript( | 562 void InjectedScript::CallFrameScope::findInjectedScript( |
| 563 V8InspectorSessionImpl* session) { | 563 V8InspectorSessionImpl* session) { |
| 564 std::unique_ptr<RemoteCallFrameId> remoteId = | 564 std::unique_ptr<RemoteCallFrameId> remoteId = |
| 565 RemoteCallFrameId::parse(m_errorString, m_remoteCallFrameId); | 565 RemoteCallFrameId::parse(m_errorString, m_remoteCallFrameId); |
| 566 if (!remoteId) return; | 566 if (!remoteId) return; |
| 567 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); | 567 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); |
| 568 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get()); | 568 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get()); |
| 569 } | 569 } |
| 570 | 570 |
| 571 } // namespace v8_inspector | 571 } // namespace v8_inspector |
| OLD | NEW |