Title: [194212] branches/safari-601-branch/Source/WebKit2
- Revision
- 194212
- Author
- [email protected]
- Date
- 2015-12-16 23:36:38 -0800 (Wed, 16 Dec 2015)
Log Message
Merged r194205. rdar://problem/23934312
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (194211 => 194212)
--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-17 07:07:36 UTC (rev 194211)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-17 07:36:38 UTC (rev 194212)
@@ -1,5 +1,22 @@
2015-12-16 Babak Shafiei <[email protected]>
+ Merge r194205.
+
+ 2015-12-16 Tim Horton <[email protected]>
+
+ REGRESSION (r191299): Zoom gestures are enabled even if allowsMagnification=NO
+ https://bugs.webkit.org/show_bug.cgi?id=152373
+ <rdar://problem/23931998>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::gestureEventWasNotHandledByWebCoreFromViewOnly):
+ Don't pass the event on to ViewGestureController if we shouldn't handle it,
+ just like we would have done in magnifyWithEvent before.
+
+2015-12-16 Babak Shafiei <[email protected]>
+
Merge r194186.
2015-12-16 Tim Horton <[email protected]>
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (194211 => 194212)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-12-17 07:07:36 UTC (rev 194211)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-12-17 07:36:38 UTC (rev 194212)
@@ -4639,7 +4639,7 @@
- (void)_gestureEventWasNotHandledByWebCore:(NSEvent *)event
{
#if ENABLE(MAC_GESTURE_EVENTS)
- if (_data->_gestureController)
+ if (_data->_allowsMagnification && _data->_gestureController)
_data->_gestureController->gestureEventWasNotHandledByWebCore(event, [self convertPoint:event.locationInWindow fromView:nil]);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
