Reviewed by Adele.

        - Fix a regression from r17521: painting of and crash caused by tables
          with collapsed borders

        * rendering/RenderTable.cpp:
        (WebCore::RenderTable::paint): Changed 'paintInfo' to 'info'. Prior to
        r17521, 'paintInfo' was the local variable. Now 'info' is the local variable
        and 'paintInfo' is the parameter, which we were accidently modifying.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b83968dfbbdcdbf6489a89872860c346c7cae0fe..5fc1d4cb4e64d53e872c1e7f4a6957dee3424a3d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-02  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Adele.
+
+        - Fix a regression from r17521: painting of and crash caused by tables
+          with collapsed borders
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::paint): Changed 'paintInfo' to 'info'. Prior to
+        r17521, 'paintInfo' was the local variable. Now 'info' is the local variable
+        and 'paintInfo' is the parameter, which we were accidently modifying.
+
 2006-11-01  Adele Peterson  <adele@apple.com>
 
         Reviewed by Mitz.

diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp
index d7c7ce51fbdf05f2974b527c80ba760ff61cdcc2..5b35a2131d0556d9e194adc9bb73efa9e15105b5 100644 (file)
--- a/WebCore/rendering/RenderTable.cpp
+++ b/WebCore/rendering/RenderTable.cpp
@@ -416,7 +416,7 @@ void RenderTable::paint(PaintInfo& paintInfo, int tx, int ty)
         // Collect all the unique border styles that we want to paint in a sorted list.  Once we
         // have all the styles sorted, we then do individual passes, painting each style of border
         // from lowest precedence to highest precedence.
-        paintInfo.phase = PaintPhaseCollapsedTableBorders;
+        info.phase = PaintPhaseCollapsedTableBorders;
         DeprecatedValueList<CollapsedBorderValue> borderStyles;
         collectBorders(borderStyles);
         DeprecatedValueListIterator<CollapsedBorderValue> it = borderStyles.begin();