Changeset 169076 in webkit

Timestamp:

May 19, 2014, 3:14:50 PM (12 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r169037.

Location:

branches/safari-538.34-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/EventHandlerMac.mm (modified) (1 diff)

branches/safari-538.34-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-19  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r169037.
+
+    2014-05-18  Brent Fulgham  <bfulgham@apple.com>
+    
+            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  <jer.noble@apple.com>
 

branches/safari-538.34-branch/Source/WebCore/page/mac/EventHandlerMac.mm

@@ -805 +805 @@
     
     if (wheelEvent.shouldConsiderLatching()) {
-        if (scrollableArea)
+        if (scrollableArea && scrollableContainer)
             m_startedGestureAtScrollLimit = scrolledToEdgeInDominantDirection(*scrollableContainer, *scrollableArea, wheelEvent.deltaX(), wheelEvent.deltaY());
         else