-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-pick 29bdd50. rdar://problem/113604753
Cherry-pick 92ab433. rdar://problem/113036183 [WebKit] [iOS] Respect `NSUnderlineStyleAttributeName` when setting attributed marked text https://bugs.webkit.org/show_bug.cgi?id=259604 rdar://113036183 Reviewed by Richard Robinson. After the changes in rdar://108610748, UIKit will use `NSUnderlineStyle` with an attribute value of `NSUnderlineStyleThick` to indicate "highlighted" segments of marked text when live conversion is active. Currently, our code only checks against `NSBackgroundColor`, so without the changes in this patch, it would no longer be possible to know which segment in marked text is the selected segment when using live conversion. Fix this by checking for this case, alongside the existing `NSBackgroundColor` check. Test: KeyboardInputTests.MarkedTextSegmentsWithUnderlines * Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm: (extractUnderlines): * Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm: Canonical link: https://commits.webkit.org/266401@main Identifier: 265870.280@safari-7616-branch
- Loading branch information
Showing
2 changed files
with
80 additions
and
2 deletions.
There are no files selected for viewing
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
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