Title: [195932] branches/safari-601-branch/Source/WebCore
- Revision
- 195932
- Author
- [email protected]
- Date
- 2016-01-31 12:39:53 -0800 (Sun, 31 Jan 2016)
Log Message
Merge patch for rdar://problem/24426332 and rdar://problem/24209109.
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195931 => 195932)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-31 20:27:08 UTC (rev 195931)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-31 20:39:53 UTC (rev 195932)
@@ -1,5 +1,9 @@
2016-01-31 Babak Shafiei <[email protected]>
+ Merge patch for rdar://problem/24426332 and rdar://problem/24209109.
+
+2016-01-31 Babak Shafiei <[email protected]>
+
Roll out r195817.
2016-01-29 Babak Shafiei <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/dom/EventContext.cpp (195931 => 195932)
--- branches/safari-601-branch/Source/WebCore/dom/EventContext.cpp 2016-01-31 20:27:08 UTC (rev 195931)
+++ branches/safari-601-branch/Source/WebCore/dom/EventContext.cpp 2016-01-31 20:39:53 UTC (rev 195932)
@@ -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
