<!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>[210985] 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/210985">210985</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-20 14:12:02 -0800 (Fri, 20 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Add support for non-breaking space character.
https://bugs.webkit.org/show_bug.cgi?id=167250
<rdar://problem/30119638>
Reviewed by Antti Koivisto.
Source/WebCore:
Do not bail out on noBreakSpace character.
The line breaking logic already takes noBreakSpace characters into account.
(except the peculiar "-webkit-nbsp-mode: space" mode)
Covered by existing test cases.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForText):
(WebCore::SimpleLineLayout::canUseForStyle):
(WebCore::SimpleLineLayout::printReason):
LayoutTests:
These are output progressions (they do not reflect changes in functionality).
* fast/block/float/br-with-clear-2-expected.txt:
* platform/mac/css1/text_properties/text_transform-expected.txt:
* platform/mac/tables/mozilla/bugs/bug4427-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastblockfloatbrwithclear2expectedtxt">trunk/LayoutTests/fast/block/float/br-with-clear-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccss1text_propertiestext_transformexpectedtxt">trunk/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmactablesmozillabugsbug4427expectedtxt">trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210984 => 210985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-20 22:07:28 UTC (rev 210984)
+++ trunk/LayoutTests/ChangeLog 2017-01-20 22:12:02 UTC (rev 210985)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-20 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Add support for non-breaking space character.
+ https://bugs.webkit.org/show_bug.cgi?id=167250
+ <rdar://problem/30119638>
+
+ Reviewed by Antti Koivisto.
+
+ These are output progressions (they do not reflect changes in functionality).
+
+ * fast/block/float/br-with-clear-2-expected.txt:
+ * platform/mac/css1/text_properties/text_transform-expected.txt:
+ * platform/mac/tables/mozilla/bugs/bug4427-expected.txt:
+
</ins><span class="cx"> 2017-01-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html as flaky on mac-wk1.
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockfloatbrwithclear2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/block/float/br-with-clear-2-expected.txt (210984 => 210985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/float/br-with-clear-2-expected.txt 2017-01-20 22:07:28 UTC (rev 210984)
+++ trunk/LayoutTests/fast/block/float/br-with-clear-2-expected.txt 2017-01-20 22:12:02 UTC (rev 210985)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> RenderBlock (floating) {DIV} at (0,0) size 50x50 [color=#FF0000] [bgcolor=#FFFFE0]
</span><span class="cx"> RenderText {#text} at (0,0) size 75x25
</span><span class="cx"> text run at (0,0) width 75: " A"
</span><del>- RenderBR {BR} at (0,0) size 0x0
</del><ins>+ RenderBR {BR} at (75,20) size 0x0
</ins><span class="cx"> RenderBR {BR} at (0,25) size 0x25
</span><span class="cx"> RenderText {#text} at (0,50) size 25x25
</span><span class="cx"> text run at (0,50) width 25: "B"
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> RenderBlock (floating) {DIV} at (0,0) size 50x50 [color=#FF0000] [bgcolor=#FFFFE0]
</span><span class="cx"> RenderText {#text} at (0,0) size 75x25
</span><span class="cx"> text run at (0,0) width 75: " A"
</span><del>- RenderBR {BR} at (0,0) size 0x0
</del><ins>+ RenderBR {BR} at (75,20) size 0x0
</ins><span class="cx"> RenderBR {BR} at (0,25) size 0x25
</span><span class="cx"> RenderText {#text} at (0,50) size 25x25
</span><span class="cx"> text run at (0,50) width 25: "B"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccss1text_propertiestext_transformexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.txt (210984 => 210985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.txt 2017-01-20 22:07:28 UTC (rev 210984)
+++ trunk/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.txt 2017-01-20 22:12:02 UTC (rev 210985)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> RenderBlock {P} at (4,56) size 747x54
</span><span class="cx"> RenderText {#text} at (0,0) size 724x54
</span><span class="cx"> text run at (0,0) width 724: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words"
</span><del>- text run at (0,18) width 719: "That Are In Uppercase In The Source (E.g. USA) Should Remain So. There Should Be A Capital Letter After A"
</del><ins>+ text run at (0,18) width 718: "That Are In Uppercase In The Source (E.g. USA) Should Remain So. There Should Be A Capital Letter After A"
</ins><span class="cx"> text run at (0,36) width 577: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence."
</span><span class="cx"> RenderBlock {P} at (4,126) size 747x36
</span><span class="cx"> RenderText {#text} at (0,0) size 743x36
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmactablesmozillabugsbug4427expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.txt (210984 => 210985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.txt 2017-01-20 22:07:28 UTC (rev 210984)
+++ trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.txt 2017-01-20 22:12:02 UTC (rev 210985)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> text run at (2,56) width 103: "San Francisco, "
</span><span class="cx"> text run at (104,56) width 31: "CA "
</span><span class="cx"> text run at (134,56) width 45: "94132 "
</span><del>- RenderBR {BR} at (0,0) size 0x0
</del><ins>+ RenderBR {BR} at (178,70) size 1x0
</ins><span class="cx"> RenderTableCell {TD} at (252,1) size 25x5 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
</span><span class="cx"> RenderImage {IMG} at (2,2) size 20x1
</span><span class="cx"> RenderTableCell {TD} at (277,1) size 148x38 [border: (1px inset #808080)] [r=0 c=3 rs=1 cs=1]
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RenderText {#text} at (2,56) size 75x18
</span><span class="cx"> text run at (2,56) width 31: "CA "
</span><span class="cx"> text run at (32,56) width 45: "00000 "
</span><del>- RenderBR {BR} at (0,0) size 0x0
</del><ins>+ RenderBR {BR} at (76,70) size 1x0
</ins><span class="cx"> RenderText {#text} at (2,74) size 100x18
</span><span class="cx"> text run at (2,74) width 100: "(000) 000-0000"
</span><span class="cx"> RenderTableCell {TD} at (252,102) size 25x5 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210984 => 210985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-20 22:07:28 UTC (rev 210984)
+++ trunk/Source/WebCore/ChangeLog 2017-01-20 22:12:02 UTC (rev 210985)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-20 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Add support for non-breaking space character.
+ https://bugs.webkit.org/show_bug.cgi?id=167250
+ <rdar://problem/30119638>
+
+ Reviewed by Antti Koivisto.
+
+ Do not bail out on noBreakSpace character.
+ The line breaking logic already takes noBreakSpace characters into account.
+ (except the peculiar "-webkit-nbsp-mode: space" mode)
+
+ Covered by existing test cases.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForText):
+ (WebCore::SimpleLineLayout::canUseForStyle):
+ (WebCore::SimpleLineLayout::printReason):
+
</ins><span class="cx"> 2017-01-20 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Animations should be off by default and enabled as an experimental feature
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (210984 => 210985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-20 22:07:28 UTC (rev 210984)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-20 22:12:02 UTC (rev 210985)
</span><span class="lines">@@ -76,27 +76,27 @@
</span><span class="cx"> FlowHasUnsupportedUnderlineDecoration = 1LLU << 11,
</span><span class="cx"> FlowHasJustifiedNonLatinText = 1LLU << 12,
</span><span class="cx"> FlowHasOverflowVisible = 1LLU << 13,
</span><del>- FlowIsNotLTR = 1LLU << 14,
- FlowHasLineBoxContainProperty = 1LLU << 15,
- FlowIsNotTopToBottom = 1LLU << 16,
- FlowHasLineBreak = 1LLU << 17,
- FlowHasNonNormalUnicodeBiDi = 1LLU << 18,
- FlowHasRTLOrdering = 1LLU << 19,
- FlowHasLineAlignEdges = 1LLU << 20,
- FlowHasLineSnap = 1LLU << 21,
- FlowHasHypensAuto = 1LLU << 22,
- FlowHasTextEmphasisFillOrMark = 1LLU << 23,
- FlowHasTextShadow = 1LLU << 24,
- FlowHasPseudoFirstLine = 1LLU << 25,
- FlowHasPseudoFirstLetter = 1LLU << 26,
- FlowHasTextCombine = 1LLU << 27,
- FlowHasTextFillBox = 1LLU << 28,
- FlowHasBorderFitLines = 1LLU << 29,
- FlowHasNonAutoLineBreak = 1LLU << 30,
- FlowHasNonAutoTrailingWord = 1LLU << 31,
- FlowHasSVGFont = 1LLU << 32,
- FlowTextIsEmpty = 1LLU << 33,
- FlowTextHasNoBreakSpace = 1LLU << 34,
</del><ins>+ FlowHasWebKitNBSPMode = 1LLU << 14,
+ FlowIsNotLTR = 1LLU << 15,
+ FlowHasLineBoxContainProperty = 1LLU << 16,
+ FlowIsNotTopToBottom = 1LLU << 17,
+ FlowHasLineBreak = 1LLU << 18,
+ FlowHasNonNormalUnicodeBiDi = 1LLU << 19,
+ FlowHasRTLOrdering = 1LLU << 20,
+ FlowHasLineAlignEdges = 1LLU << 21,
+ FlowHasLineSnap = 1LLU << 22,
+ FlowHasHypensAuto = 1LLU << 23,
+ FlowHasTextEmphasisFillOrMark = 1LLU << 24,
+ FlowHasTextShadow = 1LLU << 25,
+ FlowHasPseudoFirstLine = 1LLU << 26,
+ FlowHasPseudoFirstLetter = 1LLU << 27,
+ FlowHasTextCombine = 1LLU << 28,
+ FlowHasTextFillBox = 1LLU << 29,
+ FlowHasBorderFitLines = 1LLU << 30,
+ FlowHasNonAutoLineBreak = 1LLU << 31,
+ FlowHasNonAutoTrailingWord = 1LLU << 32,
+ FlowHasSVGFont = 1LLU << 33,
+ FlowTextIsEmpty = 1LLU << 34,
</ins><span class="cx"> FlowTextHasSoftHyphen = 1LLU << 35,
</span><span class="cx"> FlowTextHasDirectionCharacter = 1LLU << 36,
</span><span class="cx"> FlowIsMissingPrimaryFont = 1LLU << 37,
</span><span class="lines">@@ -156,9 +156,6 @@
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasJustifiedNonLatinText, reasons, includeReasons);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // These would be easy to support.
- if (character == noBreakSpace)
- SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasNoBreakSpace, reasons, includeReasons);
</del><span class="cx"> if (character == softHyphen)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasSoftHyphen, reasons, includeReasons);
</span><span class="cx">
</span><span class="lines">@@ -257,6 +254,8 @@
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasBorderFitLines, reasons, includeReasons);
</span><span class="cx"> if (style.lineBreak() != LineBreakAuto)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonAutoLineBreak, reasons, includeReasons);
</span><ins>+ if (style.nbspMode() != NBNORMAL)
+ SET_REASON_AND_RETURN_IF_NEEDED(FlowHasWebKitNBSPMode, reasons, includeReasons);
</ins><span class="cx"> #if ENABLE(CSS_TRAILING_WORD)
</span><span class="cx"> if (style.trailingWord() != TrailingWord::Auto)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonAutoTrailingWord, reasons, includeReasons);
</span><span class="lines">@@ -930,6 +929,9 @@
</span><span class="cx"> case FlowHasOverflowVisible:
</span><span class="cx"> stream << "overflow: visible";
</span><span class="cx"> break;
</span><ins>+ case FlowHasWebKitNBSPMode:
+ stream << "-webkit-nbsp-mode: space";
+ break;
</ins><span class="cx"> case FlowIsNotLTR:
</span><span class="cx"> stream << "dir is not LTR";
</span><span class="cx"> break;
</span><span class="lines">@@ -984,9 +986,6 @@
</span><span class="cx"> case FlowHasSVGFont:
</span><span class="cx"> stream << "SVG font";
</span><span class="cx"> break;
</span><del>- case FlowTextHasNoBreakSpace:
- stream << "No-break-space character";
- break;
</del><span class="cx"> case FlowTextHasSoftHyphen:
</span><span class="cx"> stream << "soft hyphen character";
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>