Changeset 23866 in webkit

Timestamp:

Jun 28, 2007 7:46:23 PM (17 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Beth.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=14118 ASSERTION FAILED: !needsLayout() seen again

• fast/dynamic/recursive-layout-expected.txt: Added.
• fast/dynamic/recursive-layout.html: Added.

WebCore:

Reviewed by Beth.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=14118 ASSERTION FAILED: !needsLayout() seen again

Test: fast/dynamic/recursive-layout.html

• page/FrameView.cpp: (WebCore::FrameView::layout): Removed the midLayout guards around the calls to invalidateSelection() and updateWidgetPositions(). Those calls may dirty the layout, but in that case they also update it, so they should be allowed to do it. Added an ASSERT to make sure that when they return, the root is not marked for layout.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dynamic/recursive-layout-expected.txt (added)
• LayoutTests/fast/dynamic/recursive-layout.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-06-28  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Beth.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=14118
+          ASSERTION FAILED: !needsLayout() seen again
+
+        * fast/dynamic/recursive-layout-expected.txt: Added.
+        * fast/dynamic/recursive-layout.html: Added.
+
 2007-06-28  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-28  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Beth.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14118
+          ASSERTION FAILED: !needsLayout() seen again
+
+        Test: fast/dynamic/recursive-layout.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout): Removed the midLayout guards around
+        the calls to invalidateSelection() and updateWidgetPositions(). Those
+        calls may dirty the layout, but in that case they also update it, so
+        they should be allowed to do it. Added an ASSERT to make sure that when
+        they return, the root is not marked for layout.
+
 2007-06-28  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/page/FrameView.cpp

@@ -428 +428 @@
     d->layoutRoot = 0;
 
-    d->midLayout = true;
     m_frame->invalidateSelection();
-    d->midLayout = false;
    
     d->layoutSchedulingEnabled=true;
@@ -441 +439 @@
 
     // We update our widget positions right after doing a layout.
-    if (!subtree) {
-        d->midLayout = true;
+    if (!subtree)
         static_cast<RenderView*>(root)->updateWidgetPositions();
-        d->midLayout = false;
-    }
     
     // FIXME: Could optimize this and have objects removed from this list
@@ -465 +460 @@
         m_frame->loader()->didFirstLayout();
     
-    if (root->needsLayout()) {
-        scheduleRelayout();
-        return;
-    }
+    ASSERT(!root->needsLayout());
+
     setStaticBackground(useSlowRepaints());