Changeset 268813 in webkit

Timestamp:

Oct 21, 2020, 11:43:33 AM (6 years ago)

Author:

Devin Rousso

Message:

[macOS WK1] provide a way for Apple-internal clients to disable link preview
​https://bugs.webkit.org/show_bug.cgi?id=217984
<rdar://problem/70500022>

Reviewed by Tim Horton.

• WebView/WebViewPrivate.h:
• WebView/WebView.mm:

(-[WebView _allowsLinkPreview]): Added.
(-[WebView _setAllowsLinkPreview:]): Added.

• WebView/WebImmediateActionController.h:
• WebView/WebImmediateActionController.mm:

(-[WebImmediateActionController isEnabled]): Added.
(-[WebImmediateActionController setEnabled:]): Added.
(-[WebImmediateActionController _cancelImmediateAction]):

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebImmediateActionController.h (modified) (1 diff)
• WebView/WebImmediateActionController.mm (modified) (2 diffs)
• WebView/WebView.mm (modified) (1 diff)
• WebView/WebViewPrivate.h (modified) (1 diff)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2020-10-21  Devin Rousso  <drousso@apple.com>
+
+        [macOS WK1] provide a way for Apple-internal clients to disable link preview
+        https://bugs.webkit.org/show_bug.cgi?id=217984
+        <rdar://problem/70500022>
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebViewPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _allowsLinkPreview]): Added.
+        (-[WebView _setAllowsLinkPreview:]): Added.
+
+        * WebView/WebImmediateActionController.h:
+        * WebView/WebImmediateActionController.mm:
+        (-[WebImmediateActionController isEnabled]): Added.
+        (-[WebImmediateActionController setEnabled:]): Added.
+        (-[WebImmediateActionController _cancelImmediateAction]):
+
 2020-10-20  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebImmediateActionController.h

@@ -59 +59 @@
 - (void)webViewClosed;
 
+@property (nonatomic, getter=isEnabled) BOOL enabled;
+
 - (void)webView:(WebView *)webView didHandleScrollWheel:(NSEvent *)event;
 

trunk/Source/WebKitLegacy/mac/WebView/WebImmediateActionController.mm

@@ -101 +101 @@
 }
 
+- (BOOL)isEnabled
+{
+    return [_immediateActionRecognizer isEnabled];
+}
+
+- (void)setEnabled:(BOOL)enabled
+{
+    if (enabled == [_immediateActionRecognizer isEnabled])
+        return;
+
+    [_immediateActionRecognizer setEnabled:enabled];
+
+    if (![_immediateActionRecognizer isEnabled])
+        [self _cancelImmediateAction];
+}
+
 - (void)webView:(WebView *)webView didHandleScrollWheel:(NSEvent *)event
 {
@@ -116 +132 @@
 {
     // Reset the recognizer by turning it off and on again.
-    [_immediateActionRecognizer setEnabled:NO];
-    [_immediateActionRecognizer setEnabled:YES];
+    if ([_immediateActionRecognizer isEnabled]) {
+        [_immediateActionRecognizer setEnabled:NO];
+        [_immediateActionRecognizer setEnabled:YES];
+    }
 
     [self _clearImmediateActionState];

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -7909 +7909 @@
 }
 
+#if PLATFORM(MAC)
+- (BOOL)_allowsLinkPreview
+{
+    if (WebImmediateActionController *immediateActionController = _private->immediateActionController)
+        return immediateActionController.enabled;
+    return NO;
+}
+
+- (void)_setAllowsLinkPreview:(BOOL)allowsLinkPreview
+{
+    if (WebImmediateActionController *immediateActionController = _private->immediateActionController)
+        immediateActionController.enabled = allowsLinkPreview;
+}
+#endif
+
 - (void)addVisitedLinks:(NSArray *)visitedLinks
 {

trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h

@@ -315 +315 @@
 - (void)resumeAllMediaPlayback;
 
+#if !TARGET_OS_IPHONE
+@property (nonatomic, setter=_setAllowsLinkPreview:) BOOL _allowsLinkPreview;
+#endif
+
 // Add visited links
 - (void)addVisitedLinks:(NSArray *)visitedLinks;