Changeset 195817 in webkit

Timestamp:

Jan 29, 2016, 9:44:34 AM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Applied patch from rdar://problem/24209109.

Location:

branches/safari-601-branch/Source/WebCore/dom

Files:

• Node.cpp (modified) (1 diff)
• WheelEvent.cpp (modified) (1 diff)
• WheelEvent.h (modified) (1 diff)

branches/safari-601-branch/Source/WebCore/dom/Node.cpp

@@ -1996 +1996 @@
         return;
 
-    if (is<Element>(*this) && downcast<Element>(*this).isDisabledFormControl() && event.isMouseEvent())
+    // FIXME: Should we deliver wheel events to disabled form controls or not?
+    if (is<Element>(*this) && downcast<Element>(*this).isDisabledFormControl() && event.isMouseEvent() && !event.isWheelEvent())
         return;
 

branches/safari-601-branch/Source/WebCore/dom/WheelEvent.cpp

@@ -115 +115 @@
 }
 
-bool WheelEvent::isMouseEvent() const
-{
-    return false;
-}
-
 bool WheelEvent::isWheelEvent() const
 {

branches/safari-601-branch/Source/WebCore/dom/WheelEvent.h

@@ -92 +92 @@
 
     virtual EventInterface eventInterface() const override;
-    virtual bool isMouseEvent() const override;
 
 #if PLATFORM(MAC)