<!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>[178964] 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/178964">178964</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 15:42:46 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Reset LineState when starting a new line.
https://bugs.webkit.org/show_bug.cgi?id=140789
Reviewed by Antti Koivisto.
Reset LineState when starting a new line to ensure we always
start with a clean state.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::updateLineConstrains):
(WebCore::SimpleLineLayout::initializeNewLine):
(WebCore::SimpleLineLayout::splitFragmentToFitLine):
(WebCore::SimpleLineLayout::createTextRuns):</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 (178963 => 178964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-22 23:35:15 UTC (rev 178963)
+++ trunk/Source/WebCore/ChangeLog 2015-01-22 23:42:46 UTC (rev 178964)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-22 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Reset LineState when starting a new line.
+ https://bugs.webkit.org/show_bug.cgi?id=140789
+
+ Reviewed by Antti Koivisto.
+
+ Reset LineState when starting a new line to ensure we always
+ start with a clean state.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::updateLineConstrains):
+ (WebCore::SimpleLineLayout::initializeNewLine):
+ (WebCore::SimpleLineLayout::splitFragmentToFitLine):
+ (WebCore::SimpleLineLayout::createTextRuns):
+
</ins><span class="cx"> 2015-01-22 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL2] Create empty interface files for new WebGL2 objects.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (178963 => 178964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-22 23:35:15 UTC (rev 178963)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-01-22 23:42:46 UTC (rev 178964)
</span><span class="lines">@@ -350,21 +350,35 @@
</span><span class="cx"> ++lineState.position;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void initializeNewLine(LineState& lineState, const FlowContents& flowContents, unsigned lineStartRunIndex)
</del><ins>+static void updateLineConstrains(const RenderBlockFlow& flow, float& availableWidth, float& logicalLeftOffset)
</ins><span class="cx"> {
</span><ins>+ LayoutUnit height = flow.logicalHeight();
+ LayoutUnit logicalHeight = flow.minLineHeightForReplacedRenderer(false, 0);
+ float logicalRightOffset = flow.logicalRightOffsetForLine(height, false, logicalHeight);
+ logicalLeftOffset = flow.logicalLeftOffsetForLine(height, false, logicalHeight);
+ availableWidth = std::max<float>(0, logicalRightOffset - logicalLeftOffset);
+}
+
+static LineState initializeNewLine(const LineState& previousLine, const RenderBlockFlow& flow, const FlowContents& flowContents, unsigned lineStartRunIndex)
+{
+ LineState lineState;
+ lineState.jumpTo(previousLine.position, 0);
</ins><span class="cx"> lineState.lineStartRunIndex = lineStartRunIndex;
</span><ins>+ updateLineConstrains(flow, lineState.availableWidth, lineState.logicalLeftOffset);
</ins><span class="cx"> // Skip leading whitespace if collapsing whitespace, unless there's an uncommitted fragment pushed from the previous line.
</span><span class="cx"> // FIXME: Be smarter when the run from the previous line does not fit the current line. Right now, we just reprocess it.
</span><del>- if (lineState.oveflowedFragment.width) {
- if (lineState.fits(lineState.oveflowedFragment.width))
- lineState.addUncommitted(lineState.oveflowedFragment);
- else
- lineState.jumpTo(lineState.oveflowedFragment.start, 0); // Start over with this fragment.
</del><ins>+ 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);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> unsigned spaceCount = 0;
</span><del>- lineState.jumpTo(flowContents.style().collapseWhitespace ? flowContents.findNextNonWhitespacePosition(lineState.position, spaceCount) : lineState.position, 0);
</del><ins>+ lineState.jumpTo(flowContents.style().collapseWhitespace ? flowContents.findNextNonWhitespacePosition(previousLine.position, spaceCount) : previousLine.position, 0);
</ins><span class="cx"> }
</span><del>- lineState.oveflowedFragment = FlowContents::TextFragment();
</del><ins>+ return lineState;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static FlowContents::TextFragment splitFragmentToFitLine(FlowContents::TextFragment& fragmentToSplit, float availableWidth, bool keepAtLeastOneCharacter, const FlowContents& flowContents)
</span><span class="lines">@@ -401,7 +415,7 @@
</span><span class="cx"> ++right;
</span><span class="cx"> FlowContents::TextFragment fragmentForNextLine(fragmentToSplit);
</span><span class="cx"> fragmentToSplit.end = right;
</span><del>- fragmentToSplit.width = fragmentToSplit.isEmpty() ? 0 : flowContents.textWidth(fragmentToSplit.start, right, 0);
</del><ins>+ fragmentToSplit.width = fragmentToSplit.isEmpty() ? 0 : flowContents.textWidth(fragmentToSplit.start, fragmentToSplit.end, 0);
</ins><span class="cx">
</span><span class="cx"> fragmentForNextLine.start = fragmentToSplit.end;
</span><span class="cx"> fragmentForNextLine.width -= fragmentToSplit.width;
</span><span class="lines">@@ -509,15 +523,6 @@
</span><span class="cx"> } while (++runIndex < lineRuns.size());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void updateLineConstrains(const RenderBlockFlow& flow, float& availableWidth, float& logicalLeftOffset)
-{
- LayoutUnit height = flow.logicalHeight();
- LayoutUnit logicalHeight = flow.minLineHeightForReplacedRenderer(false, 0);
- float logicalRightOffset = flow.logicalRightOffsetForLine(height, false, logicalHeight);
- logicalLeftOffset = flow.logicalLeftOffsetForLine(height, false, logicalHeight);
- availableWidth = std::max<float>(0, logicalRightOffset - logicalLeftOffset);
-}
-
</del><span class="cx"> static void createTextRuns(Layout::RunVector& runs, RenderBlockFlow& flow, unsigned& lineCount)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit borderAndPaddingBefore = flow.borderAndPaddingBefore();
</span><span class="lines">@@ -528,8 +533,7 @@
</span><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> flow.setLogicalHeight(lineHeight * lineCount + borderAndPaddingBefore);
</span><del>- updateLineConstrains(flow, lineState.availableWidth, lineState.logicalLeftOffset);
- initializeNewLine(lineState, flowContents, runs.size());
</del><ins>+ lineState = initializeNewLine(lineState, flow, flowContents, runs.size());
</ins><span class="cx"> isEndOfContent = createLineRuns(lineState, runs, flowContents);
</span><span class="cx"> closeLineEndingAndAdjustRuns(lineState, runs, lineCount, flowContents);
</span><span class="cx"> } while (!isEndOfContent);
</span></span></pre>
</div>
</div>
</body>
</html>