Title: [194205] trunk/Source/WebKit2
- Revision
- 194205
- Author
- [email protected]
- Date
- 2015-12-16 19:04:11 -0800 (Wed, 16 Dec 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (194204 => 194205)
--- trunk/Source/WebKit2/ChangeLog 2015-12-17 02:55:02 UTC (rev 194204)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-17 03:04:11 UTC (rev 194205)
@@ -1,5 +1,18 @@
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 Tim Horton <[email protected]>
+
REGRESSION (r194125): Crashes in touchesEndedWithEvent on occasion when interacting with the page
https://bugs.webkit.org/show_bug.cgi?id=152366
<rdar://problem/23929672>
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (194204 => 194205)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-12-17 02:55:02 UTC (rev 194204)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-12-17 03:04:11 UTC (rev 194205)
@@ -3233,7 +3233,7 @@
void WebViewImpl::gestureEventWasNotHandledByWebCoreFromViewOnly(NSEvent *event)
{
#if ENABLE(MAC_GESTURE_EVENTS)
- if (m_gestureController)
+ if (m_allowsMagnification && m_gestureController)
m_gestureController->gestureEventWasNotHandledByWebCore(event, [m_view convertPoint:event.locationInWindow fromView:nil]);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
