<!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>[45608] 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/45608">45608</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2009-07-07 14:36:21 -0700 (Tue, 07 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebCore:

        Reviewed by Simon Fraser.

        - fix https://bugs.webkit.org/show_bug.cgi?id=27042
          &lt;rdar://problem/7010981&gt; Incomplete painting of newly created floats

        Tests: fast/repaint/float-in-new-block-with-layout-delta.html
               fast/repaint/float-new-in-block.html

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::layoutBlockChildren): If the child has never been
        laid out before, paint its overhanging floats in addition to itself.
        * rendering/RenderBlock.h:
        (WebCore::RenderBlock::FloatWithRect::FloatWithRect): Added and
        initialized a boolean everHadLayout member.
        * rendering/bidi.cpp:
        (WebCore::RenderBlock::layoutInlineChildren): Paint floats that have
        never been laid out before and did not move from (0, 0).

LayoutTests:

        Reviewed by Simon Fraser.

        - tests for https://bugs.webkit.org/show_bug.cgi?id=27042
          &lt;rdar://problem/7010981&gt; Incomplete painting of newly created floats

        * fast/repaint/float-in-new-block-with-layout-delta.html: Added.
        * fast/repaint/float-new-in-block.html: Added.
        * platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.checksum: Added.
        * platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.png: Added.
        * platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.txt: Added.
        * platform/mac/fast/repaint/float-new-in-block-expected.checksum: Added.
        * platform/mac/fast/repaint/float-new-in-block-expected.png: Added.
        * platform/mac/fast/repaint/float-new-in-block-expected.txt: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockcpp">trunk/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockh">trunk/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkWebCorerenderingbidicpp">trunk/WebCore/rendering/bidi.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrepaintfloatinnewblockwithlayoutdeltahtml">trunk/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintfloatnewinblockhtml">trunk/LayoutTests/fast/repaint/float-new-in-block.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintfloatinnewblockwithlayoutdeltaexpectedchecksum">trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.checksum</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintfloatinnewblockwithlayoutdeltaexpectedpng">trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintfloatinnewblockwithlayoutdeltaexpectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintfloatnewinblockexpectedchecksum">trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.checksum</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintfloatnewinblockexpectedpng">trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastrepaintfloatnewinblockexpectedtxt">trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (45607 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-07-07 21:27:19 UTC (rev 45607)
+++ trunk/LayoutTests/ChangeLog        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2009-07-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        - tests for https://bugs.webkit.org/show_bug.cgi?id=27042
+          &lt;rdar://problem/7010981&gt; Incomplete painting of newly created floats
+
+        * fast/repaint/float-in-new-block-with-layout-delta.html: Added.
+        * fast/repaint/float-new-in-block.html: Added.
+        * platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.checksum: Added.
+        * platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.png: Added.
+        * platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.txt: Added.
+        * platform/mac/fast/repaint/float-new-in-block-expected.checksum: Added.
+        * platform/mac/fast/repaint/float-new-in-block-expected.png: Added.
+        * platform/mac/fast/repaint/float-new-in-block-expected.txt: Added.
+
</ins><span class="cx"> 2009-07-07  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintfloatinnewblockwithlayoutdeltahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html (0 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html                                (rev 0)
+++ trunk/LayoutTests/fast/repaint/float-in-new-block-with-layout-delta.html        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+&lt;script src=&quot;resources/repaint.js&quot; type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+    function repaintTest()
+    {
+        document.getElementById(&quot;target&quot;).style.removeProperty(&quot;display&quot;);
+    }
+&lt;/script&gt;
+&lt;body onload=&quot;runRepaintTest()&quot;&gt;
+    &lt;div style=&quot;height: 100px;&quot;&gt;&lt;/div&gt;
+    &lt;div id=&quot;target&quot; style=&quot;display: none&quot;&gt;
+        &lt;div style=&quot;float: left; width: 100px; height: 100px; background-color: green;&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintfloatnewinblockhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/float-new-in-block.html (0 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/float-new-in-block.html                                (rev 0)
+++ trunk/LayoutTests/fast/repaint/float-new-in-block.html        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+&lt;script src=&quot;resources/repaint.js&quot; type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+    function repaintTest()
+    {
+        document.getElementById(&quot;target&quot;).style.removeProperty(&quot;display&quot;);
+    }
+&lt;/script&gt;
+&lt;body onload=&quot;runRepaintTest()&quot;&gt;
+    &lt;div style=&quot;height: 20px; background-color: lightblue;&quot;&gt;
+        &lt;div id=&quot;target&quot; style=&quot;display: none; float: left; width: 100px; height: 100px; background-color: green;&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintfloatinnewblockwithlayoutdeltaexpectedchecksum"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.checksum (0 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.checksum                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.checksum        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+119c6f076165975c4d299ab1d9019776
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintfloatinnewblockwithlayoutdeltaexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfastrepaintfloatinnewblockwithlayoutdeltaexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.txt (0 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/repaint/float-in-new-block-with-layout-delta-expected.txt        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -0,0 +1,8 @@
</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
+      RenderBlock {DIV} at (0,0) size 784x100
+      RenderBlock {DIV} at (0,100) size 784x0
+        RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintfloatnewinblockexpectedchecksum"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.checksum (0 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.checksum                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.checksum        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+99f6144826b8ed1579bea64f9ecb381e
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastrepaintfloatnewinblockexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfastrepaintfloatnewinblockexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.txt (0 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/repaint/float-new-in-block-expected.txt        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -0,0 +1,7 @@
</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
+      RenderBlock {DIV} at (0,0) size 784x20 [bgcolor=#ADD8E6]
+        RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (45607 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-07 21:27:19 UTC (rev 45607)
+++ trunk/WebCore/ChangeLog        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2009-07-07  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        - fix https://bugs.webkit.org/show_bug.cgi?id=27042
+          &lt;rdar://problem/7010981&gt; Incomplete painting of newly created floats
+
+        Tests: fast/repaint/float-in-new-block-with-layout-delta.html
+               fast/repaint/float-new-in-block.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlockChildren): If the child has never been
+        laid out before, paint its overhanging floats in addition to itself.
+        * rendering/RenderBlock.h:
+        (WebCore::RenderBlock::FloatWithRect::FloatWithRect): Added and
+        initialized a boolean everHadLayout member.
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren): Paint floats that have
+        never been laid out before and did not move from (0, 0).
+
</ins><span class="cx"> 2009-07-07  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Contributions from both Darin Adler and Brady Eidson.
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.cpp (45607 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.cpp        2009-07-07 21:27:19 UTC (rev 45607)
+++ trunk/WebCore/rendering/RenderBlock.cpp        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -1475,8 +1475,10 @@
</span><span class="cx">                 child-&gt;repaintDuringLayoutIfMoved(oldRect);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (!childHadLayout &amp;&amp; child-&gt;checkForRepaintDuringLayout())
</del><ins>+        if (!childHadLayout &amp;&amp; child-&gt;checkForRepaintDuringLayout()) {
</ins><span class="cx">             child-&gt;repaint();
</span><ins>+            child-&gt;repaintOverhangingFloats(true);
+        }
</ins><span class="cx"> 
</span><span class="cx">         ASSERT(oldLayoutDelta == view()-&gt;layoutDelta());
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.h (45607 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.h        2009-07-07 21:27:19 UTC (rev 45607)
+++ trunk/WebCore/rendering/RenderBlock.h        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -153,11 +153,13 @@
</span><span class="cx">         FloatWithRect(RenderBox* f)
</span><span class="cx">             : object(f)
</span><span class="cx">             , rect(IntRect(f-&gt;x() - f-&gt;marginLeft(), f-&gt;y() - f-&gt;marginTop(), f-&gt;width() + f-&gt;marginLeft() + f-&gt;marginRight(), f-&gt;height() + f-&gt;marginTop() + f-&gt;marginBottom()))
</span><ins>+            , everHadLayout(f-&gt;m_everHadLayout)
</ins><span class="cx">         {
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         RenderBox* object;
</span><span class="cx">         IntRect rect;
</span><ins>+        bool everHadLayout;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     void bidiReorderLine(InlineBidiResolver&amp;, const InlineIterator&amp; end, bool previousLineBrokeCleanly);
</span></span></pre></div>
<a id="trunkWebCorerenderingbidicpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/bidi.cpp (45607 => 45608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/bidi.cpp        2009-07-07 21:27:19 UTC (rev 45607)
+++ trunk/WebCore/rendering/bidi.cpp        2009-07-07 21:36:21 UTC (rev 45608)
</span><span class="lines">@@ -1120,6 +1120,17 @@
</span><span class="cx">             }
</span><span class="cx">             lastFloat = m_floatingObjects-&gt;last();
</span><span class="cx">         }
</span><ins>+        size_t floatCount = floats.size();
+        // Floats that did not have layout did not repaint when we laid them out. They would have
+        // painted by now if they had moved, but if they stayed at (0, 0), they still need to be
+        // painted.
+        for (size_t i = 0; i &lt; floatCount; ++i) {
+            if (!floats[i].everHadLayout) {
+                RenderBox* f = floats[i].object;
+                if (!f-&gt;x() &amp;&amp; !f-&gt;y() &amp;&amp; f-&gt;checkForRepaintDuringLayout())
+                    f-&gt;repaint();
+            }
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Now add in the bottom border/padding.
</span></span></pre>
</div>
</div>

</body>
</html>