| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 #include "platform/v8_inspector/V8StringUtil.h" | 44 #include "platform/v8_inspector/V8StringUtil.h" |
| 45 #include "platform/v8_inspector/public/V8InspectorClient.h" | 45 #include "platform/v8_inspector/public/V8InspectorClient.h" |
| 46 | 46 |
| 47 using blink::protocol::Array; | 47 using blink::protocol::Array; |
| 48 using blink::protocol::Debugger::CallFrame; | 48 using blink::protocol::Debugger::CallFrame; |
| 49 using blink::protocol::Runtime::PropertyDescriptor; | 49 using blink::protocol::Runtime::PropertyDescriptor; |
| 50 using blink::protocol::Runtime::InternalPropertyDescriptor; | 50 using blink::protocol::Runtime::InternalPropertyDescriptor; |
| 51 using blink::protocol::Runtime::RemoteObject; | 51 using blink::protocol::Runtime::RemoteObject; |
| 52 using blink::protocol::Maybe; | 52 using blink::protocol::Maybe; |
| 53 | 53 |
| 54 namespace blink { | 54 namespace v8_inspector { |
| 55 | 55 |
| 56 static bool hasInternalError(ErrorString* errorString, bool hasError) | 56 static bool hasInternalError(ErrorString* errorString, bool hasError) |
| 57 { | 57 { |
| 58 if (hasError) | 58 if (hasError) |
| 59 *errorString = "Internal error"; | 59 *errorString = "Internal error"; |
| 60 return hasError; | 60 return hasError; |
| 61 } | 61 } |
| 62 | 62 |
| 63 std::unique_ptr<InjectedScript> InjectedScript::create(InspectedContext* inspect
edContext) | 63 std::unique_ptr<InjectedScript> InjectedScript::create(InspectedContext* inspect
edContext) |
| 64 { | 64 { |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 | 479 |
| 480 void InjectedScript::CallFrameScope::findInjectedScript(V8InspectorSessionImpl*
session) | 480 void InjectedScript::CallFrameScope::findInjectedScript(V8InspectorSessionImpl*
session) |
| 481 { | 481 { |
| 482 std::unique_ptr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(m_err
orString, m_remoteCallFrameId); | 482 std::unique_ptr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(m_err
orString, m_remoteCallFrameId); |
| 483 if (!remoteId) | 483 if (!remoteId) |
| 484 return; | 484 return; |
| 485 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); | 485 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); |
| 486 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get()
); | 486 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get()
); |
| 487 } | 487 } |
| 488 | 488 |
| 489 } // namespace blink | 489 } // namespace v8_inspector |
| OLD | NEW |