Changeset 278644 in webkit

Timestamp:

Jun 8, 2021, 8:29:18 PM (5 years ago)

Author:

Megan Gardner

Message:

Upstream AppHighlight Observer code
​https://bugs.webkit.org/show_bug.cgi?id=226794

Reviewed by Tim Horton.

• UIProcess/Cocoa/WebPageProxyCocoa.mm:

(WebKit::WebPageProxy::appHighlightsVisibility):
(WebKit::WebPageProxy::setUpHighlightsObserver):

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

(-[WKContentView setUpAppHighlightMenusIfNeeded]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebPageProxyCocoa.mm (modified) (4 diffs)
• UIProcess/WebPageProxy.h (modified) (5 diffs)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-08  Megan Gardner  <megan_gardner@apple.com>
+
+        Upstream AppHighlight Observer code
+        https://bugs.webkit.org/show_bug.cgi?id=226794
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+        (WebKit::WebPageProxy::appHighlightsVisibility):
+        (WebKit::WebPageProxy::setUpHighlightsObserver):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setUpAppHighlightMenusIfNeeded]):
+
 2021-06-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm

@@ -50 +50 @@
 #import <WebCore/DragItem.h>
 #import <WebCore/GeometryUtilities.h>
+#import <WebCore/HighlightVisibility.h>
 #import <WebCore/LocalCurrentGraphicsContext.h>
 #import <WebCore/NetworkExtensionContentFilter.h>
@@ -65 +66 @@
 #import "MediaUsageManagerCocoa.h"
 #endif
+
+#if ENABLE(APP_HIGHLIGHTS)
+#import <Synapse/SYNotesActivationObserver.h>
+
+SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Synapse)
+SOFT_LINK_CLASS_OPTIONAL(Synapse, SYNotesActivationObserver)
+#endif // ENABLE(APP_HIGHLIGHTS)
 
 #if USE(APPKIT)
@@ -593 +601 @@
 }
 
+bool WebPageProxy::appHighlightsVisibility()
+{
+    if (!m_appHighlightsObserver)
+        setUpHighlightsObserver();
+    return [m_appHighlightsObserver isVisible];
+}
+
+void WebPageProxy::setUpHighlightsObserver()
+{
+    if (m_appHighlightsObserver)
+        return;
+    auto updateAppHighlightsVisibility = ^(BOOL isVisible) {
+        setAppHighlightsVisibility(isVisible ? WebCore::HighlightVisibility::Visible : WebCore::HighlightVisibility::Hidden);
+    };
+    m_appHighlightsObserver = adoptNS([allocSYNotesActivationObserverInstance() initWithHandler:updateAppHighlightsVisibility]);
+    updateAppHighlightsVisibility([m_appHighlightsObserver isVisible]);
+}
+
 #endif
 
@@ -693 +719 @@
 } // namespace WebKit
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPageProxyCocoaAdditionsAfter.mm>
-#endif
-
 #undef MESSAGE_CHECK_COMPLETION
 #undef MESSAGE_CHECK

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -190 +190 @@
 #endif
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPageProxyAdditionsBefore.h>
-#endif
-
 namespace API {
 class Attachment;
@@ -231 +227 @@
 OBJC_CLASS NSView;
 OBJC_CLASS QLPreviewPanel;
+OBJC_CLASS SYNotesActivationObserver;
 OBJC_CLASS WKQLThumbnailLoadOperation;
 OBJC_CLASS WKVisualSearchPreviewController;
@@ -1898 +1895 @@
     void restoreAppHighlightsAndScrollToIndex(const Vector<Ref<WebKit::SharedMemory>>& highlights, const std::optional<unsigned> index);
     void setAppHighlightsVisibility(const WebCore::HighlightVisibility);
+    bool appHighlightsVisibility();
 #endif
 
@@ -2498 +2496 @@
     void showImageInVisualSearchPreviewPanel(ShareableBitmap& imageBitmap, const String& tooltip, const URL& imageURL);
 #endif
+        
+#if ENABLE(APP_HIGHLIGHTS)
+    void setUpHighlightsObserver();
+#endif
 
     const Identifier m_identifier;
@@ -3046 +3048 @@
 #endif
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPageProxyAdditionsAfter.h>
+#if ENABLE(APP_HIGHLIGHTS)
+    RetainPtr<SYNotesActivationObserver> m_appHighlightsObserver;
 #endif
 

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

@@ -9316 +9316 @@
 
 #if ENABLE(APP_HIGHLIGHTS)
+- (void)setUpAppHighlightMenusIfNeeded
+{
+    if (!_page->preferences().appHighlightsEnabled() || !self.window || !_page->editorState().selectionIsRange)
+        return;
+    
+    for (UIMenuItem *menuItem in [[UIMenuController sharedMenuController] menuItems]) {
+        if ([menuItem action] == @selector(createHighlightInCurrentGroupWithRange:) || [menuItem action] == @selector(createHighlightInNewGroupWithRange:))
+            return;
+    }
+    
+    auto addHighlightCurrentGroupItem = adoptNS([[UIMenuItem alloc] initWithTitle:WebCore::contextMenuItemTagAddHighlightToCurrentGroup() action:@selector(createHighlightInCurrentGroupWithRange:)]);
+    auto addHighlightNewGroupItem = adoptNS([[UIMenuItem alloc] initWithTitle:WebCore::contextMenuItemTagAddHighlightToNewGroup() action:@selector(createHighlightInNewGroupWithRange:)]);
+    [[UIMenuController sharedMenuController] setMenuItems:@[ addHighlightCurrentGroupItem.get(), addHighlightNewGroupItem.get() ]];
+}
+
 - (void)createHighlightInCurrentGroupWithRange:(id)sender
 {
@@ -9326 +9341 @@
 }
 
-#endif
+#endif // ENABLE(APP_HIGHLIGHTS)
 
 - (void)setContinuousSpellCheckingEnabled:(BOOL)enabled
@@ -10235 +10250 @@
 
 #endif // ENABLE(IMAGE_ANALYSIS)
-
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKContentViewInteractionAdditionsAfter.mm>
-#endif
 
 @end