Changeset 163323 in webkit

Timestamp:

Feb 3, 2014 1:46:46 PM (10 years ago)

Author:

timothy_horton@apple.com

Message:

WebKit2 View Gestures: Two smart magnifications in a row without moving the mouse should zoom out
​https://bugs.webkit.org/show_bug.cgi?id=128108
<rdar://problem/15914539>

Reviewed by Darin Adler.

• UIProcess/mac/ViewGestureController.h:
• UIProcess/mac/ViewGestureController.mm:

(WebKit::ViewGestureController::ViewGestureController):
(WebKit::ViewGestureController::handleMagnificationGesture):
Clear the bit that tells us that we should do "smart" things (because the
last gesture was also a smart magnification gesture) when the user manually pinch-magnifies.

(WebKit::ViewGestureController::didCollectGeometryForSmartMagnificationGesture):
Zoom out if the mouse hasn't moved since the last pinch-magnification gesture.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/ViewGestureController.h (modified) (1 diff)
• UIProcess/mac/ViewGestureController.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-03  Tim Horton  <timothy_horton@apple.com>
+
+        WebKit2 View Gestures: Two smart magnifications in a row without moving the mouse should zoom out
+        https://bugs.webkit.org/show_bug.cgi?id=128108
+        <rdar://problem/15914539>
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/mac/ViewGestureController.h:
+        * UIProcess/mac/ViewGestureController.mm:
+        (WebKit::ViewGestureController::ViewGestureController):
+        (WebKit::ViewGestureController::handleMagnificationGesture):
+        Clear the bit that tells us that we should do "smart" things (because the
+        last gesture was also a smart magnification gesture) when the user manually pinch-magnifies.
+
+        (WebKit::ViewGestureController::didCollectGeometryForSmartMagnificationGesture):
+        Zoom out if the mouse hasn't moved since the last pinch-magnification gesture.
+
+
 2014-02-03  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h

@@ -101 +101 @@
 
     WebCore::FloatRect m_lastSmartMagnificationUnscaledTargetRect;
-    bool m_lastSmartMagnificationUnscaledTargetRectIsValid;
+    bool m_lastMagnificationGestureWasSmartMagnification;
+    WebCore::FloatPoint m_lastSmartMagnificationOrigin;
 
     ViewGestureType m_activeGestureType;

trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.mm

@@ -94 +94 @@
 ViewGestureController::ViewGestureController(WebPageProxy& webPageProxy)
     : m_webPageProxy(webPageProxy)
-    , m_lastSmartMagnificationUnscaledTargetRectIsValid(false)
+    , m_lastMagnificationGestureWasSmartMagnification(false)
     , m_activeGestureType(ViewGestureType::None)
     , m_visibleContentRectIsValid(false)
@@ -154 +154 @@
         m_magnification = m_webPageProxy.pageScaleFactor();
         m_webPageProxy.process().send(Messages::ViewGestureGeometryCollector::CollectGeometryForMagnificationGesture(), m_webPageProxy.pageID());
+        m_lastMagnificationGestureWasSmartMagnification = false;
 
         return;
@@ -226 +227 @@
 
     // Allow panning between elements via double-tap while magnified, unless the target rect is
-    // similar to the last one, in which case we'll zoom all the way out.
-    if (currentScaleFactor > 1
-        && m_lastSmartMagnificationUnscaledTargetRectIsValid
-        && maximumRectangleComponentDelta(m_lastSmartMagnificationUnscaledTargetRect, unscaledTargetRect) < smartMagnificationPanScrollThreshold)
-        targetMagnification = 1;
+    // similar to the last one or the mouse has not moved, in which case we'll zoom all the way out.
+    if (currentScaleFactor > 1 && m_lastMagnificationGestureWasSmartMagnification) {
+        if (maximumRectangleComponentDelta(m_lastSmartMagnificationUnscaledTargetRect, unscaledTargetRect) < smartMagnificationPanScrollThreshold)
+            targetMagnification = 1;
+
+        if (m_lastSmartMagnificationOrigin == origin)
+            targetMagnification = 1;
+    }
 
     FloatRect targetRect(unscaledTargetRect);
@@ -241 +245 @@
 
     m_lastSmartMagnificationUnscaledTargetRect = unscaledTargetRect;
-    m_lastSmartMagnificationUnscaledTargetRectIsValid = true;
+    m_lastSmartMagnificationOrigin = origin;
+
+    m_lastMagnificationGestureWasSmartMagnification = true;
 }