Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Writing Tools] Rename Writing Tools methods #29985

Merged
merged 1 commit into from
Jun 20, 2024
Merged

[Writing Tools] Rename Writing Tools methods #29985

merged 1 commit into from
Jun 20, 2024
+275 −319

Conversation

rr-codes
Copy link
Contributor

@rr-codes rr-codes commented Jun 19, 2024 •
edited by webkit-early-warning-system

88e0d46

[Writing Tools] Rename Writing Tools methods
https://bugs.webkit.org/show_bug.cgi?id=275670
rdar://130162952

Reviewed by Abrar Rahman Protyasha.

* Source/WebCore/en.lproj/Localizable.strings:
* Source/WebCore/loader/EmptyClients.cpp:
* Source/WebCore/page/ChromeClient.h:
(WebCore::ChromeClient::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebCore::ChromeClient::proofreadingSessionUpdateStateForSuggestionWithID):
(WebCore::ChromeClient::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebCore::ChromeClient::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebCore/page/ContextMenuClient.h:
* Source/WebCore/page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
(WebCore::ContextMenuController::populate):
(WebCore::ContextMenuController::checkOrEnableIfNeeded const):
* Source/WebCore/page/Page.cpp:
(WebCore::Page::willBeginWritingToolsSession):
(WebCore::Page::didBeginWritingToolsSession):
(WebCore::Page::proofreadingSessionDidReceiveSuggestions):
(WebCore::Page::proofreadingSessionDidUpdateStateForSuggestion):
(WebCore::Page::didEndWritingToolsSession):
(WebCore::Page::compositionSessionDidReceiveTextWithReplacementRange):
(WebCore::Page::updateStateForSelectedSuggestionIfNeeded):
(WebCore::Page::writingToolsSessionDidReceiveAction):
(WebCore::Page::willBeginTextReplacementSession): Deleted.
(WebCore::Page::didBeginTextReplacementSession): Deleted.
(WebCore::Page::textReplacementSessionDidReceiveReplacements): Deleted.
(WebCore::Page::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebCore::Page::didEndTextReplacementSession): Deleted.
(WebCore::Page::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebCore::Page::updateStateForSelectedReplacementIfNeeded): Deleted.
(WebCore::Page::textReplacementSessionDidReceiveEditAction): Deleted.
* Source/WebCore/page/Page.h:
* Source/WebCore/page/writing-tools/WritingToolsController.h:
* Source/WebCore/page/writing-tools/WritingToolsController.mm:
(WebCore::WritingToolsController::willBeginWritingToolsSession):
(WebCore::WritingToolsController::didBeginWritingToolsSession):
(WebCore::WritingToolsController::proofreadingSessionDidReceiveSuggestions):
(WebCore::WritingToolsController::proofreadingSessionDidUpdateStateForSuggestion):
(WebCore::WritingToolsController::compositionSessionDidReceiveTextWithReplacementRange):
(WebCore::WritingToolsController::writingToolsSessionDidReceiveAction<WritingTools::Session::Type::Proofreading>):
(WebCore::WritingToolsController::writingToolsSessionDidReceiveAction<WritingTools::Session::Type::Composition>):
(WebCore::WritingToolsController::writingToolsSessionDidReceiveAction):
(WebCore::WritingToolsController::didEndWritingToolsSession<WritingTools::Session::Type::Proofreading>):
(WebCore::WritingToolsController::didEndWritingToolsSession<WritingTools::Session::Type::Composition>):
(WebCore::WritingToolsController::didEndWritingToolsSession):
(WebCore::WritingToolsController::updateStateForSelectedSuggestionIfNeeded):
(WebCore::WritingToolsController::willBeginTextReplacementSession): Deleted.
(WebCore::WritingToolsController::didBeginTextReplacementSession): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveReplacements): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction<WritingTools::Session::Type::Proofreading>): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction<WritingTools::Session::Type::Composition>): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction): Deleted.
(WebCore::WritingToolsController::didEndTextReplacementSession<WritingTools::Session::Type::Proofreading>): Deleted.
(WebCore::WritingToolsController::didEndTextReplacementSession<WritingTools::Session::Type::Composition>): Deleted.
(WebCore::WritingToolsController::didEndTextReplacementSession): Deleted.
(WebCore::WritingToolsController::updateStateForSelectedReplacementIfNeeded): Deleted.
* Source/WebCore/platform/ContextMenuItem.cpp:
(WebCore::isValidContextMenuAction):
* Source/WebCore/platform/ContextMenuItem.h:
* Source/WebCore/platform/LocalizedStrings.cpp:
(WebCore::contextMenuItemTagWritingTools):
(WebCore::contextMenuItemTagSwapCharacters): Deleted.
* Source/WebCore/platform/LocalizedStrings.h:
* Source/WebCore/platform/Logging.h:
* Source/WebKit/Shared/API/c/WKContextMenuItemTypes.h:
* Source/WebKit/Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
(WebKit::toImpl):
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::writingToolsBehavior const):
(API::PageConfiguration::setWritingToolsBehavior):
(API::PageConfiguration::unifiedTextReplacementBehavior const): Deleted.
(API::PageConfiguration::setUnifiedTextReplacementBehavior): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm:
* Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
(-[WKWebView isWritingToolsActive]):
(-[WKWebView willBeginWritingToolsSession:requestContexts:]):
(-[WKWebView didBeginWritingToolsSession:contexts:]):
(-[WKWebView proofreadingSession:didReceiveSuggestions:processedRange:inContext:finished:]):
(-[WKWebView proofreadingSession:didUpdateState:forSuggestionWithUUID:inContext:]):
(-[WKWebView didEndWritingToolsSession:accepted:]):
(-[WKWebView compositionSession:didReceiveText:replacementRange:inContext:finished:]):
(-[WKWebView writingToolsSession:didReceiveAction:]):
(-[WKWebView _proofreadingSessionWithUUID:showDetailsForSuggestionWithUUID:relativeToRect:]):
(-[WKWebView _proofreadingSessionWithUUID:updateState:forSuggestionWithUUID:]):
(-[WKWebView _textReplacementSession:showInformationForReplacementWithUUID:relativeToRect:]): Deleted.
(-[WKWebView _textReplacementSession:updateState:forReplacementWithUUID:]): Deleted.
(-[WKWebView _isUnifiedTextReplacementActive]): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration setWritingToolsBehavior:]):
(-[WKWebViewConfiguration writingToolsBehavior]):
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:
* Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm:
(-[WKWebView _web_wantsWritingToolsInlineEditing]):
(-[WKWebView _web_wantsCompleteUnifiedTextReplacementBehavior]): Deleted.
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h:
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm:
(WebKit::PageClientImplCocoa::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::PageClientImplCocoa::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::PageClientImplCocoa::writingToolsActiveWillChange):
(WebKit::PageClientImplCocoa::writingToolsActiveDidChange):
(WebKit::PageClientImplCocoa::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::PageClientImplCocoa::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
(WebKit::PageClientImplCocoa::unifiedTextReplacementActiveWillChange): Deleted.
(WebKit::PageClientImplCocoa::unifiedTextReplacementActiveDidChange): Deleted.
* Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::WebPageProxy::canHandleContextMenuWritingTools const):
(WebKit::WebPageProxy::handleContextMenuWritingTools):
(WebKit::WebPageProxy::setWritingToolsActive):
(WebKit::WebPageProxy::willBeginWritingToolsSession):
(WebKit::WebPageProxy::didBeginWritingToolsSession):
(WebKit::WebPageProxy::proofreadingSessionDidReceiveSuggestions):
(WebKit::WebPageProxy::proofreadingSessionDidUpdateStateForSuggestion):
(WebKit::WebPageProxy::didEndWritingToolsSession):
(WebKit::WebPageProxy::compositionSessionDidReceiveTextWithReplacementRange):
(WebKit::WebPageProxy::writingToolsSessionDidReceiveAction):
(WebKit::WebPageProxy::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::WebPageProxy::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::WebPageProxy::canHandleSwapCharacters const): Deleted.
(WebKit::WebPageProxy::handleContextMenuSwapCharacters): Deleted.
(WebKit::WebPageProxy::setUnifiedTextReplacementActive): Deleted.
(WebKit::WebPageProxy::willBeginTextReplacementSession): Deleted.
(WebKit::WebPageProxy::didBeginTextReplacementSession): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidReceiveReplacements): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebKit::WebPageProxy::didEndTextReplacementSession): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidReceiveEditAction): Deleted.
(WebKit::WebPageProxy::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::WebPageProxy::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebKit/UIProcess/PageClient.h:
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.messages.in:
* Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView canPerformActionForWebView:withSender:]):
(-[WKContentView _updateTextInputTraits:]):
(-[WKContentView unifiedTextReplacementBehavior]): Deleted.
(-[WKContentView _updateTextInputTraitsForUnifiedTextReplacement:]): Deleted.
* Source/WebKit/UIProcess/ios/WKExtendedTextInputTraits.mm:
(-[WKExtendedTextInputTraits restoreDefaultValues]):
(-[WKExtendedTextInputTraits restoreDefaultWritingToolsBehaviorValue]):
(-[WKExtendedTextInputTraits restoreDefaultUnifiedTextReplacementBehaviorValue]): Deleted.
* Source/WebKit/UIProcess/mac/PageClientImplMac.h:
* Source/WebKit/UIProcess/mac/PageClientImplMac.mm:
(WebKit::PageClientImpl::canHandleContextMenuWritingTools const):
(WebKit::PageClientImpl::handleContextMenuWritingTools):
(WebKit::PageClientImpl::canHandleSwapCharacters const): Deleted.
(WebKit::PageClientImpl::handleContextMenuSwapCharacters): Deleted.
* Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::menuItemIdentifier):
(WebKit::WebContextMenuProxyMac::getContextMenuFromItems):
* Source/WebKit/UIProcess/mac/WebViewImpl.h:
* Source/WebKit/UIProcess/mac/WebViewImpl.mm:
(WebKit::WebViewImpl::selectionDidChange):
(WebKit::WebViewImpl::canHandleContextMenuWritingTools const):
(WebKit::WebViewImpl::handleContextMenuWritingTools):
(WebKit::WebViewImpl::unifiedTextReplacementBehavior const): Deleted.
(WebKit::WebViewImpl::wantsCompleteUnifiedTextReplacementBehavior const): Deleted.
(WebKit::WebViewImpl::canHandleSwapCharacters const): Deleted.
(WebKit::WebViewImpl::handleContextMenuSwapCharacters): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::WebChromeClient::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::WebChromeClient::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::WebChromeClient::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h:
* Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.h:
* Source/WebKit/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
(WebKit::WebContextMenuClient::handleWritingTools):
(WebKit::WebContextMenuClient::handleSwapCharacters): Deleted.
* Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
(WebKit::WebPage::willBeginWritingToolsSession):
(WebKit::WebPage::didBeginWritingToolsSession):
(WebKit::WebPage::proofreadingSessionDidReceiveSuggestions):
(WebKit::WebPage::proofreadingSessionDidUpdateStateForSuggestion):
(WebKit::WebPage::didEndWritingToolsSession):
(WebKit::WebPage::compositionSessionDidReceiveTextWithReplacementRange):
(WebKit::WebPage::writingToolsSessionDidReceiveAction):
(WebKit::WebPage::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::WebPage::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::WebPage::willBeginTextReplacementSession): Deleted.
(WebKit::WebPage::didBeginTextReplacementSession): Deleted.
(WebKit::WebPage::textReplacementSessionDidReceiveReplacements): Deleted.
(WebKit::WebPage::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebKit::WebPage::didEndTextReplacementSession): Deleted.
(WebKit::WebPage::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebKit::WebPage::textReplacementSessionDidReceiveEditAction): Deleted.
(WebKit::WebPage::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::WebPage::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didChangeSelection):
(WebKit::WebPage::handleContextMenuWritingTools):
(WebKit::WebPage::handleContextMenuSwapCharacters): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:
* Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h:
* Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::handleWritingTools):
(WebContextMenuClient::handleSwapCharacters): Deleted.
* Source/WebKitLegacy/mac/WebView/WebHTMLView.mm:
(toAction):
(toTag):
* Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WritingTools.mm:
(TEST(WritingTools, APIWithBehaviorNone)):
(TEST(WritingTools, APIWithBehaviorDefault)):
(TEST(WritingTools, APIWithBehaviorComplete)):

Canonical link: https://commits.webkit.org/280205@main

983b3f6

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
⏳ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
⏳ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
⏳ 🧪 vision-wk2
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@rr-codes rr-codes requested a review from cdumez as a code owner June 19, 2024 19:32
@rr-codes rr-codes self-assigned this Jun 19, 2024
@rr-codes rr-codes added the HTML Editing For bugs in HTML editing support (including designMode and contentEditable). label Jun 19, 2024
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 983b3f6)

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
⏳ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
⏳ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
⏳ 🧪 vision-wk2
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@rr-codes rr-codes added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jun 20, 2024
@rr-codes
[Writing Tools] Rename Writing Tools methods
88e0d46 
https://bugs.webkit.org/show_bug.cgi?id=275670
rdar://130162952

Reviewed by Abrar Rahman Protyasha.

* Source/WebCore/en.lproj/Localizable.strings:
* Source/WebCore/loader/EmptyClients.cpp:
* Source/WebCore/page/ChromeClient.h:
(WebCore::ChromeClient::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebCore::ChromeClient::proofreadingSessionUpdateStateForSuggestionWithID):
(WebCore::ChromeClient::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebCore::ChromeClient::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebCore/page/ContextMenuClient.h:
* Source/WebCore/page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
(WebCore::ContextMenuController::populate):
(WebCore::ContextMenuController::checkOrEnableIfNeeded const):
* Source/WebCore/page/Page.cpp:
(WebCore::Page::willBeginWritingToolsSession):
(WebCore::Page::didBeginWritingToolsSession):
(WebCore::Page::proofreadingSessionDidReceiveSuggestions):
(WebCore::Page::proofreadingSessionDidUpdateStateForSuggestion):
(WebCore::Page::didEndWritingToolsSession):
(WebCore::Page::compositionSessionDidReceiveTextWithReplacementRange):
(WebCore::Page::updateStateForSelectedSuggestionIfNeeded):
(WebCore::Page::writingToolsSessionDidReceiveAction):
(WebCore::Page::willBeginTextReplacementSession): Deleted.
(WebCore::Page::didBeginTextReplacementSession): Deleted.
(WebCore::Page::textReplacementSessionDidReceiveReplacements): Deleted.
(WebCore::Page::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebCore::Page::didEndTextReplacementSession): Deleted.
(WebCore::Page::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebCore::Page::updateStateForSelectedReplacementIfNeeded): Deleted.
(WebCore::Page::textReplacementSessionDidReceiveEditAction): Deleted.
* Source/WebCore/page/Page.h:
* Source/WebCore/page/writing-tools/WritingToolsController.h:
* Source/WebCore/page/writing-tools/WritingToolsController.mm:
(WebCore::WritingToolsController::willBeginWritingToolsSession):
(WebCore::WritingToolsController::didBeginWritingToolsSession):
(WebCore::WritingToolsController::proofreadingSessionDidReceiveSuggestions):
(WebCore::WritingToolsController::proofreadingSessionDidUpdateStateForSuggestion):
(WebCore::WritingToolsController::compositionSessionDidReceiveTextWithReplacementRange):
(WebCore::WritingToolsController::writingToolsSessionDidReceiveAction<WritingTools::Session::Type::Proofreading>):
(WebCore::WritingToolsController::writingToolsSessionDidReceiveAction<WritingTools::Session::Type::Composition>):
(WebCore::WritingToolsController::writingToolsSessionDidReceiveAction):
(WebCore::WritingToolsController::didEndWritingToolsSession<WritingTools::Session::Type::Proofreading>):
(WebCore::WritingToolsController::didEndWritingToolsSession<WritingTools::Session::Type::Composition>):
(WebCore::WritingToolsController::didEndWritingToolsSession):
(WebCore::WritingToolsController::updateStateForSelectedSuggestionIfNeeded):
(WebCore::WritingToolsController::willBeginTextReplacementSession): Deleted.
(WebCore::WritingToolsController::didBeginTextReplacementSession): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveReplacements): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction<WritingTools::Session::Type::Proofreading>): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction<WritingTools::Session::Type::Composition>): Deleted.
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction): Deleted.
(WebCore::WritingToolsController::didEndTextReplacementSession<WritingTools::Session::Type::Proofreading>): Deleted.
(WebCore::WritingToolsController::didEndTextReplacementSession<WritingTools::Session::Type::Composition>): Deleted.
(WebCore::WritingToolsController::didEndTextReplacementSession): Deleted.
(WebCore::WritingToolsController::updateStateForSelectedReplacementIfNeeded): Deleted.
* Source/WebCore/platform/ContextMenuItem.cpp:
(WebCore::isValidContextMenuAction):
* Source/WebCore/platform/ContextMenuItem.h:
* Source/WebCore/platform/LocalizedStrings.cpp:
(WebCore::contextMenuItemTagWritingTools):
(WebCore::contextMenuItemTagSwapCharacters): Deleted.
* Source/WebCore/platform/LocalizedStrings.h:
* Source/WebCore/platform/Logging.h:
* Source/WebKit/Shared/API/c/WKContextMenuItemTypes.h:
* Source/WebKit/Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
(WebKit::toImpl):
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::writingToolsBehavior const):
(API::PageConfiguration::setWritingToolsBehavior):
(API::PageConfiguration::unifiedTextReplacementBehavior const): Deleted.
(API::PageConfiguration::setUnifiedTextReplacementBehavior): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm:
* Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
(-[WKWebView isWritingToolsActive]):
(-[WKWebView willBeginWritingToolsSession:requestContexts:]):
(-[WKWebView didBeginWritingToolsSession:contexts:]):
(-[WKWebView proofreadingSession:didReceiveSuggestions:processedRange:inContext:finished:]):
(-[WKWebView proofreadingSession:didUpdateState:forSuggestionWithUUID:inContext:]):
(-[WKWebView didEndWritingToolsSession:accepted:]):
(-[WKWebView compositionSession:didReceiveText:replacementRange:inContext:finished:]):
(-[WKWebView writingToolsSession:didReceiveAction:]):
(-[WKWebView _proofreadingSessionWithUUID:showDetailsForSuggestionWithUUID:relativeToRect:]):
(-[WKWebView _proofreadingSessionWithUUID:updateState:forSuggestionWithUUID:]):
(-[WKWebView _textReplacementSession:showInformationForReplacementWithUUID:relativeToRect:]): Deleted.
(-[WKWebView _textReplacementSession:updateState:forReplacementWithUUID:]): Deleted.
(-[WKWebView _isUnifiedTextReplacementActive]): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration setWritingToolsBehavior:]):
(-[WKWebViewConfiguration writingToolsBehavior]):
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:
* Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm:
(-[WKWebView _web_wantsWritingToolsInlineEditing]):
(-[WKWebView _web_wantsCompleteUnifiedTextReplacementBehavior]): Deleted.
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h:
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm:
(WebKit::PageClientImplCocoa::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::PageClientImplCocoa::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::PageClientImplCocoa::writingToolsActiveWillChange):
(WebKit::PageClientImplCocoa::writingToolsActiveDidChange):
(WebKit::PageClientImplCocoa::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::PageClientImplCocoa::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
(WebKit::PageClientImplCocoa::unifiedTextReplacementActiveWillChange): Deleted.
(WebKit::PageClientImplCocoa::unifiedTextReplacementActiveDidChange): Deleted.
* Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::WebPageProxy::canHandleContextMenuWritingTools const):
(WebKit::WebPageProxy::handleContextMenuWritingTools):
(WebKit::WebPageProxy::setWritingToolsActive):
(WebKit::WebPageProxy::willBeginWritingToolsSession):
(WebKit::WebPageProxy::didBeginWritingToolsSession):
(WebKit::WebPageProxy::proofreadingSessionDidReceiveSuggestions):
(WebKit::WebPageProxy::proofreadingSessionDidUpdateStateForSuggestion):
(WebKit::WebPageProxy::didEndWritingToolsSession):
(WebKit::WebPageProxy::compositionSessionDidReceiveTextWithReplacementRange):
(WebKit::WebPageProxy::writingToolsSessionDidReceiveAction):
(WebKit::WebPageProxy::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::WebPageProxy::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::WebPageProxy::canHandleSwapCharacters const): Deleted.
(WebKit::WebPageProxy::handleContextMenuSwapCharacters): Deleted.
(WebKit::WebPageProxy::setUnifiedTextReplacementActive): Deleted.
(WebKit::WebPageProxy::willBeginTextReplacementSession): Deleted.
(WebKit::WebPageProxy::didBeginTextReplacementSession): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidReceiveReplacements): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebKit::WebPageProxy::didEndTextReplacementSession): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebKit::WebPageProxy::textReplacementSessionDidReceiveEditAction): Deleted.
(WebKit::WebPageProxy::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::WebPageProxy::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebKit/UIProcess/PageClient.h:
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.messages.in:
* Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView canPerformActionForWebView:withSender:]):
(-[WKContentView _updateTextInputTraits:]):
(-[WKContentView unifiedTextReplacementBehavior]): Deleted.
(-[WKContentView _updateTextInputTraitsForUnifiedTextReplacement:]): Deleted.
* Source/WebKit/UIProcess/ios/WKExtendedTextInputTraits.mm:
(-[WKExtendedTextInputTraits restoreDefaultValues]):
(-[WKExtendedTextInputTraits restoreDefaultWritingToolsBehaviorValue]):
(-[WKExtendedTextInputTraits restoreDefaultUnifiedTextReplacementBehaviorValue]): Deleted.
* Source/WebKit/UIProcess/mac/PageClientImplMac.h:
* Source/WebKit/UIProcess/mac/PageClientImplMac.mm:
(WebKit::PageClientImpl::canHandleContextMenuWritingTools const):
(WebKit::PageClientImpl::handleContextMenuWritingTools):
(WebKit::PageClientImpl::canHandleSwapCharacters const): Deleted.
(WebKit::PageClientImpl::handleContextMenuSwapCharacters): Deleted.
* Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::menuItemIdentifier):
(WebKit::WebContextMenuProxyMac::getContextMenuFromItems):
* Source/WebKit/UIProcess/mac/WebViewImpl.h:
* Source/WebKit/UIProcess/mac/WebViewImpl.mm:
(WebKit::WebViewImpl::selectionDidChange):
(WebKit::WebViewImpl::canHandleContextMenuWritingTools const):
(WebKit::WebViewImpl::handleContextMenuWritingTools):
(WebKit::WebViewImpl::unifiedTextReplacementBehavior const): Deleted.
(WebKit::WebViewImpl::wantsCompleteUnifiedTextReplacementBehavior const): Deleted.
(WebKit::WebViewImpl::canHandleSwapCharacters const): Deleted.
(WebKit::WebViewImpl::handleContextMenuSwapCharacters): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::WebChromeClient::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::WebChromeClient::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::WebChromeClient::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h:
* Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.h:
* Source/WebKit/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
(WebKit::WebContextMenuClient::handleWritingTools):
(WebKit::WebContextMenuClient::handleSwapCharacters): Deleted.
* Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
(WebKit::WebPage::willBeginWritingToolsSession):
(WebKit::WebPage::didBeginWritingToolsSession):
(WebKit::WebPage::proofreadingSessionDidReceiveSuggestions):
(WebKit::WebPage::proofreadingSessionDidUpdateStateForSuggestion):
(WebKit::WebPage::didEndWritingToolsSession):
(WebKit::WebPage::compositionSessionDidReceiveTextWithReplacementRange):
(WebKit::WebPage::writingToolsSessionDidReceiveAction):
(WebKit::WebPage::proofreadingSessionShowDetailsForSuggestionWithIDRelativeToRect):
(WebKit::WebPage::proofreadingSessionUpdateStateForSuggestionWithID):
(WebKit::WebPage::willBeginTextReplacementSession): Deleted.
(WebKit::WebPage::didBeginTextReplacementSession): Deleted.
(WebKit::WebPage::textReplacementSessionDidReceiveReplacements): Deleted.
(WebKit::WebPage::textReplacementSessionDidUpdateStateForReplacement): Deleted.
(WebKit::WebPage::didEndTextReplacementSession): Deleted.
(WebKit::WebPage::textReplacementSessionDidReceiveTextWithReplacementRange): Deleted.
(WebKit::WebPage::textReplacementSessionDidReceiveEditAction): Deleted.
(WebKit::WebPage::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect): Deleted.
(WebKit::WebPage::textReplacementSessionUpdateStateForReplacementWithID): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didChangeSelection):
(WebKit::WebPage::handleContextMenuWritingTools):
(WebKit::WebPage::handleContextMenuSwapCharacters): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:
* Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.h:
* Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::handleWritingTools):
(WebContextMenuClient::handleSwapCharacters): Deleted.
* Source/WebKitLegacy/mac/WebView/WebHTMLView.mm:
(toAction):
(toTag):
* Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WritingTools.mm:
(TEST(WritingTools, APIWithBehaviorNone)):
(TEST(WritingTools, APIWithBehaviorDefault)):
(TEST(WritingTools, APIWithBehaviorComplete)):

Canonical link: https://commits.webkit.org/280205@main
@webkit-commit-queue
Copy link
Collaborator

Committed 280205@main (88e0d46): https://commits.webkit.org/280205@main

Reviewed commits have been landed. Closing PR #29985 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 88e0d46 into WebKit:main Jun 20, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jun 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aprotyas aprotyas aprotyas approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

Assignees

@rr-codes rr-codes

Labels
HTML Editing For bugs in HTML editing support (including designMode and contentEditable).
Projects
None yet
Milestone
No milestone
4 participants
@rr-codes @webkit-early-warning-system @webkit-commit-queue @aprotyas