<!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>[178983] 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/178983">178983</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 22:26:28 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Move leading whitespace handling from removeTrailingWhitespace() to initializeNewLine().
https://bugs.webkit.org/show_bug.cgi?id=140757
Reviewed by Antti Koivisto.
Checking if overflowed pre-wrap whitespace needs to be ignored should not be part of the trailing whitespace handling.
Move it to initializeNewLine().
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::preWrap):
(WebCore::SimpleLineLayout::removeTrailingWhitespace):
(WebCore::SimpleLineLayout::initializeNewLine):
* rendering/SimpleLineLayoutFlowContents.h:
(WebCore::SimpleLineLayout::FlowContents::isLineBreak):</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 (178982 => 178983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-23 05:38:55 UTC (rev 178982)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 06:26:28 UTC (rev 178983)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-22 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Move leading whitespace handling from removeTrailingWhitespace() to initializeNewLine().
+ https://bugs.webkit.org/show_bug.cgi?id=140757
+
+ Reviewed by Antti Koivisto.
+
+ Checking if overflowed pre-wrap whitespace needs to be ignored should not be part of the trailing whitespace handling.
+ Move it to initializeNewLine().
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::preWrap):
+ (WebCore::SimpleLineLayout::removeTrailingWhitespace):
+ (WebCore::SimpleLineLayout::initializeNewLine):
+ * rendering/SimpleLineLayoutFlowContents.h:
+ (WebCore::SimpleLineLayout::FlowContents::isLineBreak):
+
</ins><span class="cx"> 2015-01-22 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Media controls disappear when loading a HLS live stream
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (178982 => 178983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-23 05:38:55 UTC (rev 178982)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-23 06:26:28 UTC (rev 178983)
</span><span class="lines">@@ -238,6 +238,8 @@
</span><span class="cx"> committedLogicalRight += committedWidth;
</span><span class="cx"> committedTrailingWhitespaceWidth = uncomittedTrailingWhitespaceWidth;
</span><span class="cx"> committedTrailingWhitespaceLength = uncomittedTrailingWhitespaceLength;
</span><ins>+ if (!m_firstCharacterFits)
+ m_firstCharacterFits = uncommittedStart + 1 > uncommittedEnd || committedWidth <= availableWidth;
</ins><span class="cx">
</span><span class="cx"> uncommittedStart = uncommittedEnd;
</span><span class="cx"> uncommittedWidth = 0;
</span><span class="lines">@@ -306,6 +308,9 @@
</span><span class="cx"> float committedLogicalRight { 0 }; // Last committed X (coordinate) position.
</span><span class="cx"> float committedTrailingWhitespaceWidth { 0 }; // Use this to remove trailing whitespace without re-mesuring the text.
</span><span class="cx"> unsigned committedTrailingWhitespaceLength { 0 };
</span><ins>+ // Having one character on the line does not necessarily mean it actually fits.
+ // First character of the first fragment might be forced on to the current line even if it does not fit.
+ bool m_firstCharacterFits { false };
</ins><span class="cx">
</span><span class="cx"> FlowContents::TextFragment oveflowedFragment;
</span><span class="cx">
</span><span class="lines">@@ -314,40 +319,32 @@
</span><span class="cx"> unsigned uncomittedTrailingWhitespaceLength { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+static bool preWrap(const FlowContents::Style& style)
+{
+ return style.wrapLines && !style.collapseWhitespace;
+}
+
</ins><span class="cx"> static void removeTrailingWhitespace(LineState& lineState, Layout::RunVector& lineRuns, const FlowContents& flowContents)
</span><span class="cx"> {
</span><ins>+ if (!lineState.committedTrailingWhitespaceLength)
+ return;
+
+ // Remove collapsed whitespace, or non-collapsed pre-wrap whitespace, unless it's the only content on the line -so removing the whitesapce would produce an empty line.
</ins><span class="cx"> const auto& style = flowContents.style();
</span><del>- bool preWrap = style.wrapLines && !style.collapseWhitespace;
- // Trailing whitespace gets removed when we either collapse whitespace or pre-wrap is present.
- if (!(style.collapseWhitespace || preWrap))
</del><ins>+ bool collapseWhitespace = style.collapseWhitespace | preWrap(style);
+ if (!collapseWhitespace)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (preWrap(style) && lineState.hasWhitespaceOnly())
+ return;
+
</ins><span class="cx"> ASSERT(lineRuns.size());
</span><span class="cx"> Run& lastRun = lineRuns.last();
</span><del>-
- unsigned lastPosition = lineState.position;
- bool trailingPreWrapWhitespaceNeedsToBeRemoved = false;
- if (preWrap) {
- // Special overflow pre-wrap fragment handling: Ignore the overflow whitespace fragment if we managed to fit at least one character on this line.
- // When the line is too short to fit one character (thought it still stays on the line) we keep the overflow whitespace content as it is.
- if (lineState.oveflowedFragment.type == FlowContents::TextFragment::Whitespace && !lineState.oveflowedFragment.isEmpty() && lineState.availableWidth >= lineState.committedWidth) {
- lineState.position = lineState.oveflowedFragment.end;
- lineState.oveflowedFragment = FlowContents::TextFragment();
- }
- // Remove whitespace, unless it's the only fragment on the line -so removing the whitesapce would produce an empty line.
- trailingPreWrapWhitespaceNeedsToBeRemoved = !lineState.hasWhitespaceOnly();
- }
- if (lineState.committedTrailingWhitespaceLength && (style.collapseWhitespace || trailingPreWrapWhitespaceNeedsToBeRemoved)) {
- lastRun.logicalRight -= lineState.committedTrailingWhitespaceWidth;
- lastRun.end -= lineState.committedTrailingWhitespaceLength;
- if (lastRun.start == lastRun.end)
- lineRuns.removeLast();
- lineState.removeTrailingWhitespace();
- }
-
- // If we skipped any whitespace and now the line end is a hard newline, skip the newline too as we are wrapping the line here already.
- if (lastPosition != lineState.position && !flowContents.isEnd(lineState.position) && flowContents.isLineBreak(lineState.position))
- ++lineState.position;
</del><ins>+ lastRun.logicalRight -= lineState.committedTrailingWhitespaceWidth;
+ lastRun.end -= lineState.committedTrailingWhitespaceLength;
+ if (lastRun.start == lastRun.end)
+ lineRuns.removeLast();
+ lineState.removeTrailingWhitespace();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void updateLineConstrains(const RenderBlockFlow& flow, float& availableWidth, float& logicalLeftOffset)
</span><span class="lines">@@ -365,19 +362,34 @@
</span><span class="cx"> lineState.jumpTo(previousLine.position, 0);
</span><span class="cx"> lineState.lineStartRunIndex = lineStartRunIndex;
</span><span class="cx"> updateLineConstrains(flow, lineState.availableWidth, lineState.logicalLeftOffset);
</span><del>- // Skip leading whitespace if collapsing whitespace, unless there's an uncommitted fragment pushed from the previous line.
- // FIXME: Be smarter when the run from the previous line does not fit the current line. Right now, we just reprocess it.
- if (previousLine.oveflowedFragment.width) {
- if (lineState.fits(previousLine.oveflowedFragment.width))
- lineState.addUncommitted(previousLine.oveflowedFragment);
- else {
- // Start over with this fragment.
- lineState.jumpTo(previousLine.oveflowedFragment.start, 0);
- }
- } else {
</del><ins>+
+ // Handle overflowed fragment from previous line.
+ auto overflowedFragment = previousLine.oveflowedFragment;
+ unsigned linePositon = previousLine.position;
+ // Special overflow pre-wrap whitespace handling: ignore the overflowed whitespace if we managed to fit at least one character on the previous line.
+ // When the line is too short to fit one character (thought it still stays on the line) we continue with the overflow whitespace content on this line.
+ const auto& style = flowContents.style();
+ if (overflowedFragment.type == FlowContents::TextFragment::Whitespace && preWrap(style) && previousLine.m_firstCharacterFits) {
+ linePositon = overflowedFragment.end;
+ overflowedFragment = FlowContents::TextFragment();
+ // If skipping the whitespace puts us on a hard newline, skip the newline too as we already wrapped the line.
+ if (flowContents.isLineBreak(linePositon))
+ ++linePositon;
+ }
+
+ if (overflowedFragment.isEmpty()) {
</ins><span class="cx"> unsigned spaceCount = 0;
</span><del>- lineState.jumpTo(flowContents.style().collapseWhitespace ? flowContents.findNextNonWhitespacePosition(previousLine.position, spaceCount) : previousLine.position, 0);
</del><ins>+ lineState.jumpTo(style.collapseWhitespace ? flowContents.findNextNonWhitespacePosition(linePositon, spaceCount) : linePositon, 0);
+ return lineState;
</ins><span class="cx"> }
</span><ins>+
+ if (lineState.fits(overflowedFragment.width)) {
+ lineState.addUncommitted(overflowedFragment);
+ return lineState;
+ }
+
+ // Start over with this fragment.
+ lineState.jumpTo(overflowedFragment.start, 0);
</ins><span class="cx"> return lineState;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (178982 => 178983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-01-23 05:38:55 UTC (rev 178982)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-01-23 06:26:28 UTC (rev 178983)
</span><span class="lines">@@ -122,6 +122,8 @@
</span><span class="cx">
</span><span class="cx"> inline bool FlowContents::isLineBreak(unsigned position) const
</span><span class="cx"> {
</span><ins>+ if (isEnd(position))
+ return false;
</ins><span class="cx"> return m_style.preserveNewline && characterAt(position) == '\n';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>