Changeset 21120 in webkit

Timestamp:

Apr 26, 2007 12:51:11 PM (17 years ago)

Author:

hyatt

Message:

Reviewed by hyatt

• ​http://bugs.webkit.org/show_bug.cgi?id=13496 Eliminate repaintObjectsBeforeLayout

No tests added since there is no change to functionality. Several
tests in fast/repaint test repainting of objects that move during layout.

• page/FrameView.cpp: (WebCore::FrameView::layout):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::layoutBlockChildren): Removed an early setNeedsLayout(false). Resetting the bit here prevents the full repaint that we rely on when we decide not to repaint children that move.
• rendering/RenderBlock.h:
• rendering/RenderObject.cpp:
• rendering/RenderObject.h:
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::setCellWidths): Replaced the call to repaintObjectsBeforeLayout() if the cell didn't need layout with an unconditional repaint(). We don't bother with repainting only the delta between the old and new widths, since by marking the cell for layout results in a full repaint with the new width anyway.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-26  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by hyatt
+
+        - http://bugs.webkit.org/show_bug.cgi?id=13496
+          Eliminate repaintObjectsBeforeLayout
+
+        No tests added since there is no change to functionality. Several
+        tests in fast/repaint test repainting of objects that move during layout.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlockChildren): Removed an early
+        setNeedsLayout(false). Resetting the bit here prevents the full repaint
+        that we rely on when we decide not to repaint children that move.
+        * rendering/RenderBlock.h:
+        * rendering/RenderObject.cpp:
+        * rendering/RenderObject.h:
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::setCellWidths): Replaced the call to
+        repaintObjectsBeforeLayout() if the cell didn't need layout with
+        an unconditional repaint(). We don't bother with repainting only the
+        delta between the old and new widths, since by marking the cell for
+        layout results in a full repaint with the new width anyway.
+
 2007-04-26  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -406 +406 @@
     RenderLayer* layer = root->enclosingLayer();
      
-    if (!d->doFullRepaint) {
+    if (!d->doFullRepaint)
         layer->checkForRepaintOnResize();
-        root->repaintObjectsBeforeLayout();
-    }
 
     pauseScheduledEvents();

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1237 +1237 @@
     // determining the correct collapsed bottom margin information.
     handleBottomOfBlock(top, bottom, marginInfo);
-
-    // Finished. Clear the dirty layout bits.
-    setNeedsLayout(false);
 }
 
@@ -1295 +1292 @@
             }
         }
-    }
-}
-
-void RenderBlock::repaintObjectsBeforeLayout()
-{
-    RenderFlow::repaintObjectsBeforeLayout();
-    if (!needsLayout())
-        return;
-
-    // Walk our positioned objects.
-    if (m_positionedObjects) {
-        RenderObject* r;
-        DeprecatedPtrListIterator<RenderObject> it(*m_positionedObjects);
-        for ( ; (r = it.current()); ++it )
-            r->repaintObjectsBeforeLayout();
     }
 }

trunk/WebCore/rendering/RenderBlock.h

@@ -100 +100 @@
     virtual void removeChild(RenderObject*);
 
-    virtual void repaintObjectsBeforeLayout();
     virtual void repaintOverhangingFloats(bool paintAllDescendants);
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -1866 +1866 @@
 }
 
-void RenderObject::repaintObjectsBeforeLayout()
-{
-    if (!needsLayout() || isText())
-        return;
-
-    bool blockWithInlineChildren = (isRenderBlock() && !isTable() && normalChildNeedsLayout() && childrenInline());
-    if (selfNeedsLayout()) {
-        repaint();
-        if (blockWithInlineChildren)
-            return;
-    }
-
-    for (RenderObject* current = firstChild(); current; current = current->nextSibling()) {
-        if (!current->isPositioned()) // RenderBlock subclass method handles walking the positioned objects.
-            current->repaintObjectsBeforeLayout();
-    }
-}
-
 IntRect RenderObject::getAbsoluteRepaintRectWithOutline(int ow)
 {

trunk/WebCore/rendering/RenderObject.h

@@ -700 +700 @@
     virtual void repaintOverhangingFloats(bool paintAllDescendants = false);
 
-    // Called before layout to repaint all dirty children (with selfNeedsLayout() set).
-    virtual void repaintObjectsBeforeLayout();
-
     bool checkForRepaintDuringLayout() const;
 

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -283 +283 @@
             int oldWidth = cell->width();
             if (w != oldWidth) {
-                bool neededLayout = cell->selfNeedsLayout();
                 cell->setNeedsLayout(true);
-                if (!neededLayout && !selfNeedsLayout() && cell->checkForRepaintDuringLayout())
-                    cell->repaintObjectsBeforeLayout();
+                if (!table()->selfNeedsLayout() && cell->checkForRepaintDuringLayout())
+                    cell->repaint();
                 cell->setWidth(w);
             }