<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[260609] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/260609">260609</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2020-04-23 17:07:25 -0700 (Thu, 23 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Text manipulation does not account for text in fully clipped containers
https://bugs.webkit.org/show_bug.cgi?id=210940
<rdar://problem/61137648>

Reviewed by Tim Horton.

Source/WebCore:

Allow text manipulation to find both text in `visibility: hidden;` containers, as well as text in fully clipped
overflow containers. In both cases, renderers exist for these nodes, but TextIterator ignores them by default.
If these containers become visible in the future, we don't want to skip out on performing text manipulation on
them.

An alternative would be to detect when any element that has not undergone text manipulation has become visible
(i.e. no longer clipped by an ancestor), but this is likely more complicated (and possibly less performant) than
just eagerly extracting text from hidden containers, once they gain renderers.

TextManipulation.StartTextManipulationIncludesFullyClippedText

* editing/TextManipulationController.cpp:
(WebCore::ParagraphContentIterator::ParagraphContentIterator):
(WebCore::TextManipulationController::didCreateRendererForElement):
(WebCore::TextManipulationController::scheduleObservationUpdate):
(WebCore::TextManipulationController::scheduleObservartionUpdate): Deleted.

While I'm here, also rename scheduleObservartionUpdate to scheduleObservationUpdate.

* editing/TextManipulationController.h:

Tools:

Add a new text manipulation API test.

* TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm:
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingTextManipulationControllercpp">trunk/Source/WebCore/editing/TextManipulationController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextManipulationControllerh">trunk/Source/WebCore/editing/TextManipulationController.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaTextManipulationmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (260608 => 260609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-23 23:59:30 UTC (rev 260608)
+++ trunk/Source/WebCore/ChangeLog      2020-04-24 00:07:25 UTC (rev 260609)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2020-04-23  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Text manipulation does not account for text in fully clipped containers
+        https://bugs.webkit.org/show_bug.cgi?id=210940
+        <rdar://problem/61137648>
+
+        Reviewed by Tim Horton.
+
+        Allow text manipulation to find both text in `visibility: hidden;` containers, as well as text in fully clipped
+        overflow containers. In both cases, renderers exist for these nodes, but TextIterator ignores them by default.
+        If these containers become visible in the future, we don't want to skip out on performing text manipulation on
+        them.
+
+        An alternative would be to detect when any element that has not undergone text manipulation has become visible
+        (i.e. no longer clipped by an ancestor), but this is likely more complicated (and possibly less performant) than
+        just eagerly extracting text from hidden containers, once they gain renderers.
+
+        TextManipulation.StartTextManipulationIncludesFullyClippedText
+
+        * editing/TextManipulationController.cpp:
+        (WebCore::ParagraphContentIterator::ParagraphContentIterator):
+        (WebCore::TextManipulationController::didCreateRendererForElement):
+        (WebCore::TextManipulationController::scheduleObservationUpdate):
+        (WebCore::TextManipulationController::scheduleObservartionUpdate): Deleted.
+
+        While I'm here, also rename scheduleObservartionUpdate to scheduleObservationUpdate.
+
+        * editing/TextManipulationController.h:
+
</ins><span class="cx"> 2020-04-23  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Allow credentials for same-origin css mask images
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextManipulationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextManipulationController.cpp (260608 => 260609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextManipulationController.cpp      2020-04-23 23:59:30 UTC (rev 260608)
+++ trunk/Source/WebCore/editing/TextManipulationController.cpp 2020-04-24 00:07:25 UTC (rev 260609)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> class ParagraphContentIterator {
</span><span class="cx"> public:
</span><span class="cx">     ParagraphContentIterator(const Position& start, const Position& end)
</span><del>-        : m_iterator({ *makeBoundaryPoint(start), *makeBoundaryPoint(end) })
</del><ins>+        : m_iterator({ *makeBoundaryPoint(start), *makeBoundaryPoint(end) }, TextIteratorIgnoresStyleVisibility)
</ins><span class="cx">         , m_iteratorNode(m_iterator.atEnd() ? nullptr : createLiveRange(m_iterator.range())->firstNode())
</span><span class="cx">         , m_currentNodeForFindingInvisibleContent(start.firstNode())
</span><span class="cx">         , m_pastEndNode(end.firstNode())
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     if (m_elementsWithNewRenderer.computesEmpty())
</span><del>-        scheduleObservartionUpdate();
</del><ins>+        scheduleObservationUpdate();
</ins><span class="cx"> 
</span><span class="cx">     if (is<PseudoElement>(element)) {
</span><span class="cx">         if (auto* host = downcast<PseudoElement>(element).hostElement())
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx">     return { makePositionTuple(start.deepEquivalent()), makePositionTuple(end.deepEquivalent()) };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TextManipulationController::scheduleObservartionUpdate()
</del><ins>+void TextManipulationController::scheduleObservationUpdate()
</ins><span class="cx"> {
</span><span class="cx">     if (!m_document)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextManipulationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextManipulationController.h (260608 => 260609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextManipulationController.h        2020-04-23 23:59:30 UTC (rev 260608)
+++ trunk/Source/WebCore/editing/TextManipulationController.h   2020-04-24 00:07:25 UTC (rev 260609)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> private:
</span><span class="cx">     bool isInManipulatedElement(Element&);
</span><span class="cx">     void observeParagraphs(const Position& start, const Position& end);
</span><del>-    void scheduleObservartionUpdate();
</del><ins>+    void scheduleObservationUpdate();
</ins><span class="cx"> 
</span><span class="cx">     struct ManipulationItemData {
</span><span class="cx">         Position start;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (260608 => 260609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-04-23 23:59:30 UTC (rev 260608)
+++ trunk/Tools/ChangeLog       2020-04-24 00:07:25 UTC (rev 260609)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2020-04-23  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Text manipulation does not account for text in fully clipped containers
+        https://bugs.webkit.org/show_bug.cgi?id=210940
+        <rdar://problem/61137648>
+
+        Reviewed by Tim Horton.
+
+        Add a new text manipulation API test.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm:
+        (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2020-04-23  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r260278): TestWebKitAPI.Fullscreen.Delegate is timing out on macOS bots
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaTextManipulationmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm (260608 => 260609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm  2020-04-23 23:59:30 UTC (rev 260608)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TextManipulation.mm     2020-04-24 00:07:25 UTC (rev 260609)
</span><span class="lines">@@ -582,6 +582,40 @@
</span><span class="cx">     EXPECT_WK_STREQ("Ten", items[6].tokens[0].content);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(TextManipulation, StartTextManipulationIncludesFullyClippedText)
+{
+    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>"
+        "<head>"
+        "    <style>"
+        "        div { overflow: hidden; width: 200px; height: 0; }"
+        "        p { visibility: hidden; }"
+        "    </style>"
+        "</head>"
+        "<body>"
+        "    <div><span>Hello</span> world</div>"
+        "    <br>"
+        "    <p>More text</p>"
+        "</body>"];
+
+    done = false;
+    [webView _startTextManipulationsWithConfiguration:nil completion:^{
+        done = true;
+    }];
+    TestWebKitAPI::Util::run(&done);
+
+    NSArray<_WKTextManipulationItem *> *items = [delegate items];
+    EXPECT_EQ(items.count, 2UL);
+    EXPECT_EQ(items[0].tokens.count, 2UL);
+    EXPECT_WK_STREQ("Hello", items[0].tokens[0].content);
+    EXPECT_WK_STREQ(" world", items[0].tokens[1].content);
+    EXPECT_EQ(items[1].tokens.count, 1UL);
+    EXPECT_WK_STREQ("More text", items[1].tokens[0].content);
+}
+
</ins><span class="cx"> struct Token {
</span><span class="cx">     NSString *identifier;
</span><span class="cx">     NSString *content;
</span></span></pre>
</div>
</div>

</body>
</html>