Index: Source/core/events/GenericEventQueue.cpp |
diff --git a/Source/core/events/GenericEventQueue.cpp b/Source/core/events/GenericEventQueue.cpp |
index b35f85c09f9cca7cb7ee412120d3b42076a60ec5..453eeba6fa607291f7cb3bb55f8cdfb19e04b9fa 100644 |
--- a/Source/core/events/GenericEventQueue.cpp |
+++ b/Source/core/events/GenericEventQueue.cpp |
@@ -56,7 +56,7 @@ bool GenericEventQueue::enqueueEvent(PassRefPtr<Event> event) |
if (event->target() == m_owner) |
event->setTarget(0); |
- TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent", event.get(), "type", event->type().string().ascii()); |
+ TRACE_EVENT_ASYNC_BEGIN1("event", "GenericEventQueue:enqueueEvent", event.get(), "type", event->type().ascii()); |
m_pendingEvents.append(event); |
if (!m_timer.isActive()) |
@@ -71,7 +71,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().string().ascii(), "status", "cancelled"); |
+ TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii(), "status", "cancelled"); |
} |
if (m_pendingEvents.isEmpty()) |
@@ -92,7 +92,7 @@ void GenericEventQueue::timerFired(Timer<GenericEventQueue>*) |
for (size_t i = 0; i < pendingEvents.size(); ++i) { |
Event* event = pendingEvents[i].get(); |
EventTarget* target = event->target() ? event->target() : m_owner; |
- CString type(event->type().string().ascii()); |
+ CString type(event->type().ascii()); |
TRACE_EVENT_ASYNC_STEP_INTO1("event", "GenericEventQueue:enqueueEvent", event, "dispatch", "type", type); |
target->dispatchEvent(pendingEvents[i].release()); |
TRACE_EVENT_ASYNC_END1("event", "GenericEventQueue:enqueueEvent", event, "type", type); |
@@ -111,7 +111,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().string().ascii(), "status", "cancelled"); |
+ TRACE_EVENT_ASYNC_END2("event", "GenericEventQueue:enqueueEvent", event, "type", event->type().ascii(), "status", "cancelled"); |
} |
m_pendingEvents.clear(); |
} |