Attachment 187824 Details for Bug 109561 – Use FocusEvent.

[patch] Use FocusEvent.

bug-109561-20130212202929.patch (text/plain), 8.85 KB, created by Hayato Ito on 2013-02-12 03:32:59 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Hayato Ito

Created: 2013-02-12 03:32:59 PST

Size: 8.85 KB

patch

obsolete

>Subversion Revision: 142592
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 76a2e367be451ce9a3c7e10f2f1c7c3f796b51c2..0d345e4260714783d75cf08a1ba5f93222978f06 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,33 @@
>+2013-02-12  Hayato Ito  <hayato@chromium.org>
>+
>+        Make {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator type safe.
>+        https://bugs.webkit.org/show_bug.cgi?id=109561
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use FocusEvent rather than Event in {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator.
>+
>+        No new tests. No change in functionality.
>+
>+        * dom/FocusEvent.cpp:
>+        (WebCore::FocusEventDispatchMediator::create):
>+        (WebCore::FocusEventDispatchMediator::FocusEventDispatchMediator):
>+        (WebCore::BlurEventDispatchMediator::create):
>+        (WebCore::BlurEventDispatchMediator::BlurEventDispatchMediator):
>+        (WebCore::FocusInEventDispatchMediator::create):
>+        (WebCore::FocusInEventDispatchMediator::FocusInEventDispatchMediator):
>+        (WebCore::FocusOutEventDispatchMediator::create):
>+        (WebCore::FocusOutEventDispatchMediator::FocusOutEventDispatchMediator):
>+        * dom/FocusEvent.h:
>+        (FocusEventDispatchMediator):
>+        (WebCore::FocusEventDispatchMediator::event):
>+        (BlurEventDispatchMediator):
>+        (WebCore::BlurEventDispatchMediator::event):
>+        (FocusInEventDispatchMediator):
>+        (WebCore::FocusInEventDispatchMediator::event):
>+        (FocusOutEventDispatchMediator):
>+        (WebCore::FocusOutEventDispatchMediator::event):
>+
> 2013-02-12  Kent Tamura  <tkent@chromium.org>
> 
>         INPUT_MULTIPLE_FIELDS_UI: Mouse click not on sub-fields in multiple fields input  should not move focus
>diff --git a/Source/WebCore/dom/FocusEvent.cpp b/Source/WebCore/dom/FocusEvent.cpp
>index a7ebb6a324d56af66113894733351bd6b60f7f9d..fc02cebc4c0bd2dd0a7d23032e1f4b5e702aaa30 100644
>--- a/Source/WebCore/dom/FocusEvent.cpp
>+++ b/Source/WebCore/dom/FocusEvent.cpp
>@@ -64,13 +64,13 @@ FocusEvent::FocusEvent(const AtomicString& type, const FocusEventInit& initializ
> {
> }
> 
>-PassRefPtr<FocusEventDispatchMediator> FocusEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
>+PassRefPtr<FocusEventDispatchMediator> FocusEventDispatchMediator::create(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> oldFocusedNode)
> {
>-    return adoptRef(new FocusEventDispatchMediator(event, oldFocusedNode));
>+    return adoptRef(new FocusEventDispatchMediator(focusEvent, oldFocusedNode));
> }
> 
>-FocusEventDispatchMediator::FocusEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
>-    : EventDispatchMediator(event)
>+FocusEventDispatchMediator::FocusEventDispatchMediator(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> oldFocusedNode)
>+    : EventDispatchMediator(focusEvent)
>     , m_oldFocusedNode(oldFocusedNode)
> {
> }
>@@ -81,13 +81,13 @@ bool FocusEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) cons
>     return EventDispatchMediator::dispatchEvent(dispatcher);
> }
> 
>-PassRefPtr<BlurEventDispatchMediator> BlurEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
>+PassRefPtr<BlurEventDispatchMediator> BlurEventDispatchMediator::create(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> newFocusedNode)
> {
>-    return adoptRef(new BlurEventDispatchMediator(event, newFocusedNode));
>+    return adoptRef(new BlurEventDispatchMediator(focusEvent, newFocusedNode));
> }
> 
>-BlurEventDispatchMediator::BlurEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
>-    : EventDispatchMediator(event)
>+BlurEventDispatchMediator::BlurEventDispatchMediator(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> newFocusedNode)
>+    : EventDispatchMediator(focusEvent)
>     , m_newFocusedNode(newFocusedNode)
> {
> }
>@@ -98,13 +98,13 @@ bool BlurEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
>     return EventDispatchMediator::dispatchEvent(dispatcher);
> }
> 
>-PassRefPtr<FocusInEventDispatchMediator> FocusInEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
>+PassRefPtr<FocusInEventDispatchMediator> FocusInEventDispatchMediator::create(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> oldFocusedNode)
> {
>-    return adoptRef(new FocusInEventDispatchMediator(event, oldFocusedNode));
>+    return adoptRef(new FocusInEventDispatchMediator(focusEvent, oldFocusedNode));
> }
> 
>-FocusInEventDispatchMediator::FocusInEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
>-    : EventDispatchMediator(event)
>+FocusInEventDispatchMediator::FocusInEventDispatchMediator(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> oldFocusedNode)
>+    : EventDispatchMediator(focusEvent)
>     , m_oldFocusedNode(oldFocusedNode)
> {
> }
>@@ -115,13 +115,13 @@ bool FocusInEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) co
>     return EventDispatchMediator::dispatchEvent(dispatcher);
> }
> 
>-PassRefPtr<FocusOutEventDispatchMediator> FocusOutEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
>+PassRefPtr<FocusOutEventDispatchMediator> FocusOutEventDispatchMediator::create(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> newFocusedNode)
> {
>-    return adoptRef(new FocusOutEventDispatchMediator(event, newFocusedNode));
>+    return adoptRef(new FocusOutEventDispatchMediator(focusEvent, newFocusedNode));
> }
> 
>-FocusOutEventDispatchMediator::FocusOutEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
>-    : EventDispatchMediator(event)
>+FocusOutEventDispatchMediator::FocusOutEventDispatchMediator(PassRefPtr<FocusEvent> focusEvent, PassRefPtr<Node> newFocusedNode)
>+    : EventDispatchMediator(focusEvent)
>     , m_newFocusedNode(newFocusedNode)
> {
> }
>diff --git a/Source/WebCore/dom/FocusEvent.h b/Source/WebCore/dom/FocusEvent.h
>index 9908f2524ab21c654f36aed187c3327da9e34703..cbcff1a85cb37be3fbaacc19deac415cbfdd1bc2 100644
>--- a/Source/WebCore/dom/FocusEvent.h
>+++ b/Source/WebCore/dom/FocusEvent.h
>@@ -78,36 +78,40 @@ inline FocusEvent* toFocusEvent(Event* event)
> 
> class FocusEventDispatchMediator : public EventDispatchMediator {
> public:
>-    static PassRefPtr<FocusEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
>+    static PassRefPtr<FocusEventDispatchMediator> create(PassRefPtr<FocusEvent>, PassRefPtr<Node> oldFocusedNode);
> private:
>-    FocusEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
>+    FocusEventDispatchMediator(PassRefPtr<FocusEvent>, PassRefPtr<Node> oldFocusedNode);
>+    FocusEvent* event() const { return static_cast<FocusEvent*>(EventDispatchMediator::event()); }
>     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
>     RefPtr<Node> m_oldFocusedNode;
> };
> 
> class BlurEventDispatchMediator : public EventDispatchMediator {
> public:
>-    static PassRefPtr<BlurEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
>+    static PassRefPtr<BlurEventDispatchMediator> create(PassRefPtr<FocusEvent>, PassRefPtr<Node> newFocusedNode);
> private:
>-    BlurEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
>+    BlurEventDispatchMediator(PassRefPtr<FocusEvent>, PassRefPtr<Node> newFocusedNode);
>+    FocusEvent* event() const { return static_cast<FocusEvent*>(EventDispatchMediator::event()); }
>     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
>     RefPtr<Node> m_newFocusedNode;
> };
> 
> class FocusInEventDispatchMediator : public EventDispatchMediator {
> public:
>-    static PassRefPtr<FocusInEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
>+    static PassRefPtr<FocusInEventDispatchMediator> create(PassRefPtr<FocusEvent>, PassRefPtr<Node> oldFocusedNode);
> private:
>-    explicit FocusInEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
>+    FocusInEventDispatchMediator(PassRefPtr<FocusEvent>, PassRefPtr<Node> oldFocusedNode);
>+    FocusEvent* event() const { return static_cast<FocusEvent*>(EventDispatchMediator::event()); }
>     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
>     RefPtr<Node> m_oldFocusedNode;
> };
> 
> class FocusOutEventDispatchMediator : public EventDispatchMediator {
> public:
>-    static PassRefPtr<FocusOutEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
>+    static PassRefPtr<FocusOutEventDispatchMediator> create(PassRefPtr<FocusEvent>, PassRefPtr<Node> newFocusedNode);
> private:
>-    explicit FocusOutEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
>+    FocusOutEventDispatchMediator(PassRefPtr<FocusEvent>, PassRefPtr<Node> newFocusedNode);
>+    FocusEvent* event() const { return static_cast<FocusEvent*>(EventDispatchMediator::event()); }
>     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
>     RefPtr<Node> m_newFocusedNode;
> };

Actions: View | Formatted Diff | Diff

Attachments on bug 109561: 187824