Title: [195817] branches/safari-601-branch/Source/WebCore/dom
- Revision
- 195817
- Author
- matthew_han...@apple.com
- Date
- 2016-01-29 09:44:34 -0800 (Fri, 29 Jan 2016)
Log Message
Applied patch from rdar://problem/24209109.
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/dom/Node.cpp (195816 => 195817)
--- branches/safari-601-branch/Source/WebCore/dom/Node.cpp 2016-01-29 17:38:53 UTC (rev 195816)
+++ branches/safari-601-branch/Source/WebCore/dom/Node.cpp 2016-01-29 17:44:34 UTC (rev 195817)
@@ -1995,7 +1995,8 @@
if (!hasEventTargetData())
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;
fireEventListeners(&event);
Modified: branches/safari-601-branch/Source/WebCore/dom/WheelEvent.cpp (195816 => 195817)
--- branches/safari-601-branch/Source/WebCore/dom/WheelEvent.cpp 2016-01-29 17:38:53 UTC (rev 195816)
+++ branches/safari-601-branch/Source/WebCore/dom/WheelEvent.cpp 2016-01-29 17:44:34 UTC (rev 195817)
@@ -114,11 +114,6 @@
return WheelEventInterfaceType;
}
-bool WheelEvent::isMouseEvent() const
-{
- return false;
-}
-
bool WheelEvent::isWheelEvent() const
{
return true;
Modified: branches/safari-601-branch/Source/WebCore/dom/WheelEvent.h (195816 => 195817)
--- branches/safari-601-branch/Source/WebCore/dom/WheelEvent.h 2016-01-29 17:38:53 UTC (rev 195816)
+++ branches/safari-601-branch/Source/WebCore/dom/WheelEvent.h 2016-01-29 17:44:34 UTC (rev 195817)
@@ -91,7 +91,6 @@
bool isHorizontal() const { return m_wheelDelta.x(); }
virtual EventInterface eventInterface() const override;
- virtual bool isMouseEvent() const override;
#if PLATFORM(MAC)
PlatformWheelEventPhase phase() const { return m_wheelEvent.phase(); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
