<!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>[194965] 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/194965">194965</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-01-13 09:08:35 -0800 (Wed, 13 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Add support for word-break property.
https://bugs.webkit.org/show_bug.cgi?id=153054
Reviewed by Antti Koivisto.
This patch enables word-break property for simple line layout.
(https://drafts.csswg.org/css-text-3/#propdef-word-break)
word-break: normal and keep-all -> existing, non-(force)breaking behaviour.
break-all -> breaks words when needed.
Covered by existing tests like fast/text/word-break.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::createLineRuns):
(WebCore::SimpleLineLayout::canUseForStyle): Deleted.
(WebCore::SimpleLineLayout::printReason): Deleted.
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::TextFragmentIterator::Style::Style):
(WebCore::SimpleLineLayout::TextFragmentIterator::findNextTextFragment):
* rendering/SimpleLineLayoutTextFragmentIterator.h:
(WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::TextFragment):
(WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::operator==):
(WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::isBreakable): Deleted.
(WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::split): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformeflfasttextwordbreakexpectedtxt">trunk/LayoutTests/platform/efl/fast/text/word-break-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkfasttextwordbreakexpectedtxt">trunk/LayoutTests/platform/gtk/fast/text/word-break-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfasttextwordbreakexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/text/word-break-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk1fasttextwordbreakexpectedtxt">trunk/LayoutTests/platform/ios-simulator-wk1/fast/text/word-break-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextwordbreakexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/word-break-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinfasttextwordbreakexpectedtxt">trunk/LayoutTests/platform/win/fast/text/word-break-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>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsplatformeflfasttextwordbreakexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/fast/text/word-break-expected.txt (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/fast/text/word-break-expected.txt 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/LayoutTests/platform/efl/fast/text/word-break-expected.txt 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> RenderBlock {PRE} at (0,171) size 110x25 [border: (5px solid #000000)]
</span><span class="cx"> RenderText {#text} at (5,5) size 448x15
</span><span class="cx"> text run at (5,5) width 448: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre."
</span><del>- text run at (453,5) width 0: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,209) size 769x72
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x17
</span><span class="cx"> RenderText {#text} at (0,18) size 760x53
</span><span class="lines">@@ -58,7 +57,6 @@
</span><span class="cx"> text run at (5,35) width 96: "brokenbutsho"
</span><span class="cx"> text run at (5,50) width 96: "uldstickouto"
</span><span class="cx"> text run at (5,65) width 64: "fthepre."
</span><del>- text run at (69,65) width 0: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,514) size 769x72
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x17
</span><span class="cx"> RenderText {#text} at (0,18) size 764x53
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkfasttextwordbreakexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/fast/text/word-break-expected.txt (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/fast/text/word-break-expected.txt 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/LayoutTests/platform/gtk/fast/text/word-break-expected.txt 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> RenderBlock {PRE} at (0,168) size 110x25 [border: (5px solid #000000)]
</span><span class="cx"> RenderText {#text} at (5,5) size 448x15
</span><span class="cx"> text run at (5,5) width 448: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre."
</span><del>- text run at (453,5) width 0: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,206) size 769x68
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x17
</span><span class="cx"> RenderText {#text} at (0,17) size 760x51
</span><span class="lines">@@ -58,7 +57,6 @@
</span><span class="cx"> text run at (5,35) width 96: "brokenbutsho"
</span><span class="cx"> text run at (5,50) width 96: "uldstickouto"
</span><span class="cx"> text run at (5,65) width 64: "fthepre."
</span><del>- text run at (69,65) width 0: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,506) size 769x68
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x17
</span><span class="cx"> RenderText {#text} at (0,17) size 764x51
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfasttextwordbreakexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/text/word-break-expected.txt (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/text/word-break-expected.txt 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/LayoutTests/platform/ios-simulator/fast/text/word-break-expected.txt 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> RenderBlock {PRE} at (0,171) size 110x24 [border: (5px solid #000000)]
</span><span class="cx"> RenderText {#text} at (5,5) size 437x14
</span><span class="cx"> text run at (5,5) width 437: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre."
</span><del>- text run at (441,5) width 1: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,208) size 784x80
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x19
</span><span class="cx"> RenderText {#text} at (0,20) size 774x59
</span><span class="lines">@@ -58,7 +57,6 @@
</span><span class="cx"> text run at (5,33) width 94: "brokenbutsho"
</span><span class="cx"> text run at (5,47) width 94: "uldstickouto"
</span><span class="cx"> text run at (5,61) width 63: "fthepre."
</span><del>- text run at (67,61) width 1: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,512) size 784x80
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x19
</span><span class="cx"> RenderText {#text} at (0,20) size 776x59
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk1fasttextwordbreakexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk1/fast/text/word-break-expected.txt (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk1/fast/text/word-break-expected.txt 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/LayoutTests/platform/ios-simulator-wk1/fast/text/word-break-expected.txt 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> RenderBlock {PRE} at (0,171) size 110x24 [border: (5px solid #000000)]
</span><span class="cx"> RenderText {#text} at (5,5) size 437x14
</span><span class="cx"> text run at (5,5) width 437: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre."
</span><del>- text run at (441,5) width 1: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,208) size 784x80
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x19
</span><span class="cx"> RenderText {#text} at (0,20) size 774x59
</span><span class="lines">@@ -58,7 +57,6 @@
</span><span class="cx"> text run at (5,33) width 94: "brokenbutsho"
</span><span class="cx"> text run at (5,47) width 94: "uldstickouto"
</span><span class="cx"> text run at (5,61) width 63: "fthepre."
</span><del>- text run at (67,61) width 1: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,512) size 784x80
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x19
</span><span class="cx"> RenderText {#text} at (0,20) size 776x59
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextwordbreakexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/word-break-expected.txt (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/word-break-expected.txt 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/LayoutTests/platform/mac/fast/text/word-break-expected.txt 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> RenderBlock {PRE} at (0,171) size 110x25 [border: (5px solid #000000)]
</span><span class="cx"> RenderText {#text} at (5,5) size 437x15
</span><span class="cx"> text run at (5,5) width 437: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre."
</span><del>- text run at (441,5) width 1: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,209) size 769x72
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x18
</span><span class="cx"> RenderText {#text} at (0,18) size 751x54
</span><span class="lines">@@ -58,7 +57,6 @@
</span><span class="cx"> text run at (5,35) width 94: "brokenbutsho"
</span><span class="cx"> text run at (5,50) width 94: "uldstickouto"
</span><span class="cx"> text run at (5,65) width 63: "fthepre."
</span><del>- text run at (67,65) width 1: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,514) size 769x72
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x18
</span><span class="cx"> RenderText {#text} at (0,18) size 750x54
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinfasttextwordbreakexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/fast/text/word-break-expected.txt (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/fast/text/word-break-expected.txt 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/LayoutTests/platform/win/fast/text/word-break-expected.txt 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> RenderBlock {PRE} at (0,171) size 110x25 [border: (5px solid #000000)]
</span><span class="cx"> RenderText {#text} at (5,5) size 448x15
</span><span class="cx"> text run at (5,5) width 448: "Thislongwordshouldnotgetbrokenbutshouldstickoutofthepre."
</span><del>- text run at (453,5) width 0: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,209) size 769x72
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x18
</span><span class="cx"> RenderText {#text} at (0,18) size 760x54
</span><span class="lines">@@ -58,7 +57,6 @@
</span><span class="cx"> text run at (5,35) width 96: "brokenbutsho"
</span><span class="cx"> text run at (5,50) width 96: "uldstickouto"
</span><span class="cx"> text run at (5,65) width 64: "fthepre."
</span><del>- text run at (69,65) width 0: " "
</del><span class="cx"> RenderBlock (anonymous) at (0,514) size 769x72
</span><span class="cx"> RenderBR {BR} at (0,0) size 0x18
</span><span class="cx"> RenderText {#text} at (0,18) size 764x54
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/Source/WebCore/ChangeLog 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-01-13 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Add support for word-break property.
+ https://bugs.webkit.org/show_bug.cgi?id=153054
+
+ Reviewed by Antti Koivisto.
+
+ This patch enables word-break property for simple line layout.
+ (https://drafts.csswg.org/css-text-3/#propdef-word-break)
+
+ word-break: normal and keep-all -> existing, non-(force)breaking behaviour.
+ break-all -> breaks words when needed.
+
+ Covered by existing tests like fast/text/word-break.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::createLineRuns):
+ (WebCore::SimpleLineLayout::canUseForStyle): Deleted.
+ (WebCore::SimpleLineLayout::printReason): Deleted.
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::Style::Style):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::findNextTextFragment):
+ * rendering/SimpleLineLayoutTextFragmentIterator.h:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::TextFragment):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::operator==):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::isBreakable): Deleted.
+ (WebCore::SimpleLineLayout::TextFragmentIterator::TextFragment::split): Deleted.
+
</ins><span class="cx"> 2016-01-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Reference cycle between SVGPathElement and SVGPathSegWithContext leaks Document
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -80,39 +80,38 @@
</span><span class="cx"> FlowHasLineBoxContainProperty = 1LLU << 15,
</span><span class="cx"> FlowIsNotTopToBottom = 1LLU << 16,
</span><span class="cx"> FlowHasLineBreak = 1LLU << 17,
</span><del>- FlowHasWordBreak = 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,
- FlowTextHasNoBreakSpace = 1LLU << 35,
- FlowTextHasSoftHyphen = 1LLU << 36,
- FlowTextHasDirectionCharacter = 1LLU << 37,
- FlowIsMissingPrimaryFont = 1LLU << 38,
- FlowFontIsMissingGlyph = 1LLU << 39,
- FlowTextIsCombineText = 1LLU << 40,
- FlowTextIsRenderCounter = 1LLU << 41,
- FlowTextIsRenderQuote = 1LLU << 42,
- FlowTextIsTextFragment = 1LLU << 43,
- FlowTextIsSVGInlineText = 1LLU << 44,
- FlowFontIsNotSimple = 1LLU << 45,
- FeatureIsDisabled = 1LLU << 46,
- FlowHasNoParent = 1LLU << 47,
- FlowHasNoChild = 1LLU << 48,
- FlowChildIsSelected = 1LLU << 49,
- EndOfReasons = 1LLU << 50
</del><ins>+ 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,
+ FlowTextHasSoftHyphen = 1LLU << 35,
+ FlowTextHasDirectionCharacter = 1LLU << 36,
+ FlowIsMissingPrimaryFont = 1LLU << 37,
+ FlowFontIsMissingGlyph = 1LLU << 38,
+ FlowTextIsCombineText = 1LLU << 39,
+ FlowTextIsRenderCounter = 1LLU << 40,
+ FlowTextIsRenderQuote = 1LLU << 41,
+ FlowTextIsTextFragment = 1LLU << 42,
+ FlowTextIsSVGInlineText = 1LLU << 43,
+ FlowFontIsNotSimple = 1LLU << 44,
+ FeatureIsDisabled = 1LLU << 45,
+ FlowHasNoParent = 1LLU << 46,
+ FlowHasNoChild = 1LLU << 47,
+ FlowChildIsSelected = 1LLU << 48,
+ EndOfReasons = 1LLU << 49
</ins><span class="cx"> };
</span><span class="cx"> const unsigned NoReason = 0;
</span><span class="cx">
</span><span class="lines">@@ -226,8 +225,6 @@
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowIsNotTopToBottom, reasons, includeReasons);
</span><span class="cx"> if (style.lineBreak() != LineBreakAuto)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasLineBreak, reasons, includeReasons);
</span><del>- if (style.wordBreak() != NormalWordBreak)
- SET_REASON_AND_RETURN_IF_NEEDED(FlowHasWordBreak, reasons, includeReasons);
</del><span class="cx"> if (style.unicodeBidi() != UBNormal)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonNormalUnicodeBiDi, reasons, includeReasons);
</span><span class="cx"> if (style.rtlOrdering() != LogicalOrder)
</span><span class="lines">@@ -660,7 +657,7 @@
</span><span class="cx"> {
</span><span class="cx"> const auto& style = textFragmentIterator.style();
</span><span class="cx"> line.setCollapedWhitespaceWidth(style.spaceWidth + style.wordSpacing);
</span><del>- bool lineCanBeWrapped = style.wrapLines || style.breakWordOnOverflow;
</del><ins>+ bool lineCanBeWrapped = style.wrapLines || style.breakFirstWordOnOverflow || style.breakAnyWordOnOverflow;
</ins><span class="cx"> auto fragment = firstFragment(textFragmentIterator, line, previousLine, runs);
</span><span class="cx"> while (fragment.type() != TextFragmentIterator::TextFragment::ContentEnd) {
</span><span class="cx"> // Hard linebreak.
</span><span class="lines">@@ -678,7 +675,8 @@
</span><span class="cx"> // 1. Whitesapce collapse on: whitespace is skipped. Jump to next line.
</span><span class="cx"> // 2. Whitespace collapse off: whitespace is wrapped.
</span><span class="cx"> // 3. First, non-whitespace fragment is either wrapped or kept on the line. (depends on overflow-wrap)
</span><del>- // 4. Non-whitespace fragment when there's already another fragment on the line gets pushed to the next line.
</del><ins>+ // 5. Non-whitespace fragment when there's already another fragment on the line either gets wrapped (word-break: break-all)
+ // or gets pushed to the next line.
</ins><span class="cx"> bool emptyLine = line.isEmpty();
</span><span class="cx"> // Whitespace fragment.
</span><span class="cx"> if (fragment.type() == TextFragmentIterator::TextFragment::Whitespace) {
</span><span class="lines">@@ -691,7 +689,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> // Non-whitespace fragment. (!style.wrapLines: bug138102(preserve existing behavior)
</span><del>- if ((emptyLine && style.breakWordOnOverflow) || !style.wrapLines) {
</del><ins>+ if (((emptyLine && style.breakFirstWordOnOverflow) || style.breakAnyWordOnOverflow) || !style.wrapLines) {
</ins><span class="cx"> // Split the fragment; (modified)fragment stays on this line, overflowedFragment is pushed to next line.
</span><span class="cx"> line.setOverflowedFragment(splitFragmentToFitLine(fragment, line.availableWidth() - line.width(), emptyLine, textFragmentIterator));
</span><span class="cx"> line.appendFragmentAndCreateRunIfNeeded(fragment, runs);
</span><span class="lines">@@ -841,9 +839,6 @@
</span><span class="cx"> case FlowHasLineBreak:
</span><span class="cx"> stream << "line-break property";
</span><span class="cx"> break;
</span><del>- case FlowHasWordBreak:
- stream << "word-break property";
- break;
</del><span class="cx"> case FlowHasNonNormalUnicodeBiDi:
</span><span class="cx"> stream << "non-normal Unicode bidi";
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -39,7 +39,8 @@
</span><span class="cx"> , collapseWhitespace(style.collapseWhiteSpace())
</span><span class="cx"> , preserveNewline(style.preserveNewline())
</span><span class="cx"> , wrapLines(style.autoWrap())
</span><del>- , breakWordOnOverflow(style.overflowWrap() == BreakOverflowWrap && (wrapLines || preserveNewline))
</del><ins>+ , breakAnyWordOnOverflow(style.wordBreak() == BreakAllWordBreak && wrapLines)
+ , breakFirstWordOnOverflow(breakAnyWordOnOverflow || (style.breakWords() && (wrapLines || preserveNewline)))
</ins><span class="cx"> , spaceWidth(font.width(TextRun(StringView(&space, 1))))
</span><span class="cx"> , wordSpacing(font.wordSpacing())
</span><span class="cx"> , tabWidth(collapseWhitespace ? 0 : style.tabSize())
</span><span class="lines">@@ -90,13 +91,12 @@
</span><span class="cx"> if (startPosition < endPosition) {
</span><span class="cx"> bool multipleWhitespace = startPosition + 1 < endPosition;
</span><span class="cx"> bool isCollapsed = multipleWhitespace && m_style.collapseWhitespace;
</span><del>- bool isBreakable = !isCollapsed && multipleWhitespace;
</del><span class="cx"> m_position = endPosition;
</span><del>- return TextFragment(startPosition, endPosition, width, TextFragment::Whitespace, endPosition == segmentEndPosition, false, isCollapsed, m_style.collapseWhitespace, isBreakable);
</del><ins>+ return TextFragment(startPosition, endPosition, width, TextFragment::Whitespace, endPosition == segmentEndPosition, false, isCollapsed, m_style.collapseWhitespace);
</ins><span class="cx"> }
</span><span class="cx"> endPosition = skipToNextPosition(PositionType::Breakable, startPosition, width, xPosition, overlappingFragment);
</span><span class="cx"> m_position = endPosition;
</span><del>- return TextFragment(startPosition, endPosition, width, TextFragment::NonWhitespace, endPosition == segmentEndPosition, overlappingFragment, false, false, m_style.breakWordOnOverflow);
</del><ins>+ return TextFragment(startPosition, endPosition, width, TextFragment::NonWhitespace, endPosition == segmentEndPosition, overlappingFragment, false, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextFragmentIterator::revertToEndOfFragment(const TextFragment& fragment)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h (194964 => 194965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2016-01-13 17:04:36 UTC (rev 194964)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2016-01-13 17:08:35 UTC (rev 194965)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> public:
</span><span class="cx"> enum Type { ContentEnd, SoftLineBreak, HardLineBreak, Whitespace, NonWhitespace };
</span><span class="cx"> TextFragment() = default;
</span><del>- TextFragment(unsigned start, unsigned end, float width, Type type, bool isLastInRenderer = false, bool overlapsToNextRenderer = false, bool isCollapsed = false, bool isCollapsible = false, bool isBreakable = false)
</del><ins>+ TextFragment(unsigned start, unsigned end, float width, Type type, bool isLastInRenderer = false, bool overlapsToNextRenderer = false, bool isCollapsed = false, bool isCollapsible = false)
</ins><span class="cx"> : m_start(start)
</span><span class="cx"> , m_end(end)
</span><span class="cx"> , m_width(width)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> , m_overlapsToNextRenderer(overlapsToNextRenderer)
</span><span class="cx"> , m_isCollapsed(isCollapsed)
</span><span class="cx"> , m_isCollapsible(isCollapsible)
</span><del>- , m_isBreakable(isBreakable)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,7 +65,6 @@
</span><span class="cx"> bool isLineBreak() const { return m_type == SoftLineBreak || m_type == HardLineBreak; }
</span><span class="cx"> bool isCollapsed() const { return m_isCollapsed; }
</span><span class="cx"> bool isCollapsible() const { return m_isCollapsible; }
</span><del>- bool isBreakable() const { return m_isBreakable; }
</del><span class="cx">
</span><span class="cx"> bool isEmpty() const { return start() == end() && !isLineBreak(); }
</span><span class="cx"> TextFragment split(unsigned splitPosition, const TextFragmentIterator&);
</span><span class="lines">@@ -79,8 +77,7 @@
</span><span class="cx"> && m_isLastInRenderer == other.m_isLastInRenderer
</span><span class="cx"> && m_overlapsToNextRenderer == other.m_overlapsToNextRenderer
</span><span class="cx"> && m_isCollapsed == other.m_isCollapsed
</span><del>- && m_isCollapsible == other.m_isCollapsible
- && m_isBreakable == other.m_isBreakable;
</del><ins>+ && m_isCollapsible == other.m_isCollapsible;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -92,7 +89,6 @@
</span><span class="cx"> bool m_overlapsToNextRenderer { false };
</span><span class="cx"> bool m_isCollapsed { false };
</span><span class="cx"> bool m_isCollapsible { false };
</span><del>- bool m_isBreakable { false };
</del><span class="cx"> };
</span><span class="cx"> TextFragment nextTextFragment(float xPosition = 0);
</span><span class="cx"> void revertToEndOfFragment(const TextFragment&);
</span><span class="lines">@@ -106,7 +102,8 @@
</span><span class="cx"> bool collapseWhitespace;
</span><span class="cx"> bool preserveNewline;
</span><span class="cx"> bool wrapLines;
</span><del>- bool breakWordOnOverflow;
</del><ins>+ bool breakAnyWordOnOverflow;
+ bool breakFirstWordOnOverflow;
</ins><span class="cx"> float spaceWidth;
</span><span class="cx"> float wordSpacing;
</span><span class="cx"> unsigned tabWidth;
</span><span class="lines">@@ -142,7 +139,6 @@
</span><span class="cx"> if (fragment.start() + 1 > fragment.end())
</span><span class="cx"> return;
</span><span class="cx"> fragment.m_isCollapsed = false;
</span><del>- fragment.m_isBreakable = false;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> TextFragment newFragment(*this);
</span></span></pre>
</div>
</div>
</body>
</html>