Changeset 256000 in webkit

Timestamp:

Feb 6, 2020 6:54:43 PM (4 years ago)

Author:

Wenson Hsieh

Message:

WebPage::rangeForGranularityAtPoint always returns null in the case of CharacterGranularity
​https://bugs.webkit.org/show_bug.cgi?id=207350
<rdar://problem/59239914>

Reviewed by Tim Horton.

Source/WebKit:

Handle the character granularity case in WebPage::rangeForGranularityAtPoint by just returning a collapsed
Range. Certain internal clients will have a need to place and update the text selection using character
granularity; see radar for more details.

Test: UIWKInteractionViewProtocol.SelectTextWithCharacterGranularity

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView supportsTextSelectionWithCharacterGranularity]):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::rangeForGranularityAtPoint):

Tools:

Add a test to exercise the corner case in the SPI.

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/ios/UIWKInteractionViewProtocol.mm: Added.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/ios/UIWKInteractionViewProtocol.mm (added)
• Tools/TestWebKitAPI/ios/UIKitSPI.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        WebPage::rangeForGranularityAtPoint always returns null in the case of CharacterGranularity
+        https://bugs.webkit.org/show_bug.cgi?id=207350
+        <rdar://problem/59239914>
+
+        Reviewed by Tim Horton.
+
+        Handle the character granularity case in `WebPage::rangeForGranularityAtPoint` by just returning a collapsed
+        Range. Certain internal clients will have a need to place and update the text selection using character
+        granularity; see radar for more details.
+
+        Test: UIWKInteractionViewProtocol.SelectTextWithCharacterGranularity
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView supportsTextSelectionWithCharacterGranularity]):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::rangeForGranularityAtPoint):
+
 2020-02-06  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -6383 +6383 @@
 }
 
+- (BOOL)supportsTextSelectionWithCharacterGranularity
+{
+    return YES;
+}
+
 - (BOOL)hasHiddenContentEditable
 {

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2053 +2053 @@
     RefPtr<Range> range;
     switch (static_cast<WebCore::TextGranularity>(granularity)) {
+    case CharacterGranularity:
+        range = makeRange(position, position);
+        break;
     case WordGranularity:
         range = wordRangeFromPosition(position);
@@ -2063 +2066 @@
         break;
     case DocumentGranularity:
+        // FIXME: It's not clear why this mutates the current selection and returns null.
         frame.selection().selectAll();
         break;

trunk/Tools/ChangeLog

@@ +1 @@
+2020-02-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        WebPage::rangeForGranularityAtPoint always returns null in the case of CharacterGranularity
+        https://bugs.webkit.org/show_bug.cgi?id=207350
+        <rdar://problem/59239914>
+
+        Reviewed by Tim Horton.
+
+        Add a test to exercise the corner case in the SPI.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/ios/UIWKInteractionViewProtocol.mm: Added.
+
 2020-02-06  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -996 +996 @@
                 E5036F78211BC25400BFDBE2 /* color-drop.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E5036F77211BC22800BFDBE2 /* color-drop.html */; };
                 ECA680CE1E68CC0900731D20 /* StringUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = ECA680CD1E68CC0900731D20 /* StringUtilities.mm */; };
+                F402F56C23ECC2FB00865549 /* UIWKInteractionViewProtocol.mm in Sources */ = {isa = PBXBuildFile; fileRef = F402F56B23ECC2FB00865549 /* UIWKInteractionViewProtocol.mm */; };
                 F407FE391F1D0DFC0017CF25 /* enormous.svg in Copy Resources */ = {isa = PBXBuildFile; fileRef = F407FE381F1D0DE60017CF25 /* enormous.svg */; };
                 F4106C6921ACBF84004B89A1 /* WKWebViewFirstResponderTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4106C6821ACBF84004B89A1 /* WKWebViewFirstResponderTests.mm */; };
@@ -2561 +2562 @@
                 ECA680CD1E68CC0900731D20 /* StringUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringUtilities.mm; sourceTree = "<group>"; };
                 F3FC3EE213678B7300126A65 /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
+                F402F56B23ECC2FB00865549 /* UIWKInteractionViewProtocol.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = UIWKInteractionViewProtocol.mm; sourceTree = "<group>"; };
                 F407FE381F1D0DE60017CF25 /* enormous.svg */ = {isa = PBXFileReference; lastKnownFileType = text; path = enormous.svg; sourceTree = "<group>"; };
                 F4106C6821ACBF84004B89A1 /* WKWebViewFirstResponderTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewFirstResponderTests.mm; sourceTree = "<group>"; };
@@ -3264 +3266 @@
                                 F45033F4206BEC95009351CE /* TextAutosizingBoost.mm */,
                                 F46849BD1EEF58E400B937FE /* UIPasteboardTests.mm */,
+                                F402F56B23ECC2FB00865549 /* UIWKInteractionViewProtocol.mm */,
                                 F43E3BBE20DADA1E00A4E7ED /* WKScrollViewTests.mm */,
                                 514958BD1F7427AC00E87BAD /* WKWebViewAutofillTests.mm */,
@@ -4993 +4996 @@
                                 5CB40B4E1F4B98D3007DC7B9 /* UIDelegate.mm in Sources */,
                                 F46849BE1EEF58E400B937FE /* UIPasteboardTests.mm in Sources */,
+                                F402F56C23ECC2FB00865549 /* UIWKInteractionViewProtocol.mm in Sources */,
                                 5C9D922E22D7DE1C008E9266 /* UnifiedSource1.cpp in Sources */,
                                 5C9D922C22D7DE12008E9266 /* UnifiedSource1-mm.mm in Sources */,

trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h

@@ -175 +175 @@
 - (void)requestAutocorrectionContextWithCompletionHandler:(void (^)(UIWKAutocorrectionContext *autocorrectionContext))completionHandler;
 - (void)selectWordBackward;
+- (void)selectTextWithGranularity:(UITextGranularity)granularity atPoint:(CGPoint)point completionHandler:(void (^)(void))completionHandler;
+- (void)updateSelectionWithExtentPoint:(CGPoint)point withBoundary:(UITextGranularity)granularity completionHandler:(void (^)(BOOL selectionEndIsMoving))completionHandler;
 @property (nonatomic, readonly) NSString *selectedText;
 @end