- Revision
- 212973
- Author
- wenson_hs...@apple.com
- Date
- 2017-02-24 16:05:39 -0800 (Fri, 24 Feb 2017)
Log Message
Remove the data interaction gesture recognizer
https://bugs.webkit.org/show_bug.cgi?id=168600
<rdar://problem/30313681>
Reviewed by Anders Carlsson.
Source/WebKit2:
The data interaction gesture recognizer will no longer be needed moving forward.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _simulateDataInteractionGestureRecognized]): Deleted.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
(-[WKContentView _removeDefaultGestureRecognizers]):
(-[WKContentView _addDefaultGestureRecognizers]):
(-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
(-[WKContentView gestureRecognizerShouldBegin:]):
(-[WKContentView _dataInteractionGestureRecognizer]): Deleted.
Tools:
Adjust TestWebKitAPI for changes in WebKit2.
* TestWebKitAPI/ios/DataInteractionSimulator.h:
* TestWebKitAPI/ios/DataInteractionSimulator.mm:
(-[DataInteractionSimulator initWithWebView:]):
(-[DataInteractionSimulator runFrom:to:]):
(-[DataInteractionSimulator _advanceProgress]):
(-[DataInteractionSimulator _finishDataInteraction]):
(-[MockLongPressGestureRecognizer initWithWindow:]): Deleted.
(-[MockLongPressGestureRecognizer locationInView:]): Deleted.
(-[MockLongPressGestureRecognizer state]): Deleted.
(-[MockLongPressGestureRecognizer numberOfTouches]): Deleted.
(-[DataInteractionSimulator _recognizeGestureAtLocation:withState:]): Deleted.
(-[DataInteractionSimulator dataInteractionGestureRecognizer]): Deleted.
(-[DataInteractionSimulator webView:beginDataInteractionWithSourceIndex:gestureRecognizer:]): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (212972 => 212973)
--- trunk/Source/WebKit2/ChangeLog 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-25 00:05:39 UTC (rev 212973)
@@ -1,3 +1,26 @@
+2017-02-20 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove the data interaction gesture recognizer
+ https://bugs.webkit.org/show_bug.cgi?id=168600
+ <rdar://problem/30313681>
+
+ Reviewed by Anders Carlsson.
+
+ The data interaction gesture recognizer will no longer be needed moving forward.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _simulateDataInteractionGestureRecognized]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+ (-[WKContentView cleanupInteraction]):
+ (-[WKContentView _removeDefaultGestureRecognizers]):
+ (-[WKContentView _addDefaultGestureRecognizers]):
+ (-[WKContentView gestureRecognizer:shouldRecognizeSimultaneouslyWithGestureRecognizer:]):
+ (-[WKContentView gestureRecognizerShouldBegin:]):
+ (-[WKContentView _dataInteractionGestureRecognizer]): Deleted.
+
2017-02-24 Chris Dumez <cdu...@apple.com>
[iOS][WK2] Disable network cache speculative revalidation / loading in low power mode
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (212972 => 212973)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-25 00:05:39 UTC (rev 212973)
@@ -5233,11 +5233,6 @@
WebKit::ViewSnapshotStore::singleton().setDisableSnapshotVolatilityForTesting(true);
}
-
-- (void)_simulateDataInteractionGestureRecognized
-{
-}
-
- (void)_simulateDataInteractionEntered:(id)info
{
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (212972 => 212973)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-02-25 00:05:39 UTC (rev 212973)
@@ -306,7 +306,6 @@
@property (nonatomic, readonly) NSNumber *_stableStateOverride WK_API_AVAILABLE(ios(WK_IOS_TBA));
-- (void)_simulateDataInteractionGestureRecognized WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_simulateDataInteractionEntered:(id)info WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_simulateDataInteractionUpdated:(id)info WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_simulateDataInteractionPerformOperation:(id)info WK_API_AVAILABLE(ios(WK_IOS_TBA));
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (212972 => 212973)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-02-25 00:05:39 UTC (rev 212973)
@@ -118,9 +118,6 @@
RetainPtr<UITapGestureRecognizer> _twoFingerDoubleTapGestureRecognizer;
RetainPtr<UITapGestureRecognizer> _twoFingerSingleTapGestureRecognizer;
RetainPtr<WKInspectorNodeSearchGestureRecognizer> _inspectorNodeSearchGestureRecognizer;
-#if ENABLE(DATA_INTERACTION)
- RetainPtr<UILongPressGestureRecognizer> _dataInteractionGestureRecognizer;
-#endif
RetainPtr<UIWKTextInteractionAssistant> _textSelectionAssistant;
RetainPtr<UIWKSelectionAssistant> _webSelectionAssistant;
@@ -272,7 +269,6 @@
- (void)_didPerformDataInteractionControllerOperation;
- (void)_didHandleStartDataInteractionRequest:(BOOL)started;
- (void)_startDataInteractionWithImage:(RetainPtr<CGImageRef>)image withIndicatorData:(std::optional<WebCore::TextIndicatorData>)indicatorData atClientPosition:(CGPoint)clientPosition anchorPoint:(CGPoint)anchorPoint action:(uint64_t)action;
-- (void)_simulateDataInteractionGestureRecognized:(UILongPressGestureRecognizer *)gestureRecognizer WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_simulateDataInteractionEntered:(id)info WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_simulateDataInteractionUpdated:(id)info WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)_simulateDataInteractionPerformOperation:(id)info WK_API_AVAILABLE(ios(WK_IOS_TBA));
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (212972 => 212973)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-25 00:05:39 UTC (rev 212973)
@@ -558,11 +558,6 @@
[self _createAndConfigureLongPressGestureRecognizer];
#if ENABLE(DATA_INTERACTION)
- _dataInteractionGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_dataInteractionGestureRecognized:)]);
- [_dataInteractionGestureRecognizer setDelay:0.5];
- [_dataInteractionGestureRecognizer setDelegate:self];
- [_dataInteractionGestureRecognizer _setRequiresQuietImpulse:YES];
- [self addGestureRecognizer:_dataInteractionGestureRecognizer.get()];
[self setupDataInteractionDelegates];
#endif
@@ -642,8 +637,6 @@
[self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
#if ENABLE(DATA_INTERACTION)
- [_dataInteractionGestureRecognizer setDelegate:nil];
- [self removeGestureRecognizer:_dataInteractionGestureRecognizer.get()];
[self teardownDataInteractionDelegates];
_isPerformingDataInteractionOperation = NO;
#endif
@@ -675,9 +668,6 @@
[self removeGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
[self removeGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
[self removeGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
-#if ENABLE(DATA_INTERACTION)
- [self removeGestureRecognizer:_dataInteractionGestureRecognizer.get()];
-#endif
}
- (void)_addDefaultGestureRecognizers
@@ -689,9 +679,6 @@
[self addGestureRecognizer:_nonBlockingDoubleTapGestureRecognizer.get()];
[self addGestureRecognizer:_twoFingerDoubleTapGestureRecognizer.get()];
[self addGestureRecognizer:_twoFingerSingleTapGestureRecognizer.get()];
-#if ENABLE(DATA_INTERACTION)
- [self addGestureRecognizer:_dataInteractionGestureRecognizer.get()];
-#endif
}
- (UIView*)unscaledView
@@ -1227,14 +1214,6 @@
if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _previewGestureRecognizer.get()))
return YES;
-#if ENABLE(DATA_INTERACTION)
- if (isSamePair(gestureRecognizer, otherGestureRecognizer, _highlightLongPressGestureRecognizer.get(), _dataInteractionGestureRecognizer.get()))
- return YES;
-
- if (isSamePair(gestureRecognizer, otherGestureRecognizer, _longPressGestureRecognizer.get(), _dataInteractionGestureRecognizer.get()))
- return YES;
-#endif
-
return NO;
}
@@ -1405,11 +1384,6 @@
}
}
-#if ENABLE(DATA_INTERACTION)
- if (gestureRecognizer == _dataInteractionGestureRecognizer)
- return [self pointIsInDataInteractionContent:point];
-#endif
-
return YES;
}
@@ -1465,11 +1439,6 @@
return _positionInformation.hasSelectionAtPosition;
}
-- (UILongPressGestureRecognizer *)_dataInteractionGestureRecognizer
-{
- return _dataInteractionGestureRecognizer.get();
-}
-
#endif
- (BOOL)pointIsNearMarkedText:(CGPoint)point
Modified: trunk/Tools/ChangeLog (212972 => 212973)
--- trunk/Tools/ChangeLog 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Tools/ChangeLog 2017-02-25 00:05:39 UTC (rev 212973)
@@ -1,3 +1,27 @@
+2017-02-20 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove the data interaction gesture recognizer
+ https://bugs.webkit.org/show_bug.cgi?id=168600
+ <rdar://problem/30313681>
+
+ Reviewed by Anders Carlsson.
+
+ Adjust TestWebKitAPI for changes in WebKit2.
+
+ * TestWebKitAPI/ios/DataInteractionSimulator.h:
+ * TestWebKitAPI/ios/DataInteractionSimulator.mm:
+ (-[DataInteractionSimulator initWithWebView:]):
+ (-[DataInteractionSimulator runFrom:to:]):
+ (-[DataInteractionSimulator _advanceProgress]):
+ (-[DataInteractionSimulator _finishDataInteraction]):
+ (-[MockLongPressGestureRecognizer initWithWindow:]): Deleted.
+ (-[MockLongPressGestureRecognizer locationInView:]): Deleted.
+ (-[MockLongPressGestureRecognizer state]): Deleted.
+ (-[MockLongPressGestureRecognizer numberOfTouches]): Deleted.
+ (-[DataInteractionSimulator _recognizeGestureAtLocation:withState:]): Deleted.
+ (-[DataInteractionSimulator dataInteractionGestureRecognizer]): Deleted.
+ (-[DataInteractionSimulator webView:beginDataInteractionWithSourceIndex:gestureRecognizer:]): Deleted.
+
2017-02-24 John Wilander <wilan...@apple.com>
Resource Load Statistics: Add alternate classification method
Modified: trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h (212972 => 212973)
--- trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h 2017-02-25 00:05:39 UTC (rev 212973)
@@ -31,7 +31,6 @@
#import <WebKit/_WKTestingDelegate.h>
#import <wtf/BlockPtr.h>
-@class MockLongPressGestureRecognizer;
@class MockDataInteractionInfo;
extern NSString * const DataInteractionEnterEventName;
@@ -49,7 +48,6 @@
@interface DataInteractionSimulator : NSObject<_WKTestingDelegate> {
RetainPtr<TestWKWebView> _webView;
- RetainPtr<MockLongPressGestureRecognizer> _gestureRecognizer;
RetainPtr<MockDataInteractionInfo> _dataInteractionInfo;
RetainPtr<NSMutableArray> _observedEventNames;
RetainPtr<UIItemProvider> _externalItemProvider;
Modified: trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm (212972 => 212973)
--- trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm 2017-02-25 00:02:24 UTC (rev 212972)
+++ trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm 2017-02-25 00:05:39 UTC (rev 212973)
@@ -39,46 +39,6 @@
#include <WebKitAdditions/DataInteractionSimulatorAdditions.mm>
#endif
-@interface MockLongPressGestureRecognizer : UILongPressGestureRecognizer {
- RetainPtr<UIWindow> _window;
-}
-
-@property (nonatomic) CGPoint mockLocationInWindow;
-@property (nonatomic) UIGestureRecognizerState mockState;
-@property (nonatomic) NSInteger mockNumberOfTouches;
-
-@end
-
-@implementation MockLongPressGestureRecognizer
-
-- (instancetype)initWithWindow:(UIWindow *)window
-{
- if (self = [super init]) {
- _window = window;
- _mockState = UIGestureRecognizerStatePossible;
- _mockNumberOfTouches = 0;
- _mockLocationInWindow = CGPointZero;
- }
- return self;
-}
-
-- (CGPoint)locationInView:(UIView *)view
-{
- return [view convertPoint:_mockLocationInWindow fromView:_window.get()];
-}
-
-- (UIGestureRecognizerState)state
-{
- return _mockState;
-}
-
-- (NSUInteger)numberOfTouches
-{
- return _mockNumberOfTouches;
-}
-
-@end
-
static double progressIncrementStep = 0.033;
static double progressTimeStep = 0.016;
@@ -98,9 +58,6 @@
{
if (self = [super init]) {
_webView = webView;
- _gestureRecognizer = adoptNS([[MockLongPressGestureRecognizer alloc] initWithWindow:webView.window]);
-
- [_gestureRecognizer setMockNumberOfTouches:0];
[_webView _setTestingDelegate:self];
}
return self;
@@ -143,18 +100,15 @@
_startLocation = startLocation;
_endLocation = endLocation;
- [_gestureRecognizer setMockNumberOfTouches:1];
if (self.externalItemProvider) {
_phase = DataInteractionBegan;
_dataInteractionInfo = adoptNS([[MockDataInteractionInfo alloc] initWithProvider:self.externalItemProvider location:startLocation window:[_webView window]]);
- } else
- [self _recognizeGestureAtLocation:_startLocation withState:UIGestureRecognizerStateBegan];
+ }
[self _scheduleAdvanceProgress];
Util::run(&_isDoneWithCurrentRun);
- [_gestureRecognizer setMockNumberOfTouches:0];
[_webView clearMessageHandlers:dataInteractionEventNames()];
_finalSelectionRects = [_webView selectionRectsAfterPresentationUpdate];
}
@@ -175,7 +129,6 @@
switch (_phase) {
case DataInteractionUnrecognized:
- [self _recognizeGestureAtLocation:self._currentLocation withState:UIGestureRecognizerStateChanged];
[self _scheduleAdvanceProgress];
break;
case DataInteractionBegan:
@@ -195,7 +148,6 @@
- (void)_finishDataInteraction
{
if (_phase == DataInteractionUnrecognized) {
- [self _recognizeGestureAtLocation:self._currentLocation withState:UIGestureRecognizerStateEnded];
_isDoneWithCurrentRun = true;
return;
}
@@ -219,13 +171,6 @@
[self performSelector:@selector(_advanceProgress) withObject:nil afterDelay:progressTimeStep];
}
-- (void)_recognizeGestureAtLocation:(CGPoint)locationInWindow withState:(UIGestureRecognizerState)state
-{
- [_gestureRecognizer setMockState:state];
- [_gestureRecognizer setMockLocationInWindow:locationInWindow];
- [_webView _simulateDataInteractionGestureRecognized];
-}
-
- (UIItemProvider *)externalItemProvider
{
return _externalItemProvider.get();
@@ -238,37 +183,11 @@
#pragma mark - _WKTestingDelegate
-- (UILongPressGestureRecognizer *)dataInteractionGestureRecognizer
-{
- return _gestureRecognizer.get();
-}
-
- (void)webViewDidPerformDataInteractionControllerOperation:(WKWebView *)webView
{
_isDoneWithCurrentRun = true;
}
-- (void)webView:(WKWebView *)webView beginDataInteractionWithSourceIndex:(NSInteger)sourceIndex gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
-{
- _didTryToBeginDataInteraction = YES;
-
- if (self.forceRequestToFail) {
- [_webView _simulateFailedDataInteractionWithIndex:sourceIndex];
- return;
- }
-
- _phase = DataInteractionBegan;
-
- // End the data interaction gesture recognizer.
- auto location = self._currentLocation;
- [self _recognizeGestureAtLocation:location withState:UIGestureRecognizerStateEnded];
-
- // Officially begin data interaction by initializing the info.
- NSArray *items = [_webView _simulatedItemsForDataInteractionWithIndex:sourceIndex];
- _dataInteractionInfo = adoptNS([[MockDataInteractionInfo alloc] initWithItems:items location:location window:[_webView window]]);
- [_webView _simulateWillBeginDataInteractionWithIndex:sourceIndex withSession:nil];
-}
-
- (void)webViewDidSendDataInteractionStartRequest:(WKWebView *)webView
{
// This addresses a race condition in the testing harness wherein the web process might take longer than usual to process the
