Changeset 244555 in webkit

Timestamp:

Apr 23, 2019, 12:35:30 PM (7 years ago)

Author:

dino@apple.com

Message:

Use additional members and protocols from WebKitAdditions in WKContentViewInteraction
​https://bugs.webkit.org/show_bug.cgi?id=197184
<rdar://problem/50113848>

Reviewed by Wenson Hsieh.

WebKitAdditions defines some macros to include additional members
and protocols for WKContentViewInteraction.

It also defines some new functions. Provide empty version
of those functions when WebKitAdditions is not available.

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _registerPreview]):
(-[WKContentView _unregisterPreview]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (3 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-22  Dean Jackson  <dino@apple.com>
+
+        Use additional members and protocols from WebKitAdditions in WKContentViewInteraction
+        https://bugs.webkit.org/show_bug.cgi?id=197184
+        <rdar://problem/50113848>
+
+        Reviewed by Wenson Hsieh.
+
+        WebKitAdditions defines some macros to include additional members
+        and protocols for WKContentViewInteraction.
+
+        It also defines some new functions. Provide empty version
+        of those functions when WebKitAdditions is not available.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _registerPreview]):
+        (-[WKContentView _unregisterPreview]):
+
 2019-04-23  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -58 +58 @@
 #import <wtf/text/WTFString.h>
 
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKInteractionPreviewAdditions.h>)
+#import <WebKitAdditions/WKInteractionPreviewAdditions.h>
+#else
+#ifndef ADDITIONAL_LINK_PREVIEW_MEMBERS
+#define ADDITIONAL_LINK_PREVIEW_MEMBERS
+#endif
+#ifndef ADDITIONAL_LINK_PREVIEW_PROTOCOLS
+#define ADDITIONAL_LINK_PREVIEW_PROTOCOLS
+#endif
+#endif
+
 namespace API {
 class OpenPanelParameters;
@@ -241 +252 @@
 #if HAVE(LINK_PREVIEW)
     RetainPtr<UIPreviewItemController> _previewItemController;
+    ADDITIONAL_LINK_PREVIEW_MEMBERS
 #endif
 
@@ -504 +516 @@
 
 #if HAVE(LINK_PREVIEW)
-@interface WKContentView (WKInteractionPreview) <UIPreviewItemDelegate>
+@interface WKContentView (WKInteractionPreview) <UIPreviewItemDelegate ADDITIONAL_LINK_PREVIEW_PROTOCOLS>
 
 @property (nonatomic, readonly) BOOL shouldUsePreviewForLongPress;

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

@@ -149 +149 @@
 #endif
 
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKInteractionPreviewAdditions.h>)
+#import <WebKitAdditions/WKInteractionPreviewAdditions.h>
+#endif
+
 #if PLATFORM(WATCHOS)
 
@@ -7144 +7148 @@
     return NO;
 }
+
+- (void)_registerPreviewLongPress
+{
+}
+
+- (void)_unregisterPreviewLongPress
+{
+}
 #endif
 
@@ -7156 +7168 @@
         return;
 
-    _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
-    [_previewItemController setDelegate:self];
-    _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
-    if ([_previewItemController respondsToSelector:@selector(presentationSecondaryGestureRecognizer)])
-        _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
+    if (shouldUsePreviewForLongPress())
+        [self _registerPreviewLongPress];
+    else {
+        _previewItemController = adoptNS([[UIPreviewItemController alloc] initWithView:self]);
+        [_previewItemController setDelegate:self];
+        _previewGestureRecognizer = _previewItemController.get().presentationGestureRecognizer;
+        if ([_previewItemController respondsToSelector:@selector(presentationSecondaryGestureRecognizer)])
+            _previewSecondaryGestureRecognizer = _previewItemController.get().presentationSecondaryGestureRecognizer;
+    }
 }
 
 - (void)_unregisterPreview
 {
-    [_previewItemController setDelegate:nil];
-    _previewGestureRecognizer = nil;
-    _previewSecondaryGestureRecognizer = nil;
-    _previewItemController = nil;
+    if (shouldUsePreviewForLongPress())
+        [self _unregisterPreviewLongPress];
+    else {
+        [_previewItemController setDelegate:nil];
+        _previewGestureRecognizer = nil;
+        _previewSecondaryGestureRecognizer = nil;
+        _previewItemController = nil;
+    }
 }