Changeset 271262 in webkit

Timestamp:

Jan 7, 2021 3:09:29 PM (19 months ago)

Author:

Wenson Hsieh

Message:

Text fields should not be translated while typing
​https://bugs.webkit.org/show_bug.cgi?id=220431
<rdar://problem/71724918>

Reviewed by Tim Horton.

Source/WebCore:

Don't vend text nodes or newly created elements inside input elements for translation (i.e. text manipulation)
if the input element was modified by the user. Note that this check is right before the call to
observeParagraphs as opposed to when we schedule the observation update, since edit commands may create
renderers for text nodes and other elements before the m_lastChangeWasUserEdit flag has been set.

Test: TextManipulation.StartTextManipulationDoesNotExtractUserModifiedText

• editing/TextManipulationController.cpp:

(WebCore::TextManipulationController::scheduleObservationUpdate):

Tools:

Add an API test that modifies text in two input fields (by executing an edit command, and then by
programmatically setting the value attribute). The test verifies that only the latter (programmatic) value
change propagates a text manipulation update to the client layer.

• TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/TextManipulationController.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-07  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Text fields should not be translated while typing
+        https://bugs.webkit.org/show_bug.cgi?id=220431
+        <rdar://problem/71724918>
+
+        Reviewed by Tim Horton.
+
+        Don't vend text nodes or newly created elements inside input elements for translation (i.e. text manipulation)
+        if the input element was modified by the user. Note that this check is right before the call to
+        `observeParagraphs` as opposed to when we schedule the observation update, since edit commands may create
+        renderers for text nodes and other elements before the `m_lastChangeWasUserEdit` flag has been set.
+
+        Test: TextManipulation.StartTextManipulationDoesNotExtractUserModifiedText
+
+        * editing/TextManipulationController.cpp:
+        (WebCore::TextManipulationController::scheduleObservationUpdate):
+
 2021-01-07  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/editing/TextManipulationController.cpp

@@ -606 +606 @@
             if (!node->isConnected())
                 continue;
+
+            if (auto host = makeRefPtr(node->shadowHost()); is<HTMLInputElement>(host.get()) && downcast<HTMLInputElement>(*host).lastChangeWasUserEdit())
+                continue;
+
             if (!commonAncestor)
                 commonAncestor = is<ContainerNode>(node.get()) ? node.ptr() : node->parentNode();

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-07  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Text fields should not be translated while typing
+        https://bugs.webkit.org/show_bug.cgi?id=220431
+        <rdar://problem/71724918>
+
+        Reviewed by Tim Horton.
+
+        Add an API test that modifies text in two input fields (by executing an edit command, and then by
+        programmatically setting the value attribute). The test verifies that only the latter (programmatic) value
+        change propagates a text manipulation update to the client layer.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm:
+        (TestWebKitAPI::TEST):
+
 2021-01-07  Jonathan Bedard  <JonWBedard@gmail.com>
 

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

@@ -925 +925 @@
 }
 
+TEST(TextManipulation, StartTextManipulationDoesNotExtractUserModifiedText)
+{
+    auto delegate = adoptNS([[TextManipulationDelegate alloc] init]);
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)]);
+    [webView _setTextManipulationDelegate:delegate.get()];
+    [webView synchronouslyLoadHTMLString:@"<!DOCTYPE html><body><input id='one'><input id='two'></body>"];
+
+    done = false;
+    [webView _startTextManipulationsWithConfiguration:nil completion:^{
+        done = true;
+    }];
+    TestWebKitAPI::Util::run(&done);
+
+    EXPECT_EQ([delegate items].count, 0UL);
+
+    Vector<RetainPtr<_WKTextManipulationItem>> items;
+    done = false;
+    [delegate setItemCallback:[&] (_WKTextManipulationItem *item) {
+        items.append(retainPtr(item));
+        done = true;
+    }];
+
+    [webView stringByEvaluatingJavaScript:@"document.getElementById('one').focus();"
+        "document.execCommand('InsertText', true, 'foo');"
+        "document.getElementById('two').value = 'bar';"];
+
+    Util::run(&done);
+
+    EXPECT_EQ(items.size(), 1U);
+
+    auto tokens = [items[0] tokens];
+    EXPECT_EQ(tokens.count, 1UL);
+    EXPECT_WK_STREQ("bar", tokens.firstObject.content);
+}
+
 TEST(TextManipulation, StartTextManipulationExtractsVisibleLineBreaksInTextAsExcludedTokens)
 {