<!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>[178396] 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/178396">178396</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 17:33:30 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Refactor SimpleLineLayout::nextFragment().
https://bugs.webkit.org/show_bug.cgi?id=140407
Reviewed by Andreas Kling.
Simplify the code by using content specific branches with early returns.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::nextFragment):</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 (178395 => 178396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-14 01:30:09 UTC (rev 178395)
+++ trunk/Source/WebCore/ChangeLog 2015-01-14 01:33:30 UTC (rev 178396)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-13 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Refactor SimpleLineLayout::nextFragment().
+ https://bugs.webkit.org/show_bug.cgi?id=140407
+
+ Reviewed by Andreas Kling.
+
+ Simplify the code by using content specific branches with early returns.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::nextFragment):
+
</ins><span class="cx"> 2015-01-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed iOS build fix after r178390.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (178395 => 178396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-14 01:30:09 UTC (rev 178395)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-14 01:33:30 UTC (rev 178396)
</span><span class="lines">@@ -460,40 +460,43 @@
</span><span class="cx">
</span><span class="cx"> static TextFragment nextFragment(unsigned previousFragmentEnd, const FlowContents& flowContents, float xPosition)
</span><span class="cx"> {
</span><del>- // A fragment can have
</del><ins>+ // A fragment can either be
</ins><span class="cx"> // 1. new line character when preserveNewline is on (not considered as whitespace) or
</span><span class="cx"> // 2. whitespace (collasped, non-collapsed multi or single) or
</span><span class="cx"> // 3. non-whitespace characters.
</span><del>- const auto& style = flowContents.style();
</del><span class="cx"> TextFragment fragment;
</span><del>- fragment.isLineBreak = flowContents.isLineBreak(previousFragmentEnd);
- unsigned spaceCount = 0;
- unsigned whitespaceEnd = previousFragmentEnd;
- if (!fragment.isLineBreak)
- whitespaceEnd = flowContents.findNextNonWhitespacePosition(previousFragmentEnd, spaceCount);
- fragment.isWhitespaceOnly = previousFragmentEnd < whitespaceEnd;
</del><span class="cx"> fragment.start = previousFragmentEnd;
</span><del>- if (fragment.isWhitespaceOnly)
- fragment.end = whitespaceEnd;
- else if (fragment.isLineBreak)
</del><ins>+ if (flowContents.isLineBreak(fragment.start)) {
+ fragment.isLineBreak = true;
</ins><span class="cx"> fragment.end = fragment.start + 1;
</span><del>- else
- fragment.end = flowContents.findNextBreakablePosition(previousFragmentEnd + 1);
- bool multiple = fragment.start + 1 < fragment.end;
- fragment.isCollapsedWhitespace = multiple && fragment.isWhitespaceOnly && style.collapseWhitespace;
- // Non-collapsed whitespace or just plain words when "break word on overflow" is on can wrap.
- fragment.isBreakable = multiple && ((fragment.isWhitespaceOnly && !fragment.isCollapsedWhitespace) || (!fragment.isWhitespaceOnly && style.breakWordOnOverflow));
</del><ins>+ return fragment;
+ }
</ins><span class="cx">
</span><del>- // Compute fragment width or just use the pre-computed whitespace widths.
- unsigned fragmentLength = fragment.end - fragment.start;
- if (fragment.isCollapsedWhitespace)
- fragment.width = style.spaceWidth;
- else if (fragment.isLineBreak)
- fragment.width = 0; // Newline character's width is 0.
- else if (fragmentLength == spaceCount) // Space only.
- fragment.width = style.spaceWidth * spaceCount;
- else
- fragment.width = flowContents.textWidth(fragment.start, fragment.end, xPosition);
</del><ins>+ const auto& style = flowContents.style();
+ unsigned spaceCount = 0;
+ unsigned whitespaceEnd = flowContents.findNextNonWhitespacePosition(fragment.start, spaceCount);
+ ASSERT(fragment.start <= whitespaceEnd);
+ if (fragment.start != whitespaceEnd) {
+ fragment.isWhitespaceOnly = true;
+ fragment.end = whitespaceEnd;
+ bool multipleWhitespace = fragment.start + 1 < fragment.end;
+ fragment.isCollapsedWhitespace = multipleWhitespace && style.collapseWhitespace;
+ fragment.isBreakable = !fragment.isCollapsedWhitespace && multipleWhitespace;
+ if (fragment.isCollapsedWhitespace)
+ fragment.width = style.spaceWidth;
+ else {
+ unsigned fragmentLength = fragment.end - fragment.start;
+ if (fragmentLength == spaceCount)
+ fragment.width = fragmentLength * style.spaceWidth;
+ else
+ fragment.width = flowContents.textWidth(fragment.start, fragment.end, xPosition);
+ }
+ return fragment;
+ }
+
+ fragment.isBreakable = style.breakWordOnOverflow;
+ fragment.end = flowContents.findNextBreakablePosition(fragment.start + 1);
+ fragment.width = flowContents.textWidth(fragment.start, fragment.end, xPosition);
</ins><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>