Title: [195933] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 195933
- Author
- [email protected]
- Date
- 2016-01-31 12:49:15 -0800 (Sun, 31 Jan 2016)
Log Message
Merged r195932. rdar://problem/24430138
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (195932 => 195933)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-31 20:39:53 UTC (rev 195932)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-31 20:49:15 UTC (rev 195933)
@@ -1,3 +1,7 @@
+2016-01-31 Babak Shafiei <[email protected]>
+
+ Merge r195932.
+
2016-01-28 Babak Shafiei <[email protected]>
Merge r195751 and r195761.
Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/EventContext.cpp (195932 => 195933)
--- branches/safari-601.1.46-branch/Source/WebCore/dom/EventContext.cpp 2016-01-31 20:39:53 UTC (rev 195932)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/EventContext.cpp 2016-01-31 20:49:15 UTC (rev 195933)
@@ -31,6 +31,7 @@
#include "FocusEvent.h"
#include "MouseEvent.h"
#include "TouchEvent.h"
+#include "WheelEvent.h"
namespace WebCore {
@@ -76,10 +77,10 @@
void MouseOrFocusEventContext::handleLocalEvents(Event& event) const
{
- ASSERT(is<MouseEvent>(event) || is<FocusEvent>(event));
+ ASSERT(is<MouseEvent>(event) || is<WheelEvent>(event) || is<FocusEvent>(event));
if (m_relatedTarget) {
- if (is<MouseEvent>(event))
- downcast<MouseEvent>(event).setRelatedTarget(m_relatedTarget.get());
+ if (is<MouseEvent>(event) || is<WheelEvent>(event))
+ static_cast<MouseEvent&>(event).setRelatedTarget(m_relatedTarget.get());
else if (is<FocusEvent>(event))
downcast<FocusEvent>(event).setRelatedTarget(m_relatedTarget.get());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
