<!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>[176531] 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/176531">176531</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-11-24 17:00:57 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Rename TextFragment::mustBreak to TextFragment::isLineBreak
https://bugs.webkit.org/show_bug.cgi?id=139035
Reviewed by Antti Koivisto.
Move new line logic to FlowContents class.
This is in preparation to support <br>.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::TextFragment::TextFragment):
(WebCore::SimpleLineLayout::removeTrailingWhitespace):
(WebCore::SimpleLineLayout::nextFragment):
(WebCore::SimpleLineLayout::createLineRuns):
* rendering/SimpleLineLayoutFlowContents.h:
(WebCore::SimpleLineLayout::FlowContents::isNewline):
(WebCore::SimpleLineLayout::FlowContents::isNewlineCharacter): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176530 => 176531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-25 00:26:35 UTC (rev 176530)
+++ trunk/Source/WebCore/ChangeLog 2014-11-25 01:00:57 UTC (rev 176531)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-11-24 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Rename TextFragment::mustBreak to TextFragment::isLineBreak
+ https://bugs.webkit.org/show_bug.cgi?id=139035
+
+ Reviewed by Antti Koivisto.
+
+ Move new line logic to FlowContents class.
+ This is in preparation to support <br>.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::TextFragment::TextFragment):
+ (WebCore::SimpleLineLayout::removeTrailingWhitespace):
+ (WebCore::SimpleLineLayout::nextFragment):
+ (WebCore::SimpleLineLayout::createLineRuns):
+ * rendering/SimpleLineLayoutFlowContents.h:
+ (WebCore::SimpleLineLayout::FlowContents::isNewline):
+ (WebCore::SimpleLineLayout::FlowContents::isNewlineCharacter): Deleted.
+
</ins><span class="cx"> 2014-11-24 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Move :placeholder-shown out of experimental
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (176530 => 176531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-11-25 00:26:35 UTC (rev 176530)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-11-25 01:00:57 UTC (rev 176531)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> , end(0)
</span><span class="cx"> , isWhitespaceOnly(false)
</span><span class="cx"> , isBreakable(false)
</span><del>- , mustBreak(false)
</del><ins>+ , isLineBreak(false)
</ins><span class="cx"> , width(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> , end(textEnd)
</span><span class="cx"> , isWhitespaceOnly(isWhitespaceOnly)
</span><span class="cx"> , isBreakable(false)
</span><del>- , mustBreak(false)
</del><ins>+ , isLineBreak(false)
</ins><span class="cx"> , width(textWidth)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> unsigned end : 31;
</span><span class="cx"> bool isWhitespaceOnly : 1;
</span><span class="cx"> bool isBreakable;
</span><del>- bool mustBreak;
</del><ins>+ bool isLineBreak;
</ins><span class="cx"> float width;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we skipped any whitespace and now the line end is a "preserved" newline, skip the newline too as we are wrapping the line here already.
</span><del>- if (lastPosition != lineState.position && style.preserveNewline && !flowContents.isEnd(lineState.position) && flowContents.isNewlineCharacter(lineState.position))
</del><ins>+ if (lastPosition != lineState.position && style.preserveNewline && !flowContents.isEnd(lineState.position) && flowContents.isLineBreak(lineState.position))
</ins><span class="cx"> ++lineState.position;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -459,16 +459,16 @@
</span><span class="cx"> // 3. non-whitespace characters.
</span><span class="cx"> const auto& style = flowContents.style();
</span><span class="cx"> TextFragment fragment;
</span><del>- fragment.mustBreak = style.preserveNewline && flowContents.isNewlineCharacter(previousFragmentEnd);
</del><ins>+ fragment.isLineBreak = flowContents.isLineBreak(previousFragmentEnd);
</ins><span class="cx"> unsigned spaceCount = 0;
</span><span class="cx"> unsigned whitespaceEnd = previousFragmentEnd;
</span><del>- if (!fragment.mustBreak)
</del><ins>+ if (!fragment.isLineBreak)
</ins><span class="cx"> whitespaceEnd = flowContents.findNextNonWhitespacePosition(previousFragmentEnd, spaceCount);
</span><span class="cx"> fragment.isWhitespaceOnly = previousFragmentEnd < whitespaceEnd;
</span><span class="cx"> fragment.start = previousFragmentEnd;
</span><span class="cx"> if (fragment.isWhitespaceOnly)
</span><span class="cx"> fragment.end = whitespaceEnd;
</span><del>- else if (fragment.mustBreak)
</del><ins>+ else if (fragment.isLineBreak)
</ins><span class="cx"> fragment.end = fragment.start + 1;
</span><span class="cx"> else
</span><span class="cx"> fragment.end = flowContents.findNextBreakablePosition(previousFragmentEnd + 1);
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx"> unsigned fragmentLength = fragment.end - fragment.start;
</span><span class="cx"> if (fragment.isCollapsedWhitespace)
</span><span class="cx"> fragment.width = style.spaceWidth;
</span><del>- else if (fragment.mustBreak)
</del><ins>+ else if (fragment.isLineBreak)
</ins><span class="cx"> fragment.width = 0; // Newline character's width is 0.
</span><span class="cx"> else if (fragmentLength == spaceCount) // Space only.
</span><span class="cx"> fragment.width = style.spaceWidth * spaceCount;
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> while (!flowContents.isEnd(lineState.position)) {
</span><span class="cx"> // Find the next text fragment. Start from the end of the previous fragment -current line end.
</span><span class="cx"> TextFragment fragment = nextFragment(lineState.position, flowContents, lineState.width());
</span><del>- if ((lineCanBeWrapped && !lineState.fits(fragment.width)) || fragment.mustBreak) {
</del><ins>+ if ((lineCanBeWrapped && !lineState.fits(fragment.width)) || fragment.isLineBreak) {
</ins><span class="cx"> // Overflow wrapping behaviour:
</span><span class="cx"> // 1. Newline character: wraps the line unless it's treated as whitespace.
</span><span class="cx"> // 2. Whitesapce collapse on: whitespace is skipped.
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> // 4. First, non-whitespace fragment is either wrapped or kept on the line. (depends on overflow-wrap)
</span><span class="cx"> // 5. Non-whitespace fragment when there's already another fragment on the line gets pushed to the next line.
</span><span class="cx"> bool isFirstFragment = !lineState.width();
</span><del>- if (fragment.mustBreak) {
</del><ins>+ if (fragment.isLineBreak) {
</ins><span class="cx"> if (isFirstFragment)
</span><span class="cx"> lineState.addUncommitted(fragment);
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (176530 => 176531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2014-11-25 00:26:35 UTC (rev 176530)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2014-11-25 01:00:57 UTC (rev 176531)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> float textWidth(unsigned from, unsigned to, float xPosition) const;
</span><span class="cx">
</span><del>- bool isNewlineCharacter(unsigned position) const;
</del><ins>+ bool isLineBreak(unsigned position) const;
</ins><span class="cx"> bool isEnd(unsigned position) const;
</span><span class="cx">
</span><span class="cx"> struct Segment {
</span><span class="lines">@@ -95,9 +95,9 @@
</span><span class="cx"> return segment.text[position - segment.start];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool FlowContents::isNewlineCharacter(unsigned position) const
</del><ins>+inline bool FlowContents::isLineBreak(unsigned position) const
</ins><span class="cx"> {
</span><del>- return characterAt(position) == '\n';
</del><ins>+ return m_style.preserveNewline && characterAt(position) == '\n';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool FlowContents::isEnd(unsigned position) const
</span></span></pre>
</div>
</div>
</body>
</html>