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

Side by Side Diff: sky/engine/core/frame/Tracing.cpp

Issue 1107853003: Fix up strings Sky passes to base/trace_event (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "sky/engine/config.h" 5 #include "sky/engine/config.h"
6 #include "sky/engine/core/frame/Tracing.h" 6 #include "sky/engine/core/frame/Tracing.h"
7 7
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 #include "sky/engine/wtf/text/StringUTF8Adaptor.h" 9 #include "sky/engine/wtf/text/StringUTF8Adaptor.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 Tracing::Tracing() 13 Tracing::Tracing()
14 { 14 {
15 } 15 }
16 16
17 Tracing::~Tracing() 17 Tracing::~Tracing()
18 { 18 {
19 } 19 }
20 20
21 void Tracing::begin(const String& name) 21 void Tracing::begin(const String& name)
22 { 22 {
23 StringUTF8Adaptor utf8(name); 23 StringUTF8Adaptor utf8(name);
24 TRACE_EVENT_COPY_BEGIN0("script", utf8.data()); 24 // TRACE_EVENT_COPY_BEGIN0 needs a c-style null-terminated string.
jamesr 2015/04/29 00:12:46 in particular, StringUTF8Adapter::data() doesn't r
25 CString cstring(utf8.data(), utf8.length());
jamesr 2015/04/29 00:12:46 this could be std::string as well. I figured CStri
26 TRACE_EVENT_COPY_BEGIN0("script", cstring.data());
25 } 27 }
26 28
27 void Tracing::end(const String& name) 29 void Tracing::end(const String& name)
28 { 30 {
29 StringUTF8Adaptor utf8(name); 31 StringUTF8Adaptor utf8(name);
30 TRACE_EVENT_COPY_END0("script", utf8.data()); 32 // TRACE_EVENT_COPY_END0 needs a c-style null-terminated string.
33 CString cstring(utf8.data(), utf8.length());
34 TRACE_EVENT_COPY_END0("script", cstring.data());
31 } 35 }
32 36
33 } // namespace blink 37 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698