Changeset 20410 in webkit

Timestamp:

Mar 22, 2007, 3:14:03 PM (18 years ago)

Author:

bdakin

Message:

Patch by Hyatt, reviewed and committed by me.

Does not reproduce consistently, so a layout test does not seem
possible.

Fix for <rdar://problem/5082421> Constantly hitting ASSERT(!
needsLayout()) in RenderView::paint()

• page/FrameView.cpp: (WebCore::FrameView::layoutPending): It is not enough to ask if the layout timer is active. There may be times that we don't have a body yet so we cannot schedule layout yet, but the root still needs layout.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-22  Beth Dakin  <bdakin@apple.com>
+
+        Patch by Hyatt, reviewed and committed by me.
+
+        Does not reproduce consistently, so a layout test does not seem 
+        possible.
+
+        Fix for <rdar://problem/5082421> Constantly hitting ASSERT(!
+        needsLayout()) in RenderView::paint()
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layoutPending): It is not enough to ask if the 
+        layout timer is active. There may be times that we don't have a 
+        body yet so we cannot schedule layout yet, but the root still needs 
+        layout.  
+
 2007-03-22  John Sullivan  <sullivan@apple.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -693 +693 @@
 bool FrameView::layoutPending() const
 {
-    return d->layoutTimer.isActive();
+    // It is possible that our document will not have a body yet. If this is the case, 
+    // then we are not allowed to schedule layouts yet, so there won't be a timer.
+    RenderView* root = static_cast<RenderView*>(m_frame->renderer());
+    return d->layoutTimer.isActive() || (root && root->needsLayout());
 }