Title: [193568] branches/safari-601-branch/Source/WebKit2
- Revision
- 193568
- Author
- matthew_han...@apple.com
- Date
- 2015-12-05 23:27:37 -0800 (Sat, 05 Dec 2015)
Log Message
Roll out r193476. rdar://problem/23732400
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193567 => 193568)
--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-06 07:27:33 UTC (rev 193567)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-06 07:27:37 UTC (rev 193568)
@@ -1,5 +1,9 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Rollout r193476. rdar://problem/23732400
+
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
Rollout r193478. rdar://problem/23732400
2015-12-04 Matthew Hanson <matthew_han...@apple.com>
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (193567 => 193568)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-12-06 07:27:33 UTC (rev 193567)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-12-06 07:27:37 UTC (rev 193568)
@@ -161,7 +161,6 @@
BOOL _usingGestureForSelection;
BOOL _inspectorNodeSearchEnabled;
BOOL _didAccessoryTabInitiateFocus;
- BOOL _isExpectingFastSingleTapCommit;
}
@end
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (193567 => 193568)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-06 07:27:33 UTC (rev 193567)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-06 07:27:37 UTC (rev 193568)
@@ -359,7 +359,6 @@
_actionSheetAssistant = adoptNS([[WKActionSheetAssistant alloc] initWithView:self]);
[_actionSheetAssistant setDelegate:self];
_smartMagnificationController = std::make_unique<SmartMagnificationController>(self);
- _isExpectingFastSingleTapCommit = NO;
}
- (void)cleanupInteraction
@@ -369,7 +368,6 @@
_actionSheetAssistant = nil;
_smartMagnificationController = nil;
_didAccessoryTabInitiateFocus = NO;
- _isExpectingFastSingleTapCommit = NO;
[_formInputSession invalidate];
_formInputSession = nil;
[_highlightView removeFromSuperview];
@@ -759,11 +757,6 @@
}
[self _showTapHighlight];
- if (_isExpectingFastSingleTapCommit) {
- [self _finishInteraction];
- if (!_potentialTapInProgress)
- _isExpectingFastSingleTapCommit = NO;
- }
}
- (CGFloat)_fastClickZoomThreshold
@@ -1159,7 +1152,6 @@
_page->potentialTapAtPosition(gestureRecognizer.location, ++_latestTapID);
_potentialTapInProgress = YES;
_isTapHighlightIDValid = YES;
- _isExpectingFastSingleTapCommit = !_doubleTapGestureRecognizer.get().enabled;
}
static void cancelPotentialTapIfNecessary(WKContentView* contentView)
@@ -1213,8 +1205,7 @@
_page->commitPotentialTap();
- if (!_isExpectingFastSingleTapCommit)
- [self _finishInteraction];
+ [self _finishInteraction];
}
- (void)_doubleTapRecognized:(UITapGestureRecognizer *)gestureRecognizer
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
