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

Side by Side Diff: src/inspector/injected-script.cc

Issue 2332163002: [inspector] fixed all shorten-64-to-32 warnings (Closed)
Patch Set: rebased 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 | « include/v8-inspector.h ('k') | src/inspector/search-util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 message.IsEmpty() 373 message.IsEmpty()
374 ? 0 374 ? 0
375 : message->GetLineNumber(m_context->context()).FromMaybe(1) - 375 : message->GetLineNumber(m_context->context()).FromMaybe(1) -
376 1) 376 1)
377 .setColumnNumber( 377 .setColumnNumber(
378 message.IsEmpty() 378 message.IsEmpty()
379 ? 0 379 ? 0
380 : message->GetStartColumn(m_context->context()).FromMaybe(0)) 380 : message->GetStartColumn(m_context->context()).FromMaybe(0))
381 .build(); 381 .build();
382 if (!message.IsEmpty()) { 382 if (!message.IsEmpty()) {
383 exceptionDetails->setScriptId( 383 exceptionDetails->setScriptId(String16::fromInteger(
384 String16::fromInteger(message->GetScriptOrigin().ScriptID()->Value())); 384 static_cast<int>(message->GetScriptOrigin().ScriptID()->Value())));
385 v8::Local<v8::StackTrace> stackTrace = message->GetStackTrace(); 385 v8::Local<v8::StackTrace> stackTrace = message->GetStackTrace();
386 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) 386 if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
387 exceptionDetails->setStackTrace(m_context->inspector() 387 exceptionDetails->setStackTrace(m_context->inspector()
388 ->debugger() 388 ->debugger()
389 ->createStackTrace(stackTrace) 389 ->createStackTrace(stackTrace)
390 ->buildInspectorObjectImpl()); 390 ->buildInspectorObjectImpl());
391 } 391 }
392 if (!exception.IsEmpty()) { 392 if (!exception.IsEmpty()) {
393 std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = wrapObject( 393 std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = wrapObject(
394 errorString, exception, objectGroup, false /* forceValueType */, 394 errorString, exception, objectGroup, false /* forceValueType */,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 void InjectedScript::CallFrameScope::findInjectedScript( 566 void InjectedScript::CallFrameScope::findInjectedScript(
567 V8InspectorSessionImpl* session) { 567 V8InspectorSessionImpl* session) {
568 std::unique_ptr<RemoteCallFrameId> remoteId = 568 std::unique_ptr<RemoteCallFrameId> remoteId =
569 RemoteCallFrameId::parse(m_errorString, m_remoteCallFrameId); 569 RemoteCallFrameId::parse(m_errorString, m_remoteCallFrameId);
570 if (!remoteId) return; 570 if (!remoteId) return;
571 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal()); 571 m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal());
572 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get()); 572 m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get());
573 } 573 }
574 574
575 } // namespace v8_inspector 575 } // namespace v8_inspector
OLDNEW
« no previous file with comments | « include/v8-inspector.h ('k') | src/inspector/search-util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698