Title: [253850] trunk/Source/WebKit
Revision
253850
Author
timothy_hor...@apple.com
Date
2019-12-20 15:24:00 -0800 (Fri, 20 Dec 2019)

Log Message

Clean up and generalize some interaction additions
https://bugs.webkit.org/show_bug.cgi?id=205430

Reviewed by Wenson Hsieh.

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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (253849 => 253850)


--- trunk/Source/WebKit/ChangeLog	2019-12-20 23:21:30 UTC (rev 253849)
+++ trunk/Source/WebKit/ChangeLog	2019-12-20 23:24:00 UTC (rev 253850)
@@ -1,5 +1,16 @@
 2019-12-20  Tim Horton  <timothy_hor...@apple.com>
 
+        Clean up and generalize some interaction additions
+        https://bugs.webkit.org/show_bug.cgi?id=205430
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView cleanupInteraction]):
+
+2019-12-20  Tim Horton  <timothy_hor...@apple.com>
+
         Expose approximate caret extents for the hit line via InteractionInformationAtPosition
         https://bugs.webkit.org/show_bug.cgi?id=205526
         <rdar://problem/57983076>

Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (253849 => 253850)


--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-12-20 23:21:30 UTC (rev 253849)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2019-12-20 23:24:00 UTC (rev 253850)
@@ -151,8 +151,8 @@
 #import <WebKitAdditions/WKPlatformFileUploadPanel.mm>
 #endif
 
-#if HAVE(PENCILKIT_ADDITIONS)
-#import <WebKitAdditions/WebKitPencilAdditions.h>
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
 #endif
 
 #if ENABLE(POINTER_EVENTS)
@@ -818,8 +818,8 @@
     [self setupDragAndDropInteractions];
 #endif
 
-#if HAVE(PENCILKIT_ADDITIONS)
-    [self setupPencilInteraction];
+#if USE(APPLE_INTERNAL_SDK)
+    [self setupAdditionalInteractions];
 #endif
 
     _twoFingerSingleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerSingleTapGestureRecognized:)]);
@@ -986,8 +986,8 @@
     [self teardownDragAndDropInteractions];
 #endif
 
-#if HAVE(PENCILKIT_ADDITIONS)
-    [self cleanupPencilInteraction];
+#if USE(APPLE_INTERNAL_SDK)
+    [self cleanupAdditionalInteractions];
 #endif
 
     _inspectorNodeSearchEnabled = NO;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to