[Unified Text Replacement] Distinguish plain text and rich text replacements#26229
Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom Mar 21, 2024
Merged
[Unified Text Replacement] Distinguish plain text and rich text replacements#26229webkit-commit-queue merged 1 commit intoWebKit:mainfrom
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
Conversation
pxlcoder
added
the
New Bugs
Collaborator
|
EWS run on previous version of this PR (hash 1fbc0f6) Details |
whsieh
approved these changes
Mar 21, 2024
Member
There was a problem hiding this comment.
(Double checking — oldData.originalText in the context of redo refers to the text after replacement?)
Member
Author
There was a problem hiding this comment.
Correct. I also realized I don't need to return a tuple here, since the first value is always the same. Will simplify that.
Member
There was a problem hiding this comment.
Should this check if the WeakPtr is null and skip if so? Because we're triggering editing commands and layout in this loop, I suspect it's possible that some of the (previously non-null) markers in this vector could become null during iteration.
Collaborator
|
EWS run on previous version of this PR (hash 96b7930) Details
|
Collaborator
|
EWS run on previous version of this PR (hash b3f9eae) Details
|
🧪 services
Collaborator
|
EWS run on current version of this PR (hash c4f78cc) Details |
pxlcoder
added
the
unsafe-merge-queue
…cements https://bugs.webkit.org/show_bug.cgi?id=271351 rdar://123530706 Reviewed by Wenson Hsieh. Edit actions should have a different effect depending on whether a plain or rich text replacement is occuring. * Source/WebCore/dom/SimpleRange.h: * Source/WebKit/Scripts/webkit/messages.py: (headers_for_type): * Source/WebKit/Shared/UnifiedTextReplacement.serialization.in: * Source/WebKit/Shared/WebUnifiedTextReplacementContextData.h: * Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm: (WebKit::WebPageProxy::willBeginTextReplacementSession): * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/mac/WebViewImpl.h: * Source/WebKit/UIProcess/mac/WebViewImpl.mm: (WebKit::WebViewImpl::willBeginTextReplacementSession): * Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm: (WebKit::replaceTextInRange): Refactor to use `Document` rather than `Frame` so that common code can be shared, and indirection is reduced. (WebKit::replaceContentsInRange): Ditto (WebKit::replaceTextInRange). (WebKit::UnifiedTextReplacementController::willBeginTextReplacementSession): Store the replacement type for retrieval when an edit action is performed. (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveReplacements): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidUpdateStateForReplacement): Committed and reverted state changes are now permanent. Do not restore the marker after it is removed. (WebKit::UnifiedTextReplacementController::didEndTextReplacementSession): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveTextWithReplacementRange): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveEditAction): (WebKit::UnifiedTextReplacementController::textReplacementSessionPerformEditActionForPlainText): Add a new path for plain text edit actions. Replacements are performed in reverse order to avoid recomputing ranges. (WebKit::UnifiedTextReplacementController::textReplacementSessionPerformEditActionForRichText): Preserve existing rich text behavior. * Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm: (WebKit::WebPage::willBeginTextReplacementSession): * Source/WebKit/WebProcess/WebPage/UnifiedTextReplacementController.h: Add a map of UUIDs to replacement types, to ensure the right method is used when an edit action is received. * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/WebPage.messages.in: Canonical link: https://commits.webkit.org/276490@main
webkit-commit-queue
force-pushed
the
eng/271351
branch
from
c4f78cc to
b50554e
Compare
Collaborator
|
Committed 276490@main (b50554e): https://commits.webkit.org/276490@main Reviewed commits have been landed. Closing PR #26229 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-merge-queue
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
b50554e
c4f78cc
🧪 wpe-wk2🧪 api-mac🧪 ios-wk2-wpt🧪 mac-wk1🧪 api-ios🧪 mac-AS-debug-wk2🧪 gtk-wk2🛠 tv-sim🧪 api-gtk🛠 watch