Title: [189748] trunk/Source/WebKit2
- Revision
- 189748
- Author
- m...@apple.com
- Date
- 2015-09-14 14:16:31 -0700 (Mon, 14 Sep 2015)
Log 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]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (189747 => 189748)
--- trunk/Source/WebKit2/ChangeLog 2015-09-14 21:15:19 UTC (rev 189747)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-14 21:16:31 UTC (rev 189748)
@@ -1,3 +1,14 @@
+2015-09-14 Dan Bernstein <m...@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 <beid...@apple.com>
Rename current concrete IDB implementation to "Legacy".
Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (189747 => 189748)
--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-09-14 21:15:19 UTC (rev 189747)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-09-14 21:16:31 UTC (rev 189748)
@@ -209,6 +209,7 @@
@interface UILongPressGestureRecognizer ()
@property (nonatomic) CFTimeInterval delay;
@property (nonatomic, readonly) CGPoint startPoint;
+@property (nonatomic, assign, setter=_setRequiresQuietImpulse:) BOOL _requiresQuietImpulse;
@end
@interface _UIWebHighlightLongPressGestureRecognizer : UILongPressGestureRecognizer
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (189747 => 189748)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-09-14 21:15:19 UTC (rev 189747)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-09-14 21:16:31 UTC (rev 189748)
@@ -70,9 +70,6 @@
#import <WebCore/TextIndicator.h>
#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>
@@ -345,9 +342,8 @@
_longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
[_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()];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
