Changeset 145514 in webkit

Timestamp:

Mar 12, 2013 4:13:02 AM (11 years ago)

Author:

falken@chromium.org

Message:

Refactoring: Pull Node::disabled() and Node::isInert() down to Element.
​https://bugs.webkit.org/show_bug.cgi?id=112085

Reviewed by Hajime Morrita.

Node is too low a level for these methods.

No new tests, just refactoring.

• dom/Element.cpp:

(WebCore::Element::disabled):
(WebCore):
(WebCore::Element::isInert):

• dom/Element.h:

(Element):

• dom/EventDispatcher.cpp:

(WebCore::EventDispatcher::dispatchSimulatedClick):

• dom/GestureEvent.cpp:

(WebCore::GestureEventDispatchMediator::dispatchEvent):

• dom/MouseEvent.cpp:

(WebCore::MouseEventDispatchMediator::dispatchEvent):

• dom/Node.cpp:

(WebCore::Node::handleLocalEvents):
(WebCore::Node::willRespondToMouseMoveEvents):
(WebCore::Node::willRespondToMouseClickEvents):
(WebCore::Node::willRespondToTouchEvents):

• dom/Node.h:

(Node):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• dom/EventDispatcher.cpp (modified) (1 diff)
• dom/GestureEvent.cpp (modified) (2 diffs)
• dom/MouseEvent.cpp (modified) (1 diff)
• dom/Node.cpp (modified) (6 diffs)
• dom/Node.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-12  Matt Falkenhagen  <falken@chromium.org>
+
+        Refactoring: Pull Node::disabled() and Node::isInert() down to Element.
+        https://bugs.webkit.org/show_bug.cgi?id=112085
+
+        Reviewed by Hajime Morrita.
+
+        Node is too low a level for these methods.
+
+        No new tests, just refactoring.
+
+        * dom/Element.cpp:
+        (WebCore::Element::disabled):
+        (WebCore):
+        (WebCore::Element::isInert):
+        * dom/Element.h:
+        (Element):
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventDispatcher::dispatchSimulatedClick):
+        * dom/GestureEvent.cpp:
+        (WebCore::GestureEventDispatchMediator::dispatchEvent):
+        * dom/MouseEvent.cpp:
+        (WebCore::MouseEventDispatchMediator::dispatchEvent):
+        * dom/Node.cpp:
+        (WebCore::Node::handleLocalEvents):
+        (WebCore::Node::willRespondToMouseMoveEvents):
+        (WebCore::Node::willRespondToMouseClickEvents):
+        (WebCore::Node::willRespondToTouchEvents):
+        * dom/Node.h:
+        (Node):
+
 2013-03-12  Marja Hölttä  <marja@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1153 +1153 @@
 }
 
+bool Element::disabled() const
+{
+#if ENABLE(DIALOG_ELEMENT)
+    // FIXME: disabled and inert are separate concepts in the spec, but now we treat them as the same.
+    // For example, an inert, non-disabled form control should not be grayed out.
+    if (isInert())
+        return true;
+#endif
+    return false;
+}
+
+#if ENABLE(DIALOG_ELEMENT)
+bool Element::isInert() const
+{
+    Element* dialog = document()->activeModalDialog();
+    return dialog && !containsIncludingShadowDOM(dialog) && !dialog->containsIncludingShadowDOM(this);
+}
+#endif
+
 Node::InsertionNotificationRequest Element::insertedInto(ContainerNode* insertionPoint)
 {

trunk/Source/WebCore/dom/Element.h

@@ -547 +547 @@
     virtual void dispatchFormControlChangeEvent() { }
 
+    // Used for disabled form elements; if true, prevents mouse events from being dispatched
+    // to event listeners, and prevents DOMActivate events from being sent at all.
+    virtual bool disabled() const;
+
+#if ENABLE(DIALOG_ELEMENT)
+    bool isInert() const;
+#endif
+
 #if ENABLE(SVG)
     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const;

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -80 +80 @@
 void EventDispatcher::dispatchSimulatedClick(Node* node, Event* underlyingEvent, SimulatedClickMouseEventOptions mouseEventOptions, SimulatedClickVisualOptions visualOptions)
 {
-    if (node->disabled())
+    if (node->isElementNode() && toElement(node)->disabled())
         return;
 

trunk/Source/WebCore/dom/GestureEvent.cpp

@@ -30 +30 @@
 #include "GestureEvent.h"
 
+#include "Element.h"
 #include <wtf/text/AtomicString.h>
 
@@ -120 +121 @@
 bool GestureEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
 {
-    if (dispatcher->node()->disabled())
+    if (dispatcher->node()->isElementNode() && toElement(dispatcher->node())->disabled())
         return true;
 

trunk/Source/WebCore/dom/MouseEvent.cpp

@@ -301 +301 @@
     }
 
-    if (dispatcher->node()->disabled()) // Don't even send DOM events for disabled controls..
+    if (dispatcher->node()->isElementNode() && toElement(dispatcher->node())->disabled()) // Don't even send DOM events for disabled controls..
         return false;
 

trunk/Source/WebCore/dom/Node.cpp

@@ -903 +903 @@
 }
 
-#if ENABLE(DIALOG_ELEMENT)
-bool Node::isInert() const
-{
-    Element* dialog = document()->activeModalDialog();
-    return dialog && !containsIncludingShadowDOM(dialog) && !dialog->containsIncludingShadowDOM(this);
-}
-#endif
-
 unsigned Node::nodeIndex() const
 {
@@ -2313 +2305 @@
         return;
 
-    if (disabled() && event->isMouseEvent())
+    if (isElementNode() && toElement(this)->disabled() && event->isMouseEvent())
         return;
 
@@ -2451 +2443 @@
 {
     dispatchScopedEvent(Event::create(eventNames().inputEvent, true, false));
-}
-
-bool Node::disabled() const
-{
-#if ENABLE(DIALOG_ELEMENT)
-    if (isInert())
-        return true;
-#endif
-    return false;
 }
 
@@ -2521 +2504 @@
 bool Node::willRespondToMouseMoveEvents()
 {
-    if (disabled())
+    if (isElementNode() && toElement(this)->disabled())
         return false;
     return hasEventListeners(eventNames().mousemoveEvent) || hasEventListeners(eventNames().mouseoverEvent) || hasEventListeners(eventNames().mouseoutEvent);
@@ -2528 +2511 @@
 bool Node::willRespondToMouseClickEvents()
 {
-    if (disabled())
+    if (isElementNode() && toElement(this)->disabled())
         return false;
     return isContentEditable(UserSelectAllIsAlwaysNonEditable) || hasEventListeners(eventNames().mouseupEvent) || hasEventListeners(eventNames().mousedownEvent) || hasEventListeners(eventNames().clickEvent) || hasEventListeners(eventNames().DOMActivateEvent);
@@ -2536 +2519 @@
 {
 #if ENABLE(TOUCH_EVENTS)
-    if (disabled())
+    if (isElementNode() && toElement(this)->disabled())
         return false;
     return hasEventListeners(eventNames().touchstartEvent) || hasEventListeners(eventNames().touchmoveEvent) || hasEventListeners(eventNames().touchcancelEvent) || hasEventListeners(eventNames().touchendEvent);

trunk/Source/WebCore/dom/Node.h

@@ -415 +415 @@
     virtual Node* focusDelegate();
 
-#if ENABLE(DIALOG_ELEMENT)
-    bool isInert() const;
-#endif
-
     enum UserSelectAllTreatment {
         UserSelectAllDoesNotAffectEditability,
@@ -664 +660 @@
     virtual void defaultEventHandler(Event*);
 
-    // Used for disabled form elements; if true, prevents mouse events from being dispatched
-    // to event listeners, and prevents DOMActivate events from being sent at all.
-    virtual bool disabled() const;
-
     using TreeShared<Node>::ref;
     using TreeShared<Node>::deref;