[Unified Text Replacement] Refactor UnifiedTextReplacementController methods to pass in a session type instead of separate parameters #28760
Conversation
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
rr-codes
added
the
HTML Editing
|
EWS run on previous version of this PR (hash 7ea52e3) |
rr-codes
requested review from
hortont424,
whsieh,
pxlcoder,
aprotyas and
megangardner
whsieh
approved these changes
May 18, 2024
| using ReplacementType = WebUnifiedTextReplacementSessionDataReplacementType; | ||
|
|
||
| WTF::UUID uuid; | ||
| ReplacementType replacementType; |
There was a problem hiding this comment.
Nit - might be good to specify an explicit initial value here to prevent UB.
|
EWS run on current version of this PR (hash e6e3fd3) |
rr-codes
added
the
unsafe-merge-queue
…methods to pass in a session type instead of separate parameters https://bugs.webkit.org/show_bug.cgi?id=274356 rdar://128333023 Reviewed by Wenson Hsieh. Work towards using more strongly typed objects instead of passing around UUIDs everywhere by creating a new `WebUnifiedTextReplacementSessionData` type and using that, similar to the existing `WebUnifiedTextReplacementContextData` type. This also has the advantage of being more expressive with regards to optional-ness. * Source/WebKit/Scripts/webkit/messages.py: (headers_for_type): * Source/WebKit/Shared/UnifiedTextReplacement.serialization.in: * Source/WebKit/Shared/WebUnifiedTextReplacementContextData.h: * Source/WebKit/Shared/WebUnifiedTextReplacementSessionData.h: Copied from Source/WebKit/Shared/WebUnifiedTextReplacementContextData.h. * 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::addTextIndicatorStyleForID): * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm: (WebKit::UnifiedTextReplacementController::willBeginTextReplacementSession): (WebKit::UnifiedTextReplacementController::didBeginTextReplacementSession): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveReplacements): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidUpdateStateForReplacement): (WebKit::UnifiedTextReplacementController::didEndTextReplacementSession<WebUnifiedTextReplacementSessionData::ReplacementType::PlainText>): (WebKit::UnifiedTextReplacementController::didEndTextReplacementSession<WebUnifiedTextReplacementSessionData::ReplacementType::RichText>): (WebKit::UnifiedTextReplacementController::didEndTextReplacementSession): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveTextWithReplacementRange): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveEditAction): (WebKit::UnifiedTextReplacementController::textReplacementSessionPerformEditActionForPlainText): (WebKit::UnifiedTextReplacementController::textReplacementSessionPerformEditActionForRichText): (WebKit::UnifiedTextReplacementController::didEndTextReplacementSession<WebUnifiedTextReplacementType::PlainText>): Deleted. (WebKit::UnifiedTextReplacementController::didEndTextReplacementSession<WebUnifiedTextReplacementType::RichText>): Deleted. * Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm: (WebKit::WebPage::updateTextIndicatorStyleVisibilityForID): (WebKit::WebPage::willBeginTextReplacementSession): (WebKit::WebPage::didBeginTextReplacementSession): (WebKit::WebPage::textReplacementSessionDidReceiveReplacements): (WebKit::WebPage::textReplacementSessionDidUpdateStateForReplacement): (WebKit::WebPage::didEndTextReplacementSession): (WebKit::WebPage::textReplacementSessionDidReceiveTextWithReplacementRange): (WebKit::WebPage::textReplacementSessionDidReceiveEditAction): * Source/WebKit/WebProcess/WebPage/UnifiedTextReplacementController.h: * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/WebPage.messages.in: Canonical link: https://commits.webkit.org/278965@main
webkit-commit-queue
force-pushed
the
eng/128333023
branch
from
e6e3fd3
to
670f9c7
Compare
|
Committed 278965@main (670f9c7): https://commits.webkit.org/278965@main Reviewed commits have been landed. Closing PR #28760 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
670f9c7
e6e3fd3
🛠 wincairo🛠 ios-sim🛠 mac-AS-debug🧪 wpe-wk2🧪 wincairo-tests🧪 webkitperl🧪 ios-wk2🧪 api-mac🧪 api-wpe🧪 ios-wk2-wpt🧪 api-ios🧪 mac-wk2🛠 tv🧪 mac-AS-debug-wk2🧪 gtk-wk2🧪 mac-wk2-stress🧪 api-gtk🛠 watch