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

Unified Diff: sky/engine/core/events/GenericEventQueue.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, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/engine/core/fetch/ResourceFetcher.cpp » ('j') | sky/engine/core/fetch/ResourceFetcher.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/events/GenericEventQueue.cpp
diff --git a/sky/engine/core/events/GenericEventQueue.cpp b/sky/engine/core/events/GenericEventQueue.cpp
index f1662fd91f6e29e8d8dfd4e044c10b486089a119..056cbbc0530fdf6430420ea8eb58cac6055c357f 100644
--- a/sky/engine/core/events/GenericEventQueue.cpp
+++ b/sky/engine/core/events/GenericEventQueue.cpp
@@ -56,7 +56,9 @@ bool GenericEventQueue::enqueueEvent(PassRefPtr<Event> event)
if (event->target() == m_owner)
event->setTarget(nullptr);
- TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent", event.get(), "type", event->type().ascii().data());
+ TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent",
+ event.get(), "type",
+ TRACE_STR_COPY(event->type().ascii().data()));
jamesr 2015/04/29 00:12:46 event->type().ascii().data() is a pointer to tempo
m_pendingEvents.append(event);
if (!m_timer.isActive())
@@ -71,7 +73,10 @@ bool GenericEventQueue::cancelEvent(Event* event)
if (found) {
m_pendingEvents.remove(m_pendingEvents.find(event));
- TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii().data(), "status", "cancelled");
+ TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event,
+ "type",
+ TRACE_STR_COPY(event->type().ascii().data()),
jamesr 2015/04/29 00:12:46 ditto
+ "status", "cancelled");
}
if (m_pendingEvents.isEmpty())
@@ -111,7 +116,10 @@ void GenericEventQueue::cancelAllEvents()
for (size_t i = 0; i < m_pendingEvents.size(); ++i) {
Event* event = m_pendingEvents[i].get();
- TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii().data(), "status", "cancelled");
+ TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event,
+ "type",
+ TRACE_STR_COPY(event->type().ascii().data()),
jamesr 2015/04/29 00:12:46 ditto
+ "status", "cancelled");
}
m_pendingEvents.clear();
}
« no previous file with comments | « no previous file | sky/engine/core/fetch/ResourceFetcher.cpp » ('j') | sky/engine/core/fetch/ResourceFetcher.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698