Title: [163211] tags/Safari-538.15/Source/WebKit2
- Revision
- 163211
- Author
- [email protected]
- Date
- 2014-01-31 15:27:16 -0800 (Fri, 31 Jan 2014)
Log Message
Merged r163192. <rdar://problem/15959481>
Modified Paths
Diff
Modified: tags/Safari-538.15/Source/WebKit2/ChangeLog (163210 => 163211)
--- tags/Safari-538.15/Source/WebKit2/ChangeLog 2014-01-31 23:18:15 UTC (rev 163210)
+++ tags/Safari-538.15/Source/WebKit2/ChangeLog 2014-01-31 23:27:16 UTC (rev 163211)
@@ -1,3 +1,26 @@
+2014-01-31 Lucas Forschler <[email protected]>
+
+ Merge r163192
+
+ 2014-01-31 Tim Horton <[email protected]>
+
+ WebKit2 View Gestures (Swipe): Crashes swiping around a Google Docs spreadsheet
+ https://bugs.webkit.org/show_bug.cgi?id=128013
+ <rdar://problem/15959481>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/ViewGestureController.mm:
+ (WebKit::ViewGestureController::wheelEventWasNotHandledByWebCore):
+ We should never (currently) start a swipe from a non-begin-phase wheel event.
+ We already check this in handleScrollWheelEvent, but can still get
+ non-begin-phase events in wheelEventWasNotHandled.
+
+ We only start "pending" swipes with Begin events, so we should never make them
+ non-pending with anything but a Begin event (we'll get it when it bubbles back up,
+ unhandled, from WebCore). In addition, AppKit throws an exception when we try
+ to start a swipe from end-phase events.
+
2014-01-30 Commit Queue <[email protected]>
Unreviewed, rolling out r163125.
Modified: tags/Safari-538.15/Source/WebKit2/UIProcess/mac/ViewGestureController.mm (163210 => 163211)
--- tags/Safari-538.15/Source/WebKit2/UIProcess/mac/ViewGestureController.mm 2014-01-31 23:18:15 UTC (rev 163210)
+++ tags/Safari-538.15/Source/WebKit2/UIProcess/mac/ViewGestureController.mm 2014-01-31 23:27:16 UTC (rev 163211)
@@ -286,6 +286,10 @@
return;
m_hasPendingSwipe = false;
+
+ if (event.phase != NSEventPhaseBegan)
+ return;
+
trackSwipeGesture(event, m_pendingSwipeDirection);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
