Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp

Issue 2102453003: [DevTools] Move collectionEntries to internalProperties in protocol (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
44 #include "platform/v8_inspector/V8InjectedScriptHost.h" 44 #include "platform/v8_inspector/V8InjectedScriptHost.h"
45 #include "platform/v8_inspector/V8InspectorSessionImpl.h" 45 #include "platform/v8_inspector/V8InspectorSessionImpl.h"
46 #include "platform/v8_inspector/V8StackTraceImpl.h" 46 #include "platform/v8_inspector/V8StackTraceImpl.h"
47 #include "platform/v8_inspector/V8StringUtil.h" 47 #include "platform/v8_inspector/V8StringUtil.h"
48 #include "platform/v8_inspector/public/V8Debugger.h" 48 #include "platform/v8_inspector/public/V8Debugger.h"
49 #include "platform/v8_inspector/public/V8DebuggerClient.h" 49 #include "platform/v8_inspector/public/V8DebuggerClient.h"
50 #include "platform/v8_inspector/public/V8ToProtocolValue.h" 50 #include "platform/v8_inspector/public/V8ToProtocolValue.h"
51 51
52 using blink::protocol::Array; 52 using blink::protocol::Array;
53 using blink::protocol::Debugger::CallFrame; 53 using blink::protocol::Debugger::CallFrame;
54 using blink::protocol::Debugger::CollectionEntry;
55 using blink::protocol::Debugger::FunctionDetails; 54 using blink::protocol::Debugger::FunctionDetails;
56 using blink::protocol::Debugger::GeneratorObjectDetails; 55 using blink::protocol::Debugger::GeneratorObjectDetails;
57 using blink::protocol::Runtime::PropertyDescriptor; 56 using blink::protocol::Runtime::PropertyDescriptor;
58 using blink::protocol::Runtime::InternalPropertyDescriptor; 57 using blink::protocol::Runtime::InternalPropertyDescriptor;
59 using blink::protocol::Runtime::RemoteObject; 58 using blink::protocol::Runtime::RemoteObject;
60 using blink::protocol::Maybe; 59 using blink::protocol::Maybe;
61 60
62 namespace blink { 61 namespace blink {
63 62
64 static bool hasInternalError(ErrorString* errorString, bool hasError) 63 static bool hasInternalError(ErrorString* errorString, bool hasError)
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 void InjectedScript::CallFrameScope::findInjectedScript(V8InspectorSessionImpl* session) 506 void InjectedScript::CallFrameScope::findInjectedScript(V8InspectorSessionImpl* session)
508 { 507 {
509 std::unique_ptr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(m_err orString, m_remoteCallFrameId); 508 std::unique_ptr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(m_err orString, m_remoteCallFrameId);
510 if (!remoteId) 509 if (!remoteId)
511 return; 510 return;
512 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); 511 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal());
513 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get() ); 512 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get() );
514 } 513 }
515 514
516 } // namespace blink 515 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698