Title: [195931] branches/safari-601-branch/Source/WebCore
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195930 => 195931)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-31 19:51:04 UTC (rev 195930)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-31 20:27:08 UTC (rev 195931)
@@ -1,3 +1,7 @@
+2016-01-31 Babak Shafiei <[email protected]>
+
+ Roll out r195817.
+
2016-01-29 Babak Shafiei <[email protected]>
Merge r194479.
Modified: branches/safari-601-branch/Source/WebCore/dom/Node.cpp (195930 => 195931)
--- branches/safari-601-branch/Source/WebCore/dom/Node.cpp 2016-01-31 19:51:04 UTC (rev 195930)
+++ branches/safari-601-branch/Source/WebCore/dom/Node.cpp 2016-01-31 20:27:08 UTC (rev 195931)
@@ -1995,8 +1995,7 @@
if (!hasEventTargetData())
return;
- // FIXME: Should we deliver wheel events to disabled form controls or not?
- if (is<Element>(*this) && downcast<Element>(*this).isDisabledFormControl() && event.isMouseEvent() && !event.isWheelEvent())
+ if (is<Element>(*this) && downcast<Element>(*this).isDisabledFormControl() && event.isMouseEvent())
return;
fireEventListeners(&event);
Modified: branches/safari-601-branch/Source/WebCore/dom/WheelEvent.cpp (195930 => 195931)
--- branches/safari-601-branch/Source/WebCore/dom/WheelEvent.cpp 2016-01-31 19:51:04 UTC (rev 195930)
+++ branches/safari-601-branch/Source/WebCore/dom/WheelEvent.cpp 2016-01-31 20:27:08 UTC (rev 195931)
@@ -114,6 +114,11 @@
return WheelEventInterfaceType;
}
+bool WheelEvent::isMouseEvent() const
+{
+ return false;
+}
+
bool WheelEvent::isWheelEvent() const
{
return true;
Modified: branches/safari-601-branch/Source/WebCore/dom/WheelEvent.h (195930 => 195931)
--- branches/safari-601-branch/Source/WebCore/dom/WheelEvent.h 2016-01-31 19:51:04 UTC (rev 195930)
+++ branches/safari-601-branch/Source/WebCore/dom/WheelEvent.h 2016-01-31 20:27:08 UTC (rev 195931)
@@ -91,6 +91,7 @@
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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
