<!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>[178114] trunk</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/178114">178114</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 08:14:59 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Borders inside box-decoration-break: clone after a br do not contribute to line breaking
https://bugs.webkit.org/show_bug.cgi?id=140238
Reviewed by Darin Adler.
Source/WebCore:
When we iterate through renderers for line breaking, we determine which of the renderers
is responsible for inserting its parent's border width. However, this determination didn't
take a <br> and box-decoration-break: clone into account.
Test: fast/box-decoration-break/box-decoration-break-clone-line-break.html
* rendering/line/BreakingContextInlineHeaders.h:
(WebCore::shouldAddBorderPaddingMargin):
(WebCore::previousInFlowSibling): Clean up to use a do / while block.
LayoutTests:
* fast/box-decoration-break/box-decoration-break-clone-line-break-expected.html: Added.
* fast/box-decoration-break/box-decoration-break-clone-line-break.html: Added.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastboxdecorationbreakboxdecorationbreakclonelinebreakexpectedhtml">trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastboxdecorationbreakboxdecorationbreakclonelinebreakhtml">trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178113 => 178114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-08 15:55:16 UTC (rev 178113)
+++ trunk/LayoutTests/ChangeLog 2015-01-08 16:14:59 UTC (rev 178114)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Borders inside box-decoration-break: clone after a br do not contribute to line breaking
+ https://bugs.webkit.org/show_bug.cgi?id=140238
+
+ Reviewed by Darin Adler.
+
+ * fast/box-decoration-break/box-decoration-break-clone-line-break-expected.html: Added.
+ * fast/box-decoration-break/box-decoration-break-clone-line-break.html: Added.
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-01-08 Bartlomiej Gajda <b.gajda@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Clean typos in tests expectations after r177492.
</span></span></pre></div>
<a id="trunkLayoutTestsfastboxdecorationbreakboxdecorationbreakclonelinebreakexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break-expected.html (0 => 178114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break-expected.html (rev 0)
+++ trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break-expected.html 2015-01-08 16:14:59 UTC (rev 178114)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that starting border after a newline inside a box-decoration-break span correctly influences line breaking.
+<div style="width: 200px; background: yellow; font: 20px Ahem; color: blue;">
+<span style="border-left: 160px solid black; -webkit-box-decoration-break: clone;">a</span><br>
+<span style="border-left: 160px solid black; -webkit-box-decoration-break: clone;">a</span><br>
+<span style="border-left: 160px solid black; -webkit-box-decoration-break: clone;">a</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastboxdecorationbreakboxdecorationbreakclonelinebreakhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break.html (0 => 178114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break.html (rev 0)
+++ trunk/LayoutTests/fast/box-decoration-break/box-decoration-break-clone-line-break.html 2015-01-08 16:14:59 UTC (rev 178114)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that starting border after a newline inside a box-decoration-break span correctly influences line breaking.
+<div style="width: 200px; background: yellow; font: 20px Ahem; color: blue;">
+<span style="border-left: 160px solid black; -webkit-box-decoration-break: clone;">a<br>a a</span>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (178113 => 178114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-01-08 15:55:16 UTC (rev 178113)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-01-08 16:14:59 UTC (rev 178114)
</span><span class="lines">@@ -1340,7 +1340,6 @@
</span><span class="cx"> # Kerning, Ligatures, and Printer Fonts caused these tests to fail
</span><span class="cx"> # The following tests are reftests
</span><span class="cx"> webkit.org/b/139968 css3/flexbox/csswg/flexbox_direction-row-reverse.html [ ImageOnlyFailure ]
</span><del>-webkit.org/b/139968 fast/box-decoration-break/box-decoration-break-rendering.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/139968 fast/css-generated-content/after-with-inline-continuation.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/139968 fast/css-intrinsic-dimensions/width-avoid-floats.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/139968 fast/css/object-fit/object-fit-canvas.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178113 => 178114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-08 15:55:16 UTC (rev 178113)
+++ trunk/Source/WebCore/ChangeLog 2015-01-08 16:14:59 UTC (rev 178114)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Borders inside box-decoration-break: clone after a br do not contribute to line breaking
+ https://bugs.webkit.org/show_bug.cgi?id=140238
+
+ Reviewed by Darin Adler.
+
+ When we iterate through renderers for line breaking, we determine which of the renderers
+ is responsible for inserting its parent's border width. However, this determination didn't
+ take a <br> and box-decoration-break: clone into account.
+
+ Test: fast/box-decoration-break/box-decoration-break-clone-line-break.html
+
+ * rendering/line/BreakingContextInlineHeaders.h:
+ (WebCore::shouldAddBorderPaddingMargin):
+ (WebCore::previousInFlowSibling): Clean up to use a do / while block.
+
</ins><span class="cx"> 2015-01-08 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Seperate updateBackingStore from flushCompositingState.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (178113 => 178114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2015-01-08 15:55:16 UTC (rev 178113)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2015-01-08 16:14:59 UTC (rev 178114)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "RenderCombineText.h"
</span><span class="cx"> #include "RenderCounter.h"
</span><span class="cx"> #include "RenderInline.h"
</span><ins>+#include "RenderLineBreak.h"
</ins><span class="cx"> #include "RenderListMarker.h"
</span><span class="cx"> #include "RenderRubyRun.h"
</span><span class="cx"> #include "RenderSVGInlineText.h"
</span><span class="lines">@@ -269,15 +270,23 @@
</span><span class="cx">
</span><span class="cx"> inline bool shouldAddBorderPaddingMargin(RenderObject* child)
</span><span class="cx"> {
</span><ins>+ if (!child)
+ return true;
</ins><span class="cx"> // When deciding whether we're at the edge of an inline, adjacent collapsed whitespace is the same as no sibling at all.
</span><del>- return !child || (is<RenderText>(*child) && !downcast<RenderText>(*child).textLength());
</del><ins>+ if (is<RenderText>(*child) && !downcast<RenderText>(*child).textLength())
+ return true;
+#if ENABLE(CSS_BOX_DECORATION_BREAK)
+ if (is<RenderLineBreak>(*child) && child->parent()->style().boxDecorationBreak() == DCLONE)
+ return true;
+#endif
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline RenderObject* previousInFlowSibling(RenderObject* child)
</span><span class="cx"> {
</span><del>- child = child->previousSibling();
- while (child && child->isOutOfFlowPositioned())
</del><ins>+ do {
</ins><span class="cx"> child = child->previousSibling();
</span><ins>+ } while (child && child->isOutOfFlowPositioned());
</ins><span class="cx"> return child;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>