Remove old and unused pointIsInAssistedNode definition
authormegan_gardner@apple.com <megan_gardner@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Aug 2017 01:39:37 +0000 (01:39 +0000)
committermegan_gardner@apple.com <megan_gardner@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Aug 2017 01:39:37 +0000 (01:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=175335

Stage removal here to allow removal from UIKit.
Replaced by textInteractionGesture:shouldBeginAtPoint:

Reviewed by Tim Horton.

* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView pointIsInAssistedNode:]): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/Platform/spi/ios/UIKitSPI.h
Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

index c065639e7ed0680a69bb23e5b218b2a0e7acd748..ddf0be0ebd90a38154de68102bfbc7d8104e1595 100644 (file)
@@ -1,3 +1,17 @@
+2017-08-08  Megan Gardner  <megan_gardner@apple.com>
+
+        Remove old and unused pointIsInAssistedNode definition
+        https://bugs.webkit.org/show_bug.cgi?id=175335
+
+        Stage removal here to allow removal from UIKit.
+        Replaced by textInteractionGesture:shouldBeginAtPoint:
+
+        Reviewed by Tim Horton.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView pointIsInAssistedNode:]): Deleted.
+
 2017-08-08  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Unreviewed, fix Ubuntu LTS build
index 7edb56614cea28756fc22e804ffd9b0e65f6a2d4..d39f76c435e667c85947d4c148604b02bf53a05f 100644 (file)
@@ -603,7 +603,9 @@ typedef NS_ENUM(NSInteger, UIWKHandlePosition) {
 - (BOOL)hasMarkedText;
 
 - (BOOL)hasSelectablePositionAtPoint:(CGPoint)point;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 110000
 - (BOOL)pointIsInAssistedNode:(CGPoint)point;
+#endif
 - (NSArray *)webSelectionRects;
 - (void)_cancelLongPressGestureRecognizer;
 
index 239af7166f72008983c8da107156fd89b98bea07..436182fe92c226c19a8db15df1b9e5f361b23269 100644 (file)
@@ -1501,12 +1501,13 @@ static inline bool isSamePair(UIGestureRecognizer *a, UIGestureRecognizer *b, UI
         return NO;
     return _positionInformation.isNearMarkedText;
 }
-
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 110000
 - (BOOL)pointIsInAssistedNode:(CGPoint)point
 {
     // This method is still implemented for backwards compatibility with older UIKit versions.
     return [self textInteractionGesture:UIWKGestureLoupe shouldBeginAtPoint:point];
 }
+#endif
 
 - (BOOL)textInteractionGesture:(UIWKGestureType)gesture shouldBeginAtPoint:(CGPoint)point
 {