Changeset 21905 in webkit

Timestamp:

May 30, 2007, 4:03:51 PM (18 years ago)

Author:

bdakin

Message:

Reviewed by Hyatt.

Fix for <rdar://problem/5198882> CrashTracer: [USER] 7 crashes in
Safari at com.apple.WebCore: WebCore::RenderBlock::layoutBlock +
2360

The problem is that we are re-entering layout when we should not.
​http://trac.webkit.org/projects/webkit/changeset/21778 actually
fixed this crash, but we have been inspired to add the same guard
in two other possibly-dangerous places.

• page/FrameView.cpp: (WebCore::FrameView::layout): Add the guard in two more places.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• page/FrameView.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-30  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Hyatt.
+
+        Fix for <rdar://problem/5198882> CrashTracer: [USER] 7 crashes in 
+        Safari at com.apple.WebCore: WebCore::RenderBlock::layoutBlock + 
+        2360
+
+        The problem is that we are re-entering layout when we should not. 
+        http://trac.webkit.org/projects/webkit/changeset/21778 actually 
+        fixed this crash, but we have been inspired to add the same guard 
+        in two other possibly-dangerous places.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout): Add the guard in two more places.
+
 2007-05-30  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -11527 +11527 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
+                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         knownRegions = (
@@ -11541 +11542 @@
                         projectDirPath = "";
                         projectRoot = "";
+                        shouldCheckCompatibility = 1;
                         targets = (
                                 93F198A508245E59001E9ABC /* WebCore */,

trunk/WebCore/page/FrameView.cpp

@@ -429 +429 @@
     d->layoutRoot = 0;
 
+    d->midLayout = true;
     m_frame->invalidateSelection();
+    d->midLayout = false;
    
     d->layoutSchedulingEnabled=true;
@@ -440 +442 @@
 
     // We update our widget positions right after doing a layout.
-    if (!subtree)
+    if (!subtree) {
+        d->midLayout = true;
         static_cast<RenderView*>(root)->updateWidgetPositions();
+        d->midLayout = false;
+    }
     
     // FIXME: Could optimize this and have objects removed from this list