Changeset 21778 in webkit

Timestamp:

May 25, 2007, 2:44:44 PM (17 years ago)

Author:

bdakin

Message:

Reviewed by Oliver and Hyatt.

Fix for <rdar://problem/5228363> REGRESSION: In Mail, attempting to
create a To Do results in a crash

This regressed with r21635. Now that -boundingBox updates layout if
it is needed, we infinitely recurse when Mail draws a custom
highlight. The fix is to put a guard around laying out the render
tree.

• page/FrameView.cpp: (WebCore::FrameViewPrivate::reset): (WebCore::FrameView::layout):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-25  dethbakin  <bdakin@apple.com>
+
+        Reviewed by Oliver and Hyatt.
+
+        Fix for <rdar://problem/5228363> REGRESSION: In Mail, attempting to 
+        create a To Do results in a crash
+
+        This regressed with r21635. Now that -boundingBox updates layout if 
+        it is needed, we infinitely recurse when Mail draws a custom 
+        highlight. The fix is to put a guard around laying out the render 
+        tree.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameViewPrivate::reset):
+        (WebCore::FrameView::layout):
+
 2007-05-25  Patti Hoa <patti@apple.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -80 +80 @@
         doFullRepaint = true;
         layoutSchedulingEnabled = true;
+        midLayout = false;
         layoutCount = 0;
         firstLayout = true;
@@ -100 +101 @@
     
     bool layoutSchedulingEnabled;
+    bool midLayout;
     int layoutCount;
 
@@ -286 +288 @@
 void FrameView::layout(bool allowSubtree)
 {
+    if (d->midLayout)
+        return;
+
     d->layoutTimer.stop();
     d->delayedLayout = false;
@@ -416 +421 @@
     if (subtree)
         root->view()->pushLayoutState(root);
+    d->midLayout = true;
     root->layout();
+    d->midLayout = false;
     if (subtree)
         root->view()->popLayoutState();