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

Side by Side Diff: src/inspector/V8DebuggerAgentImpl.cpp

Issue 2339173004: Revert of [inspector] fixed all shorten-64-to-32 warnings (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « src/inspector/V8Debugger.cpp ('k') | src/inspector/V8DebuggerScript.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 the V8 project authors. All rights reserved. 1 // Copyright 2015 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/inspector/V8DebuggerAgentImpl.h" 5 #include "src/inspector/V8DebuggerAgentImpl.h"
6 6
7 #include "src/inspector/InjectedScript.h" 7 #include "src/inspector/InjectedScript.h"
8 #include "src/inspector/InspectedContext.h" 8 #include "src/inspector/InspectedContext.h"
9 #include "src/inspector/JavaScriptCallFrame.h" 9 #include "src/inspector/JavaScriptCallFrame.h"
10 #include "src/inspector/RemoteObjectId.h" 10 #include "src/inspector/RemoteObjectId.h"
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 v8::Local<v8::Object> details = currentCallFrame->details(); 927 v8::Local<v8::Object> details = currentCallFrame->details();
928 if (hasInternalError(errorString, details.IsEmpty())) 928 if (hasInternalError(errorString, details.IsEmpty()))
929 return Array<CallFrame>::create(); 929 return Array<CallFrame>::create();
930 930
931 int contextId = currentCallFrame->contextId(); 931 int contextId = currentCallFrame->contextId();
932 InjectedScript* injectedScript = 932 InjectedScript* injectedScript =
933 contextId ? m_session->findInjectedScript(&ignored, contextId) 933 contextId ? m_session->findInjectedScript(&ignored, contextId)
934 : nullptr; 934 : nullptr;
935 935
936 String16 callFrameId = 936 String16 callFrameId =
937 RemoteCallFrameId::serialize(contextId, static_cast<int>(frameOrdinal)); 937 RemoteCallFrameId::serialize(contextId, frameOrdinal);
938 if (hasInternalError( 938 if (hasInternalError(
939 errorString, 939 errorString,
940 !details 940 !details
941 ->Set(debuggerContext, 941 ->Set(debuggerContext,
942 toV8StringInternalized(m_isolate, "callFrameId"), 942 toV8StringInternalized(m_isolate, "callFrameId"),
943 toV8String(m_isolate, callFrameId)) 943 toV8String(m_isolate, callFrameId))
944 .FromMaybe(false))) 944 .FromMaybe(false)))
945 return Array<CallFrame>::create(); 945 return Array<CallFrame>::create();
946 946
947 if (injectedScript) { 947 if (injectedScript) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 return Array<CallFrame>::create(); 999 return Array<CallFrame>::create();
1000 if (hasInternalError( 1000 if (hasInternalError(
1001 errorString, 1001 errorString,
1002 !details 1002 !details
1003 ->Delete(debuggerContext, 1003 ->Delete(debuggerContext,
1004 toV8StringInternalized(m_isolate, "returnValue")) 1004 toV8StringInternalized(m_isolate, "returnValue"))
1005 .FromMaybe(false))) 1005 .FromMaybe(false)))
1006 return Array<CallFrame>::create(); 1006 return Array<CallFrame>::create();
1007 } 1007 }
1008 1008
1009 if (hasInternalError( 1009 if (hasInternalError(errorString,
1010 errorString, 1010 !objects->Set(debuggerContext, frameOrdinal, details)
1011 !objects 1011 .FromMaybe(false)))
1012 ->Set(debuggerContext, static_cast<int>(frameOrdinal), details)
1013 .FromMaybe(false)))
1014 return Array<CallFrame>::create(); 1012 return Array<CallFrame>::create();
1015 } 1013 }
1016 1014
1017 protocol::ErrorSupport errorSupport; 1015 protocol::ErrorSupport errorSupport;
1018 std::unique_ptr<Array<CallFrame>> callFrames = Array<CallFrame>::parse( 1016 std::unique_ptr<Array<CallFrame>> callFrames = Array<CallFrame>::parse(
1019 toProtocolValue(debuggerContext, objects).get(), &errorSupport); 1017 toProtocolValue(debuggerContext, objects).get(), &errorSupport);
1020 if (hasInternalError(errorString, !callFrames)) 1018 if (hasInternalError(errorString, !callFrames))
1021 return Array<CallFrame>::create(); 1019 return Array<CallFrame>::create();
1022 return callFrames; 1020 return callFrames;
1023 } 1021 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 1241
1244 void V8DebuggerAgentImpl::reset() { 1242 void V8DebuggerAgentImpl::reset() {
1245 if (!enabled()) return; 1243 if (!enabled()) return;
1246 m_scheduledDebuggerStep = NoStep; 1244 m_scheduledDebuggerStep = NoStep;
1247 m_scripts.clear(); 1245 m_scripts.clear();
1248 m_blackboxedPositions.clear(); 1246 m_blackboxedPositions.clear();
1249 m_breakpointIdToDebuggerBreakpointIds.clear(); 1247 m_breakpointIdToDebuggerBreakpointIds.clear();
1250 } 1248 }
1251 1249
1252 } // namespace v8_inspector 1250 } // namespace v8_inspector
OLDNEW
« no previous file with comments | « src/inspector/V8Debugger.cpp ('k') | src/inspector/V8DebuggerScript.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698