Changeset 19848 in webkit

Timestamp:

Feb 25, 2007, 5:29:46 PM (18 years ago)

Author:

hyatt

Message:

Fix for regression caused by changing the containing block of positioned elements with no positioned ancestor
to be the initial containing block (represented in our tree by the RenderView). Rework RenderView's layout
to have very few special cases. Now it will just relayout its children when the width/height of the
view actually changes. Positioned elements no longer get a special additional layout, since width/height
adjustments are caught by the base class already anyway.

Reviewed by mjs, darin

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::layoutBlock):
• rendering/RenderFlexibleBox.cpp: (WebCore::RenderFlexibleBox::layoutBlock): (WebCore::RenderFlexibleBox::layoutVerticalBox):
• rendering/RenderView.cpp: (WebCore::RenderView::RenderView): (WebCore::RenderView::layout):
• rendering/RenderView.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (2 diffs)
• rendering/RenderView.cpp (modified) (2 diffs)
• rendering/RenderView.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-25  David Hyatt  <hyatt@apple.com>
+
+        Fix for regression caused by changing the containing block of positioned elements with no positioned ancestor
+        to be the initial containing block (represented in our tree by the RenderView).  Rework RenderView's layout
+        to have very few special cases.   Now it will just relayout its children when the width/height of the
+        view actually changes.  Positioned elements no longer get a special additional layout, since width/height
+        adjustments are caught by the base class already anyway.
+
+        Reviewed by mjs, darin
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock):
+        (WebCore::RenderFlexibleBox::layoutVerticalBox):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::RenderView):
+        (WebCore::RenderView::layout):
+        * rendering/RenderView.h:
+
 2007-02-25  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -575 +575 @@
     // Update our scroll information if we're overflow:auto/scroll/hidden now that we know if
     // we overflow or not.
-    RenderObject* flexbox = view()->flexBoxInFirstLayout();
-    if (hasOverflowClip() && !(flexbox && flexbox != this && isDescendantOf(flexbox)))
+    if (hasOverflowClip())
         m_layer->updateScrollInfoAfterLayout();
 

trunk/WebCore/rendering/RenderFlexibleBox.cpp

@@ -325 +325 @@
     // Update our scrollbars if we're overflow:auto/scroll/hidden now that we know if
     // we overflow or not.
-    RenderObject* flexbox = view()->flexBoxInFirstLayout();
-    if (hasOverflowClip() && !(flexbox && flexbox != this && isDescendantOf(flexbox)))
+    if (hasOverflowClip())
         m_layer->updateScrollInfoAfterLayout();
 
@@ -806 +805 @@
     // out within the box.
     do {
-    
-        if (view()->flexBoxInFirstLayout() == this)
-            view()->setFlexBoxInFirstLayout(0);
-        else if (!view()->flexBoxInFirstLayout())
-            view()->setFlexBoxInFirstLayout(this);
-            
         m_height = borderTop() + paddingTop();
         int minHeight = m_height + toAdd;

trunk/WebCore/rendering/RenderView.cpp

@@ -41 +41 @@
     , m_printImages(true)
     , m_maximalOutlineSize(0)
-    , m_flexBoxInFirstLayout(0)
 {
     // Clear our anonymous bit, set because RenderObject assumes
@@ -96 +95 @@
         m_minWidth = m_width;
 
-    // FIXME: This is all just a terrible workaround for bugs in layout when the view height changes.
-    // Find a better way to detect view height changes.  We're guessing that if we don't need layout that the reason
-    // we were called is because of a FrameView bounds change.
-    if (!needsLayout()) {
+    bool relayoutChildren = !printing() && (!m_frameView || m_width != m_frameView->visibleWidth() || m_height != m_frameView->visibleHeight());
+    if (relayoutChildren)
         setChildNeedsLayout(true, false);
-        setMinMaxKnown(false);
-        for (RenderObject* c = firstChild(); c; c = c->nextSibling())
-            c->setChildNeedsLayout(true, false);
-    }
 
     if (recalcMinMax())
         recalcMinMaxWidths();
-
-    RenderBlock::layout();
-
-    int docw = docWidth();
-    int doch = docHeight();
-
-    if (!printing()) {
-        setWidth(m_frameView->visibleWidth());
-        setHeight(m_frameView->visibleHeight());
-    }
-
-    // FIXME: we could maybe do the call below better and only pass true if the docsize changed.
-    layoutPositionedObjects(true);
-
-    layer()->setHeight(max(doch, m_height));
-    layer()->setWidth(max(docw, m_width));
+    
+    if (needsLayout())
+        RenderBlock::layout();
+
+    setOverflowWidth(max(docWidth(), m_width));
+    setOverflowHeight(max(docHeight(), m_height));
 
     setNeedsLayout(false);

trunk/WebCore/rendering/RenderView.h

@@ -91 +91 @@
     void removeWidget(RenderObject*);
 
-    void setFlexBoxInFirstLayout(RenderObject* r) { m_flexBoxInFirstLayout = r; }
-    RenderObject* flexBoxInFirstLayout() { return m_flexBoxInFirstLayout; }
-
     const IntSize& layoutDelta() const { return m_layoutDelta; }
     void addLayoutDelta(const IntSize& delta) { m_layoutDelta += delta; }
@@ -116 +113 @@
     RenderObjectSet m_widgets;
 
-    RenderObject* m_flexBoxInFirstLayout;
-
 private:
     int m_bestTruncatedAt;