REGRESSION (r191299): Zoom gestures are enabled even if allowsMagnification=NO
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Dec 2015 03:04:11 +0000 (03:04 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Dec 2015 03:04:11 +0000 (03:04 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194205 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm

index 832d3bc..01a907e 100644 (file)
@@ -1,5 +1,18 @@
 2015-12-16  Tim Horton  <timothy_horton@apple.com>
 
+        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  <timothy_horton@apple.com>
+
         REGRESSION (r194125): Crashes in touchesEndedWithEvent on occasion when interacting with the page
         https://bugs.webkit.org/show_bug.cgi?id=152366
         <rdar://problem/23929672>
index 4c73596..2c960d4 100644 (file)
@@ -3233,7 +3233,7 @@ void WebViewImpl::gestureEventWasNotHandledByWebCore(NSEvent *event)
 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
 }