Changeset 189748 in webkit

Timestamp:

Sep 14, 2015 2:16:31 PM (9 years ago)

Author:

mitz@apple.com

Message:

[iOS] Stop importing WebKitAdditions/WKContentViewInteraction.mm
​https://bugs.webkit.org/show_bug.cgi?id=149127

Reviewed by Beth Dakin.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView setupInteraction]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-14  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Stop importing WebKitAdditions/WKContentViewInteraction.mm
+        https://bugs.webkit.org/show_bug.cgi?id=149127
+
+        Reviewed by Beth Dakin.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+
 2015-09-14  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -210 +210 @@
 @property (nonatomic) CFTimeInterval delay;
 @property (nonatomic, readonly) CGPoint startPoint;
+@property (nonatomic, assign, setter=_setRequiresQuietImpulse:) BOOL _requiresQuietImpulse;
 @end
 

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -71 +71 @@
 #import <WebCore/WebEvent.h>
 #import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
-#if __has_include(<WebKitAdditions/WKContentViewInteraction.mm>)
-#import <WebKitAdditions/WKContentViewInteraction.mm>
-#endif
 #import <WebKitSystemInterfaceIOS.h>
 #import <wtf/RetainPtr.h>
@@ -346 +343 @@
     [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
     [_longPressGestureRecognizer setDelegate:self];
-#if __has_include(<WebKitAdditions/WKContentViewInteraction.mm>) && HAVE(LINK_PREVIEW)
-    if ([_longPressGestureRecognizer respondsToSelector:@selector(_setAdjustsDelayBasedOnOtherRecognizers:)])
-        [_longPressGestureRecognizer _setAdjustsDelayBasedOnOtherRecognizers:YES];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+    [_longPressGestureRecognizer _setRequiresQuietImpulse:YES];
 #endif
     [self addGestureRecognizer:_longPressGestureRecognizer.get()];