<!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>[69500] branches/chromium/517</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/69500">69500</a></dd>
<dt>Author</dt> <dd>inferno@chromium.org</dd>
<dt>Date</dt> <dd>2010-10-11 09:21:41 -0700 (Mon, 11 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge 69476

BUG=57200
Review URL: http://codereview.chromium.org/3662002</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheschromium517WebCorerenderingRenderBoxcpp">branches/chromium/517/WebCore/rendering/RenderBox.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedexpectedchecksum">branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.checksum</a></li>
<li><a href="#brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedexpectedpng">branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.png</a></li>
<li><a href="#brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedexpectedtxt">branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.txt</a></li>
<li><a href="#brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedhtml">branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedexpectedchecksumfromrev69476trunkLayoutTestsfastflexboxoverhangingfloatsremovedexpectedchecksum"></a>
<div class="copfile"><h4>Copied: branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.checksum (from rev 69476, trunk/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.checksum) (0 => 69500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.checksum                                (rev 0)
+++ branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.checksum        2010-10-11 16:21:41 UTC (rev 69500)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+2423f179100b3721cb89ba9ab955c206
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedexpectedpngfromrev69476trunkLayoutTestsfastflexboxoverhangingfloatsremovedexpectedpng"></a>
<div class="binary"><h4>Copied: branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.png (from rev 69476, trunk/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.png)</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedexpectedtxtfromrev69476trunkLayoutTestsfastflexboxoverhangingfloatsremovedexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.txt (from rev 69476, trunk/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.txt) (0 => 69500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.txt                                (rev 0)
+++ branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed-expected.txt        2010-10-11 16:21:41 UTC (rev 69500)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderFlexibleBox {DIV} at (0,0) size 784x160
+        RenderBlock {DIV} at (0,0) size 80x80 [bgcolor=#0000FF]
+        RenderBlock {DIV} at (0,80) size 80x80 [bgcolor=#FFFF00]
+          RenderText {#text} at (0,0) size 176x48
+            text run at (0,0) width 64: &quot;Test&quot;
+            text run at (0,16) width 176: &quot;overhanging&quot;
+            text run at (0,32) width 96: &quot;floats&quot;
</ins></span></pre></div>
<a id="brancheschromium517LayoutTestsfastflexboxoverhangingfloatsremovedhtmlfromrev69476trunkLayoutTestsfastflexboxoverhangingfloatsremovedhtml"></a>
<div class="copfile"><h4>Copied: branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed.html (from rev 69476, trunk/LayoutTests/fast/flexbox/overhanging-floats-removed.html) (0 => 69500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed.html                                (rev 0)
+++ branches/chromium/517/LayoutTests/fast/flexbox/overhanging-floats-removed.html        2010-10-11 16:21:41 UTC (rev 69500)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+&lt;div style=&quot;display: -webkit-box; -webkit-box-orient: vertical;&quot;&gt;
+    &lt;div style=&quot;width: 80px; height: 80px; background-color: blue;&quot;&gt;
+        &lt;div id=&quot;float&quot; style=&quot;float: left; width: 20px; height: 110px; background-color: silver;&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+    &lt;div style=&quot;font-family: ahem; width: 80px; height: 80px; background-color: yellow;&quot;&gt;Test overhanging floats&lt;/div&gt;
+&lt;/div&gt;
+&lt;script&gt;
+    document.body.offsetTop;
+    document.getElementById(&quot;float&quot;).style.display = &quot;none&quot;;
+&lt;/script&gt;
</ins></span></pre></div>
<a id="brancheschromium517WebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/chromium/517/WebCore/rendering/RenderBox.cpp (69499 => 69500)</h4>
<pre class="diff"><span>
<span class="info">--- branches/chromium/517/WebCore/rendering/RenderBox.cpp        2010-10-11 16:19:34 UTC (rev 69499)
+++ branches/chromium/517/WebCore/rendering/RenderBox.cpp        2010-10-11 16:21:41 UTC (rev 69500)
</span><span class="lines">@@ -111,8 +111,13 @@
</span><span class="cx">                 outermostBlock = p;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (outermostBlock)
</del><ins>+        if (outermostBlock) {
+            RenderObject* parent = outermostBlock-&gt;parent();
+            if (parent &amp;&amp; parent-&gt;isFlexibleBox())
+                outermostBlock = toRenderBlock(parent);
+
</ins><span class="cx">             outermostBlock-&gt;markAllDescendantsWithFloatsForLayout(this, false);
</span><ins>+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (isPositioned()) {
</span></span></pre>
</div>
</div>

</body>
</html>