Title: [194692] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 194692
- Author
- matthew_han...@apple.com
- Date
- 2016-01-07 00:16:55 -0800 (Thu, 07 Jan 2016)
Log Message
Merge r194662. rdar://problem/24043055
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (194691 => 194692)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-07 08:16:49 UTC (rev 194691)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-07 08:16:55 UTC (rev 194692)
@@ -1,3 +1,15 @@
+2016-01-06 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r194662. rdar://problem/24043055
+
+ 2016-01-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge for rdar://problem/24043055.
+
+ * dom/EventDispatcher.cpp:
+ (WebCore::EventPath::EventPath):
+ Set the isMouseOrFocusEvent boolean flag to True if the event is a wheelEvent.
+
2015-12-21 Babak Shafiei <bshaf...@apple.com>
Merge r194114.
Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/EventDispatcher.cpp (194691 => 194692)
--- branches/safari-601.1.46-branch/Source/WebCore/dom/EventDispatcher.cpp 2016-01-07 08:16:49 UTC (rev 194691)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/EventDispatcher.cpp 2016-01-07 08:16:55 UTC (rev 194692)
@@ -417,7 +417,7 @@
{
bool inDocument = targetNode.inDocument();
bool isSVGElement = targetNode.isSVGElement();
- bool isMouseOrFocusEvent = event.isMouseEvent() || event.isFocusEvent();
+ bool isMouseOrFocusEvent = event.isMouseEvent() || event.isWheelEvent() || event.isFocusEvent();
#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
bool isTouchEvent = event.isTouchEvent();
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
