| Index: sky/engine/core/events/GenericEventQueue.cpp
|
| diff --git a/sky/engine/core/events/GenericEventQueue.cpp b/sky/engine/core/events/GenericEventQueue.cpp
|
| index cc7d8bf9116fa33da4b540dd3f756b6a6e58a50d..9bbdf599dc8066f3570db6a9cd07f5aea42328a7 100644
|
| --- a/sky/engine/core/events/GenericEventQueue.cpp
|
| +++ b/sky/engine/core/events/GenericEventQueue.cpp
|
| @@ -63,7 +63,7 @@ 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());
|
| + TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent", event.get(), "type", event->type().ascii().data());
|
| m_pendingEvents.append(event);
|
|
|
| if (!m_timer.isActive())
|
| @@ -78,7 +78,7 @@ 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(), "status", "cancelled");
|
| + TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii().data(), "status", "cancelled");
|
| }
|
|
|
| if (m_pendingEvents.isEmpty())
|
| @@ -100,9 +100,9 @@ void GenericEventQueue::timerFired(Timer<GenericEventQueue>*)
|
| Event* event = pendingEvents[i].get();
|
| EventTarget* target = event->target() ? event->target() : m_owner.get();
|
| CString type(event->type().ascii());
|
| - TRACE_EVENT_ASYNC_STEP_INTO1("event", "GenericEventQueue:enqueueEvent", event, "dispatch", "type", type);
|
| + TRACE_EVENT_ASYNC_STEP_INTO1("event", "GenericEventQueue:enqueueEvent", event, "dispatch", "type", type.data());
|
| target->dispatchEvent(pendingEvents[i]);
|
| - TRACE_EVENT_ASYNC_END1("event", "GenericEventQueue:enqueueEvent", event, "type", type);
|
| + TRACE_EVENT_ASYNC_END1("event", "GenericEventQueue:enqueueEvent", event, "type", type.data());
|
| }
|
| }
|
|
|
| @@ -118,7 +118,7 @@ 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(), "status", "cancelled");
|
| + TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii().data(), "status", "cancelled");
|
| }
|
| m_pendingEvents.clear();
|
| }
|
|
|