Changeset 21183 in webkit

Timestamp:

Apr 29, 2007, 1:09:08 PM (18 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Darin and Hyatt.

• test and updated results for ​http://bugs.webkit.org/show_bug.cgi?id=13487 Implement O(1) absoluteClippedOverflowRect and absoluteOutlineBox during layout for a possible speed gain

• fast/repaint/bugzilla-3509-expected.checksum:
• fast/repaint/bugzilla-3509-expected.png:
• fast/repaint/intermediate-layout-position-clip-expected.checksum: Added.
• fast/repaint/intermediate-layout-position-clip-expected.png: Added.
• fast/repaint/intermediate-layout-position-clip-expected.txt: Added.
• fast/repaint/intermediate-layout-position-clip.html: Added.
• fast/repaint/intermediate-layout-position-expected.checksum:
• fast/repaint/intermediate-layout-position-expected.png:

WebCore:

Reviewed by Darin and Hyatt.

• ​http://bugs.webkit.org/show_bug.cgi?id=13487 Implement O(1) absoluteClippedOverflowRect and absoluteOutlineBox during layout for a possible speed gain

Test for a bug fixed by this patch: fast/repaint/intermediate-layout-position-clip.html

By keeping track of the total translation and clip during layout, absolutePosition and
computeAbsoluteRepaintRect become O(1).

• WebCore.pro: Added LayoutState.cpp
• WebCore.vcproj/WebCore/WebCore.vcproj: Added LayoutState.{cpp,h}
• WebCore.xcodeproj/project.pbxproj: Added LayoutState.{cpp,h}
• WebCoreSources.bkl: Added LayoutState.cpp
• page/FrameView.cpp: (WebCore::FrameView::layout): When doing subtree layout, push an initial layout state for the layout root.
• rendering/LayoutState.cpp: Added. A LayoutState corresponding to a box consists of the origin of its coordinate system in view coordinates and possibly the clip rect, in view coordinates, which applies to its children. (WebCore::LayoutState::LayoutState): (WebCore::LayoutState::destroy): (WebCore::throw): (WebCore::LayoutState::operator delete):
• rendering/LayoutState.h: Added. (WebCore::LayoutState::LayoutState):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::layoutBlock): Factored out the "only positioned objects" case into layoutOnlyPositionedObjects(). Added code to push/pop LayoutState, unless we have columns, in which case we disable/enable LayoutState. Removed the translation by the layout delta of the old absolute rects, since that is now integral to absoluteClippedOverflowRect() and absoluteOutlineBox(). (WebCore::RenderBlock::layoutOnlyPositionedObjects): Added this helper function that checks for and handles the case where only positioned objects need layout. Returns true in that case. (WebCore::RenderBlock::repaintOverhangingFloats): Disabled LayoutState when repainting floats, since they may belong to other containers. (WebCore::RenderBlock::updateFirstLetter): Disabled LayoutState when adding and removing from the first letter container, since it may be different than ourselves.
• rendering/RenderBlock.h:
• rendering/RenderBox.cpp: (WebCore::RenderBox::setStyle): Minor cleanup: changed element()->document() to the equivalent document(). (WebCore::RenderBox::offsetForPositionedInContainer): Added. Factored out common code from absolutePosition, computeAbsoluteRepaintRect and RenderLayer::updateLayerPosition into this function. (WebCore::RenderBox::absolutePosition): Added an O(1) code path when this function is called during layout (and LayoutState has not been disabled). Factored out some code into offsetForPositionedInContainer. (WebCore::RenderBox::absoluteClippedOverflowRect): Added the layout delta here, so callers don't need to. (WebCore::RenderBox::computeAbsoluteRepaintRect): Added an O(1) code path when this function is called during layout (and LayoutState has not been disabled). Factored out some code into offsetForPositionedInContainer.
• rendering/RenderContainer.cpp: (WebCore::RenderContainer::layout): Added LayoutState push/pop.
• rendering/RenderFlexibleBox.cpp: (WebCore::RenderFlexibleBox::layoutBlock): Factored out the "only positioned objects" case into layoutOnlyPositionedObjects(). Added LayoutState push/pop. Removed the translation by the layout delta of the old absolute rects, since that is now integral to absoluteClippedOverflowRect() and absoluteOutlineBox().
• rendering/RenderFlow.cpp: (WebCore::RenderFlow::absoluteClippedOverflowRect): Added an ASSERT.
• rendering/RenderForeignObject.cpp: (WebCore::RenderForeignObject::layout): Disabled LayoutState because it is incompatible with arbitrary affine transforms.
• rendering/RenderHTMLCanvas.cpp: (WebCore::RenderHTMLCanvas::layout): Removed the translation by the layout delta of the old absolute rects, since that is now integral to absoluteClippedOverflowRect() and absoluteOutlineBox().
• rendering/RenderImage.cpp: (WebCore::RenderImage::layout): Ditto.
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::updateLayerPositions): Added ASSERTs. Factored out some code into RenderBox::offsetForPositionedInContainer. (WebCore::RenderLayer::updateScrollInfoAfterLayout): Disabled LayoutState around the call to scrollToOffset.
• rendering/RenderListItem.cpp: (WebCore::RenderListItem::updateMarkerLocation): Disabled LayoutState when moving the list marker, since it can trigger repainting in other containers.
• rendering/RenderObject.cpp: (WebCore::RenderObject::isRoot): Minor cleanup: changed element()->document() to the equivalent document(). (WebCore::RenderObject::computeAbsoluteRepaintRect): Removed 'return' at the end of the function. (WebCore::RenderObject::container): Reordered to avoid calling isText() twice. (WebCore::RenderObject::absoluteOutlineBox): Added the layout delta here, so callers don't need to.
• rendering/RenderSVGContainer.cpp: (WebCore::RenderSVGContainer::layout): Disabled LayoutState because it is incompatible with arbitrary affine transforms.
• rendering/RenderTable.cpp: (WebCore::RenderTable::layout): Factored out the "only positioned objects" case into layoutOnlyPositionedObjects(). Added LayoutState push/pop. Removed the translation by the layout delta of the old absolute rects, since that is now integral to absoluteClippedOverflowRect() and absoluteOutlineBox().
• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::absoluteClippedOverflowRect): Added the layout delta here, so callers don't need to. (WebCore::RenderTableCell::computeAbsoluteRepaintRect): For the O(1) code path, skipped the correction for the parent row, because RenderTableRow doesn't push a translation into LayoutState. (WebCore::RenderTableCell::absolutePosition): Ditto.
• rendering/RenderTableRow.cpp: (WebCore::RenderTableRow::layout): Added LayoutState push/pop.
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::setCellWidths): Added LayoutState push/pop if cells are repainted or receive layout. (WebCore::RenderTableSection::calcRowHeight): Ditto. (WebCore::RenderTableSection::layoutRows): Added LayoutState push/pop.
• rendering/RenderView.cpp: (WebCore::RenderView::RenderView): (WebCore::RenderView::layout): Added initial LayoutState setup for the layout. (WebCore::RenderView::paintBoxDecorations): Minor cleanup: changed element()->document() to the equivalent document(). (WebCore::RenderView::repaintViewRectangle): Ditto. (WebCore::RenderView::pushLayoutState): Added. Pushes initial layout state for subtree layout.
• rendering/RenderView.h: (WebCore::RenderView::pushLayoutState): (WebCore::RenderView::popLayoutState): (WebCore::RenderView::layoutState): (WebCore::RenderView::disableLayoutState): (WebCore::RenderView::enableLayoutState):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/bugzilla-3509-expected.checksum (modified) (1 diff)
• LayoutTests/fast/repaint/bugzilla-3509-expected.png (modified) ( previous)
• LayoutTests/fast/repaint/intermediate-layout-position-clip-expected.checksum (added)
• LayoutTests/fast/repaint/intermediate-layout-position-clip-expected.png (added)
• LayoutTests/fast/repaint/intermediate-layout-position-clip-expected.txt (added)
• LayoutTests/fast/repaint/intermediate-layout-position-clip.html (added)
• LayoutTests/fast/repaint/intermediate-layout-position-expected.checksum (modified) (1 diff)
• LayoutTests/fast/repaint/intermediate-layout-position-expected.png (modified) ( previous)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebCore/WebCore.vcproj/WebCore/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebCore/WebCoreSources.bkl (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/rendering/LayoutState.cpp (added)
• WebCore/rendering/LayoutState.h (added)
• WebCore/rendering/RenderBlock.cpp (modified) (8 diffs)
• WebCore/rendering/RenderBlock.h (modified) (1 diff)
• WebCore/rendering/RenderBox.cpp (modified) (6 diffs)
• WebCore/rendering/RenderBox.h (modified) (1 diff)
• WebCore/rendering/RenderContainer.cpp (modified) (2 diffs)
• WebCore/rendering/RenderFlexibleBox.cpp (modified) (3 diffs)
• WebCore/rendering/RenderFlow.cpp (modified) (1 diff)
• WebCore/rendering/RenderForeignObject.cpp (modified) (2 diffs)
• WebCore/rendering/RenderHTMLCanvas.cpp (modified) (1 diff)
• WebCore/rendering/RenderImage.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (3 diffs)
• WebCore/rendering/RenderListItem.cpp (modified) (3 diffs)
• WebCore/rendering/RenderObject.cpp (modified) (5 diffs)
• WebCore/rendering/RenderSVGContainer.cpp (modified) (3 diffs)
• WebCore/rendering/RenderTable.cpp (modified) (4 diffs)
• WebCore/rendering/RenderTableCell.cpp (modified) (4 diffs)
• WebCore/rendering/RenderTableRow.cpp (modified) (3 diffs)
• WebCore/rendering/RenderTableSection.cpp (modified) (8 diffs)
• WebCore/rendering/RenderView.cpp (modified) (6 diffs)
• WebCore/rendering/RenderView.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-04-29  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin and Hyatt.
+
+        - test and updated results for http://bugs.webkit.org/show_bug.cgi?id=13487
+          Implement O(1) absoluteClippedOverflowRect and absoluteOutlineBox during layout for a possible speed gain
+
+        * fast/repaint/bugzilla-3509-expected.checksum:
+        * fast/repaint/bugzilla-3509-expected.png:
+        * fast/repaint/intermediate-layout-position-clip-expected.checksum: Added.
+        * fast/repaint/intermediate-layout-position-clip-expected.png: Added.
+        * fast/repaint/intermediate-layout-position-clip-expected.txt: Added.
+        * fast/repaint/intermediate-layout-position-clip.html: Added.
+        * fast/repaint/intermediate-layout-position-expected.checksum:
+        * fast/repaint/intermediate-layout-position-expected.png:
+
 2007-04-28  Adele Peterson  <adele@apple.com>
 

trunk/LayoutTests/fast/repaint/bugzilla-3509-expected.checksum

@@ -1 @@
-2af7cd983d67fe56c79c8a968bdaa75d
+5bd77316c6336bd3dc5382806f5e5a36

trunk/LayoutTests/fast/repaint/intermediate-layout-position-expected.checksum

@@ -1 @@
-1e297091caae6dc9b0bb887a590021a6
+ff2ab8ca87826c939775ba447f3a6d84

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-29  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin and Hyatt.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=13487
+          Implement O(1) absoluteClippedOverflowRect and absoluteOutlineBox during layout for a possible speed gain
+
+        Test for a bug fixed by this patch: fast/repaint/intermediate-layout-position-clip.html
+
+        By keeping track of the total translation and clip during layout, absolutePosition and
+        computeAbsoluteRepaintRect become O(1).
+
+        * WebCore.pro: Added LayoutState.cpp
+        * WebCore.vcproj/WebCore/WebCore.vcproj: Added LayoutState.{cpp,h}
+        * WebCore.xcodeproj/project.pbxproj: Added LayoutState.{cpp,h}
+        * WebCoreSources.bkl: Added LayoutState.cpp
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout): When doing subtree layout, push an initial layout state for the
+        layout root.
+        * rendering/LayoutState.cpp: Added. A LayoutState corresponding to a box consists of the origin of
+        its coordinate system in view coordinates and possibly the clip rect, in view coordinates, which
+        applies to its children.
+        (WebCore::LayoutState::LayoutState):
+        (WebCore::LayoutState::destroy):
+        (WebCore::throw):
+        (WebCore::LayoutState::operator delete):
+        * rendering/LayoutState.h: Added.
+        (WebCore::LayoutState::LayoutState):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock): Factored out the "only positioned objects" case into
+        layoutOnlyPositionedObjects(). Added code to push/pop LayoutState, unless we have columns, in
+        which case we disable/enable LayoutState. Removed the translation by the layout delta
+        of the old absolute rects, since that is now integral to absoluteClippedOverflowRect() and
+        absoluteOutlineBox().
+        (WebCore::RenderBlock::layoutOnlyPositionedObjects): Added this helper function that checks for
+        and handles the case where only positioned objects need layout. Returns true in that case.
+        (WebCore::RenderBlock::repaintOverhangingFloats): Disabled LayoutState when repainting floats, since
+        they may belong to other containers.
+        (WebCore::RenderBlock::updateFirstLetter): Disabled LayoutState when adding and removing from the
+        first letter container, since it may be different than ourselves.
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::setStyle): Minor cleanup: changed element()->document() to the equivalent document().
+        (WebCore::RenderBox::offsetForPositionedInContainer): Added. Factored out common code from
+        absolutePosition, computeAbsoluteRepaintRect and RenderLayer::updateLayerPosition into this function.
+        (WebCore::RenderBox::absolutePosition): Added an O(1) code path when this function is called during
+        layout (and LayoutState has not been disabled). Factored out some code into
+        offsetForPositionedInContainer.
+        (WebCore::RenderBox::absoluteClippedOverflowRect): Added the layout delta here, so callers don't need
+        to.
+        (WebCore::RenderBox::computeAbsoluteRepaintRect): Added an O(1) code path when this function is called
+        during layout (and LayoutState has not been disabled). Factored out some code into
+        offsetForPositionedInContainer.
+        * rendering/RenderContainer.cpp:
+        (WebCore::RenderContainer::layout): Added LayoutState push/pop.
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Factored out the "only positioned objects" case into
+        layoutOnlyPositionedObjects(). Added LayoutState push/pop. Removed the translation by the layout delta
+        of the old absolute rects, since that is now integral to absoluteClippedOverflowRect() and
+        absoluteOutlineBox().
+        * rendering/RenderFlow.cpp:
+        (WebCore::RenderFlow::absoluteClippedOverflowRect): Added an ASSERT.
+        * rendering/RenderForeignObject.cpp:
+        (WebCore::RenderForeignObject::layout): Disabled LayoutState because it is incompatible with arbitrary
+        affine transforms.
+        * rendering/RenderHTMLCanvas.cpp:
+        (WebCore::RenderHTMLCanvas::layout): Removed the translation by the layout delta of the old absolute
+        rects, since that is now integral to absoluteClippedOverflowRect() and absoluteOutlineBox().
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::layout): Ditto.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateLayerPositions): Added ASSERTs. Factored out some code into
+        RenderBox::offsetForPositionedInContainer.
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout): Disabled LayoutState around the call to
+        scrollToOffset.
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::updateMarkerLocation): Disabled LayoutState when moving the list marker, since
+        it can trigger repainting in other containers.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::isRoot): Minor cleanup: changed element()->document() to the equivalent
+        document().
+        (WebCore::RenderObject::computeAbsoluteRepaintRect): Removed 'return' at the end of the function.
+        (WebCore::RenderObject::container): Reordered to avoid calling isText() twice.
+        (WebCore::RenderObject::absoluteOutlineBox): Added the layout delta here, so callers don't need to.
+        * rendering/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::layout): Disabled LayoutState because it is incompatible with arbitrary
+        affine transforms.
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::layout):  Factored out the "only positioned objects" case into
+        layoutOnlyPositionedObjects(). Added LayoutState push/pop. Removed the translation by the layout delta
+        of the old absolute rects, since that is now integral to absoluteClippedOverflowRect() and
+        absoluteOutlineBox().
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::absoluteClippedOverflowRect): Added the layout delta here, so callers
+        don't need to.
+        (WebCore::RenderTableCell::computeAbsoluteRepaintRect): For the O(1) code path, skipped the correction
+        for the parent row, because RenderTableRow doesn't push a translation into LayoutState.
+        (WebCore::RenderTableCell::absolutePosition): Ditto.
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::layout): Added LayoutState push/pop.
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::setCellWidths): Added LayoutState push/pop if cells are repainted or
+        receive layout.
+        (WebCore::RenderTableSection::calcRowHeight): Ditto.
+        (WebCore::RenderTableSection::layoutRows): Added LayoutState push/pop.
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::RenderView):
+        (WebCore::RenderView::layout): Added initial LayoutState setup for the layout.
+        (WebCore::RenderView::paintBoxDecorations): Minor cleanup: changed element()->document() to the
+        equivalent document().
+        (WebCore::RenderView::repaintViewRectangle): Ditto.
+        (WebCore::RenderView::pushLayoutState): Added. Pushes initial layout state for subtree layout.
+        * rendering/RenderView.h:
+        (WebCore::RenderView::pushLayoutState):
+        (WebCore::RenderView::popLayoutState):
+        (WebCore::RenderView::layoutState):
+        (WebCore::RenderView::disableLayoutState):
+        (WebCore::RenderView::enableLayoutState):
+
 2007-04-29  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/WebCore.pro

@@ -648 +648 @@
     rendering/InlineFlowBox.cpp \
     rendering/InlineTextBox.cpp \
+    rendering/LayoutState.cpp \
     rendering/ListMarkerBox.cpp \
     rendering/RenderApplet.cpp \

trunk/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj

@@ -3372 +3372 @@
                         </File>
                         <File
+                                RelativePath="..\..\rendering\LayoutState.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\rendering\LayoutState.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\rendering\Length.h"
                                 >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -272 +272 @@
                 37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 /* PositionIterator.cpp */; };
                 37919C240B7D188600A56998 /* PositionIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 /* PositionIterator.h */; settings = {ATTRIBUTES = (); }; };
+                2D9066060BE141D400956998 /* LayoutState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9066040BE141D400956998 /* LayoutState.cpp */; };
+                2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; };
                 448A29BF0A46D9CB0030759F /* JSHTMLOptionsCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */; };
                 448A29C00A46D9CB0030759F /* JSHTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 448A29BE0A46D9CB0030759F /* JSHTMLOptionsCollection.cpp */; };
@@ -3383 +3385 @@
                 37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };
                 37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };
+                2D9066040BE141D400956998 /* LayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; };
+                2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; };
                 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLOptionsCollection.h; sourceTree = "<group>"; };
                 448A29BE0A46D9CB0030759F /* JSHTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLOptionsCollection.cpp; sourceTree = "<group>"; };
@@ -9467 +9471 @@
                                 BCEA481A097D93020094C9E4 /* InlineTextBox.cpp */,
                                 BCEA481B097D93020094C9E4 /* InlineTextBox.h */,
+                                2D9066040BE141D400956998 /* LayoutState.cpp */,
+                                2D9066050BE141D400956998 /* LayoutState.h */,
                                 935C476009AC4CD100A6AAB4 /* Length.h */,
                                 A8EA7A4D0A191A5200A8EF5F /* ListMarkerBox.cpp */,
@@ -11241 +11247 @@
                                 06FC442E0BAE5A9E0090EDE1 /* JavaScriptStatistics.h in Headers */,
                                 E1EC29A00BB04C6B00EA187B /* XPathNodeSet.h in Headers */,
+                                2D9066070BE141D400956998 /* LayoutState.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -12610 +12617 @@
                                 E1EC299F0BB04C6B00EA187B /* XPathNodeSet.cpp in Sources */,
                                 51AA3F6F0BD5AA9E00892971 /* ResourceLoaderMac.mm in Sources */,
+                                2D9066060BE141D400956998 /* LayoutState.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/WebCoreSources.bkl

@@ -447 +447 @@
         rendering/InlineFlowBox.cpp
         rendering/InlineTextBox.cpp
+        rendering/LayoutState.cpp
         rendering/ListMarkerBox.cpp
         rendering/RenderApplet.cpp

trunk/WebCore/page/FrameView.cpp

@@ -410 +410 @@
 
     pauseScheduledEvents();
+
+    if (subtree)
+        root->view()->pushLayoutState(root);
     root->layout();
+    if (subtree)
+        root->view()->popLayoutState();
     d->layoutRoot = 0;
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -487 +487 @@
         return;                                      // cause us to come in here.  Just bail.
 
-    if (!relayoutChildren && posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
-        // All we have to is lay out our positioned objects.
-        layoutPositionedObjects(false);
-        if (hasOverflowClip())
-            m_layer->updateScrollInfoAfterLayout();
-        setNeedsLayout(false);
+    if (!relayoutChildren && layoutOnlyPositionedObjects())
         return;
-    }
-    
+
     IntRect oldBounds;
     IntRect oldOutlineBox;
@@ -501 +495 @@
     if (checkForRepaint) {
         oldBounds = absoluteClippedOverflowRect();
-        oldBounds.move(view()->layoutDelta());
         oldOutlineBox = absoluteOutlineBox();
-        oldOutlineBox.move(view()->layoutDelta());
-    }
+    }
+
+    bool hadColumns = m_hasColumns;
+    if (!hadColumns)
+        view()->pushLayoutState(this, IntSize(xPos(), yPos()));
+    else
+        view()->disableLayoutState();
 
     int oldWidth = m_width;
@@ -606 +604 @@
     m_overflowWidth = max(m_overflowWidth, m_width);
     m_overflowHeight = max(m_overflowHeight, m_height);
+
+    if (!hadColumns)
+        view()->popLayoutState();
+    else
+        view()->enableLayoutState();
 
     // Update our scroll information if we're overflow:auto/scroll/hidden now that we know if
@@ -1239 +1242 @@
 }
 
+bool RenderBlock::layoutOnlyPositionedObjects()
+{
+    if (!posChildNeedsLayout() || normalChildNeedsLayout() || selfNeedsLayout())
+        return false;
+
+    // All we have to is lay out our positioned objects.
+    if (!m_hasColumns)
+        view()->pushLayoutState(this, IntSize(xPos(), yPos()));
+    else
+        view()->disableLayoutState();
+
+    layoutPositionedObjects(false);
+    if (hasOverflowClip())
+        m_layer->updateScrollInfoAfterLayout();
+
+    if (!m_hasColumns)
+        view()->popLayoutState();
+    else
+        view()->enableLayoutState();
+
+    setNeedsLayout(false);
+    return true;
+}
+
 void RenderBlock::layoutPositionedObjects(bool relayoutChildren)
 {
@@ -1283 +1310 @@
         FloatingObject* r;
         DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
+
+        // FIXME: Avoid disabling LayoutState. At the very least, don't disable it for floats originating
+        // in this block. Better yet would be to push extra state for the containers of other floats.
+        view()->disableLayoutState();
         for ( ; (r = it.current()); ++it) {
             // Only repaint the object if it is overhanging, is not in its own layer, and
@@ -1292 +1323 @@
             }
         }
+        view()->enableLayoutState();
     }
 }
@@ -3939 +3971 @@
 
     // If the child does not already have style, we create it here.
-    if (currChild->isText() && !currChild->isBR() && 
-        currChild->parent()->style()->styleType() != RenderStyle::FIRST_LETTER) {
-        
+    if (currChild->isText() && !currChild->isBR() && currChild->parent()->style()->styleType() != RenderStyle::FIRST_LETTER) {
+        // Our layout state is not valid for the repaints we are going to trigger by
+        // adding and removing children of firstLetterContainer.
+        view()->disableLayoutState();
+
         RenderText* textObj = static_cast<RenderText*>(currChild);
         
@@ -3995 +4029 @@
             textObj->destroy();
         }
+        view()->enableLayoutState();
     }
 }

trunk/WebCore/rendering/RenderBlock.h

@@ -295 +295 @@
     void newLine();
     virtual bool hasLineIfEmpty() const;
+    bool layoutOnlyPositionedObjects();
 
 private:

trunk/WebCore/rendering/RenderBox.cpp

@@ -137 +137 @@
     // Set the text color if we're the body.
     if (isBody())
-        element()->document()->setTextColor(newStyle->color());
+        document()->setTextColor(newStyle->color());
 
     if (style()->outlineWidth() > 0 && style()->outlineSize() > maximalOutlineSize(PaintPhaseOutline))
@@ -777 +777 @@
 }
 
+IntSize RenderBox::offsetForPositionedInContainer(RenderObject* container) const
+{
+    if (!container->isRelPositioned() || !container->isInlineFlow())
+        return IntSize();
+
+    // When we have an enclosing relpositioned inline, we need to add in the offset of the first line
+    // box from the rest of the content, but only in the cases where we know we're positioned
+    // relative to the inline itself.
+
+    IntSize offset;
+    RenderFlow* flow = static_cast<RenderFlow*>(container);
+    int sx;
+    int sy;
+    if (flow->firstLineBox()) {
+        sx = flow->firstLineBox()->xPos();
+        sy = flow->firstLineBox()->yPos();
+    } else {
+        sx = flow->staticX();
+        sy = flow->staticY();
+    }
+
+    if (!hasStaticX())
+        offset.setWidth(sx);
+    // This is not terribly intuitive, but we have to match other browsers.  Despite being a block display type inside
+    // an inline, we still keep our x locked to the left of the relative positioned inline.  Arguably the correct
+    // behavior would be to go flush left to the block that contains the inline, but that isn't what other browsers
+    // do.
+    else if (!style()->isOriginalDisplayInlineType())
+        // Avoid adding in the left border/padding of the containing block twice.  Subtract it out.
+        offset.setWidth(sx - (containingBlock()->borderLeft() + containingBlock()->paddingLeft()));
+
+    if (!hasStaticY())
+        offset.setHeight(sy);
+
+    return offset;
+}
+
 bool RenderBox::absolutePosition(int& xPos, int& yPos, bool fixed) const
 {
+    if (RenderView* v = view()) {
+        if (LayoutState* layoutState = v->layoutState()) {
+            xPos = layoutState->m_offset.width() + m_x;
+            yPos = layoutState->m_offset.height() + m_y;
+            return true;
+        }
+    }
+
     if (style()->position() == FixedPosition)
         fixed = true;
@@ -786 +831 @@
         yPos += o->borderTopExtra();
 
-        if (style()->position() == AbsolutePosition && o->isRelPositioned() && o->isInlineFlow()) {
-            // When we have an enclosing relpositioned inline, we need to add in the offset of the first line
-            // box from the rest of the content, but only in the cases where we know we're positioned
-            // relative to the inline itself.
-            RenderFlow* flow = static_cast<RenderFlow*>(o);
-            int sx;
-            int sy;
-            if (flow->firstLineBox()) {
-                sx = flow->firstLineBox()->xPos();
-                sy = flow->firstLineBox()->yPos();
-            } else {
-                sx = flow->staticX();
-                sy = flow->staticY();
-            }
-
-            bool isInlineType = style()->isOriginalDisplayInlineType();
-
-            if (!hasStaticX())
-                xPos += sx;
-            // This is not terribly intuitive, but we have to match other browsers.  Despite being a block display type inside
-            // an inline, we still keep our x locked to the left of the relative positioned inline.  Arguably the correct
-            // behavior would be to go flush left to the block that contains the inline, but that isn't what other browsers
-            // do.
-            if (hasStaticX() && !isInlineType)
-                // Avoid adding in the left border/padding of the containing block twice.  Subtract it out.
-                xPos += sx - (containingBlock()->borderLeft() + containingBlock()->paddingLeft());
-
-            if (!hasStaticY())
-                yPos += sy;
-        }
+        if (style()->position() == AbsolutePosition) {
+            IntSize offset = offsetForPositionedInContainer(o);
+            xPos += offset.width();
+            yPos += offset.height();
+        }
+
         if (o->hasOverflowClip())
             o->layer()->subtractScrollOffset(xPos, yPos);
@@ -900 +921 @@
 {
     IntRect r = overflowRect(false);
+
+    if (RenderView* v = view())
+        r.move(v->layoutDelta());
+
     if (style()) {
         if (style()->hasAppearance())
@@ -914 +939 @@
 void RenderBox::computeAbsoluteRepaintRect(IntRect& rect, bool fixed)
 {
+    if (RenderView* v = view()) {
+        if (LayoutState* layoutState = v->layoutState()) {
+            rect.move(m_x, m_y);
+            rect.move(layoutState->m_offset);
+            if (layoutState->m_clipped)
+                rect.intersect(layoutState->m_clipRect);
+            return;
+        }
+    }
+
     int x = rect.x() + m_x;
     int y = rect.y() + m_y;
@@ -940 +975 @@
         }
 
-        if (style()->position() == AbsolutePosition && o->isRelPositioned() && o->isInlineFlow()) {
-            // When we have an enclosing relpositioned inline, we need to add in the offset of the first line
-            // box from the rest of the content, but only in the cases where we know we're positioned
-            // relative to the inline itself.
-            RenderFlow* flow = static_cast<RenderFlow*>(o);
-            int sx;
-            int sy;
-            if (flow->firstLineBox()) {
-                sx = flow->firstLineBox()->xPos();
-                sy = flow->firstLineBox()->yPos();
-            } else {
-                sx = flow->staticX();
-                sy = flow->staticY();
-            }
-
-            bool isInlineType = style()->isOriginalDisplayInlineType();
-
-            if (!hasStaticX())
-                x += sx;
-            // This is not terribly intuitive, but we have to match other browsers.  Despite being a block display type inside
-            // an inline, we still keep our x locked to the left of the relative positioned inline.  Arguably the correct
-            // behavior would be to go flush left to the block that contains the inline, but that isn't what other browsers
-            // do.
-            if (hasStaticX() && !isInlineType)
-                // Avoid adding in the left border/padding of the containing block twice.  Subtract it out.
-                x += sx - (containingBlock()->borderLeft() + containingBlock()->paddingLeft());
-
-            if (!hasStaticY())
-                y += sy;
+        if (style()->position() == AbsolutePosition) {
+            IntSize offset = offsetForPositionedInContainer(o);
+            x += offset.width();
+            y += offset.height();
         }
 

trunk/WebCore/rendering/RenderBox.h

@@ -99 +99 @@
     virtual IntRect absoluteClippedOverflowRect();
     virtual void computeAbsoluteRepaintRect(IntRect&, bool fixed = false);
+    IntSize offsetForPositionedInContainer(RenderObject*) const;
 
     virtual void repaintDuringLayoutIfMoved(const IntRect&);

trunk/WebCore/rendering/RenderContainer.cpp

@@ -482 +482 @@
     ASSERT(needsLayout());
 
+    view()->pushLayoutState(this, IntSize(m_x, m_y));
+
     RenderObject* child = m_firstChild;
     while (child) {
@@ -488 +490 @@
         child = child->nextSibling();
     }
+
+    view()->popLayoutState();
     setNeedsLayout(false);
 }

trunk/WebCore/rendering/RenderFlexibleBox.cpp

@@ -209 +209 @@
     ASSERT(needsLayout());
 
-    if (!relayoutChildren && posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
-        // All we have to is lay out our positioned objects.
-        layoutPositionedObjects(false);
-        if (hasOverflowClip())
-            m_layer->updateScrollInfoAfterLayout();
-        setNeedsLayout(false);
+    if (!relayoutChildren && layoutOnlyPositionedObjects())
         return;
-    }
 
     IntRect oldBounds;
@@ -223 +217 @@
     if (checkForRepaint) {
         oldBounds = absoluteClippedOverflowRect();
-        oldBounds.move(view()->layoutDelta());
         oldOutlineBox = absoluteOutlineBox();
-        oldOutlineBox.move(view()->layoutDelta());
-    }
+    }
+
+    view()->pushLayoutState(this, IntSize(m_x, m_y));
 
     int previousWidth = m_width;
@@ -294 +288 @@
     if (m_overflowWidth < m_width)
         m_overflowWidth = m_width;
+
+    view()->popLayoutState();
 
     // Update our scrollbars if we're overflow:auto/scroll/hidden now that we know if

trunk/WebCore/rendering/RenderFlow.cpp

@@ -451 +451 @@
 {
     if (isInlineFlow()) {
+        // Only compacts and run-ins are allowed in here during layout.
+        ASSERT(!view() || !view()->layoutState() || isCompact() || isRunIn());
+
         if (!firstLineBox())
             return IntRect();

trunk/WebCore/rendering/RenderForeignObject.cpp

@@ -87 +87 @@
     ASSERT(needsLayout());
 
+    // Arbitrary affine transforms are incompatible with LayoutState.
+    view()->disableLayoutState();
+
     IntRect oldBounds;
     IntRect oldOutlineBox;
@@ -102 +105 @@
         repaintAfterLayoutIfNeeded(oldBounds, oldOutlineBox);
 
+    view()->enableLayoutState();
     setNeedsLayout(false);
 }

trunk/WebCore/rendering/RenderHTMLCanvas.cpp

@@ -86 +86 @@
     if (checkForRepaint) {
         oldBounds = absoluteClippedOverflowRect();
-        oldBounds.move(view()->layoutDelta());
         oldOutlineBox = absoluteOutlineBox();
-        oldOutlineBox.move(view()->layoutDelta());
     }
     calcWidth();

trunk/WebCore/rendering/RenderImage.cpp

@@ -310 +310 @@
     if (checkForRepaint) {
         oldBounds = absoluteClippedOverflowRect();
-        oldBounds.move(view()->layoutDelta());
         oldOutlineBox = absoluteOutlineBox();
-        oldOutlineBox.move(view()->layoutDelta());
     }
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -200 +200 @@
         
     if (m_hasVisibleContent) {
+        RenderView* view = m_object->view();
+        ASSERT(view);
+        // FIXME: Optimize using LayoutState and remove the disableLayoutState() call
+        // from updateScrollInfoAfterLayout().
+        ASSERT(!view->layoutState());
+
         IntRect newRect = m_object->absoluteClippedOverflowRect();
         IntRect newOutlineBox = m_object->absoluteOutlineBox();
         if (checkForRepaint) {
-            RenderView* view = m_object->view();
-            ASSERT(view);
             if (view && !view->printing()) {
                 bool didMove = newOutlineBox.location() != m_outlineBox.location();
@@ -358 +362 @@
         positionedParent->subtractScrollOffset(x, y);
         
-        if (m_object->isPositioned() && positionedParent->renderer()->isRelPositioned() &&
-            positionedParent->renderer()->isInlineFlow()) {
-            // When we have an enclosing relpositioned inline, we need to add in the offset of the first line
-            // box from the rest of the content, but only in the cases where we know we're positioned
-            // relative to the inline itself.
-            RenderFlow* flow = static_cast<RenderFlow*>(positionedParent->renderer());
-            int sx = 0, sy = 0;
-            if (flow->firstLineBox()) {
-                sx = flow->firstLineBox()->xPos();
-                sy = flow->firstLineBox()->yPos();
-            }
-            else {
-                sx = flow->staticX();
-                sy = flow->staticY();
-            }
-            bool isInlineType = m_object->style()->isOriginalDisplayInlineType();
-            
-            if (!m_object->hasStaticX())
-                x += sx;
-            
-            // This is not terribly intuitive, but we have to match other browsers.  Despite being a block display type inside
-            // an inline, we still keep our x locked to the left of the relative positioned inline.  Arguably the correct
-            // behavior would be to go flush left to the block that contains the inline, but that isn't what other browsers
-            // do.
-            if (m_object->hasStaticX() && !isInlineType)
-                // Avoid adding in the left border/padding of the containing block twice.  Subtract it out.
-                x += sx - (m_object->containingBlock()->borderLeft() + m_object->containingBlock()->paddingLeft());
-            
-            if (!m_object->hasStaticY())
-                y += sy;
-        }
-    }
-    else if (parent())
+        if (m_object->isPositioned()) {
+            IntSize offset = static_cast<RenderBox*>(m_object)->offsetForPositionedInContainer(positionedParent->renderer());
+            x += offset.width();
+            y += offset.height();
+        }
+    } else if (parent())
         parent()->subtractScrollOffset(x, y);
     
@@ -1184 +1161 @@
         int newX = max(0, min(scrollXOffset(), scrollWidth() - m_object->clientWidth()));
         int newY = max(0, min(m_scrollY, scrollHeight() - m_object->clientHeight()));
-        if (newX != scrollXOffset() || newY != m_scrollY)
+        if (newX != scrollXOffset() || newY != m_scrollY) {
+            RenderView* view = m_object->view();
+            ASSERT(view);
+            // scrollToOffset() may call updateLayerPositions(), which doesn't work
+            // with LayoutState.
+            // FIXME: Remove the disableLayoutState/enableLayoutState if the above changes.
+            if (view)
+                view->disableLayoutState();
             scrollToOffset(newX, newY);
+            if (view)
+                view->enableLayoutState();
+        }
     }
 

trunk/WebCore/rendering/RenderListItem.cpp

@@ -31 +31 @@
 #include "HTMLOListElement.h"
 #include "RenderListMarker.h"
+#include "RenderView.h"
 
 using namespace std;
@@ -201 +202 @@
 
         if (markerPar != lineBoxParent || m_marker->prefWidthsDirty()) {
+            // Removing and adding the marker can trigger repainting in
+            // containers other than ourselves, so we need to disable LayoutState.
+            view()->disableLayoutState();
             updateFirstLetter();
             m_marker->remove();
@@ -208 +212 @@
             if (m_marker->prefWidthsDirty())
                 m_marker->calcPrefWidths();
+            view()->enableLayoutState();
         }
     }

trunk/WebCore/rendering/RenderObject.cpp

@@ -215 +215 @@
 bool RenderObject::isRoot() const
 {
-    return element() && element()->renderer() == this && element()->document()->documentElement() == element();
+    return element() && element()->renderer() == this && document()->documentElement() == element();
 }
 
@@ -1894 +1894 @@
 {
     if (parent())
-        return parent()->computeAbsoluteRepaintRect(r, f);
+        parent()->computeAbsoluteRepaintRect(r, f);
 }
 
@@ -2422 +2422 @@
     // calcAbsoluteVertical have to use container().
     RenderObject* o = parent();
+
+    if (isText())
+        return o;
+
     EPosition pos = m_style->position();
-    if (!isText() && pos == FixedPosition) {
+    if (pos == FixedPosition) {
         // container() can be called on an object that is not in the
         // tree yet.  We don't call view() since it will assert if it
@@ -2432 +2436 @@
         while (o && o->parent())
             o = o->parent();
-    } else if (!isText() && pos == AbsolutePosition) {
+    } else if (pos == AbsolutePosition) {
         // Same goes here.  We technically just want our containing block, but
         // we may not have one if we're part of an uninstalled subtree.  We'll
@@ -3026 +3030 @@
     absolutePosition(x, y);
     box.move(x, y);
+    box.move(view()->layoutDelta());
     box.inflate(style()->outlineSize());
     return box;

trunk/WebCore/rendering/RenderSVGContainer.cpp

@@ -27 +27 @@
 
 #include "GraphicsContext.h"
+#include "RenderView.h"
 #include "SVGLength.h"
 #include "SVGMarkerElement.h"
@@ -92 +93 @@
     calcViewport();
 
+    // Arbitrary affine transforms are incompatible with LayoutState.
+    view()->disableLayoutState();
+
     IntRect oldBounds;
     IntRect oldOutlineBox;
@@ -118 +122 @@
         repaintAfterLayoutIfNeeded(oldBounds, oldOutlineBox);
 
+    view()->enableLayoutState();
     setNeedsLayout(false);
 }

trunk/WebCore/rendering/RenderTable.cpp

@@ -33 +33 @@
 #include "FrameView.h"
 #include "HTMLNames.h"
+#include "RenderLayer.h"
 #include "RenderTableCell.h"
 #include "RenderTableCol.h"
@@ -266 +267 @@
     ASSERT(needsLayout());
 
-    if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
-        // All we have to do is lay out our positioned objects.
-        layoutPositionedObjects(false);
-        setNeedsLayout(false);
+    if (layoutOnlyPositionedObjects())
         return;
-    }
 
     recalcSectionsIfNeeded();
@@ -280 +277 @@
     if (checkForRepaint) {
         oldBounds = absoluteClippedOverflowRect();
-        oldBounds.move(view()->layoutDelta());
         oldOutlineBox = absoluteOutlineBox();
-        oldOutlineBox.move(view()->layoutDelta());
     }
     
+    view()->pushLayoutState(this, IntSize(m_x, m_y));
+
     m_height = 0;
     m_overflowHeight = 0;
@@ -424 +421 @@
     // FIXME: Only pass true if width or height changed.
     layoutPositionedObjects(true);
+
+    view()->popLayoutState();
 
     bool didFullRepaint = true;

trunk/WebCore/rendering/RenderTableCell.cpp

@@ -30 +30 @@
 #include "HTMLTableCellElement.h"
 #include "RenderTableCol.h"
+#include "RenderView.h"
 #include "TextStream.h"
 
@@ -176 +177 @@
         top = max(top, -overflowTop(false) - borderTopExtra());
         IntRect r(-left, -borderTopExtra() - top, left + max(width() + right, overflowWidth(false)), borderTopExtra() + top + max(height() + bottom + borderBottomExtra(), overflowHeight(false)));
+
+        if (RenderView* v = view())
+            r.move(v->layoutDelta());
+
         computeAbsoluteRepaintRect(r);
         return r;
@@ -185 +190 @@
 {
     r.setY(r.y() + m_topExtra);
-    r.move(-parent()->xPos(), -parent()->yPos()); // Rows are in the same coordinate space, so don't add their offset in.
+    RenderView* v = view();
+    if (!v || !v->layoutState())
+        r.move(-parent()->xPos(), -parent()->yPos()); // Rows are in the same coordinate space, so don't add their offset in.
     RenderBlock::computeAbsoluteRepaintRect(r, fixed);
 }
@@ -192 +199 @@
 {
     bool result = RenderBlock::absolutePosition(xPos, yPos, fixed);
-    xPos -= parent()->xPos(); // Rows are in the same coordinate space, so don't add their offset in.
-    yPos -= parent()->yPos();
+    RenderView* v = view();
+    if (!v || !v->layoutState()) {
+        xPos -= parent()->xPos(); // Rows are in the same coordinate space, so don't add their offset in.
+        yPos -= parent()->yPos();
+    }
     return result;
 }

trunk/WebCore/rendering/RenderTableRow.cpp

@@ -32 +32 @@
 #include "HTMLNames.h"
 #include "RenderTableCell.h"
+#include "RenderView.h"
 
 namespace WebCore {
@@ -114 +115 @@
     ASSERT(needsLayout());
 
+    // Table rows do not add translation.
+    view()->pushLayoutState(this, IntSize());
+
     for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
         if (child->isTableCell()) {
@@ -123 +127 @@
         }
     }
+
+    view()->popLayoutState();
     setNeedsLayout(false);
 }

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -35 +35 @@
 #include "RenderTableCol.h"
 #include "RenderTableRow.h"
+#include "RenderView.h"
 #include "TextStream.h"
 #include <limits>
@@ -264 +265 @@
 {
     Vector<int>& columnPos = table()->columnPositions();
+    bool pushedLayoutState = false;
 
     for (int i = 0; i < m_gridRows; i++) {
@@ -284 +286 @@
             if (w != oldWidth) {
                 cell->setNeedsLayout(true);
-                if (!table()->selfNeedsLayout() && cell->checkForRepaintDuringLayout())
+                if (!table()->selfNeedsLayout() && cell->checkForRepaintDuringLayout()) {
+                    if (!pushedLayoutState) {
+                        // Technically, we should also push state for the row, but since
+                        // rows don't push a coordinate transform, that's not necessary.
+                        view()->pushLayoutState(this, IntSize(m_x, m_y));
+                        pushedLayoutState = true;
+                    }
                     cell->repaint();
+                }
                 cell->setWidth(w);
             }
         }
     }
+    
+    if (pushedLayoutState)
+        view()->popLayoutState();
 }
 
@@ -297 +309 @@
 
     int spacing = table()->vBorderSpacing();
+    bool pushedLayoutState = false;
 
     m_rowPos.resize(m_gridRows + 1);
@@ -325 +338 @@
 
             if (cell->overrideSize() != -1) {
+                if (!pushedLayoutState) {
+                    // Technically, we should also push state for the row, but since
+                    // rows don't push a coordinate transform, that's not necessary.
+                    view()->pushLayoutState(this, IntSize(m_x, m_y));
+                    pushedLayoutState = true;
+                }
                 cell->setOverrideSize(-1);
                 cell->setChildNeedsLayout(true, false);
@@ -361 +380 @@
         m_rowPos[r + 1] = max(m_rowPos[r + 1], m_rowPos[r]);
     }
+
+    if (pushedLayoutState)
+        view()->popLayoutState();
 }
 
@@ -442 +464 @@
     int vspacing = table()->vBorderSpacing();
     int nEffCols = table()->numEffCols();
+
+    view()->pushLayoutState(this, IntSize(m_x, m_y));
 
     for (int r = 0; r < totalRows; r++) {
@@ -551 +575 @@
         }
     }
+
+    view()->popLayoutState();
 
     m_height = m_rowPos[totalRows];

trunk/WebCore/rendering/RenderView.cpp

@@ -41 +41 @@
     , m_printImages(true)
     , m_maximalOutlineSize(0)
+    , m_layoutState(0)
+    , m_layoutStateDisableCount(0)
 {
     // Clear our anonymous bit, set because RenderObject assumes
@@ -100 +102 @@
         setChildNeedsLayout(true, false);
     
+    ASSERT(!m_layoutState);
+    LayoutState state;
+    // FIXME: May be better to push a clip and avoid issuing offscreen repaints.
+    state.m_clipped = false;
+    m_layoutState = &state;
+
     if (needsLayout())
         RenderBlock::layout();
@@ -110 +118 @@
     setOverflowHeight(docHeight());
 
+    ASSERT(m_layoutStateDisableCount == 0);
+    ASSERT(m_layoutState == &state);
+    m_layoutState = 0;
     setNeedsLayout(false);
 }
@@ -140 +151 @@
     // Check to see if we are enclosed by a transparent layer.  If so, we cannot blit
     // when scrolling, and we need to use slow repaints.
-    Element* elt = element()->document()->ownerElement();
+    Element* elt = document()->ownerElement();
     if (view() && elt && elt->renderer()) {
         RenderLayer* layer = elt->renderer()->enclosingLayer();
@@ -177 +188 @@
     // We always just invalidate the root view, since we could be an iframe that is clipped out
     // or even invisible.
-    Element* elt = element()->document()->ownerElement();
+    Element* elt = document()->ownerElement();
     if (!elt)
         m_frameView->repaintRectangle(ur, immediate);
@@ -525 +536 @@
 }
 
+void RenderView::pushLayoutState(RenderObject* root)
+{
+    ASSERT(!m_frameView->needsFullRepaint());
+    ASSERT(m_layoutStateDisableCount == 0);
+    ASSERT(m_layoutState == 0);
+
+    m_layoutState = new (renderArena()) LayoutState(root);
+}
+
 } // namespace WebCore

trunk/WebCore/rendering/RenderView.h

@@ -25 +25 @@
 #define RenderView_h
 
+#include "FrameView.h"
+#include "LayoutState.h"
 #include "RenderBlock.h"
 
 namespace WebCore {
-
-class FrameView;
 
 class RenderView : public RenderBlock {
@@ -94 +94 @@
     void addLayoutDelta(const IntSize& delta) { m_layoutDelta += delta; }
 
+    void pushLayoutState(RenderBox* renderer, const IntSize& offset)
+    {
+        if (m_layoutStateDisableCount || m_frameView->needsFullRepaint())
+            return;
+        m_layoutState = new (renderArena()) LayoutState(m_layoutState, renderer, offset);
+    }
+
+    void pushLayoutState(RenderObject*);
+
+    void popLayoutState()
+    {
+        if (m_layoutStateDisableCount || m_frameView->needsFullRepaint())
+            return;
+        LayoutState* state = m_layoutState;
+        m_layoutState = state->m_next;
+        state->destroy(renderArena());
+    }
+
+    LayoutState* layoutState() const { return m_layoutStateDisableCount ? 0 : m_layoutState; }
+
+    // Suspends the LayoutState optimization. Used under transforms that cannot be represented by
+    // LayoutState (common in SVG) and when manipulating the render tree during layout in ways
+    // that can trigger repaint of a non-child (e.g. when a list item moves its list marker around).
+    void disableLayoutState() { m_layoutStateDisableCount++; }
+    void enableLayoutState() { ASSERT(m_layoutStateDisableCount > 0); m_layoutStateDisableCount--; }
+
 protected:
     FrameView* m_frameView;
@@ -118 +144 @@
     bool m_forcedPageBreak;
     IntSize m_layoutDelta;
+    LayoutState* m_layoutState;
+    unsigned m_layoutStateDisableCount;
 };