Title: [169037] trunk/Source/WebCore
- Revision
- 169037
- Author
- [email protected]
- Date
- 2014-05-18 22:50:30 -0700 (Sun, 18 May 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169036 => 169037)
--- trunk/Source/WebCore/ChangeLog 2014-05-19 04:48:29 UTC (rev 169036)
+++ trunk/Source/WebCore/ChangeLog 2014-05-19 05:50:30 UTC (rev 169037)
@@ -1,3 +1,14 @@
+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-18 Svetlana Redchenko <[email protected]>
Input ::selection pseudo class does not work leading to hidden selection
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (169036 => 169037)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-05-19 04:48:29 UTC (rev 169036)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-05-19 05:50:30 UTC (rev 169037)
@@ -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
