Commit 44ba0002 authored by jochen@chromium.org's avatar jochen@chromium.org

Replace function static vector with atomically initialized vector

BUG=420492
R=sigbjornf@opera.com

Review URL: https://codereview.chromium.org/656653003

git-svn-id: svn://svn.chromium.org/blink/trunk@183731 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 7b9f7cc5
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "platform/EventDispatchForbiddenScope.h" #include "platform/EventDispatchForbiddenScope.h"
#include "platform/RuntimeEnabledFeatures.h" #include "platform/RuntimeEnabledFeatures.h"
#include "wtf/StdLibExtras.h" #include "wtf/StdLibExtras.h"
#include "wtf/Threading.h"
#include "wtf/Vector.h" #include "wtf/Vector.h"
using namespace WTF; using namespace WTF;
...@@ -356,15 +357,15 @@ void EventTarget::fireEventListeners(Event* event, EventTargetData* d, EventList ...@@ -356,15 +357,15 @@ void EventTarget::fireEventListeners(Event* event, EventTargetData* d, EventList
const EventListenerVector& EventTarget::getEventListeners(const AtomicString& eventType) const EventListenerVector& EventTarget::getEventListeners(const AtomicString& eventType)
{ {
DEFINE_STATIC_LOCAL(EventListenerVector, emptyVector, ()); AtomicallyInitializedStatic(EventListenerVector*, emptyVector = new EventListenerVector);
EventTargetData* d = eventTargetData(); EventTargetData* d = eventTargetData();
if (!d) if (!d)
return emptyVector; return *emptyVector;
EventListenerVector* listenerVector = d->eventListenerMap.find(eventType); EventListenerVector* listenerVector = d->eventListenerMap.find(eventType);
if (!listenerVector) if (!listenerVector)
return emptyVector; return *emptyVector;
return *listenerVector; return *listenerVector;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment