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

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

Issue 2226863003: [DevTools] Reduce API surface of String16. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium 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 "platform/v8_inspector/V8StackTraceImpl.h" 5 #include "platform/v8_inspector/V8StackTraceImpl.h"
6 6
7 #include "platform/inspector_protocol/Platform.h" 7 #include "platform/inspector_protocol/Platform.h"
8 #include "platform/inspector_protocol/String16.h" 8 #include "platform/inspector_protocol/String16.h"
9 #include "platform/v8_inspector/V8Debugger.h" 9 #include "platform/v8_inspector/V8Debugger.h"
10 #include "platform/v8_inspector/V8StringUtil.h" 10 #include "platform/v8_inspector/V8StringUtil.h"
11 11
12 #include <v8-debug.h> 12 #include <v8-debug.h>
13 #include <v8-profiler.h> 13 #include <v8-profiler.h>
14 #include <v8-version.h> 14 #include <v8-version.h>
15 15
16 namespace blink { 16 namespace blink {
17 17
18 namespace { 18 namespace {
19 19
20 static const v8::StackTrace::StackTraceOptions stackTraceOptions = static_cast<v 8::StackTrace::StackTraceOptions>( 20 static const v8::StackTrace::StackTraceOptions stackTraceOptions = static_cast<v 8::StackTrace::StackTraceOptions>(
21 v8::StackTrace::kLineNumber | 21 v8::StackTrace::kLineNumber |
22 v8::StackTrace::kColumnOffset | 22 v8::StackTrace::kColumnOffset |
23 v8::StackTrace::kScriptId | 23 v8::StackTrace::kScriptId |
24 v8::StackTrace::kScriptNameOrSourceURL | 24 v8::StackTrace::kScriptNameOrSourceURL |
25 v8::StackTrace::kFunctionName); 25 v8::StackTrace::kFunctionName);
26 26
27 V8StackTraceImpl::Frame toFrame(v8::Local<v8::StackFrame> frame) 27 V8StackTraceImpl::Frame toFrame(v8::Local<v8::StackFrame> frame)
28 { 28 {
29 String16 scriptId = String16::fromInteger(frame->GetScriptId()); 29 String16 scriptId = protocol::string16FromInteger(frame->GetScriptId());
30 String16 sourceName; 30 String16 sourceName;
31 v8::Local<v8::String> sourceNameValue(frame->GetScriptNameOrSourceURL()); 31 v8::Local<v8::String> sourceNameValue(frame->GetScriptNameOrSourceURL());
32 if (!sourceNameValue.IsEmpty()) 32 if (!sourceNameValue.IsEmpty())
33 sourceName = toProtocolString(sourceNameValue); 33 sourceName = toProtocolString(sourceNameValue);
34 34
35 String16 functionName; 35 String16 functionName;
36 v8::Local<v8::String> functionNameValue(frame->GetFunctionName()); 36 v8::Local<v8::String> functionNameValue(frame->GetFunctionName());
37 if (!functionNameValue.IsEmpty()) 37 if (!functionNameValue.IsEmpty())
38 functionName = toProtocolString(functionNameValue); 38 functionName = toProtocolString(functionNameValue);
39 39
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 249
250 String16 V8StackTraceImpl::toString() const 250 String16 V8StackTraceImpl::toString() const
251 { 251 {
252 String16Builder stackTrace; 252 String16Builder stackTrace;
253 for (size_t i = 0; i < m_frames.size(); ++i) { 253 for (size_t i = 0; i < m_frames.size(); ++i) {
254 const Frame& frame = m_frames[i]; 254 const Frame& frame = m_frames[i];
255 stackTrace.append("\n at " + (frame.functionName().length() ? frame.f unctionName() : "(anonymous function)")); 255 stackTrace.append("\n at " + (frame.functionName().length() ? frame.f unctionName() : "(anonymous function)"));
256 stackTrace.append(" ("); 256 stackTrace.append(" (");
257 stackTrace.append(frame.sourceURL()); 257 stackTrace.append(frame.sourceURL());
258 stackTrace.append(':'); 258 stackTrace.append(':');
259 stackTrace.appendNumber(frame.lineNumber()); 259 stackTrace.append(protocol::string16FromInteger(frame.lineNumber()));
260 stackTrace.append(':'); 260 stackTrace.append(':');
261 stackTrace.appendNumber(frame.columnNumber()); 261 stackTrace.append(protocol::string16FromInteger(frame.columnNumber()));
262 stackTrace.append(')'); 262 stackTrace.append(')');
263 } 263 }
264 return stackTrace.toString(); 264 return stackTrace.toString();
265 } 265 }
266 266
267 } // namespace blink 267 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698