<!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>[210456] trunk/Source/WebCore</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/210456">210456</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-06 15:29:09 -0800 (Fri, 06 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Text highlight causes Yoon Gothic webfont to reflow.
https://bugs.webkit.org/show_bug.cgi?id=166753
Reviewed by Darin Adler.
Add word-break: keep-all; support for CJK and breaking NBSPs.
Add test later. Need to figure out what font file to use.
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::TextFragmentIterator::Style::Style):
(WebCore::SimpleLineLayout::TextFragmentIterator::nextBreakablePosition): Use BreakingContext's helper functions
to figure out the next breakable position.
(WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):
* rendering/SimpleLineLayoutTextFragmentIterator.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210455 => 210456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-06 20:46:24 UTC (rev 210455)
+++ trunk/Source/WebCore/ChangeLog 2017-01-06 23:29:09 UTC (rev 210456)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-01-06 Zalan Bujtas <zalan@apple.com>
+
+ Text highlight causes Yoon Gothic webfont to reflow.
+ https://bugs.webkit.org/show_bug.cgi?id=166753
+
+ Reviewed by Darin Adler.
+
+ Add word-break: keep-all; support for CJK and breaking NBSPs.
+
+ Add test later. Need to figure out what font file to use.
+
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::Style::Style):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::nextBreakablePosition): Use BreakingContext's helper functions
+ to figure out the next breakable position.
+ (WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):
+ * rendering/SimpleLineLayoutTextFragmentIterator.h:
+
</ins><span class="cx"> 2017-01-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Add some missing longhand properties to CSSComputedStyleDeclaration and fix default values
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (210455 => 210456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2017-01-06 20:46:24 UTC (rev 210455)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2017-01-06 23:29:09 UTC (rev 210456)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx"> , wrapLines(style.autoWrap())
</span><span class="cx"> , breakAnyWordOnOverflow(style.wordBreak() == BreakAllWordBreak && wrapLines)
</span><span class="cx"> , breakFirstWordOnOverflow(breakAnyWordOnOverflow || (style.breakWords() && (wrapLines || preserveNewline)))
</span><ins>+ , breakNBSP(wrapLines && style.nbspMode() == SPACE)
+ , keepAllWordsForCJK(style.wordBreak() == KeepAllWordBreak)
</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">@@ -110,7 +112,25 @@
</span><span class="cx"> m_atEndOfSegment = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template <typename CharacterType>
</del><ins>+static unsigned nextBreakablePositionInSegment(LazyLineBreakIterator& lineBreakIterator, unsigned startPosition, bool breakNBSP, bool keepAllWordsForCJK)
+{
+ if (keepAllWordsForCJK) {
+ if (breakNBSP)
+ return nextBreakablePositionKeepingAllWords(lineBreakIterator, startPosition);
+ return nextBreakablePositionKeepingAllWordsIgnoringNBSP(lineBreakIterator, startPosition);
+ }
+
+ if (lineBreakIterator.isLooseCJKMode()) {
+ if (breakNBSP)
+ return nextBreakablePositionLoose(lineBreakIterator, startPosition);
+ return nextBreakablePositionIgnoringNBSPLoose(lineBreakIterator, startPosition);
+ }
+
+ if (breakNBSP)
+ return WebCore::nextBreakablePosition(lineBreakIterator, startPosition);
+ return nextBreakablePositionIgnoringNBSP(lineBreakIterator, startPosition);
+}
+
</ins><span class="cx"> unsigned TextFragmentIterator::nextBreakablePosition(const FlowContents::Segment& segment, unsigned startPosition)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(startPosition < segment.end);
</span><span class="lines">@@ -123,10 +143,8 @@
</span><span class="cx"> m_lineBreakIterator.setPriorContext(lastCharacter, secondToLastCharacter);
</span><span class="cx"> m_lineBreakIterator.resetStringAndReleaseIterator(segment.text, m_style.locale, LineBreakIteratorMode::Default);
</span><span class="cx"> }
</span><del>- const auto* characters = segment.text.characters<CharacterType>();
- unsigned segmentLength = segment.end - segment.start;
</del><span class="cx"> unsigned segmentPosition = startPosition - segment.start;
</span><del>- return segment.start + nextBreakablePositionNonLoosely<CharacterType, NonBreakingSpaceBehavior::IgnoreNonBreakingSpace>(m_lineBreakIterator, characters, segmentLength, segmentPosition);
</del><ins>+ return segment.start + nextBreakablePositionInSegment(m_lineBreakIterator, segmentPosition, m_style.breakNBSP, m_style.keepAllWordsForCJK);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><span class="lines">@@ -165,7 +183,7 @@
</span><span class="cx"> if (positionType == NonWhitespace)
</span><span class="cx"> nextPosition = m_currentSegment->text.is8Bit() ? nextNonWhitespacePosition<LChar>(*m_currentSegment, currentPosition) : nextNonWhitespacePosition<UChar>(*m_currentSegment, currentPosition);
</span><span class="cx"> else if (positionType == Breakable) {
</span><del>- nextPosition = m_currentSegment->text.is8Bit() ? nextBreakablePosition<LChar>(*m_currentSegment, currentPosition) : nextBreakablePosition<UChar>(*m_currentSegment, currentPosition);
</del><ins>+ nextPosition = nextBreakablePosition(*m_currentSegment, currentPosition);
</ins><span class="cx"> // nextBreakablePosition returns the same position for certain characters such as hyphens. Call next again with modified position unless we are at the end of the segment.
</span><span class="cx"> bool skipCurrentPosition = nextPosition == currentPosition;
</span><span class="cx"> if (skipCurrentPosition) {
</span><span class="lines">@@ -174,13 +192,13 @@
</span><span class="cx"> if (currentPosition == m_currentSegment->end - 1)
</span><span class="cx"> nextPosition = m_currentSegment->end;
</span><span class="cx"> else
</span><del>- nextPosition = m_currentSegment->text.is8Bit() ? nextBreakablePosition<LChar>(*m_currentSegment, currentPosition + 1) : nextBreakablePosition<UChar>(*m_currentSegment, currentPosition + 1);
</del><ins>+ nextPosition = nextBreakablePosition(*m_currentSegment, currentPosition + 1);
</ins><span class="cx"> }
</span><span class="cx"> // We need to know whether the word actually finishes at the end of this renderer or not.
</span><span class="cx"> if (nextPosition == m_currentSegment->end) {
</span><span class="cx"> const auto nextSegment = m_currentSegment + 1;
</span><span class="cx"> if (nextSegment != m_flowContents.end() && !isHardLineBreak(nextSegment))
</span><del>- overlappingFragment = nextPosition < (nextSegment->text.is8Bit() ? nextBreakablePosition<LChar>(*nextSegment, nextPosition) : nextBreakablePosition<UChar>(*nextSegment, nextPosition));
</del><ins>+ overlappingFragment = nextPosition < nextBreakablePosition(*nextSegment, nextPosition);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> width = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h (210455 => 210456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2017-01-06 20:46:24 UTC (rev 210455)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2017-01-06 23:29:09 UTC (rev 210456)
</span><span class="lines">@@ -103,6 +103,8 @@
</span><span class="cx"> bool wrapLines;
</span><span class="cx"> bool breakAnyWordOnOverflow;
</span><span class="cx"> bool breakFirstWordOnOverflow;
</span><ins>+ bool breakNBSP;
+ bool keepAllWordsForCJK;
</ins><span class="cx"> float spaceWidth;
</span><span class="cx"> float wordSpacing;
</span><span class="cx"> unsigned tabWidth;
</span><span class="lines">@@ -116,7 +118,7 @@
</span><span class="cx"> unsigned skipToNextPosition(PositionType, unsigned startPosition, float& width, float xPosition, bool& overlappingFragment);
</span><span class="cx"> bool isSoftLineBreak(unsigned position) const;
</span><span class="cx"> bool isHardLineBreak(const FlowContents::Iterator& segment) const;
</span><del>- template <typename CharacterType> unsigned nextBreakablePosition(const FlowContents::Segment&, unsigned startPosition);
</del><ins>+ unsigned nextBreakablePosition(const FlowContents::Segment&, unsigned startPosition);
</ins><span class="cx"> template <typename CharacterType> unsigned nextNonWhitespacePosition(const FlowContents::Segment&, unsigned startPosition);
</span><span class="cx"> float runWidth(const FlowContents::Segment&, unsigned startPosition, unsigned endPosition, float xPosition) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>