Changeset 21602 in webkit

Timestamp:

May 19, 2007 4:09:17 PM (17 years ago)

Author:

bdash

Message:

2007-05-19 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=13774 REGRESSION: Crash emailing blog entry using Google Reader

Test: fast/table/stale-grid-crash.html

• rendering/RenderTable.cpp: (WebCore::RenderTable::recalcSections): Made const and replaced setNeedsLayout(true) with an assertion that the table is already marked for layout. (WebCore::RenderTable::sectionAbove): Added call to recalcSectionsIfNeeded(). (WebCore::RenderTable::sectionBelow): Ditto. (WebCore::RenderTable::cellAbove): Ditto. (WebCore::RenderTable::cellBelow): Ditto. (WebCore::RenderTable::cellBefore): Ditto. (WebCore::RenderTable::cellAfter): Ditto.
• rendering/RenderTable.h: Made some private member variables which are used in section recalc mutable. (WebCore::RenderTable::setNeedsSectionRecalc): Moved the call to setNeedsLayout() from recalcSections() into here, because I made recalcSections() const. (WebCore::RenderTable::recalcSectionsIfNeeded): Made const.

2007-05-19 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=13774 REGRESSION: Crash emailing blog entry using Google Reader

• fast/table/stale-grid-crash-expected.checksum: Added.
• fast/table/stale-grid-crash-expected.png: Added.
• fast/table/stale-grid-crash-expected.txt: Added.
• fast/table/stale-grid-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/stale-grid-crash-expected.checksum (added)
• LayoutTests/fast/table/stale-grid-crash-expected.png (added)
• LayoutTests/fast/table/stale-grid-crash-expected.txt (added)
• LayoutTests/fast/table/stale-grid-crash.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTable.cpp (modified) (8 diffs)
• WebCore/rendering/RenderTable.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-05-19  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=13774
+          REGRESSION: Crash emailing blog entry using Google Reader
+
+        * fast/table/stale-grid-crash-expected.checksum: Added.
+        * fast/table/stale-grid-crash-expected.png: Added.
+        * fast/table/stale-grid-crash-expected.txt: Added.
+        * fast/table/stale-grid-crash.html: Added.
+
 2007-05-19  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-19  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=13774
+          REGRESSION: Crash emailing blog entry using Google Reader
+
+        Test: fast/table/stale-grid-crash.html
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::recalcSections): Made const and replaced
+        setNeedsLayout(true) with an assertion that the table is already
+        marked for layout.
+        (WebCore::RenderTable::sectionAbove): Added call to recalcSectionsIfNeeded().
+        (WebCore::RenderTable::sectionBelow): Ditto.
+        (WebCore::RenderTable::cellAbove): Ditto.
+        (WebCore::RenderTable::cellBelow): Ditto.
+        (WebCore::RenderTable::cellBefore): Ditto.
+        (WebCore::RenderTable::cellAfter): Ditto.
+        * rendering/RenderTable.h:
+        Made some private member variables which are used in section recalc mutable.
+        (WebCore::RenderTable::setNeedsSectionRecalc): Moved the call to
+        setNeedsLayout() from recalcSections() into here, because I made
+        recalcSections() const.
+        (WebCore::RenderTable::recalcSectionsIfNeeded): Made const.
+
 2007-05-19  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/rendering/RenderTable.cpp

@@ -603 +603 @@
 }
 
-void RenderTable::recalcSections()
+void RenderTable::recalcSections() const
 {
     m_caption = 0;
@@ -670 +670 @@
     m_columns.resize(maxCols);
     m_columnPos.resize(maxCols + 1);
-    
+
+    ASSERT(selfNeedsLayout());
+
     m_needsSectionRecalc = false;
-    setNeedsLayout(true);
 }
 
@@ -935 +936 @@
 RenderTableSection* RenderTable::sectionAbove(const RenderTableSection* section, bool skipEmptySections) const
 {
+    recalcSectionsIfNeeded();
+
     if (section == m_head)
         return 0;
+
     RenderObject* prevSection = section == m_foot ? lastChild() : section->previousSibling();
     while (prevSection) {
@@ -950 +954 @@
 RenderTableSection* RenderTable::sectionBelow(const RenderTableSection* section, bool skipEmptySections) const
 {
+    recalcSectionsIfNeeded();
+
     if (section == m_foot)
         return 0;
+
     RenderObject* nextSection = section == m_head ? firstChild() : section->nextSibling();
     while (nextSection) {
@@ -965 +972 @@
 RenderTableCell* RenderTable::cellAbove(const RenderTableCell* cell) const
 {
+    recalcSectionsIfNeeded();
+
     // Find the section and row to look in
     int r = cell->row();
@@ -995 +1004 @@
 RenderTableCell* RenderTable::cellBelow(const RenderTableCell* cell) const
 {
+    recalcSectionsIfNeeded();
+
     // Find the section and row to look in
     int r = cell->row() + cell->rowSpan() - 1;
@@ -1025 +1036 @@
 RenderTableCell* RenderTable::cellBefore(const RenderTableCell* cell) const
 {
+    recalcSectionsIfNeeded();
+
     RenderTableSection* section = cell->section();
     int effCol = colToEffCol(cell->col());
@@ -1041 +1054 @@
 RenderTableCell* RenderTable::cellAfter(const RenderTableCell* cell) const
 {
+    recalcSectionsIfNeeded();
+
     int effCol = colToEffCol(cell->col() + cell->colSpan());
     if (effCol >= numEffCols())

trunk/WebCore/rendering/RenderTable.h

@@ -164 +164 @@
 
     bool needsSectionRecalc() const { return m_needsSectionRecalc; }
-    void setNeedsSectionRecalc() { m_needsSectionRecalc = true; }
+    void setNeedsSectionRecalc()
+    {
+        if (documentBeingDestroyed())
+            return;
+        m_needsSectionRecalc = true;
+        setNeedsLayout(true);
+    }
 
     virtual RenderObject* removeChildNode(RenderObject*, bool fullRemove = true);
@@ -182 +188 @@
     virtual IntRect getOverflowClipRect(int tx, int ty);
 
-    void recalcSectionsIfNeeded()
+    void recalcSectionsIfNeeded() const
     {
         if (m_needsSectionRecalc)
@@ -193 +199 @@
 
 private:
-    void recalcSections();
-
-    Vector<int> m_columnPos;
-    Vector<ColumnStruct> m_columns;
-
-    RenderBlock* m_caption;
-    RenderTableSection* m_head;
-    RenderTableSection* m_foot;
-    RenderTableSection* m_firstBody;
+    void recalcSections() const;
+
+    mutable Vector<int> m_columnPos;
+    mutable Vector<ColumnStruct> m_columns;
+
+    mutable RenderBlock* m_caption;
+    mutable RenderTableSection* m_head;
+    mutable RenderTableSection* m_foot;
+    mutable RenderTableSection* m_firstBody;
 
     TableLayout* m_tableLayout;
@@ -210 +216 @@
     unsigned m_rules : 4; // Rules
 
-    bool m_hasColElements : 1;
+    mutable bool m_hasColElements : 1;
     unsigned m_padding : 22;
-    bool m_needsSectionRecalc : 1;
+    mutable bool m_needsSectionRecalc : 1;
     
     short m_hSpacing;