| Index: Source/core/events/EventListenerMap.cpp
|
| diff --git a/Source/core/events/EventListenerMap.cpp b/Source/core/events/EventListenerMap.cpp
|
| index 11150452bcf65ecbc3f486efdd59ad26bd846656..43d095810f65dd04eb86ae2f251cf78b3efc2688 100644
|
| --- a/Source/core/events/EventListenerMap.cpp
|
| +++ b/Source/core/events/EventListenerMap.cpp
|
| @@ -107,7 +107,7 @@ Vector<AtomicString> EventListenerMap::eventTypes() const
|
| return types;
|
| }
|
|
|
| -static bool addListenerToVector(EventListenerVector* vector, PassRefPtr<EventListener> listener, bool useCapture)
|
| +static bool addListenerToVector(EventListenerVector* vector, PassRefPtrWillBeRawPtr<EventListener> listener, bool useCapture)
|
| {
|
| RegisteredEventListener registeredListener(listener, useCapture);
|
|
|
| @@ -118,7 +118,7 @@ static bool addListenerToVector(EventListenerVector* vector, PassRefPtr<EventLis
|
| return true;
|
| }
|
|
|
| -bool EventListenerMap::add(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
|
| +bool EventListenerMap::add(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener> listener, bool useCapture)
|
| {
|
| assertNoActiveIterators();
|
|
|
| @@ -127,7 +127,7 @@ bool EventListenerMap::add(const AtomicString& eventType, PassRefPtr<EventListen
|
| return addListenerToVector(entry.second.get(), listener, useCapture);
|
| }
|
|
|
| - m_entries.append(std::make_pair(eventType, adoptPtr(new EventListenerVector)));
|
| + m_entries.append(std::make_pair(eventType, adoptPtrWillBeNoop(new EventListenerVector)));
|
| return addListenerToVector(m_entries.last().second.get(), listener, useCapture);
|
| }
|
|
|
| @@ -187,6 +187,11 @@ void EventListenerMap::copyEventListenersNotCreatedFromMarkupToTarget(EventTarge
|
| copyListenersNotCreatedFromMarkupToTarget(eventListener.first, eventListener.second.get(), target);
|
| }
|
|
|
| +DEFINE_TRACE(EventListenerMap)
|
| +{
|
| + visitor->trace(m_entries);
|
| +}
|
| +
|
| EventListenerIterator::EventListenerIterator(EventTarget* target)
|
| : m_map(nullptr)
|
| , m_entryIndex(0)
|
|
|