[Unified Text Replacement] Replacements should maintain the original text attributes #25564
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 4d62c9c) |
pxlcoder
reviewed
Mar 7, 2024
| EXPECT_EQ(green, observedRed); | ||
| EXPECT_EQ(green, observedGreen); |
There was a problem hiding this comment.
Was this just working before because the tested red and green values were always equal?
|
EWS run on previous version of this PR (hash aa96629) |
rr-codes
commented
Mar 7, 2024
|
|
||
| auto newResolvedRange = resolveCharacterRange(*sessionRange, newRange); | ||
| RELEASE_ASSERT(sessionRangeCharacterCount >= range.location + range.length); |
There was a problem hiding this comment.
is this release assert ok to leave in? It's needed because otherwise there would be an underflow in the below lines if this was somehow ever false. I could do an early return with a debug assert too, but this should never ever happen in the first place.
There was a problem hiding this comment.
A RELEASE_ASSERT is not the answer here, unless there is some security implication. Otherwise, why are we creating an even worse user experience because of a bug in our code?
|
EWS run on previous version of this PR (hash 36022a5) |
whsieh
approved these changes
Mar 7, 2024
|
|
||
| replaceTextInRange(*frame, newResolvedRange, newText); | ||
| if (UNLIKELY(sessionRangeCharacterCount < range.location + range.length)) { | ||
| RELEASE_LOG(UnifiedTextReplacement, "UnifiedTextReplacementController::textReplacementSessionDidReceiveTextWithReplacementRange (%s) => trying to replace a range larger than the context range (context range count: %llu, range.location %llu, range.length %llu)", uuid.toString().utf8().data(), sessionRangeCharacterCount, range.location, range.length); |
| case WebKit::WebTextReplacementData::EditAction::UndoAll: { | ||
| auto updatedContents = updatedLiveRange->cloneContents(); | ||
| if (updatedContents.hasException()) { | ||
| RELEASE_LOG(UnifiedTextReplacement, "UnifiedTextReplacementController::textReplacementSessionDidReceiveEditAction (%s) => exception when cloning contents after action", uuid.toString().utf8().data()); |
|
EWS run on current version of this PR (hash ba0c4ae) |
…text attributes https://bugs.webkit.org/show_bug.cgi?id=270606 rdar://122835651 Reviewed by Wenson Hsieh. Add support for attributed strings to work properly and have their attributes persisted. Also, add `WEBCORE_EXPORT` to `showTreeForThis` to ease future debugging, and make a correctness fix for an unrelated API test. * Source/WebCore/dom/Node.h: * Source/WebCore/editing/WebContentReader.h: * Source/WebCore/editing/cocoa/EditorCocoa.mm: (WebCore::Editor::replaceSelectionWithAttributedString): * Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): (WebCore::WebContentReader::readRTFD): (WebCore::WebContentMarkupReader::readRTFD): (WebCore::WebContentReader::readRTF): (WebCore::WebContentMarkupReader::readRTF): (WebCore::createFragmentAndAddResources): Deleted. * Source/WebKit/Sources.txt: * Source/WebKit/SourcesCocoa.txt: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm: Renamed from Source/WebKit/WebProcess/WebPage/UnifiedTextReplacementController.cpp. (WebKit::replaceTextInRange): (WebKit::replaceContentsInRange): (WebKit::extendedBoundaryPoint): (WebKit::findReplacementMarkerByUUID): (WebKit::UnifiedTextReplacementController::UnifiedTextReplacementController): (WebKit::UnifiedTextReplacementController::willBeginTextReplacementSession): (WebKit::UnifiedTextReplacementController::didBeginTextReplacementSession): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveReplacements): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidUpdateStateForReplacement): (WebKit::UnifiedTextReplacementController::didEndTextReplacementSession): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveTextWithReplacementRange): (WebKit::UnifiedTextReplacementController::textReplacementSessionDidReceiveEditAction): * Source/WebKit/WebProcess/WebPage/UnifiedTextReplacementController.h: * Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyRTF.mm: (checkColor): Canonical link: https://commits.webkit.org/275821@main
webkit-commit-queue
force-pushed
the
eng/122835651
branch
from
ba0c4ae
to
6cffe2c
Compare
|
Committed 275821@main (6cffe2c): https://commits.webkit.org/275821@main Reviewed commits have been landed. Closing PR #25564 and removing active labels. |
webkit-commit-queue
removed
the
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.
6cffe2c
ba0c4ae
🧪 wpe-wk2🧪 mac-wk1🧪 gtk-wk2🛠 tv-sim🧪 api-gtk🛠 watch-sim