Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193569 => 193570)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,5 +1,9 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r193474. rdar://problem/23732400
+
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
Rollout r193478. rdar://problem/23732400
2015-12-05 David Kilzer <ddkil...@apple.com>
Deleted: branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt (193569 => 193570)
--- branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt 2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt 2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,5 +0,0 @@
-
-Double tapping on the button should fire 2 click events.
-Click!
-Click!
-
Deleted: branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html (193569 => 193570)
--- branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html 2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html 2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,55 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
-
-<html>
-<meta id="viewport-data" name="viewport" content="user-scalable=no, initial-scale=1.0">
-
-<head>
- <script id="ui-script" type="text/plain">
- (function() {
- uiController.doubleTapAtPoint(50, 50, function() {});
- })();
- </script>
-
- <script>
- var clickCount = 0;
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- function getUIScript() {
- return document.getElementById("ui-script").text;
- }
-
- function runTest() {
- if (testRunner.runUIScript) {
- testRunner.runUIScript(getUIScript(), function(result) {});
- }
- }
- function handleClicked() {
- clickCount++;
- document.body.appendChild(document.createTextNode("Click!"));
- document.body.appendChild(document.createElement("br"));
- if (clickCount == 2)
- testRunner.notifyDone();
- }
- </script>
-
- <style>
- body {
- margin: 0;
- }
-
- #target {
- width: 100px;
- height: 100px;
- }
- </style>
-</head>
-
-<body _onload_="runTest()">
- <button id="target" _onclick_="handleClicked()"></button>
- <div>Double tapping on the button should fire 2 click events.</div>
-</body>
-
-</html>
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193569 => 193570)
--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,5 +1,9 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r193474. rdar://problem/23732400
+
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
Rollout r193475. rdar://problem/23732400
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193569 => 193570)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-06 07:27:50 UTC (rev 193570)
@@ -1005,8 +1005,6 @@
}
}
- [_contentView _setDoubleTapGesturesEnabled:[_scrollView isZoomEnabled] && [_scrollView minimumZoomScale] < [_scrollView maximumZoomScale]];
-
[self _updateScrollViewBackground];
if (_gestureController)
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (193569 => 193570)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-12-06 07:27:50 UTC (rev 193570)
@@ -206,7 +206,6 @@
- (void)_enableInspectorNodeSearch;
- (void)_disableInspectorNodeSearch;
- (void)_becomeFirstResponderWithSelectionMovingForward:(BOOL)selectingForward completionHandler:(void (^)(BOOL didBecomeFirstResponder))completionHandler;
-- (void)_setDoubleTapGesturesEnabled:(BOOL)enabled;
@end
#if HAVE(LINK_PREVIEW)
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (193569 => 193570)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-06 07:27:50 UTC (rev 193570)
@@ -296,15 +296,6 @@
return UIWebSelectionModeWeb;
}
-- (void)_createAndConfigureDoubleTapGestureRecognizer
-{
- _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
- [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
- [_doubleTapGestureRecognizer setDelegate:self];
- [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
- [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
-}
-
- (void)setupInteraction
{
if (!_interactionViewsContainerView) {
@@ -328,7 +319,11 @@
[_singleTapGestureRecognizer setResetTarget:self action:@selector(_singleTapDidReset:)];
[self addGestureRecognizer:_singleTapGestureRecognizer.get()];
- [self _createAndConfigureDoubleTapGestureRecognizer];
+ _doubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognized:)]);
+ [_doubleTapGestureRecognizer setNumberOfTapsRequired:2];
+ [_doubleTapGestureRecognizer setDelegate:self];
+ [self addGestureRecognizer:_doubleTapGestureRecognizer.get()];
+ [_singleTapGestureRecognizer requireOtherGestureToFail:_doubleTapGestureRecognizer.get()];
_twoFingerDoubleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerDoubleTapRecognized:)]);
[_twoFingerDoubleTapGestureRecognizer setNumberOfTapsRequired:2];
@@ -2231,18 +2226,6 @@
});
}
-- (void)_setDoubleTapGesturesEnabled:(BOOL)enabled
-{
- if (enabled && ![_doubleTapGestureRecognizer isEnabled]) {
- // The first tap recognized after re-enabling double tap gestures will not wait for the
- // second tap before committing. To fix this, we use a new double tap gesture recognizer.
- [self removeGestureRecognizer:_doubleTapGestureRecognizer.get()];
- [_doubleTapGestureRecognizer setDelegate:nil];
- [self _createAndConfigureDoubleTapGestureRecognizer];
- }
- [_doubleTapGestureRecognizer setEnabled:enabled];
-}
-
- (void)accessoryAutoFill
{
id <_WKFormDelegate> formDelegate = [_webView _formDelegate];
