<!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>[179048] 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/179048">179048</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-23 17:13:44 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Refactor line wrapping logic.
https://bugs.webkit.org/show_bug.cgi?id=140834
Reviewed by Antti Koivisto.
Use a more readable structure to deal with wrapping logic.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(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 (179047 => 179048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-24 01:12:06 UTC (rev 179047)
+++ trunk/Source/WebCore/ChangeLog 2015-01-24 01:13:44 UTC (rev 179048)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-01-23 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Simple line layout: Refactor line wrapping logic.
+ https://bugs.webkit.org/show_bug.cgi?id=140834
+
+ Reviewed by Antti Koivisto.
+
+ Use a more readable structure to deal with wrapping logic.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::createLineRuns):
+
+2015-01-23 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Simple line layout: Use only FlowContents::nextTextFragment() to read fragments from the text flow.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140842
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (179047 => 179048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-24 01:12:06 UTC (rev 179047)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-24 01:13:44 UTC (rev 179048)
</span><span class="lines">@@ -443,41 +443,50 @@
</span><span class="cx"> const auto& style = flowContents.style();
</span><span class="cx"> bool lineCanBeWrapped = style.wrapLines || style.breakWordOnOverflow;
</span><span class="cx"> while (!flowContents.isEnd(lineState.position)) {
</span><del>- // Find the next text fragment. Start from the end of the previous fragment -current line end.
- FlowContents::TextFragment fragment = flowContents.nextTextFragment(lineState.position, lineState.width());
- if ((lineCanBeWrapped && !lineState.fits(fragment.width)) || fragment.type == FlowContents::TextFragment::LineBreak) {
</del><ins>+ // Find the next text fragment.
+ auto fragment = flowContents.nextTextFragment(lineState.position, lineState.width());
+ // Hard linebreak.
+ if (fragment.type == FlowContents::TextFragment::LineBreak) {
+ if (lineState.width()) {
+ // No need to add the new line fragment if there's already content on the line. We are about to close this line anyway.
+ ++lineState.position;
+ } else
+ lineState.addUncommitted(fragment);
+ break;
+ }
+ if (lineCanBeWrapped && !lineState.fits(fragment.width)) {
</ins><span class="cx"> // Overflow wrapping behaviour:
</span><del>- // 1. Newline character: wraps the line unless it's treated as whitespace.
- // 2. Whitesapce collapse on: whitespace is skipped.
- // 3. Whitespace collapse off: whitespace is wrapped.
- // 4. First, non-whitespace fragment is either wrapped or kept on the line. (depends on overflow-wrap)
- // 5. Non-whitespace fragment when there's already another fragment on the line gets pushed to the next line.
- bool isFirstFragment = !lineState.width();
- if (fragment.type == FlowContents::TextFragment::LineBreak) {
- if (isFirstFragment)
- lineState.addUncommitted(fragment);
- else {
- // No need to add the new line fragment if there's already content on the line. We are about to close this line anyway.
- ++lineState.position;
</del><ins>+ // 1. Whitesapce collapse on: whitespace is skipped. Jump to next line.
+ // 2. Whitespace collapse off: whitespace is wrapped.
+ // 3. First, non-whitespace fragment is either wrapped or kept on the line. (depends on overflow-wrap)
+ // 4. Non-whitespace fragment when there's already another fragment on the line gets pushed to the next line.
+ bool emptyLine = !lineState.width();
+ // Whitespace fragment.
+ if (fragment.type == FlowContents::TextFragment::Whitespace) {
+ if (style.collapseWhitespace) {
+ // Whitespace collapse is on: whitespace that doesn't fit is simply skipped.
+ lineState.position = fragment.end;
+ break;
</ins><span class="cx"> }
</span><del>- } else if (style.collapseWhitespace && fragment.type == FlowContents::TextFragment::Whitespace) {
- // Whitespace collapse is on: whitespace that doesn't fit is simply skipped.
- lineState.position = fragment.end;
- } else if (fragment.type == FlowContents::TextFragment::Whitespace || ((isFirstFragment && style.breakWordOnOverflow) || !style.wrapLines)) { // !style.wrapLines: bug138102(preserve existing behavior)
- // Whitespace collapse is off or non-whitespace content. split the fragment; (modified)fragment -> this lineState, oveflowedFragment -> next line.
- // When this is the only (first) fragment, the first character stays on the line, even if it does not fit.
- lineState.oveflowedFragment = splitFragmentToFitLine(fragment, lineState.availableWidth - lineState.width(), isFirstFragment, flowContents);
- if (!fragment.isEmpty()) {
- // Whitespace fragments can get pushed entirely to the next line.
- lineState.addUncommitted(fragment);
- }
- } else if (isFirstFragment) {
- // Non-breakable non-whitespace first fragment. Add it to the current line. -it overflows though.
</del><ins>+ // Split the fragment; (modified)fragment stays on this line, oveflowedFragment is pushed to next line.
+ lineState.oveflowedFragment = splitFragmentToFitLine(fragment, lineState.availableWidth - lineState.width(), emptyLine, flowContents);
</ins><span class="cx"> lineState.addUncommitted(fragment);
</span><del>- } else {
- // Non-breakable non-whitespace fragment when there's already a fragment on the line. Push it to the next line.
- lineState.oveflowedFragment = fragment;
</del><ins>+ break;
</ins><span class="cx"> }
</span><ins>+ // Non-whitespace fragment. (!style.wrapLines: bug138102(preserve existing behavior)
+ if ((emptyLine && style.breakWordOnOverflow) || !style.wrapLines) {
+ // Split the fragment; (modified)fragment stays on this line, oveflowedFragment is pushed to next line.
+ lineState.oveflowedFragment = splitFragmentToFitLine(fragment, lineState.availableWidth - lineState.width(), emptyLine, flowContents);
+ lineState.addUncommitted(fragment);
+ break;
+ }
+ // Non-breakable non-whitespace first fragment. Add it to the current line. -it overflows though.
+ if (emptyLine) {
+ lineState.addUncommitted(fragment);
+ break;
+ }
+ // Non-breakable non-whitespace fragment when there's already content on the line. Push it to the next line.
+ lineState.oveflowedFragment = fragment;
</ins><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></span></pre>
</div>
</div>
</body>
</html>