Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: f8b99c13593c324bd47b4fa3488c7c3f231779fa
https://github.com/WebKit/WebKit/commit/f8b99c13593c324bd47b4fa3488c7c3f231779fa
Author: Richard Robinson <richard_robins...@apple.com>
Date: 2024-06-18 (Tue, 18 Jun 2024)
Changed paths:
M Source/WebCore/Headers.cmake
M Source/WebCore/SourcesCocoa.txt
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/dom/DocumentMarker.h
M Source/WebCore/page/ChromeClient.h
M Source/WebCore/page/Page.cpp
M Source/WebCore/page/Page.h
R
Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.h
R
Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.mm
R Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementTypes.h
A Source/WebCore/page/writing-tools/WritingToolsController.h
A Source/WebCore/page/writing-tools/WritingToolsController.mm
A Source/WebCore/page/writing-tools/WritingToolsTypes.h
M Source/WebKit/Scripts/webkit/messages.py
M Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.serialization.in
M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
M Source/WebKit/UIProcess/API/APIPageConfiguration.h
M Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
M Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
M Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h
M Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm
M Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.h
M Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.mm
M Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
M Source/WebKit/UIProcess/PageClient.h
M Source/WebKit/UIProcess/WebPageProxy.h
M Source/WebKit/UIProcess/WebPageProxy.messages.in
M Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
M Source/WebKit/UIProcess/mac/WebViewImpl.h
M Source/WebKit/UIProcess/mac/WebViewImpl.mm
M Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
M Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
M Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm
M Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm
M Source/WebKit/WebProcess/WebPage/TextAnimationController.h
M Source/WebKit/WebProcess/WebPage/WebPage.h
M Source/WebKit/WebProcess/WebPage/WebPage.messages.in
M Tools/TestWebKitAPI/SourcesCocoa.txt
M Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
R Tools/TestWebKitAPI/Tests/WebKitCocoa/UnifiedTextReplacement.mm
A Tools/TestWebKitAPI/Tests/WebKitCocoa/WritingTools.mm
Log Message:
-----------
[Writing Tools] Rename UnifiedTextReplacementController and
UnifiedTextReplacement namespace to their WritingTools equivalents
https://bugs.webkit.org/show_bug.cgi?id=275633
rdar://130110041
Reviewed by Aditya Keerthi.
* Source/WebCore/SourcesCocoa.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/dom/DocumentMarker.h:
* Source/WebCore/page/ChromeClient.h:
(WebCore::ChromeClient::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect):
(WebCore::ChromeClient::textReplacementSessionUpdateStateForReplacementWithID):
(WebCore::ChromeClient::removeTextAnimationForID):
(WebCore::ChromeClient::cleanUpTextAnimationsForSessionID):
(WebCore::ChromeClient::addSourceTextAnimation):
(WebCore::ChromeClient::addDestinationTextAnimation):
* Source/WebCore/page/Page.cpp:
(WebCore::m_writingToolsController):
(WebCore::Page::willBeginTextReplacementSession):
(WebCore::Page::didBeginTextReplacementSession):
(WebCore::Page::textReplacementSessionDidReceiveReplacements):
(WebCore::Page::textReplacementSessionDidUpdateStateForReplacement):
(WebCore::Page::didEndTextReplacementSession):
(WebCore::Page::textReplacementSessionDidReceiveTextWithReplacementRange):
(WebCore::Page::updateStateForSelectedReplacementIfNeeded):
(WebCore::Page::contextRangeForSessionWithID const):
(WebCore::Page::textReplacementSessionDidReceiveEditAction):
(WebCore::m_unifiedTextReplacementController): Deleted.
* Source/WebCore/page/Page.h:
* Source/WebCore/page/unified-text-replacement/WritingToolsController.h:
Renamed from
Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.h.
* Source/WebCore/page/unified-text-replacement/WritingToolsController.mm:
Renamed from
Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementController.mm.
(WebCore::WritingToolsController::characterRange):
(WebCore::WritingToolsController::characterCount):
(WebCore::WritingToolsController::resolveCharacterRange):
(WebCore::WritingToolsController::plainText):
(WebCore::WritingToolsController::WritingToolsController):
(WebCore::contextRangeForDocument):
(WebCore::WritingToolsController::willBeginTextReplacementSession):
(WebCore::WritingToolsController::didBeginTextReplacementSession):
(WebCore::WritingToolsController::textReplacementSessionDidReceiveReplacements):
(WebCore::WritingToolsController::textReplacementSessionDidUpdateStateForReplacement):
(WebCore::WritingToolsController::textReplacementSessionDidReceiveTextWithReplacementRange):
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction<WritingTools::Session::ReplacementType::PlainText>):
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction<WritingTools::Session::ReplacementType::RichText>):
(WebCore::WritingToolsController::textReplacementSessionDidReceiveEditAction):
(WebCore::WritingToolsController::didEndTextReplacementSession<WritingTools::Session::ReplacementType::PlainText>):
(WebCore::WritingToolsController::didEndTextReplacementSession<WritingTools::Session::ReplacementType::RichText>):
(WebCore::WritingToolsController::didEndTextReplacementSession):
(WebCore::WritingToolsController::updateStateForSelectedReplacementIfNeeded):
(WebCore::WritingToolsController::contextRangeForSessionWithID const):
(WebCore::WritingToolsController::stateForSession):
(WebCore::WritingToolsController::document const):
(WebCore::WritingToolsController::findReplacementMarkerByID const):
(WebCore::WritingToolsController::findReplacementMarkerContainingRange const):
(WebCore::WritingToolsController::replaceContentsOfRangeInSessionInternal):
(WebCore::WritingToolsController::replaceContentsOfRangeInSession):
* Source/WebCore/page/unified-text-replacement/WritingToolsTypes.h: Renamed
from Source/WebCore/page/unified-text-replacement/UnifiedTextReplacementTypes.h.
* Source/WebKit/Scripts/webkit/messages.py:
(headers_for_type):
* Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.serialization.in:
* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::unifiedTextReplacementBehavior const):
(API::PageConfiguration::setUnifiedTextReplacementBehavior):
* Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView didBeginWritingToolsSession:contexts:]):
(-[WKWebView
proofreadingSession:didReceiveSuggestions:processedRange:inContext:finished:]):
(-[WKWebView _textReplacementSession:updateState:forReplacementWithUUID:]):
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h:
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h:
* Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm:
(WebKit::PageClientImplCocoa::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect):
(WebKit::PageClientImplCocoa::textReplacementSessionUpdateStateForReplacementWithID):
* Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.h:
* Source/WebKit/UIProcess/Cocoa/PlatformWritingToolsUtilities.mm:
(WebKit::convertToPlatformWritingToolsBehavior):
(WebKit::convertToPlatformTextSuggestionState):
(WebKit::convertToPlatformContext):
(WebKit::convertToWebWritingToolsBehavior):
(WebKit::convertToWebTextSuggestionState):
(WebKit::convertToWebAction):
(WebKit::convertToWebSessionType):
(WebKit::convertToWebCompositionSessionType):
(WebKit::convertToWebContext):
(WebKit::convertToWebSession):
(WebKit::convertToWebTextSuggestion):
* Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::WebPageProxy::willBeginTextReplacementSession):
(WebKit::WebPageProxy::didBeginTextReplacementSession):
(WebKit::WebPageProxy::textReplacementSessionDidReceiveReplacements):
(WebKit::WebPageProxy::textReplacementSessionDidUpdateStateForReplacement):
(WebKit::WebPageProxy::didEndTextReplacementSession):
(WebKit::WebPageProxy::textReplacementSessionDidReceiveTextWithReplacementRange):
(WebKit::WebPageProxy::textReplacementSessionDidReceiveEditAction):
(WebKit::WebPageProxy::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect):
(WebKit::WebPageProxy::textReplacementSessionUpdateStateForReplacementWithID):
* 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 unifiedTextReplacementBehavior]):
* Source/WebKit/UIProcess/mac/WebViewImpl.h:
* Source/WebKit/UIProcess/mac/WebViewImpl.mm:
(WebKit::WebViewImpl::unifiedTextReplacementBehavior const):
(WebKit::WebViewImpl::canHandleSwapCharacters const):
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect):
(WebKit::WebChromeClient::textReplacementSessionUpdateStateForReplacementWithID):
(WebKit::WebChromeClient::removeTextAnimationForID):
(WebKit::WebChromeClient::cleanUpTextAnimationsForSessionID):
(WebKit::WebChromeClient::addSourceTextAnimation):
(WebKit::WebChromeClient::addDestinationTextAnimation):
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h:
* Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm:
(WebKit::TextAnimationController::contextRangeForSessionWithID const):
* Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm:
(WebKit::WebPage::willBeginTextReplacementSession):
(WebKit::WebPage::didBeginTextReplacementSession):
(WebKit::WebPage::textReplacementSessionDidReceiveReplacements):
(WebKit::WebPage::textReplacementSessionDidUpdateStateForReplacement):
(WebKit::WebPage::didEndTextReplacementSession):
(WebKit::WebPage::textReplacementSessionDidReceiveTextWithReplacementRange):
(WebKit::WebPage::textReplacementSessionDidReceiveEditAction):
(WebKit::WebPage::textReplacementSessionShowInformationForReplacementWithIDRelativeToRect):
(WebKit::WebPage::textReplacementSessionUpdateStateForReplacementWithID):
* Source/WebKit/WebProcess/WebPage/TextAnimationController.h:
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/WebPage.messages.in:
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WritingTools.mm: Renamed from
Tools/TestWebKitAPI/Tests/WebKitCocoa/UnifiedTextReplacement.mm.
(-[NSMenu itemWithIdentifier:]):
(-[NSString _withVisibleReplacementCharacters]):
(-[_WKAttachment synchronouslySetFileWrapper:newContentType:]):
(-[WritingToolsWKWebView initWithHTMLString:]):
(-[WritingToolsWKWebView initWithHTMLString:writingToolsBehavior:]):
(-[WritingToolsWKWebView
initWithHTMLString:writingToolsBehavior:attachmentElementEnabled:]):
(-[WritingToolsWKWebView focusDocumentBodyAndSelectAll]):
(-[WritingToolsWKWebView writingToolsDelegate]):
(-[WritingToolsWKWebView writingToolsAllowedInputOptionsForTesting]):
(-[WritingToolsWKWebView contentsAsStringWithoutNBSP]):
(-[WritingToolsWKWebView transparentContentMarkerCount:]):
(-[WritingToolsWKWebView ensureAttachmentForImageElement]):
(checkColor):
(TEST(WritingTools, ProofreadingAcceptReject)):
(TEST(WritingTools, ProofreadingWithStreamingSuggestions)):
(TEST(WritingTools, ProofreadingWithLongReplacement)):
(TEST(WritingTools, ProofreadingShowOriginal)):
(TEST(WritingTools, ProofreadingRevert)):
(TEST(WritingTools, ProofreadingRevertWithSuggestionAtEndOfText)):
(TEST(WritingTools, ProofreadingWithImage)):
(TEST(WritingTools, Composition)):
(TEST(WritingTools, CompositionRevert)):
(TEST(WritingTools, CompositionWithAttributedStringAttributes)):
(TEST(WritingTools, CompositionWithUnderline)):
(TEST(WritingTools, CompositionWithList)):
(TEST(WritingTools, CompositionWithTextAttachment)):
(synchronouslyInsertAttachmentWithFilename):
(TEST(WritingTools, CompositionWithImageRoundTrip)):
(TEST(WritingTools, CompositionWithImageAttachmentRoundTrip)):
(TEST(WritingTools, CompositionWithNonImageAttachmentRoundTrip)):
(TEST(WritingTools, CompositionWithSystemFont)):
(TEST(WritingTools, CompositionWithMultipleChunks)):
(TEST(WritingTools, CompositionWithTrailingNewlines)):
(TEST(WritingTools, CompositionWithTrailingBreaks)):
(-[WKConcreteWTTextViewDelegate
initWithWritingToolsDelegate:suggestions:expectedRects:]):
(-[WKConcreteWTTextViewDelegate
proofreadingSessionWithUUID:updateState:forSuggestionWithUUID:]):
(-[WKConcreteWTTextViewDelegate
proofreadingSessionWithUUID:showDetailsForSuggestionWithUUID:relativeToRect:inView:proofreadingSessionWithUUID:showDetailsForSuggestionWithUUID:relativeToRect:inView:]):
(-[WKConcreteWTTextViewDelegate
textSystemWillBeginEditingDuringSessionWithUUID:]):
(TEST(WritingTools, RevealOffScreenSuggestionWhenActive)):
(TEST(WritingTools, ShowDetailsForSuggestions)):
(TEST(WritingTools, WantsInlineEditing)):
(TEST(WritingTools, AllowedInputOptionsNonEditable)):
(TEST(WritingTools, AllowedInputOptionsEditable)):
(TEST(WritingTools, AllowedInputOptionsRichText)):
(TEST(WritingTools, AllowedInputOptionsPlainText)):
(TEST(WritingTools, EphemeralSessionWithDifferingTextLengths)):
(TEST(WritingTools, EphemeralSession)):
(TEST(WritingTools, TransparencyMarkersForInlineEditing)):
(TEST(WritingTools, TransparencyMarkersUsingWKWebViewSPI)):
(expectScheduleShowAffordanceForSelectionRectCalled):
(TEST(WritingTools, APIWithBehaviorNone)):
(TEST(WritingTools, APIWithBehaviorDefault)):
(TEST(WritingTools, APIWithBehaviorComplete)):
(-[IsWritingToolsAvailableKVOWrapper initWithObservable:keyPath:callback:]):
(-[IsWritingToolsAvailableKVOWrapper dealloc]):
(-[IsWritingToolsAvailableKVOWrapper
observeValueForKeyPath:ofObject:change:context:]):
(waitForIsWritingToolsActiveToChange):
(TEST(WritingTools, IsWritingToolsActiveAPI)):
(TEST(WritingTools, IsWritingToolsActiveAPIWithNoInlineEditing)):
(TEST(WritingTools, ShowAffordance)):
(TEST(WritingTools, ShowAffordanceForMultipleLines)):
(TEST(WritingTools, SmartRepliesMatchStyle)):
(TEST(WritingTools, ContextRangeFromCaretSelection)):
(TEST(WritingTools, ContextRangeFromRangeSelection)):
(TEST(WritingTools, SuggestedTextIsSelectedAfterSmartReply)):
Canonical link: https://commits.webkit.org/280150@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
