Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e

1 files changed, 4 insertions, 8 deletions

diff --git a/WebCore/dom/EventTarget.cpp b/WebCore/dom/EventTarget.cpp
index d2b6f49..42cbb32 100644
--- a/WebCore/dom/EventTarget.cpp
+++ b/WebCore/dom/EventTarget.cpp
@@ -66,6 +66,10 @@ bool eventDispatchForbidden()
 }
 #endif // NDEBUG
 
+EventTargetData::EventTargetData()
+{
+}
+
 EventTargetData::~EventTargetData()
 {
     deleteAllValues(eventListenerMap);
@@ -299,14 +303,6 @@ bool EventTarget::fireEventListeners(Event* event)
     if (result != d->eventListenerMap.end())
         fireEventListeners(event, d, *result->second);
     
-    // Alias DOMFocusIn/DOMFocusOut to focusin/focusout (and vice versa). Just consider them to be the
-    // same event (triggering one another's handlers).  This mechanism allows us to deprecate or change event
-    // names in the future and still make them be interoperable.
-    if (event->hasAliasedType() && !event->immediatePropagationStopped()) {
-        EventListenerMap::iterator result = d->eventListenerMap.find(event->aliasedType());
-        if (result != d->eventListenerMap.end())
-            fireEventListeners(event, d, *result->second);
-    }
     return !event->defaultPrevented();
 }