Changeset 68923 in webkit

Timestamp:

Oct 1, 2010 1:50:41 PM (14 years ago)

Author:

enrica@apple.com

Message:

DOMFocusIn/DOMFocusOut return focusin/focusout Event.type
​https://bugs.webkit.org/show_bug.cgi?id=42580
<rdar://problem/8107311>

Reviewed by Darin Adler.

WebCore:

This change removes the aliased type machinery from the Event class.
We now fire the event with the new name and the oldname.

Tests: Modified fast/events/focusinout.html to check the event
type.

• dom/Document.cpp:

(WebCore::Document::setFocusedNode):

• dom/Event.cpp: Removed aliasedType and hasAliasedType.
• dom/Event.h: Removed aliasedType and hasAliasedType.
• dom/EventTarget.cpp:

(WebCore::EventTarget::fireEventListeners): Removed aliasedType related code.

LayoutTests:

• fast/events/focusinout.html: Modified to check the event type.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/focusinout.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (2 diffs)
• WebCore/dom/Event.cpp (modified) (1 diff)
• WebCore/dom/Event.h (modified) (1 diff)
• WebCore/dom/EventTarget.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-01  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Darin Adler.
+
+        DOMFocusIn/DOMFocusOut return focusin/focusout Event.type
+        https://bugs.webkit.org/show_bug.cgi?id=42580
+        <rdar://problem/8107311>
+        
+        * fast/events/focusinout.html: Modified to check the event type.
+
 2010-10-01  Adam Roben  <aroben@apple.com>
 

trunk/LayoutTests/fast/events/focusinout.html

@@ -10 +10 @@
 }
 
+function writeFailed(id, reason)
+{
+    document.getElementById(id).innerHTML = "FAIL: " + reason;
+}
+
 function focusHandler(event)
 {
-    writePass('result1');
+    if (event.type == "focusin")
+        writePass('result1');
+    else
+        writeFailed('result1', "Wrong event type");
 }
 
 function blurHandler(event)
 {
-    writePass('result2');
+    if (event.type == "focusout")
+        writePass('result2');
+    else
+        writeFailed('result2', "Wrong event type");
 }
 
 function focusHandlerTwo(event)
 {
-    writePass('result3');
+    if (event.type == "DOMFocusIn")
+        writePass('result3');
+    else
+        writeFailed('result3', "Wrong event type");
 }
 
 function blurHandlerTwo(event)
 {
-    writePass('result4');
+    if (event.type == "DOMFocusOut")
+        writePass('result4');
+    else
+        writeFailed('result4', "Wrong event type");
 }
 </script>

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-01  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Darin Adler.
+
+        DOMFocusIn/DOMFocusOut return focusin/focusout Event.type
+        https://bugs.webkit.org/show_bug.cgi?id=42580
+        <rdar://problem/8107311>
+        
+        This change removes the aliased type machinery from the Event class.
+        We now fire the event with the new name and the oldname.
+        
+        Tests: Modified fast/events/focusinout.html to check the event
+        type.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode):
+        * dom/Event.cpp: Removed aliasedType and hasAliasedType.
+        * dom/Event.h: Removed aliasedType and hasAliasedType.
+        * dom/EventTarget.cpp:
+        (WebCore::EventTarget::fireEventListeners): Removed aliasedType related code.
+
 2010-10-01  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -3106 +3106 @@
         
         oldFocusedNode->dispatchUIEvent(eventNames().focusoutEvent, 0, 0); // DOM level 3 name for the bubbling blur event.
+        // FIXME: We should remove firing DOMFocusOutEvent event when we are sure no content depends
+        // on it, probably when <rdar://problem/8503958> is resolved.
+        oldFocusedNode->dispatchUIEvent(eventNames().DOMFocusOutEvent, 0, 0); // DOM level 2 name for compatibility.
 
         if (m_focusedNode) {
@@ -3146 +3149 @@
 
         m_focusedNode->dispatchUIEvent(eventNames().focusinEvent, 0, 0); // DOM level 3 bubbling focus event.
+        // FIXME: We should remove firing DOMFocusInEvent event when we are sure no content depends
+        // on it, probably when <rdar://problem/8503958> is resolved.
+        m_focusedNode->dispatchUIEvent(eventNames().DOMFocusInEvent, 0, 0); // DOM level 2 for compatibility.
 
         if (m_focusedNode != newFocusedNode) { 

trunk/WebCore/dom/Event.cpp

@@ -283 +283 @@
 }
 
-const AtomicString& Event::aliasedType() const
-{
-    if (type() == eventNames().focusinEvent)
-        return eventNames().DOMFocusInEvent;
-    if (type() == eventNames().focusoutEvent)
-        return eventNames().DOMFocusOutEvent;
-    if (type() == eventNames().DOMFocusInEvent)
-        return eventNames().focusinEvent;
-    if (type() == eventNames().DOMFocusOutEvent)
-        return eventNames().focusoutEvent;
-    
-    ASSERT_NOT_REACHED();
-    return type();
-}
-
-bool Event::hasAliasedType() const
-{
-    return type() == eventNames().focusinEvent || type() == eventNames().focusoutEvent ||
-           type() == eventNames().DOMFocusInEvent || type() == eventNames().DOMFocusOutEvent;
-}
-
 } // namespace WebCore

trunk/WebCore/dom/Event.h

@@ -77 +77 @@
         const AtomicString& type() const { return m_type; }
         
-        const AtomicString& aliasedType() const;
-        bool hasAliasedType() const;
-
         EventTarget* target() const { return m_target.get(); }
         void setTarget(PassRefPtr<EventTarget>);

trunk/WebCore/dom/EventTarget.cpp

@@ -300 +300 @@
         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();
 }