<!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>[159757] trunk/LayoutTests</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/159757">159757</a></dd>
<dt>Author</dt> <dd>robert@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-25 10:46:51 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add complex line layout path version of empty-clear-blocks.html
https://bugs.webkit.org/show_bug.cgi?id=124808
Reviewed by Sam Weinig.
* fast/block/margin-collapse/empty-clear-blocks-complex-expected.html: Added.
* fast/block/margin-collapse/empty-clear-blocks-complex.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockmargincollapseemptyclearblockscomplexexpectedhtml">trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastblockmargincollapseemptyclearblockscomplexhtml">trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159756 => 159757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-11-25 18:41:13 UTC (rev 159756)
+++ trunk/LayoutTests/ChangeLog        2013-11-25 18:46:51 UTC (rev 159757)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-11-25 Robert Hogan <robert@webkit.org>
+
+ Add complex line layout path version of empty-clear-blocks.html
+ https://bugs.webkit.org/show_bug.cgi?id=124808
+
+ Reviewed by Sam Weinig.
+
+ * fast/block/margin-collapse/empty-clear-blocks-complex-expected.html: Added.
+ * fast/block/margin-collapse/empty-clear-blocks-complex.html: Added.
+
</ins><span class="cx"> 2013-11-25 Laszlo Vidacs <lac@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Vertical border spacing is doubled between table row groups
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockmargincollapseemptyclearblockscomplexexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex-expected.html (0 => 159757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex-expected.html         (rev 0)
+++ trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex-expected.html        2013-11-25 18:46:51 UTC (rev 159757)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<head>
+<style>
+div {
+ width:100px;
+ height:100px;
+ background-color:lime;
+ float:left
+}
+
+span {
+ display:block
+}
+</style>
+</head>
+<body>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+<span>This text should be immediately under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+<span style="margin-top:40px">This text should be 10px under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:30px;margin-bottom:-60px"></span>
+<span style="margin-top:60px">This text should be to the right of the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+<span>This text should be immediately under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:30px"></span>
+<span style="margin-top:40px">This text should be 10px under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:-30px"></span>
+<span style="margin-top:30px">This text should be 20px under the float.</span>
+<hr>
+<span style="border:10px dotted black">
+ <span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+ This paragraph has a bottom margin of 50px.</span>
+ <span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+</span>
+<hr>
+<span style="border:10px dotted black">
+ <span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+ This paragraph has a bottom margin of 50px.</span>
+ <span style="clear:both; margin-top:-30px"></span>
+</span>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockmargincollapseemptyclearblockscomplexhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex.html (0 => 159757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex.html         (rev 0)
+++ trunk/LayoutTests/fast/block/margin-collapse/empty-clear-blocks-complex.html        2013-11-25 18:46:51 UTC (rev 159757)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<head>
+<style>
+div {
+ width:100px;
+ height:100px;
+ background-color:lime;
+ float:left
+}
+
+span {
+ display:block
+}
+</style>
+<script>
+// Force line box path.
+if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+</script>
+</head>
+<body>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+<span>This text should be immediately under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+<span style="margin-top:40px">This text should be 10px under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:30px;margin-bottom:-60px"></span>
+<span style="margin-top:60px">This text should be to the right of the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+<span>This text should be immediately under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:30px"></span>
+<span style="margin-top:40px">This text should be 10px under the float.</span>
+<hr>
+<span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+This paragraph has a bottom margin of 50px.</span>
+<span style="clear:both; margin-top:-30px"></span>
+<span style="margin-top:30px">This text should be 20px under the float.</span>
+<hr>
+<span style="border:10px dotted black">
+ <span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+ This paragraph has a bottom margin of 50px.</span>
+ <span style="clear:both; margin-top:25px;margin-bottom:30px"></span>
+</span>
+<hr>
+<span style="border:10px dotted black">
+ <span style="margin-bottom:50px"><div>This is a float that is 100px high.</div>
+ This paragraph has a bottom margin of 50px.</span>
+ <span style="clear:both; margin-top:-30px"></span>
+</span>
</ins></span></pre>
</div>
</div>
</body>
</html>