Changeset 249508 in webkit

Timestamp:

Sep 4, 2019 6:17:13 PM (5 years ago)

Author:

Wenson Hsieh

Message:

-[WKContentView selectedText] returns an empty string when selecting more than 200 characters
​https://bugs.webkit.org/show_bug.cgi?id=201471
<rdar://problem/55039227>

Reviewed by Tim Horton.

Source/WebKit:

The fix for <rdar://problem/54308019> is contingent on -[WKContentView selectedText] returning a non-empty
result in the case where text is selected. However, in WebKit, if more than 200 characters are selected,
-selectedText ends up returning nothing.

This is due to logic added in trac.webkit.org/r167624 that was intended to return the selected text in
PostLayoutData's wordAtSelection, up to a maximum of 200 characters, likely for performance and/or security
reasons. However, instead of truncating at 200 characters, the change simply drops wordAtSelection altogether.
This patch fixes this issue by taking the first 200 characters of the selected text.

Test: EditorStateTests.SelectedText

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::platformEditorState const):

Tools:

Add an API test to ensure that -selectedText is non-empty in the case where more than 200 characters are
selected.

• TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm:

(TestWebKitAPI::TEST):

• TestWebKitAPI/ios/UIKitSPI.h:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm (modified) (1 diff)
• Tools/TestWebKitAPI/ios/UIKitSPI.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-04  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        -[WKContentView selectedText] returns an empty string when selecting more than 200 characters
+        https://bugs.webkit.org/show_bug.cgi?id=201471
+        <rdar://problem/55039227>
+
+        Reviewed by Tim Horton.
+
+        The fix for <rdar://problem/54308019> is contingent on -[WKContentView selectedText] returning a non-empty
+        result in the case where text is selected. However, in WebKit, if more than 200 characters are selected,
+        -selectedText ends up returning nothing.
+
+        This is due to logic added in trac.webkit.org/r167624 that was intended to return the selected text in
+        PostLayoutData's wordAtSelection, up to a maximum of 200 characters, likely for performance and/or security
+        reasons. However, instead of truncating at 200 characters, the change simply drops wordAtSelection altogether.
+        This patch fixes this issue by taking the first 200 characters of the selected text.
+
+        Test: EditorStateTests.SelectedText
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::platformEditorState const):
+
 2019-09-04  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -262 +262 @@
             postLayoutData.selectedTextLength = selectedText.length();
             const int maxSelectedTextLength = 200;
-            if (selectedText.length() <= maxSelectedTextLength)
-                postLayoutData.wordAtSelection = selectedText;
+            postLayoutData.wordAtSelection = selectedText.left(maxSelectedTextLength);
         }
         // FIXME: We should disallow replace when the string contains only CJ characters.

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-04  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        -[WKContentView selectedText] returns an empty string when selecting more than 200 characters
+        https://bugs.webkit.org/show_bug.cgi?id=201471
+        <rdar://problem/55039227>
+
+        Reviewed by Tim Horton.
+
+        Add an API test to ensure that -selectedText is non-empty in the case where more than 200 characters are
+        selected.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/ios/UIKitSPI.h:
+
 2019-09-04  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm

@@ -421 +421 @@
 }
 
+TEST(EditorStateTests, SelectedText)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
+    [webView synchronouslyLoadTestPageNamed:@"lots-of-text"];
+    [webView _synchronouslyExecuteEditCommand:@"SelectAll" argument:nil];
+    [webView waitForNextPresentationUpdate];
+    EXPECT_GT([[webView textInputContentView] selectedText].length, 0U);
+}
+
 #endif // PLATFORM(IOS_FAMILY)
 

trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h

@@ -164 +164 @@
 - (void)requestAutocorrectionRectsForString:(NSString *)input withCompletionHandler:(void (^)(UIWKAutocorrectionRects *rectsForInput))completionHandler;
 - (void)requestAutocorrectionContextWithCompletionHandler:(void (^)(UIWKAutocorrectionContext *autocorrectionContext))completionHandler;
+@property (nonatomic, readonly) NSString *selectedText;
 @end