Title: [169076] branches/safari-538.34-branch/Source/WebCore
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (169075 => 169076)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-19 22:07:10 UTC (rev 169075)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-19 22:14:50 UTC (rev 169076)
@@ -1,3 +1,18 @@
+2014-05-19 Matthew Hanson <[email protected]>
+
+ Merge r169037.
+
+ 2014-05-18 Brent Fulgham <[email protected]>
+
+ Crash during scroll when latched
+ https://bugs.webkit.org/show_bug.cgi?id=133064
+
+ Reviewed by Simon Fraser.
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformPrepareForWheelEvents): Prevent dereference of NULL
+ wheelEventTarget argument.
+
2014-05-16 Jer Noble <[email protected]>
[Mac][MSE] setCurrentTime() goes down fastSeek path in MediaPlayerPrivateMediaSourceAVFObjC.
Modified: branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm (169075 => 169076)
--- branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2014-05-19 22:07:10 UTC (rev 169075)
+++ branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm 2014-05-19 22:14:50 UTC (rev 169076)
@@ -804,7 +804,7 @@
}
if (wheelEvent.shouldConsiderLatching()) {
- if (scrollableArea)
+ if (scrollableArea && scrollableContainer)
m_startedGestureAtScrollLimit = scrolledToEdgeInDominantDirection(*scrollableContainer, *scrollableArea, wheelEvent.deltaX(), wheelEvent.deltaY());
else
m_startedGestureAtScrollLimit = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
