<!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>[283290] branches/safari-613.1.3-branch</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/283290">283290</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-09-29 17:57:35 -0700 (Wed, 29 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/283087">r283087</a>. rdar://problem/83697121

    Line iterator firstRun/lastRun may return runs from wrong lines
    https://bugs.webkit.org/show_bug.cgi?id=230770
    <rdar://problem/83509753>

    Reviewed by Alan Bujtas.

    Source/WebCore:

    In some situation line iterator firstRun/lastRun could return runs from different lines.
    This could lead to inconsistencies like firstRun being non-null while lastRun is null.

    Test: editing/iterator-line-start-end.html

    * layout/integration/LayoutIntegrationLineIteratorModernPath.h:
    (WebCore::LayoutIntegration::LineIteratorModernPath::firstRun const):
    (WebCore::LayoutIntegration::LineIteratorModernPath::lastRun const):

    Take care to only return runs from this line.

    LayoutTests:

    * editing/iterator-line-start-end-expected.txt: Added.
    * editing/iterator-line-start-end.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283087 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari61313branchLayoutTestsChangeLog">branches/safari-613.1.3-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari61313branchSourceWebCoreChangeLog">branches/safari-613.1.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari61313branchSourceWebCorelayoutintegrationLayoutIntegrationLineIteratorModernPathh">branches/safari-613.1.3-branch/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari61313branchLayoutTestseditingiteratorlinestartendexpectedtxt">branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end-expected.txt</a></li>
<li><a href="#branchessafari61313branchLayoutTestseditingiteratorlinestartendhtml">branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari61313branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.3-branch/LayoutTests/ChangeLog (283289 => 283290)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.3-branch/LayoutTests/ChangeLog     2021-09-30 00:55:27 UTC (rev 283289)
+++ branches/safari-613.1.3-branch/LayoutTests/ChangeLog        2021-09-30 00:57:35 UTC (rev 283290)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2021-09-29  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283087. rdar://problem/83697121
+
+    Line iterator firstRun/lastRun may return runs from wrong lines
+    https://bugs.webkit.org/show_bug.cgi?id=230770
+    <rdar://problem/83509753>
+    
+    Reviewed by Alan Bujtas.
+    
+    Source/WebCore:
+    
+    In some situation line iterator firstRun/lastRun could return runs from different lines.
+    This could lead to inconsistencies like firstRun being non-null while lastRun is null.
+    
+    Test: editing/iterator-line-start-end.html
+    
+    * layout/integration/LayoutIntegrationLineIteratorModernPath.h:
+    (WebCore::LayoutIntegration::LineIteratorModernPath::firstRun const):
+    (WebCore::LayoutIntegration::LineIteratorModernPath::lastRun const):
+    
+    Take care to only return runs from this line.
+    
+    LayoutTests:
+    
+    * editing/iterator-line-start-end-expected.txt: Added.
+    * editing/iterator-line-start-end.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283087 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-26  Antti Koivisto  <antti@apple.com>
+
+            Line iterator firstRun/lastRun may return runs from wrong lines
+            https://bugs.webkit.org/show_bug.cgi?id=230770
+            <rdar://problem/83509753>
+
+            Reviewed by Alan Bujtas.
+
+            * editing/iterator-line-start-end-expected.txt: Added.
+            * editing/iterator-line-start-end.html: Added.
+
</ins><span class="cx"> 2021-09-23  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Make inert nodes invisible to hit testing
</span></span></pre></div>
<a id="branchessafari61313branchLayoutTestseditingiteratorlinestartendexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end-expected.txt (0 => 283290)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end-expected.txt                          (rev 0)
+++ branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end-expected.txt     2021-09-30 00:57:35 UTC (rev 283290)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+This test passes if it doesn't crash
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
</ins></span></pre></div>
<a id="branchessafari61313branchLayoutTestseditingiteratorlinestartendhtml"></a>
<div class="addfile"><h4>Added: branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end.html (0 => 283290)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end.html                          (rev 0)
+++ branches/safari-613.1.3-branch/LayoutTests/editing/iterator-line-start-end.html     2021-09-30 00:57:35 UTC (rev 283290)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<img align="right" height="100">
+<div>This test passes if it doesn't crash</div>
+<div>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x</div>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+
+document.execCommand("selectAll");
+</script>
</ins></span></pre></div>
<a id="branchessafari61313branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.3-branch/Source/WebCore/ChangeLog (283289 => 283290)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.3-branch/Source/WebCore/ChangeLog  2021-09-30 00:55:27 UTC (rev 283289)
+++ branches/safari-613.1.3-branch/Source/WebCore/ChangeLog     2021-09-30 00:57:35 UTC (rev 283290)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2021-09-29  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283087. rdar://problem/83697121
+
+    Line iterator firstRun/lastRun may return runs from wrong lines
+    https://bugs.webkit.org/show_bug.cgi?id=230770
+    <rdar://problem/83509753>
+    
+    Reviewed by Alan Bujtas.
+    
+    Source/WebCore:
+    
+    In some situation line iterator firstRun/lastRun could return runs from different lines.
+    This could lead to inconsistencies like firstRun being non-null while lastRun is null.
+    
+    Test: editing/iterator-line-start-end.html
+    
+    * layout/integration/LayoutIntegrationLineIteratorModernPath.h:
+    (WebCore::LayoutIntegration::LineIteratorModernPath::firstRun const):
+    (WebCore::LayoutIntegration::LineIteratorModernPath::lastRun const):
+    
+    Take care to only return runs from this line.
+    
+    LayoutTests:
+    
+    * editing/iterator-line-start-end-expected.txt: Added.
+    * editing/iterator-line-start-end.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283087 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-26  Antti Koivisto  <antti@apple.com>
+
+            Line iterator firstRun/lastRun may return runs from wrong lines
+            https://bugs.webkit.org/show_bug.cgi?id=230770
+            <rdar://problem/83509753>
+
+            Reviewed by Alan Bujtas.
+
+            In some situation line iterator firstRun/lastRun could return runs from different lines.
+            This could lead to inconsistencies like firstRun being non-null while lastRun is null.
+
+            Test: editing/iterator-line-start-end.html
+
+            * layout/integration/LayoutIntegrationLineIteratorModernPath.h:
+            (WebCore::LayoutIntegration::LineIteratorModernPath::firstRun const):
+            (WebCore::LayoutIntegration::LineIteratorModernPath::lastRun const):
+
+            Take care to only return runs from this line.
+
</ins><span class="cx"> 2021-09-25  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix win build.
</span></span></pre></div>
<a id="branchessafari61313branchSourceWebCorelayoutintegrationLayoutIntegrationLineIteratorModernPathh"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.3-branch/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h (283289 => 283290)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.3-branch/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h       2021-09-30 00:55:27 UTC (rev 283289)
+++ branches/safari-613.1.3-branch/Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h  2021-09-30 00:57:35 UTC (rev 283290)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">             return { *m_inlineContent };
</span><span class="cx">         auto runIterator = RunIteratorModernPath { *m_inlineContent, line().firstBoxIndex() };
</span><span class="cx">         if (runIterator.box().isInlineBox())
</span><del>-            runIterator.traverseNextLeaf();
</del><ins>+            runIterator.traverseNextOnLine();
</ins><span class="cx">         return runIterator;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">             return { *m_inlineContent };
</span><span class="cx">         auto runIterator = RunIteratorModernPath { *m_inlineContent, line().firstBoxIndex() + boxCount - 1 };
</span><span class="cx">         if (runIterator.box().isInlineBox())
</span><del>-            runIterator.traversePreviousLeaf();
</del><ins>+            runIterator.traversePreviousOnLine();
</ins><span class="cx">         return runIterator;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>