<!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>[178346] releases/WebKitGTK/webkit-2.6</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/178346">178346</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 02:32:39 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/177128">r177128</a> - Continuously repainting large parts of Huffington Post.
https://bugs.webkit.org/show_bug.cgi?id=139468
Reviewed by Antti Koivisto.
This patch eliminates redundant repaint requests for inlines when neither the parent
block flow nor any of the inline children are dirty.
Previously,
1. simple line layout always recalculated inline content positions regardless of whether
the content needed relayout at all; as a result, it always triggered full repaint.
2. inline tree layout ignored the needslayout flag on the last line and treated it dirty
(unless it broke cleanly (<div>foo<br></div>)).
This was an ancient workaround for an editing/insert use case, but it seems not to be the case anymore.
Source/WebCore:
Tests: fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html
fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutInlineChildren):
(WebCore::RenderBlockFlow::layoutSimpleLines): Check if we need to trigger layout at all.
* rendering/RenderBlockFlow.h:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::determineStartPosition): Remove the last line dirty hack. If it
happens to introduce regression, we should fix it at the caller site to make the line dirty.
LayoutTests:
* fast/repaint/implicitly-positioned-block-repaint-complex-line-layout-expected.txt: Added.
* fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html: Added.
* fast/repaint/implicitly-positioned-block-repaint-simple-line-layout-expected.txt: Added.
* fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html: Added.
* platform/mac/fast/line-grid/line-align-right-edges-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformmacfastlinegridlinealignrightedgesexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/fast/line-grid/line-align-right-edges-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderBlockFlowcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderBlockFlowh">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderBlockLineLayoutcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintcomplexlinelayoutexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintcomplexlinelayouthtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintsimplelinelayoutexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintsimplelinelayouthtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (178345 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 10:22:15 UTC (rev 178345)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-12-10 Zalan Bujtas <zalan@apple.com>
+
+ Continuously repainting large parts of Huffington Post.
+ https://bugs.webkit.org/show_bug.cgi?id=139468
+
+ Reviewed by Antti Koivisto.
+
+ This patch eliminates redundant repaint requests for inlines when neither the parent
+ block flow nor any of the inline children are dirty.
+ Previously,
+ 1. simple line layout always recalculated inline content positions regardless of whether
+ the content needed relayout at all; as a result, it always triggered full repaint.
+ 2. inline tree layout ignored the needslayout flag on the last line and treated it dirty
+ (unless it broke cleanly (<div>foo<br></div>)).
+ This was an ancient workaround for an editing/insert use case, but it seems not to be the case anymore.
+
+ * fast/repaint/implicitly-positioned-block-repaint-complex-line-layout-expected.txt: Added.
+ * fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html: Added.
+ * fast/repaint/implicitly-positioned-block-repaint-simple-line-layout-expected.txt: Added.
+ * fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html: Added.
+ * platform/mac/fast/line-grid/line-align-right-edges-expected.txt:
+
</ins><span class="cx"> 2014-12-10 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r164329): Input fields are not honoring the maxlength attribute
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintcomplexlinelayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout-expected.txt (0 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout-expected.txt 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+PASS window.internals.repaintRectsAsText().indexOf('8 541 180 18') is -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+this is scrolling and should be repainted.
+this should not be repainting
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintcomplexlinelayouthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html (0 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<html>
+<head>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+
+<script>
+window.onload = function() {
+ if (window.internals) {
+ internals.settings.setSimpleLineLayoutEnabled(false)
+ window.internals.startTrackingRepaints();
+ }
+ setTimeout(function() {
+ document.querySelector('#scroll_inner').style.left = "100px";
+ if (!window.testRunner || !window.internals)
+ return;
+
+ shouldBe("window.internals.repaintRectsAsText().indexOf('8 541 180 18')", "-1");
+ window.internals.stopTrackingRepaints();
+ finishJSTest();
+ }, 10);
+}
+</script>
+<style>
+#scroll_container {
+ width: 200px;
+ white-space: nowrap;
+ overflow: hidden;
+ border: 1px solid black;
+}
+#scroll_inner {
+ position: relative;
+}
+
+#innocent_repaint_victim {
+ position: absolute;
+ border: 1px solid green;
+}
+</style>
+</head>
+<body>
+<div id="scroll_container">
+ <span id="scroll_inner">
+ this is scrolling and should be repainted.
+ </span>
+</div>
+
+<!-- padding 512px so we get to the next tile -->
+<div style="height: 512px;"></div>
+
+<div id="innocent_repaint_victim">
+ this should not be repainting
+</div>
+<pre id="repaints"></pre>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintsimplelinelayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout-expected.txt (0 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout-expected.txt 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+PASS window.internals.repaintRectsAsText().indexOf('8 541 180 18') is -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+this is scrolling and should be repainted.
+this should not be repainting
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastrepaintimplicitlypositionedblockrepaintsimplelinelayouthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html (0 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<html>
+<head>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+
+<script>
+window.onload = function() {
+ if (window.internals)
+ window.internals.startTrackingRepaints();
+
+ setTimeout(function() {
+ document.querySelector('#scroll_inner').style.left = "100px";
+ if (!window.testRunner || !window.internals)
+ return;
+
+ shouldBe("window.internals.repaintRectsAsText().indexOf('8 541 180 18')", "-1");
+ window.internals.stopTrackingRepaints();
+ finishJSTest();
+ }, 10);
+}
+</script>
+<style>
+#scroll_container {
+ width: 200px;
+ white-space: nowrap;
+ overflow: hidden;
+ border: 1px solid black;
+}
+#scroll_inner {
+ position: relative;
+}
+
+#innocent_repaint_victim {
+ position: absolute;
+ border: 1px solid green;
+}
+</style>
+</head>
+<body>
+<div id="scroll_container">
+ <span id="scroll_inner">
+ this is scrolling and should be repainted.
+ </span>
+</div>
+
+<!-- padding 512px so we get to the next tile -->
+<div style="height: 512px;"></div>
+
+<div id="innocent_repaint_victim">
+ this should not be repainting
+</div>
+<pre id="repaints"></pre>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformmacfastlinegridlinealignrightedgesexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/fast/line-grid/line-align-right-edges-expected.txt (178345 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/fast/line-grid/line-align-right-edges-expected.txt 2015-01-13 10:22:15 UTC (rev 178345)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/fast/line-grid/line-align-right-edges-expected.txt 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -21,5 +21,5 @@
</span><span class="cx"> text run at (360,33) width 216: "X X X X X"
</span><span class="cx"> layer at (342,308) size 300x30
</span><span class="cx"> RenderBlock (positioned) {DIV} at (334,300) size 300x30 [bgcolor=#DDDDDD]
</span><del>- RenderText {#text} at (170,3) size 120x24
- text run at (170,3) width 120: "X X X"
</del><ins>+ RenderText {#text} at (161,3) size 120x24
+ text run at (161,3) width 120: "X X X"
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178345 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 10:22:15 UTC (rev 178345)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-12-10 Zalan Bujtas <zalan@apple.com>
+
+ Continuously repainting large parts of Huffington Post.
+ https://bugs.webkit.org/show_bug.cgi?id=139468
+
+ Reviewed by Antti Koivisto.
+
+ This patch eliminates redundant repaint requests for inlines when neither the parent
+ block flow nor any of the inline children are dirty.
+ Previously,
+ 1. simple line layout always recalculated inline content positions regardless of whether
+ the content needed relayout at all; as a result, it always triggered full repaint.
+ 2. inline tree layout ignored the needslayout flag on the last line and treated it dirty
+ (unless it broke cleanly (<div>foo<br></div>)).
+ This was an ancient workaround for an editing/insert use case, but it seems not to be the case anymore.
+
+ Tests: fast/repaint/implicitly-positioned-block-repaint-complex-line-layout.html
+ fast/repaint/implicitly-positioned-block-repaint-simple-line-layout.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutInlineChildren):
+ (WebCore::RenderBlockFlow::layoutSimpleLines): Check if we need to trigger layout at all.
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::determineStartPosition): Remove the last line dirty hack. If it
+ happens to introduce regression, we should fix it at the caller site to make the line dirty.
+
</ins><span class="cx"> 2014-12-10 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r164329): Input fields are not honoring the maxlength attribute
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.cpp (178345 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-01-13 10:22:15 UTC (rev 178345)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -644,8 +644,7 @@
</span><span class="cx"> m_lineLayoutPath = SimpleLineLayout::canUseFor(*this) ? SimpleLinesPath : LineBoxesPath;
</span><span class="cx">
</span><span class="cx"> if (m_lineLayoutPath == SimpleLinesPath) {
</span><del>- deleteLineBoxesBeforeSimpleLineLayout();
- layoutSimpleLines(repaintLogicalTop, repaintLogicalBottom);
</del><ins>+ layoutSimpleLines(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3477,18 +3476,19 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlockFlow::layoutSimpleLines(LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom)
</del><ins>+void RenderBlockFlow::layoutSimpleLines(bool relayoutChildren, LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom)
</ins><span class="cx"> {
</span><ins>+ bool needsLayout = selfNeedsLayout() || relayoutChildren || !m_simpleLineLayout;
+ if (needsLayout) {
+ deleteLineBoxesBeforeSimpleLineLayout();
+ m_simpleLineLayout = SimpleLineLayout::create(*this);
+ }
</ins><span class="cx"> ASSERT(!m_lineBoxes.firstLineBox());
</span><span class="cx">
</span><del>- m_simpleLineLayout = SimpleLineLayout::create(*this);
-
</del><span class="cx"> LayoutUnit lineLayoutHeight = SimpleLineLayout::computeFlowHeight(*this, *m_simpleLineLayout);
</span><span class="cx"> LayoutUnit lineLayoutTop = borderAndPaddingBefore();
</span><del>-
</del><span class="cx"> repaintLogicalTop = lineLayoutTop;
</span><del>- repaintLogicalBottom = lineLayoutTop + lineLayoutHeight;
-
</del><ins>+ repaintLogicalBottom = needsLayout ? repaintLogicalTop + lineLayoutHeight : repaintLogicalTop;
</ins><span class="cx"> setLogicalHeight(lineLayoutTop + lineLayoutHeight + borderAndPaddingAfter());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.h (178345 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.h 2015-01-13 10:22:15 UTC (rev 178345)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockFlow.h 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const;
</span><span class="cx">
</span><span class="cx"> void layoutLineBoxes(bool relayoutChildren, LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom);
</span><del>- void layoutSimpleLines(LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom);
</del><ins>+ void layoutSimpleLines(bool relayoutChildren, LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom);
</ins><span class="cx">
</span><span class="cx"> virtual std::unique_ptr<RootInlineBox> createRootInlineBox(); // Subclassed by RenderSVGText.
</span><span class="cx"> InlineFlowBox* createLineBoxes(RenderObject*, const LineInfo&, InlineBox* childBox);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockLineLayout.cpp (178345 => 178346)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-13 10:22:15 UTC (rev 178345)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-13 10:32:39 UTC (rev 178346)
</span><span class="lines">@@ -1570,13 +1570,7 @@
</span><span class="cx"> // that has been deleted, so treat it as dirty too.
</span><span class="cx"> curr = prevRootBox;
</span><span class="cx"> }
</span><del>- } else {
- // No dirty lines were found.
- // If the last line didn't break cleanly, treat it as dirty.
- if (lastRootBox() && !lastRootBox()->endsWithBreak())
- curr = lastRootBox();
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> // If we have no dirty lines, then last is just the last root box.
</span><span class="cx"> last = curr ? curr->prevRootBox() : lastRootBox();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>