Add some PencilKit extension points

https://bugs.webkit.org/show_bug.cgi?id=202962
<rdar://problem/56269759>

Reviewed by Andy Estes.

This is the WebKit part corresponding to <rdar://problem/56261392>.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]): Call extension point.
(-[WKContentView cleanupInteraction]): Ditto.

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

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index d913c17..b01c4a5 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2019-10-21  Daniel Bates  <dabates@apple.com>
+
+        Add some PencilKit extension points
+        https://bugs.webkit.org/show_bug.cgi?id=202962
+        <rdar://problem/56269759>
+
+        Reviewed by Andy Estes.
+
+        This is the WebKit part corresponding to <rdar://problem/56261392>.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]): Call extension point.
+        (-[WKContentView cleanupInteraction]): Ditto.
+
 2019-10-21  Matt Lewis  <jlewis3@apple.com>
 
         Unreviewed, rolling out r251381.

diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
index bda6cca..22a34eb 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
@@ -146,6 +146,10 @@
 #import <WebKitAdditions/WKPlatformFileUploadPanel.mm>
 #endif
 
+#if HAVE(PENCILKIT_ADDITIONS)
+#import <WebKitAdditions/WebKitPencilAdditions.h>
+#endif
+
 #if ENABLE(POINTER_EVENTS)
 #import "RemoteScrollingCoordinatorProxy.h"
 #import <WebCore/TouchAction.h>
@@ -796,6 +800,10 @@ static inline bool hasFocusedElement(WebKit::FocusedElementInformation focusedEl
     [self setupDragAndDropInteractions];
 #endif
 
+#if HAVE(PENCILKIT_ADDITIONS)
+    [self setupPencilInteraction];
+#endif
+
     _twoFingerSingleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerSingleTapGestureRecognized:)]);
     [_twoFingerSingleTapGestureRecognizer setAllowableMovement:60];
     [_twoFingerSingleTapGestureRecognizer _setAllowableSeparation:150];
@@ -949,6 +957,10 @@ static inline bool hasFocusedElement(WebKit::FocusedElementInformation focusedEl
     [self teardownDragAndDropInteractions];
 #endif
 
+#if HAVE(PENCILKIT_ADDITIONS)
+    [self cleanupPencilInteraction];
+#endif
+
     _inspectorNodeSearchEnabled = NO;
     if (_inspectorNodeSearchGestureRecognizer) {
         [_inspectorNodeSearchGestureRecognizer setDelegate:nil];