-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Cocoa] Upstream support for system context retrieval through UIIntel…
…ligenceSupport https://bugs.webkit.org/show_bug.cgi?id=275510 Reviewed by NOBODY (OOPS!). Upstream support for system context retrieval through the UIIntelligenceSupport framework on iOS 18 and macOS Sequoia. See below for more comments. * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WTF/wtf/PlatformHave.h: Add a new compile-time flag: `HAVE(UIINTELLIGENCESUPPORT_FRAMEWORK)`. Use this flag to enable the runtime flag `TextExtractionEnabled` by default on supported platforms. * Source/WebKit/Configurations/WebKitSwift.xcconfig: Remove `WKWebView+TextExtraction.swift` as an excluded source, now that the file is no longer in WebKitAdditions. * Source/WebKit/DerivedSources.make: * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didCommitLoadForFrame): Remove an unnecessary compile-time flag, `ENABLE(TEXT_EXTRACTION)`. This was only used to avoid eagerly loading `libWebKitSwift` on platforms where support for UIIntelligenceSupport is missing; it's a bit cleaner to just turn the runtime feature off by default when the above compile-time flag, `HAVE(UIINTELLIGENCESUPPORT_FRAMEWORK)`, is off. * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebKitSwift/TextExtraction/WKWebView+TextExtraction.swift: Added. Move this source file to `WebKitSwift/`, from WebKitAdditions. (createEditable(for:)): (createElementContent(for:)): (createIntelligenceElement(_:)): (WKWebView._intelligenceBaseClass): (WKWebView._intelligenceCollectContent(in:collector:)): (WKWebView._intelligenceCollectRemoteContent(in:remoteContextWrapper:)): (WKWebView._requestTextExtraction(in:completionHandler:)): Upstream support code for converting `WKTextExtractionItem` → `IntelligenceElement`.
- Loading branch information
Showing
7 changed files
with
113 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
Source/WebKit/WebKitSwift/TextExtraction/WKWebView+TextExtraction.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // Copyright (C) 2024 Apple Inc. All rights reserved. | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions | ||
| // are met: | ||
| // 1. Redistributions of source code must retain the above copyright | ||
| // notice, this list of conditions and the following disclaimer. | ||
| // 2. Redistributions in binary form must reproduce the above copyright | ||
| // notice, this list of conditions and the following disclaimer in the | ||
| // documentation and/or other materials provided with the distribution. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| // THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| // PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| // BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| // THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| #if canImport(UIIntelligenceSupport) | ||
|
|
||
| @_spiOnly import WebKit | ||
| @_spiOnly import UIIntelligenceSupport | ||
|
|
||
| #if canImport(UIKit) | ||
| @_spi(UIIntelligenceSupport) import UIKit | ||
| #else | ||
| @_spi(UIIntelligenceSupport) import AppKit | ||
| #endif | ||
|
|
||
| private func createEditable(for editable: WKTextExtractionEditable?) -> IntelligenceElement.Text.Editable? { | ||
| guard let editable else { return .none } | ||
| return .init(label: editable.label, prompt: editable.placeholder, contentType: nil, isSecure: editable.isSecure, isFocused: editable.isFocused) | ||
| } | ||
|
|
||
| private func createElementContent(for item: WKTextExtractionItem) -> IntelligenceElement.Content { | ||
| switch item { | ||
| case let text as WKTextExtractionTextItem: | ||
| var content = AttributedString(text.content) | ||
| if text.selectedRange.location != NSNotFound { | ||
| if let range = Range(text.selectedRange, in: content) { | ||
| content[range].intelligenceSelected = true | ||
| } | ||
| } | ||
| for link in text.links { | ||
| if let range = Range(link.range, in: content) { | ||
| content[range].intelligenceLink = link.url as URL | ||
| } | ||
| } | ||
| return .text(IntelligenceElement.Text(attributedText: content, editable: createEditable(for: text.editable))) | ||
| case let image as WKTextExtractionImageItem: | ||
| return .image(IntelligenceElement.Image(name: image.name, textDescription: image.altText)) | ||
| default: | ||
| return .base | ||
| } | ||
| } | ||
|
|
||
| private func createIntelligenceElement(item: WKTextExtractionItem) -> IntelligenceElement { | ||
| var element = IntelligenceElement(boundingBox: item.rectInWebView, content: createElementContent(for: item)) | ||
| element.subelements = item.children.map { child in createIntelligenceElement(item: child) } | ||
| return element | ||
| } | ||
|
|
||
| @_spi(WKIntelligenceSupport) | ||
| extension WKWebView { | ||
| open override var _intelligenceBaseClass: AnyClass { | ||
| WKWebView.self | ||
| } | ||
|
|
||
| open override func _intelligenceCollectContent(in visibleRect: CGRect, collector: UIIntelligenceElementCollector) { | ||
| collector.collect(.remote(collector.context.createRemoteContext())) | ||
| } | ||
|
|
||
| open override func _intelligenceCollectRemoteContent(in visibleRect: CGRect, remoteContextWrapper: UIIntelligenceCollectionRemoteContextWrapper) { | ||
| let coordinator = IntelligenceCollectionCoordinator.shared | ||
| coordinator.createCollector(remoteContextWrapper: remoteContextWrapper) { collector, error in | ||
| guard let collector else { return } | ||
| self._requestTextExtraction(in: visibleRect) { item in | ||
| if let item { | ||
| collector.collect(createIntelligenceElement(item: item)) | ||
| } | ||
| coordinator.finishCollection(collector) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @objc private func _requestTextExtraction(in rect: CGRect, completionHandler: @escaping (WKTextExtractionItem?) -> Void) { | ||
| let context = WKTextExtractionRequest(rectInWebView: rect, completionHandler) | ||
| self.perform(Selector(("_requestTextExtractionForSwift:")), with: context) | ||
| } | ||
| } | ||
|
|
||
| #endif // canImport(UIIntelligenceSupport) |