<!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>[282339] trunk/Source/WebCore</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/282339">282339</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2021-09-13 11:06:30 -0700 (Mon, 13 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Expose TextBoxSelectableRange in the iterator
https://bugs.webkit.org/show_bug.cgi?id=230213

Reviewed by Alan Bujtas.

Replace isSelectable with more generic TextBoxSelectableRange accessor.
This will be helpful in the future.

* layout/integration/LayoutIntegrationRunIterator.h:
(WebCore::LayoutIntegration::PathTextRun::selectableRange const):
(WebCore::LayoutIntegration::PathTextRun::isSelectable const): Deleted.
* layout/integration/LayoutIntegrationRunIteratorLegacyPath.h:
(WebCore::LayoutIntegration::RunIteratorLegacyPath::selectableRange const):
(WebCore::LayoutIntegration::RunIteratorLegacyPath::isSelectable const): Deleted.
* layout/integration/LayoutIntegrationRunIteratorModernPath.h:
(WebCore::LayoutIntegration::RunIteratorModernPath::selectableRange const):
(WebCore::LayoutIntegration::RunIteratorModernPath::isSelectable const): Deleted.
* rendering/LegacyInlineTextBox.cpp:
(WebCore::LegacyInlineTextBox::isSelectable const): Deleted.
* rendering/LegacyInlineTextBox.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::inlineSelectionGaps):
* rendering/RenderText.cpp:
(WebCore::RenderText::absoluteQuadsForRange const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorh">trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorLegacyPathh">trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorLegacyPath.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorModernPathh">trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h</a></li>
<li><a href="#trunkSourceWebCorerenderingLegacyInlineTextBoxcpp">trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLegacyInlineTextBoxh">trunk/Source/WebCore/rendering/LegacyInlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/ChangeLog      2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2021-09-13  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><ins>+        Expose TextBoxSelectableRange in the iterator
+        https://bugs.webkit.org/show_bug.cgi?id=230213
+
+        Reviewed by Alan Bujtas.
+
+        Replace isSelectable with more generic TextBoxSelectableRange accessor.
+        This will be helpful in the future.
+
+        * layout/integration/LayoutIntegrationRunIterator.h:
+        (WebCore::LayoutIntegration::PathTextRun::selectableRange const):
+        (WebCore::LayoutIntegration::PathTextRun::isSelectable const): Deleted.
+        * layout/integration/LayoutIntegrationRunIteratorLegacyPath.h:
+        (WebCore::LayoutIntegration::RunIteratorLegacyPath::selectableRange const):
+        (WebCore::LayoutIntegration::RunIteratorLegacyPath::isSelectable const): Deleted.
+        * layout/integration/LayoutIntegrationRunIteratorModernPath.h:
+        (WebCore::LayoutIntegration::RunIteratorModernPath::selectableRange const):
+        (WebCore::LayoutIntegration::RunIteratorModernPath::isSelectable const): Deleted.
+        * rendering/LegacyInlineTextBox.cpp:
+        (WebCore::LegacyInlineTextBox::isSelectable const): Deleted.
+        * rendering/LegacyInlineTextBox.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::inlineSelectionGaps):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::absoluteQuadsForRange const):
+
+2021-09-13  Antti Koivisto  <antti@apple.com>
+
</ins><span class="cx">         Remove redundant copy of visibleToHitTesting function
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=230212
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.h (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.h   2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIterator.h      2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">     unsigned offsetForPosition(float x) const;
</span><span class="cx">     float positionForOffset(unsigned) const;
</span><span class="cx"> 
</span><del>-    bool isSelectable(unsigned start, unsigned end) const;
</del><ins>+    TextBoxSelectableRange selectableRange() const;
</ins><span class="cx">     LayoutRect selectionRect(unsigned start, unsigned end) const;
</span><span class="cx"> 
</span><span class="cx">     const RenderText& renderer() const { return downcast<RenderText>(PathRun::renderer()); }
</span><span class="lines">@@ -343,10 +343,10 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline bool PathTextRun::isSelectable(unsigned start, unsigned end) const
</del><ins>+inline TextBoxSelectableRange PathTextRun::selectableRange() const
</ins><span class="cx"> {
</span><span class="cx">     return WTF::switchOn(m_pathVariant, [&](auto& path) {
</span><del>-        return path.isSelectable(start, end);
</del><ins>+        return path.selectableRange();
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorLegacyPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorLegacyPath.h (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorLegacyPath.h 2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorLegacyPath.h    2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "LegacyInlineTextBox.h"
</span><span class="cx"> #include "LegacyRootInlineBox.h"
</span><span class="cx"> #include "RenderText.h"
</span><ins>+#include "TextBoxSelectableRange.h"
</ins><span class="cx"> #include <wtf/RefCountedArray.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> 
</span><span class="lines">@@ -74,7 +75,7 @@
</span><span class="cx">     unsigned offsetForPosition(float x) const { return inlineTextBox()->offsetForPosition(x); }
</span><span class="cx">     float positionForOffset(unsigned offset) const { return inlineTextBox()->positionForOffset(offset); }
</span><span class="cx"> 
</span><del>-    bool isSelectable(unsigned start, unsigned end) const { return inlineTextBox()->isSelectable(start, end); }
</del><ins>+    TextBoxSelectableRange selectableRange() const { return inlineTextBox()->selectableRange(); }
</ins><span class="cx">     LayoutRect selectionRect(unsigned start, unsigned end) const { return inlineTextBox()->localSelectionRect(start, end); }
</span><span class="cx"> 
</span><span class="cx">     const RenderObject& renderer() const
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationRunIteratorModernPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h 2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationRunIteratorModernPath.h    2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -100,9 +100,14 @@
</span><span class="cx">         return snapRectToDevicePixelsWithWritingDirection(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()).maxX();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    bool isSelectable(unsigned start, unsigned end) const
</del><ins>+    TextBoxSelectableRange selectableRange() const
</ins><span class="cx">     {
</span><del>-        return selectableRange().intersects(start, end);
</del><ins>+        return {
+            start(),
+            length(),
+            run().style().hyphenString().length(),
+            run().isLineBreak()
+        };
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     LayoutRect selectionRect(unsigned rangeStart, unsigned rangeEnd) const
</span><span class="lines">@@ -219,16 +224,6 @@
</span><span class="cx">         } while (!atEnd() && run().isInlineBox());
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    TextBoxSelectableRange selectableRange() const
-    {
-        return {
-            start(),
-            length(),
-            run().style().hyphenString().length(),
-            run().isLineBreak()
-        };
-    }
-
</del><span class="cx">     enum class HyphenMode { Include, Ignore };
</span><span class="cx">     TextRun createTextRun(HyphenMode hyphenMode) const
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLegacyInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp   2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp      2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -154,11 +154,6 @@
</span><span class="cx">     return root().selectionHeight();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool LegacyInlineTextBox::isSelectable(unsigned startPosition, unsigned endPosition) const
-{
-    return selectableRange().intersects(startPosition, endPosition);
-}
-
</del><span class="cx"> RenderObject::HighlightState LegacyInlineTextBox::selectionState() const
</span><span class="cx"> {
</span><span class="cx">     return renderer().view().selection().highlightStateForTextBox(renderer(), selectableRange());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLegacyInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LegacyInlineTextBox.h (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LegacyInlineTextBox.h     2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/rendering/LegacyInlineTextBox.h        2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -115,7 +115,6 @@
</span><span class="cx"> 
</span><span class="cx"> public:
</span><span class="cx">     virtual LayoutRect localSelectionRect(unsigned startPos, unsigned endPos) const;
</span><del>-    bool isSelectable(unsigned startPosition, unsigned endPosition) const;
</del><span class="cx">     std::pair<unsigned, unsigned> selectionStartEnd() const;
</span><span class="cx"> 
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp       2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp  2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -3260,7 +3260,7 @@
</span><span class="cx">             case RenderObject::HighlightState::Both:
</span><span class="cx">                 break;
</span><span class="cx">             }
</span><del>-            if (textBox.isSelectable(start, end))
</del><ins>+            if (textBox.selectableRange().intersects(start, end))
</ins><span class="cx">                 return true;
</span><span class="cx">         }
</span><span class="cx">         return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (282338 => 282339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp    2021-09-13 17:57:14 UTC (rev 282338)
+++ trunk/Source/WebCore/rendering/RenderText.cpp       2021-09-13 18:06:30 UTC (rev 282339)
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> 
</span><span class="cx">     Vector<FloatQuad> quads;
</span><span class="cx">     for (auto& run : LayoutIntegration::textRunsFor(*this)) {
</span><del>-        if (ignoreEmptyTextSelections && !run.isSelectable(start, end))
</del><ins>+        if (ignoreEmptyTextSelections && !run.selectableRange().intersects(start, end))
</ins><span class="cx">             continue;
</span><span class="cx">         if (start <= run.start() && run.end() <= end) {
</span><span class="cx">             auto boundaries = boundariesForTextRun(run);
</span></span></pre>
</div>
</div>

</body>
</html>