Changeset 13982 in webkit

Timestamp:

Apr 19, 2006 7:51:48 PM (18 years ago)

Author:

thatcher

Message:

Reviewed by Haytt.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6770 REGRESSION: Incomplete repaint when block with clipping grows

• manual-tests/repaint-resized-overflow.html: Added.
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::RenderLayer): (WebCore::RenderLayer::computeRepaintRects): Set the m_repaintOverflowOnResize flag to true if our object itself needs layout or if we're an overflow and have a normal child that needs layout, in which case if we end up resizing it will be because of the child, and that child might have not repainted itself correctly during its own layout. (WebCore::RenderLayer::updateLayerPositions): Do a full repaint if m_repaintOverflowOnResize is set and we resized but didn't move.
• rendering/RenderLayer.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/repaint-resized-overflow.html (added)
• rendering/RenderLayer.cpp (modified) (3 diffs)
• rendering/RenderLayer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-04-19  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Haytt.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6770
+          REGRESSION: Incomplete repaint when block with clipping grows
+
+        * manual-tests/repaint-resized-overflow.html: Added.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::RenderLayer):
+        (WebCore::RenderLayer::computeRepaintRects): Set the m_repaintOverflowOnResize
+        flag to true if our object itself needs layout or if we're an overflow
+        and have a normal child that needs layout, in which case if we end up
+        resizing it will be because of the child, and that child might have not repainted
+        itself correctly during its own layout.
+        (WebCore::RenderLayer::updateLayerPositions): Do a full repaint if
+        m_repaintOverflowOnResize is set and we resized but didn't move.
+        * rendering/RenderLayer.h:
+
 2006-04-19  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -139 +139 @@
 m_usedTransparency(false),
 m_inOverflowRelayout(false),
+m_repaintOverflowOnResize(false),
 m_marquee(0)
 {
@@ -162 +163 @@
     // FIXME: Child object could override visibility.
     if (m_object->style()->visibility() == VISIBLE) {
+        m_repaintOverflowOnResize = m_object->selfNeedsLayout() || m_object->hasOverflowClip() && m_object->normalChildNeedsLayout();
         m_object->getAbsoluteRepaintRectIncludingFloats(m_repaintRect, m_fullRepaintRect);
         m_object->absolutePosition(m_repaintX, m_repaintY);
@@ -191 +193 @@
     // FIXME: Child object could override visibility.
     if (checkForRepaint && (m_object->style()->visibility() == VISIBLE)) {
-        int x, y;
-        m_object->absolutePosition(x, y);
-        if (x == m_repaintX && y == m_repaintY)
-            m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect);
-        else {
-            RenderCanvas *c = m_object->canvas();
-            if (c && !c->printingMode()) {
-                c->repaintViewRectangle(m_fullRepaintRect);
-                IntRect newRect, newFullRect;
+        RenderCanvas *c = m_object->canvas();
+        if (c && !c->printingMode()) {
+            int x, y;
+            m_object->absolutePosition(x, y);
+            IntRect newRect, newFullRect;
+            bool didMove = x != m_repaintX || y != m_repaintY;
+            if (!didMove && !m_repaintOverflowOnResize)
+                m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect);
+            else {
                 m_object->getAbsoluteRepaintRectIncludingFloats(newRect, newFullRect);
-                if (newRect != m_repaintRect)
+                if (didMove || newRect != m_repaintRect) {
+                    c->repaintViewRectangle(m_fullRepaintRect);
                     c->repaintViewRectangle(newFullRect);
+                }
             }
         }

trunk/WebCore/rendering/RenderLayer.h

@@ -398 +398 @@
                                  // blend).
     bool m_inOverflowRelayout : 1;
+    bool m_repaintOverflowOnResize : 1;
 
     Marquee* m_marquee; // Used by layers with overflow:marquee