Reviewed by Hyatt.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=7951
        REGRESSION: Safari crashes when printing a google map w/directions

        Tests: none, because I believe it only happens when printing, due to the relayouts

        * rendering/RenderTable.cpp:
        (WebCore::RenderTable::recalcSectionsIfNeeded): Add new utility to let the cells
        ensure the sections' grid data is up to date.
        * rendering/RenderTable.h:
        * rendering/RenderTableCell.cpp:
        (WebCore::RenderTableCell::calcMinMaxWidth):  Call above method.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1062feaaa3fcea696b83f37d06dde29ee4be7fe0..393ec4ec8cba31e32d6943902e6da25987a94dfe 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2006-04-04  Trey Matteson  <trey@usa.net>
+
+        Reviewed by Hyatt.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=7951
+        REGRESSION: Safari crashes when printing a google map w/directions
+
+        Tests: none, because I believe it only happens when printing, due to the relayouts
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::recalcSectionsIfNeeded): Add new utility to let the cells
+        ensure the sections' grid data is up to date.
+        * rendering/RenderTable.h:
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::calcMinMaxWidth):  Call above method.
+
 2006-04-03  Justin Haygood <jhaygood@spsu.edu>
 
         Reviewed by eseidel.  Landed by eseidel.

diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp
index a0e47c0055b0aa31e494ea819a112d1521d77034..bff5d07388d7aafc1b73b4c2dd47879d77d5aac3 100644 (file)
--- a/WebCore/rendering/RenderTable.cpp
+++ b/WebCore/rendering/RenderTable.cpp
@@ -546,6 +546,12 @@ RenderTableCol *RenderTable::colElement(int col)
     return 0;
 }
 
+void RenderTable::recalcSectionsIfNeeded()
+{
+    if (needSectionRecalc)
+        recalcSections();
+}
+
 void RenderTable::recalcSections()
 {
     tCaption = 0;

diff --git a/WebCore/rendering/RenderTable.h b/WebCore/rendering/RenderTable.h
index f1a7976c0112c9f908125d5535c234c7ebf32cf2..a18cad131d7ed2c2f572964d7902d82575814fc4 100644 (file)
--- a/WebCore/rendering/RenderTable.h
+++ b/WebCore/rendering/RenderTable.h
@@ -160,6 +160,8 @@ public:
 
     virtual IntRect getOverflowClipRect(int tx, int ty);
 
+    void recalcSectionsIfNeeded();
+
 private:
     void recalcSections();
 

diff --git a/WebCore/rendering/RenderTableCell.cpp b/WebCore/rendering/RenderTableCell.cpp
index 87d73cffb136a17cddf0fdafc967cb89b98d9768..a3d4ec2dc138c23fc7d3deb8c902345f4ae54d68 100644 (file)
--- a/WebCore/rendering/RenderTableCell.cpp
+++ b/WebCore/rendering/RenderTableCell.cpp
@@ -85,6 +85,12 @@ Length RenderTableCell::styleOrColWidth()
 
 void RenderTableCell::calcMinMaxWidth()
 {
+    // recalcMinMaxWidths works depth first.  However, the child cells rely on the grids up in the
+    // sections to do their calcMinMaxWidths work.  Normally the sections are set up early, as table
+    // cells are added, but relayout can cause the cells to be freed, leaving stale ptrs in the sections'
+    // grids.  We must refresh those grids before the child cells try to use them.
+    table()->recalcSectionsIfNeeded();
+
     RenderBlock::calcMinMaxWidth();
     if (element() && style()->autoWrap()) {
         // See if nowrap was set.