Changeset 28519 in webkit

Timestamp:

Dec 7, 2007 10:26:50 AM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16334 <rdar://problem/5634923> REGRESSION (r28299): Homepage of any DotMac Web Gallery won't load completely

Test: fast/dynamic/subtree-no-common-root-static-y.html

• rendering/RenderObject.cpp: (WebCore::RenderObject::markContainingBlocksForLayout): Changed the call to setChildNeedsLayout() to not mark containing blocks and added a separate call to markContainingBlocksForLayout() that will not schedule a layout if we are already in the middle of scheduleRelayoutOfSubtree().

LayoutTests:

Reviewed by Darin Adler.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=16334 <rdar://problem/5634923> REGRESSION (r28299): Homepage of any DotMac Web Gallery won't load completely

• fast/dynamic/subtree-no-common-root-static-y.html: Added.
• platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.checksum: Added.
• platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.png: Added.
• platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/subtree-no-common-root-static-y.html (added)
• LayoutTests/platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.checksum (added)
• LayoutTests/platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.png (added)
• LayoutTests/platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=16334
+          <rdar://problem/5634923> REGRESSION (r28299): Homepage of any DotMac Web Gallery won't load completely
+
+        * fast/dynamic/subtree-no-common-root-static-y.html: Added.
+        * platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.checksum: Added.
+        * platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.png: Added.
+        * platform/mac/fast/dynamic/subtree-no-common-root-static-y-expected.txt: Added.
+
 2007-12-07  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16334
+          <rdar://problem/5634923> REGRESSION (r28299): Homepage of any DotMac Web Gallery won't load completely
+
+        Test: fast/dynamic/subtree-no-common-root-static-y.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::markContainingBlocksForLayout): Changed the call
+        to setChildNeedsLayout() to not mark containing blocks and added a
+        separate call to markContainingBlocksForLayout() that will not schedule
+        a layout if we are already in the middle of scheduleRelayoutOfSubtree().
+
 2007-12-07  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -728 +728 @@
     while (o) {
         if (!last->isText() && (last->style()->position() == FixedPosition || last->style()->position() == AbsolutePosition)) {
-            if (last->hasStaticY())
-                last->parent()->setChildNeedsLayout(true);
+            if (last->hasStaticY()) {
+                RenderObject* parent = last->parent();
+                if (!parent->normalChildNeedsLayout()) {
+                    parent->setChildNeedsLayout(true, false);
+                    parent->markContainingBlocksForLayout(scheduleRelayout, newRoot);
+                }
+            }
             if (o->m_posChildNeedsLayout)
                 return;