<!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>[185729] 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/185729">185729</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-06-18 16:59:19 -0700 (Thu, 18 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS3] Add support for the word-break:keep-all CSS property
https://bugs.webkit.org/show_bug.cgi?id=123782
Reviewed by Darin Adler.
Source/WebCore:
Add support for word-break:keep-all CSS property by CSS3 spec:
http://www.w3.org/TR/2013/WD-css-text-3-20131010/#word-break-property
Test: fast/text/word-break-keep-all.html
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EWordBreak):
* css/CSSValueKeywords.in:
* rendering/RenderText.cpp:
(WebCore::RenderText::computePreferredLogicalWidths):
* rendering/break_lines.h:
(WebCore::nextBreakablePositionKeepingAllWords):
(WebCore::nextBreakablePositionKeepingAllWordsIgnoringNBSP):
(WebCore::isBreakable):
* rendering/line/BreakingContext.h:
(WebCore::BreakingContext::handleText):
(WebCore::BreakingContext::optimalLineBreakLocationForTrailingWord):
* rendering/style/RenderStyleConstants.h:
LayoutTests:
* fast/text/word-break-keep-all.html: Added.
* platform/mac/fast/text/word-break-keep-all-expected.png: Added.
* platform/mac/fast/text/word-break-keep-all-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingbreak_linesh">trunk/Source/WebCore/rendering/break_lines.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContexth">trunk/Source/WebCore/rendering/line/BreakingContext.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextwordbreakkeepallexpectedhtml">trunk/LayoutTests/fast/text/word-break-keep-all-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextwordbreakkeepallhtml">trunk/LayoutTests/fast/text/word-break-keep-all.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/LayoutTests/ChangeLog 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-18 KyungTae Kim <ktf.kim@samsung.com> and Myles C. Maxfield <mmaxfield@apple.com>
+
+ [CSS3] Add support for the word-break:keep-all CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=123782
+
+ Reviewed by Darin Adler.
+
+ * fast/text/word-break-keep-all.html: Added.
+ * platform/mac/fast/text/word-break-keep-all-expected.png: Added.
+ * platform/mac/fast/text/word-break-keep-all-expected.txt: Added.
+
</ins><span class="cx"> 2015-06-18 Conrad Shultz <conrad_shultz@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: js/dom/navigator-plugins-crash.html asserts a lot
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextwordbreakkeepallexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/word-break-keep-all-expected.html (0 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/word-break-keep-all-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/word-break-keep-all-expected.html 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style>
+div{width:150px;border:2px solid black;}
+</style>
+</head>
+<body>
+This test checks whether word-break:keep-all keeps the words
+
+<p>On the next line, lines should break between any two Korean syllables (word-break: normal)</p>
+<div style="word-break: normal;">각 줄의 마지막에 한글이 올 때 줄 나눔 기준을 글자 또는 어절 단위로 한다.</div>
+
+<p>On the next line, lines should break only at spaces like English (word-break: keep-all)<p>
+<div style="word-break: keep-all;">각 줄의 마지막에<br>한글이 올 때 줄 나눔<br>기준을 글자 또는<br>어절 단위로 한다.</div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextwordbreakkeepallhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/word-break-keep-all.html (0 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/word-break-keep-all.html (rev 0)
+++ trunk/LayoutTests/fast/text/word-break-keep-all.html 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style>
+div{width:150px;border:2px solid black;}
+</style>
+</head>
+<body>
+This test checks whether word-break:keep-all keeps the words
+
+<p>On the next line, lines should break between any two Korean syllables (word-break: normal)</p>
+<div style="word-break: normal;">각 줄의 마지막에 한글이 올 때 줄 나눔 기준을 글자 또는 어절 단위로 한다.</div>
+
+<p>On the next line, lines should break only at spaces like English (word-break: keep-all)<p>
+<div style="word-break: keep-all;">각 줄의 마지막에 한글이 올 때 줄 나눔 기준을 글자 또는 어절 단위로 한다.</div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/ChangeLog 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-06-18 KyungTae Kim <ktf.kim@samsung.com> and Myles C. Maxfield <mmaxfield@apple.com>
+
+ [CSS3] Add support for the word-break:keep-all CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=123782
+
+ Reviewed by Darin Adler.
+
+ Add support for word-break:keep-all CSS property by CSS3 spec:
+ http://www.w3.org/TR/2013/WD-css-text-3-20131010/#word-break-property
+
+ Test: fast/text/word-break-keep-all.html
+
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator EWordBreak):
+ * css/CSSValueKeywords.in:
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::computePreferredLogicalWidths):
+ * rendering/break_lines.h:
+ (WebCore::nextBreakablePositionKeepingAllWords):
+ (WebCore::nextBreakablePositionKeepingAllWordsIgnoringNBSP):
+ (WebCore::isBreakable):
+ * rendering/line/BreakingContext.h:
+ (WebCore::BreakingContext::handleText):
+ (WebCore::BreakingContext::optimalLineBreakLocationForTrailingWord):
+ * rendering/style/RenderStyleConstants.h:
+
</ins><span class="cx"> 2015-06-18 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Update AVKit usage of pip
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -1029,8 +1029,8 @@
</span><span class="cx"> if (valueID == CSSValueNormal || valueID == CSSValuePre || valueID == CSSValuePreWrap || valueID == CSSValuePreLine || valueID == CSSValueNowrap)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWordBreak: // normal | break-all | break-word (this is a custom extension)
- if (valueID == CSSValueNormal || valueID == CSSValueBreakAll || valueID == CSSValueBreakWord)
</del><ins>+ case CSSPropertyWordBreak: // normal | break-all | keep-all | break-word (this is a custom extension)
+ if (valueID == CSSValueNormal || valueID == CSSValueBreakAll || valueID == CSSValueKeepAll || valueID == CSSValueBreakWord)
</ins><span class="cx"> return true;
</span><span class="cx"> break;
</span><span class="cx"> #if ENABLE(CSS_TRAILING_WORD)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -3010,6 +3010,9 @@
</span><span class="cx"> case BreakAllWordBreak:
</span><span class="cx"> m_value.valueID = CSSValueBreakAll;
</span><span class="cx"> break;
</span><ins>+ case KeepAllWordBreak:
+ m_value.valueID = CSSValueKeepAll;
+ break;
</ins><span class="cx"> case BreakWordBreak:
</span><span class="cx"> m_value.valueID = CSSValueBreakWord;
</span><span class="cx"> break;
</span><span class="lines">@@ -3023,6 +3026,8 @@
</span><span class="cx"> switch (m_value.valueID) {
</span><span class="cx"> case CSSValueBreakAll:
</span><span class="cx"> return BreakAllWordBreak;
</span><ins>+ case CSSValueKeepAll:
+ return KeepAllWordBreak;
</ins><span class="cx"> case CSSValueBreakWord:
</span><span class="cx"> return BreakWordBreak;
</span><span class="cx"> case CSSValueNormal:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -680,6 +680,7 @@
</span><span class="cx"> // CSS_PROP_WORD_BREAK
</span><span class="cx"> //
</span><span class="cx"> break-all
</span><ins>+keep-all
</ins><span class="cx">
</span><span class="cx"> //
</span><span class="cx"> // CSS_PROP_WORD_WRAP
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -738,6 +738,7 @@
</span><span class="cx">
</span><span class="cx"> bool breakNBSP = style.autoWrap() && style.nbspMode() == SPACE;
</span><span class="cx"> bool breakAll = (style.wordBreak() == BreakAllWordBreak || style.wordBreak() == BreakWordBreak) && style.autoWrap();
</span><ins>+ bool keepAllWords = style.wordBreak() == KeepAllWordBreak;
</ins><span class="cx"> bool isLooseCJKMode = breakIterator.isLooseCJKMode();
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < len; i++) {
</span><span class="lines">@@ -783,7 +784,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool hasBreak = breakAll || isBreakable(breakIterator, i, nextBreakable, breakNBSP, isLooseCJKMode);
</del><ins>+ bool hasBreak = breakAll || isBreakable(breakIterator, i, nextBreakable, breakNBSP, isLooseCJKMode, keepAllWords);
</ins><span class="cx"> bool betweenWords = true;
</span><span class="cx"> int j = i;
</span><span class="cx"> while (c != '\n' && !isSpaceAccordingToStyle(c, style) && c != '\t' && (c != softHyphen || style.hyphens() == HyphensNone)) {
</span><span class="lines">@@ -791,7 +792,7 @@
</span><span class="cx"> if (j == len)
</span><span class="cx"> break;
</span><span class="cx"> c = uncheckedCharacterAt(j);
</span><del>- if (isBreakable(breakIterator, j, nextBreakable, breakNBSP, isLooseCJKMode) && characterAt(j - 1) != softHyphen)
</del><ins>+ if (isBreakable(breakIterator, j, nextBreakable, breakNBSP, isLooseCJKMode, keepAllWords) && characterAt(j - 1) != softHyphen)
</ins><span class="cx"> break;
</span><span class="cx"> if (breakAll) {
</span><span class="cx"> betweenWords = false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingbreak_linesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/break_lines.h (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/break_lines.h 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/rendering/break_lines.h 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -161,14 +161,40 @@
</span><span class="cx"> return len;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline int nextBreakablePosition(LazyLineBreakIterator& lazyBreakIterator, int pos)
</del><ins>+template<typename CharacterType, NBSPBehavior nbspBehavior>
+inline unsigned nextBreakablePositionKeepingAllWords(const CharacterType* string, unsigned length, unsigned startPosition)
</ins><span class="cx"> {
</span><ins>+ for (unsigned i = startPosition; i < length; i++) {
+ if (isBreakableSpace<nbspBehavior>(string[i]))
+ return i;
+ }
+ return length;
+}
+
+inline unsigned nextBreakablePositionKeepingAllWords(LazyLineBreakIterator& lazyBreakIterator, int startPosition)
+{
</ins><span class="cx"> String string = lazyBreakIterator.string();
</span><span class="cx"> if (string.is8Bit())
</span><del>- return nextBreakablePositionNonLoosely<LChar, NBSPBehavior::TreatNBSPAsBreak>(lazyBreakIterator, string.characters8(), string.length(), pos);
- return nextBreakablePositionNonLoosely<UChar, NBSPBehavior::TreatNBSPAsBreak>(lazyBreakIterator, string.characters16(), string.length(), pos);
</del><ins>+ return nextBreakablePositionKeepingAllWords<LChar, NBSPBehavior::TreatNBSPAsBreak>(string.characters8(), string.length(), startPosition);
+ return nextBreakablePositionKeepingAllWords<UChar, NBSPBehavior::TreatNBSPAsBreak>(string.characters16(), string.length(), startPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+inline unsigned nextBreakablePositionKeepingAllWordsIgnoringNBSP(LazyLineBreakIterator& iterator, int startPosition)
+{
+ String string = iterator.string();
+ if (string.is8Bit())
+ return nextBreakablePositionKeepingAllWords<LChar, NBSPBehavior::IgnoreNBSP>(string.characters8(), string.length(), startPosition);
+ return nextBreakablePositionKeepingAllWords<UChar, NBSPBehavior::IgnoreNBSP>(string.characters16(), string.length(), startPosition);
+}
+
+inline int nextBreakablePosition(LazyLineBreakIterator& iterator, int pos)
+{
+ String string = iterator.string();
+ if (string.is8Bit())
+ return nextBreakablePositionNonLoosely<LChar, NBSPBehavior::TreatNBSPAsBreak>(iterator, string.characters8(), string.length(), pos);
+ return nextBreakablePositionNonLoosely<UChar, NBSPBehavior::TreatNBSPAsBreak>(iterator, string.characters16(), string.length(), pos);
+}
+
</ins><span class="cx"> inline int nextBreakablePositionIgnoringNBSP(LazyLineBreakIterator& lazyBreakIterator, int pos)
</span><span class="cx"> {
</span><span class="cx"> String string = lazyBreakIterator.string();
</span><span class="lines">@@ -193,13 +219,18 @@
</span><span class="cx"> return nextBreakablePositionLoosely<UChar, NBSPBehavior::IgnoreNBSP>(lazyBreakIterator, string.characters16(), string.length(), pos);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isBreakable(LazyLineBreakIterator& lazyBreakIterator, int pos, int& nextBreakable, bool breakNBSP, bool isLooseMode)
</del><ins>+inline bool isBreakable(LazyLineBreakIterator& lazyBreakIterator, int pos, int& nextBreakable, bool breakNBSP, bool isLooseMode, bool keepAllWords)
</ins><span class="cx"> {
</span><span class="cx"> if (pos <= nextBreakable)
</span><span class="cx"> return pos == nextBreakable;
</span><span class="cx">
</span><del>- if (isLooseMode) {
</del><ins>+ if (keepAllWords) {
</ins><span class="cx"> if (breakNBSP)
</span><ins>+ nextBreakable = static_cast<int>(nextBreakablePositionKeepingAllWords(lazyBreakIterator, pos));
+ else
+ nextBreakable = static_cast<int>(nextBreakablePositionKeepingAllWordsIgnoringNBSP(lazyBreakIterator, pos));
+ } else if (isLooseMode) {
+ if (breakNBSP)
</ins><span class="cx"> nextBreakable = nextBreakablePositionLoose(lazyBreakIterator, pos);
</span><span class="cx"> else
</span><span class="cx"> nextBreakable = nextBreakablePositionIgnoringNBSPLoose(lazyBreakIterator, pos);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContext.h (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContext.h 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/rendering/line/BreakingContext.h 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -744,6 +744,7 @@
</span><span class="cx"> bool breakWords = m_currentStyle->breakWords() && ((m_autoWrap && !m_width.committedWidth()) || m_currWS == PRE);
</span><span class="cx"> bool midWordBreak = false;
</span><span class="cx"> bool breakAll = m_currentStyle->wordBreak() == BreakAllWordBreak && m_autoWrap;
</span><ins>+ bool keepAllWords = m_currentStyle->wordBreak() == KeepAllWordBreak;
</ins><span class="cx"> float hyphenWidth = 0;
</span><span class="cx"> bool isLooseCJKMode = false;
</span><span class="cx">
</span><span class="lines">@@ -798,7 +799,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int nextBreakablePosition = m_current.nextBreakablePosition();
</span><del>- bool betweenWords = c == '\n' || (m_currWS != PRE && !m_atStart && isBreakable(m_renderTextInfo.lineBreakIterator, m_current.offset(), nextBreakablePosition, breakNBSP, isLooseCJKMode)
</del><ins>+ bool betweenWords = c == '\n' || (m_currWS != PRE && !m_atStart && isBreakable(m_renderTextInfo.lineBreakIterator, m_current.offset(), nextBreakablePosition, breakNBSP, isLooseCJKMode, keepAllWords)
</ins><span class="cx"> && (style.hyphens() != HyphensNone || (m_current.previousInSameNode() != softHyphen)));
</span><span class="cx"> m_current.setNextBreakablePosition(nextBreakablePosition);
</span><span class="cx">
</span><span class="lines">@@ -1219,7 +1220,7 @@
</span><span class="cx"> bool isLooseCJKMode = m_renderTextInfo.text != &renderText && m_renderTextInfo.lineBreakIterator.isLooseCJKMode();
</span><span class="cx"> bool breakNBSP = m_autoWrap && m_currentStyle->nbspMode() == SPACE;
</span><span class="cx"> int nextBreakablePosition = lineBreak.nextBreakablePosition();
</span><del>- isBreakable(m_renderTextInfo.lineBreakIterator, lineBreak.offset() + 1, nextBreakablePosition, breakNBSP, isLooseCJKMode);
</del><ins>+ isBreakable(m_renderTextInfo.lineBreakIterator, lineBreak.offset() + 1, nextBreakablePosition, breakNBSP, isLooseCJKMode, m_currentStyle->wordBreak() == KeepAllWordBreak);
</ins><span class="cx"> if (nextBreakablePosition < 0 || static_cast<unsigned>(nextBreakablePosition) != renderText.textLength())
</span><span class="cx"> return lineBreak;
</span><span class="cx"> const RenderStyle& style = lineStyle(renderText, m_lineInfo);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (185728 => 185729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-06-18 23:45:06 UTC (rev 185728)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-06-18 23:59:19 UTC (rev 185729)
</span><span class="lines">@@ -285,10 +285,8 @@
</span><span class="cx"> AspectRatioAuto, AspectRatioFromIntrinsic, AspectRatioFromDimensions, AspectRatioSpecified
</span><span class="cx"> };
</span><span class="cx">
</span><del>-// Word Break Values. Matches WinIE, rather than CSS3
-
</del><span class="cx"> enum EWordBreak {
</span><del>- NormalWordBreak, BreakAllWordBreak, BreakWordBreak
</del><ins>+ NormalWordBreak, BreakAllWordBreak, KeepAllWordBreak, BreakWordBreak
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum EOverflowWrap {
</span></span></pre>
</div>
</div>
</body>
</html>