<!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>[281314] 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/281314">281314</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-20 08:24:44 -0700 (Fri, 20 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/281307">r281307</a>.
https://bugs.webkit.org/show_bug.cgi?id=229336

broke layout tests

Reverted changeset:

"[IFC][Integration] Enable non-auto line-break values"
https://bugs.webkit.org/show_bug.cgi?id=228842
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/281307">r281307</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttexttrailingwhitespaceexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationCoveragecpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationCoverageh">trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (281313 => 281314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/LayoutTests/ChangeLog 2021-08-20 15:24:44 UTC (rev 281314)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-08-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r281307.
+        https://bugs.webkit.org/show_bug.cgi?id=229336
+
+        broke layout tests
+
+        Reverted changeset:
+
+        "[IFC][Integration] Enable non-auto line-break values"
+        https://bugs.webkit.org/show_bug.cgi?id=228842
+        https://commits.webkit.org/r281307
+
</ins><span class="cx"> 2021-08-20  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][Integration] Enable full underline support
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (281313 => 281314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/LayoutTests/TestExpectations  2021-08-20 15:24:44 UTC (rev 281314)
</span><span class="lines">@@ -4377,7 +4377,9 @@
</span><span class="cx"> webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-010.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-001.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-002.html [ ImageOnlyFailure ]
</span><ins>+webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-002.html [ ImageOnlyFailure ]
</ins><span class="cx"> webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-shaping-001.html [ ImageOnlyFailure ]
</span><ins>+webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-002.html [ ImageOnlyFailure ]
</ins><span class="cx"> webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-014.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-016.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-017.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttexttrailingwhitespaceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt (281313 => 281314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt       2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt  2021-08-20 15:24:44 UTC (rev 281314)
</span><span class="lines">@@ -4,20 +4,24 @@
</span><span class="cx">   RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx">     RenderBody {BODY} at (8,8) size 784x584
</span><span class="cx">       RenderBlock (floating) {DIV} at (8,8) size 200x46 [bgcolor=#FFFFE0]
</span><del>-        RenderText {#text} at (0,0) size 185x46
</del><ins>+        RenderText {#text} at (0,0) size 191x46
</ins><span class="cx">           text run at (0,0) width 185: "Lorem ipsum dolor"
</span><ins>+          text run at (184,0) width 7: " "
</ins><span class="cx">           text run at (0,23) width 79: "sit amet"
</span><span class="cx">       RenderBlock (floating) {DIV} at (224,8) size 200x46 [bgcolor=#FFFFE0]
</span><del>-        RenderText {#text} at (7,0) size 186x46
</del><ins>+        RenderText {#text} at (7,0) size 192x46
</ins><span class="cx">           text run at (7,0) width 186: "Lorem ipsum dolor"
</span><ins>+          text run at (192,0) width 7: " "
</ins><span class="cx">           text run at (60,23) width 80: "sit amet"
</span><span class="cx">       RenderBlock (floating) {DIV} at (440,8) size 200x46 [bgcolor=#FFFFE0]
</span><span class="cx">         RenderText {#text} at (15,0) size 185x46
</span><span class="cx">           text run at (15,0) width 185: "Lorem ipsum dolor"
</span><ins>+          text run at (200,0) width 0: " "
</ins><span class="cx">           text run at (121,23) width 79: "sit amet"
</span><span class="cx">       RenderBlock (floating) {DIV} at (8,70) size 200x46 [bgcolor=#FFFFE0]
</span><span class="cx">         RenderText {#text} at (0,0) size 200x46
</span><span class="cx">           text run at (0,0) width 200: "Lorem ipsum dolor"
</span><ins>+          text run at (200,0) width 0: " "
</ins><span class="cx">           text run at (0,23) width 79: "sit amet"
</span><span class="cx">       RenderBlock (floating) {DIV} at (224,70) size 200x46 [bgcolor=#FFFFE0]
</span><span class="cx">         RenderText {#text} at (0,0) size 185x46
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281313 => 281314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/Source/WebCore/ChangeLog      2021-08-20 15:24:44 UTC (rev 281314)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-08-20  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r281307.
+        https://bugs.webkit.org/show_bug.cgi?id=229336
+
+        broke layout tests
+
+        Reverted changeset:
+
+        "[IFC][Integration] Enable non-auto line-break values"
+        https://bugs.webkit.org/show_bug.cgi?id=228842
+        https://commits.webkit.org/r281307
+
</ins><span class="cx"> 2021-08-20  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [IFC] Undo incorrect InlineTextBox -> LegacyInlineTextBox renaming
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationCoveragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (281313 => 281314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp    2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp       2021-08-20 15:24:44 UTC (rev 281314)
</span><span class="lines">@@ -168,6 +168,9 @@
</span><span class="cx">     case AvoidanceReason::FlowHasBorderFitLines:
</span><span class="cx">         stream << "-webkit-border-fit";
</span><span class="cx">         break;
</span><ins>+    case AvoidanceReason::FlowHasNonAutoLineBreak:
+        stream << "line-break is not auto";
+        break;
</ins><span class="cx">     case AvoidanceReason::FlowHasTextSecurity:
</span><span class="cx">         stream << "text-security is not none";
</span><span class="cx">         break;
</span><span class="lines">@@ -568,6 +571,8 @@
</span><span class="cx">         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasTextFillBox, reasons, includeReasons);
</span><span class="cx">     if (style.borderFit() == BorderFit::Lines)
</span><span class="cx">         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasBorderFitLines, reasons, includeReasons);
</span><ins>+    if (style.lineBreak() != LineBreak::Auto)
+        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonAutoLineBreak, reasons, includeReasons);
</ins><span class="cx">     // Special handling of text-security:disc is not yet implemented in the simple line layout code path.
</span><span class="cx">     // See RenderBlock::updateSecurityDiscCharacters.
</span><span class="cx">     if (style.textSecurity() != TextSecurity::None)
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationCoverageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h (281313 => 281314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h      2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-08-20 15:24:44 UTC (rev 281314)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     FlowHasTextCombine                           = 1LLU  << 26,
</span><span class="cx">     FlowHasTextFillBox                           = 1LLU  << 27,
</span><span class="cx">     FlowHasBorderFitLines                        = 1LLU  << 28,
</span><del>-    // Unused                                    = 1LLU  << 29,
</del><ins>+    FlowHasNonAutoLineBreak                      = 1LLU  << 29,
</ins><span class="cx">     FlowHasTextSecurity                          = 1LLU  << 30,
</span><span class="cx">     FlowHasSVGFont                               = 1LLU  << 31,
</span><span class="cx">     FlowTextHasDirectionCharacter                = 1LLU  << 32,
</span></span></pre>
</div>
</div>

</body>
</html>