| 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 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "platform/v8_inspector/InjectedScript.h" | 31 #include "platform/v8_inspector/InjectedScript.h" |
| 32 | 32 |
| 33 #include "platform/inspector_protocol/Parser.h" | |
| 34 #include "platform/inspector_protocol/String16.h" | |
| 35 #include "platform/inspector_protocol/Values.h" | |
| 36 #include "platform/v8_inspector/InjectedScriptNative.h" | 33 #include "platform/v8_inspector/InjectedScriptNative.h" |
| 37 #include "platform/v8_inspector/InjectedScriptSource.h" | 34 #include "platform/v8_inspector/InjectedScriptSource.h" |
| 38 #include "platform/v8_inspector/InspectedContext.h" | 35 #include "platform/v8_inspector/InspectedContext.h" |
| 39 #include "platform/v8_inspector/RemoteObjectId.h" | 36 #include "platform/v8_inspector/RemoteObjectId.h" |
| 40 #include "platform/v8_inspector/V8Compat.h" | 37 #include "platform/v8_inspector/V8Compat.h" |
| 41 #include "platform/v8_inspector/V8Console.h" | 38 #include "platform/v8_inspector/V8Console.h" |
| 42 #include "platform/v8_inspector/V8FunctionCall.h" | 39 #include "platform/v8_inspector/V8FunctionCall.h" |
| 43 #include "platform/v8_inspector/V8InjectedScriptHost.h" | 40 #include "platform/v8_inspector/V8InjectedScriptHost.h" |
| 44 #include "platform/v8_inspector/V8InspectorImpl.h" | 41 #include "platform/v8_inspector/V8InspectorImpl.h" |
| 45 #include "platform/v8_inspector/V8InspectorSessionImpl.h" | 42 #include "platform/v8_inspector/V8InspectorSessionImpl.h" |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 void InjectedScript::CallFrameScope::findInjectedScript(V8InspectorSessionImpl*
session) | 485 void InjectedScript::CallFrameScope::findInjectedScript(V8InspectorSessionImpl*
session) |
| 489 { | 486 { |
| 490 std::unique_ptr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(m_err
orString, m_remoteCallFrameId); | 487 std::unique_ptr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(m_err
orString, m_remoteCallFrameId); |
| 491 if (!remoteId) | 488 if (!remoteId) |
| 492 return; | 489 return; |
| 493 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); | 490 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); |
| 494 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get()
); | 491 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get()
); |
| 495 } | 492 } |
| 496 | 493 |
| 497 } // namespace blink | 494 } // namespace blink |
| OLD | NEW |