Changeset 202354 in webkit

Timestamp:

Jun 22, 2016 3:52:00 PM (8 years ago)

Author:

dino@apple.com

Message:

REGRESSION: Double tap to zoom does not work on yahoo finance
​https://bugs.webkit.org/show_bug.cgi?id=158886
<rdar://problem/24917760>

Reviewed by Simon Fraser.

Source/WebKit2:

We shouldn't enable fast click on pages that have
had to shrink to fit. In other words, we should enable
double-tap-to-zoom if the page has already zoomed.

Test: fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _allowsDoubleTapGestures]):

LayoutTests:

• fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt: Added.
• fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt (added)
• LayoutTests/fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-17  Dean Jackson  <dino@apple.com>
+
+        REGRESSION: Double tap to zoom does not work on yahoo finance
+        https://bugs.webkit.org/show_bug.cgi?id=158886
+        <rdar://problem/24917760>
+
+        Reviewed by Simon Fraser.
+
+        * fast/events/ios/viewport-shrink-to-fit-allows-double-tap-expected.txt: Added.
+        * fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html: Added.
+
 2016-06-22  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-17  Dean Jackson  <dino@apple.com>
+
+        REGRESSION: Double tap to zoom does not work on yahoo finance
+        https://bugs.webkit.org/show_bug.cgi?id=158886
+        <rdar://problem/24917760>
+
+        Reviewed by Simon Fraser.
+
+        We shouldn't enable fast click on pages that have
+        had to shrink to fit. In other words, we should enable
+        double-tap-to-zoom if the page has already zoomed.
+
+        Test: fast/events/ios/viewport-shrink-to-fit-allows-double-tap.html
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _allowsDoubleTapGestures]):
+
 2016-06-22  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1739 +1739 @@
         return YES;
 
-    // For scalable viewports, only disable double tap gestures if the viewport width is device width.
+    // If the page set a viewport width that wasn't the device width, then it was
+    // scaled and thus will probably need to zoom.
     if (_viewportMetaTagWidth != WebCore::ViewportArguments::ValueDeviceWidth)
         return YES;
 
-    return !areEssentiallyEqualAsFloat(contentZoomScale(self), _initialScaleFactor);
+    // At this point, we have a page that asked for width = device-width. However,
+    // if the content's width and height were large, we might have had to shrink it.
+    // Since we'll enable double tap zoom whenever we're not at the actual
+    // initial scale, this simply becomes a test of the current scale against 1.
+    return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
 }