<!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>[178407] 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/178407">178407</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 21:04:04 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Refactor TextFragment class.
https://bugs.webkit.org/show_bug.cgi?id=140417
Reviewed by Andreas Kling.
Introduce text fragment type and use class member initializers.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::TextFragment::TextFragment):
(WebCore::SimpleLineLayout::LineState::addUncommitted):
(WebCore::SimpleLineLayout::removeTrailingWhitespace):
(WebCore::SimpleLineLayout::nextFragment):
(WebCore::SimpleLineLayout::createLineRuns):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178406 => 178407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-14 05:01:18 UTC (rev 178406)
+++ trunk/Source/WebCore/ChangeLog 2015-01-14 05:04:04 UTC (rev 178407)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-13 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Refactor TextFragment class.
+ https://bugs.webkit.org/show_bug.cgi?id=140417
+
+ Reviewed by Andreas Kling.
+
+ Introduce text fragment type and use class member initializers.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::TextFragment::TextFragment):
+ (WebCore::SimpleLineLayout::LineState::addUncommitted):
+ (WebCore::SimpleLineLayout::removeTrailingWhitespace):
+ (WebCore::SimpleLineLayout::nextFragment):
+ (WebCore::SimpleLineLayout::createLineRuns):
+
</ins><span class="cx"> 2015-01-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r178400.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (178406 => 178407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-14 05:01:18 UTC (rev 178406)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-14 05:04:04 UTC (rev 178407)
</span><span class="lines">@@ -227,24 +227,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct TextFragment {
</span><del>- TextFragment()
- : start(0)
- , isCollapsedWhitespace(false)
- , end(0)
- , isWhitespaceOnly(false)
- , isBreakable(false)
- , isLineBreak(false)
- , width(0)
- {
- }
-
</del><ins>+ TextFragment() = default;
</ins><span class="cx"> TextFragment(unsigned textStart, unsigned textEnd, float textWidth, bool isWhitespaceOnly)
</span><span class="cx"> : start(textStart)
</span><del>- , isCollapsedWhitespace(false)
</del><span class="cx"> , end(textEnd)
</span><del>- , isWhitespaceOnly(isWhitespaceOnly)
- , isBreakable(false)
- , isLineBreak(false)
</del><ins>+ , type(isWhitespaceOnly ? Whitespace : NonWhitespace)
</ins><span class="cx"> , width(textWidth)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -254,13 +241,13 @@
</span><span class="cx"> return start == end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned start : 31;
- bool isCollapsedWhitespace : 1;
- unsigned end : 31;
- bool isWhitespaceOnly : 1;
- bool isBreakable;
- bool isLineBreak;
- float width;
</del><ins>+ enum Type { LineBreak, Whitespace, NonWhitespace };
+ unsigned start = 0;
+ unsigned end = 0;
+ Type type = NonWhitespace;
+ bool isCollapsed = false;
+ bool isBreakable = false;
+ float width = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct LineState {
</span><span class="lines">@@ -298,8 +285,8 @@
</span><span class="cx"> uncommittedWidth += fragment.width;
</span><span class="cx"> uncommittedEnd = fragment.end;
</span><span class="cx"> position = uncommittedEnd;
</span><del>- trailingWhitespaceWidth = fragment.isWhitespaceOnly ? fragment.width : 0;
- trailingWhitespaceLength = fragment.isWhitespaceOnly ? uncomittedFragmentLength : 0;
</del><ins>+ trailingWhitespaceWidth = fragment.type == TextFragment::Whitespace ? fragment.width : 0;
+ trailingWhitespaceLength = fragment.type == TextFragment::Whitespace ? uncomittedFragmentLength : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void addUncommittedWhitespace(float whitespaceWidth)
</span><span class="lines">@@ -378,7 +365,7 @@
</span><span class="cx"> // we don't remove any whitespace at all.
</span><span class="cx"> // 2. from this line: remove whitespace, unless it's the only fragment on the line -so removing the whitesapce would produce an empty line.
</span><span class="cx"> if (preWrap) {
</span><del>- if (lineState.oveflowedFragment.isWhitespaceOnly && !lineState.oveflowedFragment.isEmpty() && lineState.availableWidth >= lineState.committedWidth) {
</del><ins>+ if (lineState.oveflowedFragment.type == TextFragment::Whitespace && !lineState.oveflowedFragment.isEmpty() && lineState.availableWidth >= lineState.committedWidth) {
</ins><span class="cx"> lineState.position = lineState.oveflowedFragment.end;
</span><span class="cx"> lineState.oveflowedFragment = TextFragment();
</span><span class="cx"> }
</span><span class="lines">@@ -467,7 +454,7 @@
</span><span class="cx"> TextFragment fragment;
</span><span class="cx"> fragment.start = previousFragmentEnd;
</span><span class="cx"> if (flowContents.isLineBreak(fragment.start)) {
</span><del>- fragment.isLineBreak = true;
</del><ins>+ fragment.type = TextFragment::LineBreak;
</ins><span class="cx"> fragment.end = fragment.start + 1;
</span><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="lines">@@ -477,12 +464,12 @@
</span><span class="cx"> unsigned whitespaceEnd = flowContents.findNextNonWhitespacePosition(fragment.start, spaceCount);
</span><span class="cx"> ASSERT(fragment.start <= whitespaceEnd);
</span><span class="cx"> if (fragment.start != whitespaceEnd) {
</span><del>- fragment.isWhitespaceOnly = true;
</del><ins>+ fragment.type = TextFragment::Whitespace;
</ins><span class="cx"> fragment.end = whitespaceEnd;
</span><span class="cx"> bool multipleWhitespace = fragment.start + 1 < fragment.end;
</span><del>- fragment.isCollapsedWhitespace = multipleWhitespace && style.collapseWhitespace;
- fragment.isBreakable = !fragment.isCollapsedWhitespace && multipleWhitespace;
- if (fragment.isCollapsedWhitespace)
</del><ins>+ fragment.isCollapsed = multipleWhitespace && style.collapseWhitespace;
+ fragment.isBreakable = !fragment.isCollapsed && multipleWhitespace;
+ if (fragment.isCollapsed)
</ins><span class="cx"> fragment.width = style.spaceWidth;
</span><span class="cx"> else {
</span><span class="cx"> unsigned fragmentLength = fragment.end - fragment.start;
</span><span class="lines">@@ -494,6 +481,7 @@
</span><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ fragment.type = TextFragment::NonWhitespace;
</ins><span class="cx"> fragment.isBreakable = style.breakWordOnOverflow;
</span><span class="cx"> fragment.end = flowContents.findNextBreakablePosition(fragment.start + 1);
</span><span class="cx"> fragment.width = flowContents.textWidth(fragment.start, fragment.end, xPosition);
</span><span class="lines">@@ -507,7 +495,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.isLineBreak) {
</del><ins>+ if ((lineCanBeWrapped && !lineState.fits(fragment.width)) || fragment.type == TextFragment::LineBreak) {
</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">@@ -515,17 +503,17 @@
</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.isLineBreak) {
</del><ins>+ if (fragment.type == TextFragment::LineBreak) {
</ins><span class="cx"> if (isFirstFragment)
</span><span class="cx"> lineState.addUncommitted(fragment);
</span><span class="cx"> else {
</span><span class="cx"> // No need to add the new line fragment if there's already content on the line. We are about to close this line anyway.
</span><span class="cx"> ++lineState.position;
</span><span class="cx"> }
</span><del>- } else if (style.collapseWhitespace && fragment.isWhitespaceOnly) {
</del><ins>+ } else if (style.collapseWhitespace && fragment.type == TextFragment::Whitespace) {
</ins><span class="cx"> // Whitespace collapse is on: whitespace that doesn't fit is simply skipped.
</span><span class="cx"> lineState.position = fragment.end;
</span><del>- } else if (fragment.isWhitespaceOnly || ((isFirstFragment && style.breakWordOnOverflow) || !style.wrapLines)) { // !style.wrapLines: bug138102(preserve existing behavior)
</del><ins>+ } else if (fragment.type == TextFragment::Whitespace || ((isFirstFragment && style.breakWordOnOverflow) || !style.wrapLines)) { // !style.wrapLines: bug138102(preserve existing behavior)
</ins><span class="cx"> // Whitespace collapse is off or non-whitespace content. split the fragment; (modified)fragment -> this lineState, oveflowedFragment -> next line.
</span><span class="cx"> // When this is the only (first) fragment, the first character stays on the line, even if it does not fit.
</span><span class="cx"> lineState.oveflowedFragment = splitFragmentToFitLine(fragment, lineState.availableWidth - lineState.width(), isFirstFragment, flowContents);
</span><span class="lines">@@ -543,7 +531,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> // When the current fragment is collapsed whitespace, we need to create a run for what we've processed so far.
</span><del>- if (fragment.isCollapsedWhitespace) {
</del><ins>+ if (fragment.isCollapsed) {
</ins><span class="cx"> // One trailing whitespace to preserve.
</span><span class="cx"> lineState.addUncommittedWhitespace(style.spaceWidth);
</span><span class="cx"> lineState.commitAndCreateRun(lineRuns);
</span></span></pre>
</div>
</div>
</body>
</html>