Changeset 31044 in webkit

Timestamp:

Mar 13, 2008 3:14:15 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17819 Border-collapse: collapse later cell wins on PC, earlier cell on Mac

Test: fast/table/border-collapsing/equal-precedence-resolution.html

• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::collapsedLeftBorder): When calling compareBorders() with borders that may have the same precedence, made sure to pass the border belonging to the earlier (in document order) element first, since compareBorders() prefers the first argument when there is a tie. (WebCore::RenderTableCell::collapsedRightBorder): Ditto. (WebCore::RenderTableCell::collapsedTopBorder): Ditto.

LayoutTests:

Reviewed by Dave Hyatt.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17819 Border-collapse: collapse later cell wins on PC, earlier cell on Mac

• fast/table/border-collapsing/equal-precedence-resolution.html: Added.
• platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.checksum: Added.
• platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.png: Added.
• platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/border-collapsing/equal-precedence-resolution.html (added)
• LayoutTests/platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.checksum (added)
• LayoutTests/platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.png (added)
• LayoutTests/platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTableCell.cpp (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-13  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17819
+          Border-collapse: collapse later cell wins on PC, earlier cell on Mac
+
+        * fast/table/border-collapsing/equal-precedence-resolution.html: Added.
+        * platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.checksum: Added.
+        * platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.png: Added.
+        * platform/mac/fast/table/border-collapsing/equal-precedence-resolution-expected.txt: Added.
+
 2008-03-12  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-13  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17819
+          Border-collapse: collapse later cell wins on PC, earlier cell on Mac
+
+        Test: fast/table/border-collapsing/equal-precedence-resolution.html
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::collapsedLeftBorder): When calling
+        compareBorders() with borders that may have the same precedence, made
+        sure to pass the border belonging to the earlier (in document order)
+        element first, since compareBorders() prefers the first argument when
+        there is a tie.
+        (WebCore::RenderTableCell::collapsedRightBorder): Ditto.
+        (WebCore::RenderTableCell::collapsedTopBorder): Ditto.
+
 2008-03-13  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/rendering/RenderTableCell.cpp

@@ -315 +315 @@
     RenderTableCell* prevCell = rtl ? tableElt->cellAfter(this) : tableElt->cellBefore(this);
     if (prevCell) {
-        result = compareBorders(result, CollapsedBorderValue(&prevCell->style()->borderRight(), BCELL));
+        result = rtl ? compareBorders(result, CollapsedBorderValue(&prevCell->style()->borderRight(), BCELL)) : compareBorders(CollapsedBorderValue(&prevCell->style()->borderRight(), BCELL), result);
         if (!result.exists())
             return result;
@@ -349 +349 @@
         colElt = tableElt->colElement(col() + (rtl ? colSpan() : -1), &startColEdge, &endColEdge);
         if (colElt && (!rtl ? endColEdge : startColEdge)) {
-            result = compareBorders(result, CollapsedBorderValue(&colElt->style()->borderRight(), BCOL));
+            result = rtl ? compareBorders(result, CollapsedBorderValue(&colElt->style()->borderRight(), BCOL)) : compareBorders(CollapsedBorderValue(&colElt->style()->borderRight(), BCOL), result);
             if (!result.exists())
                 return result;
@@ -382 +382 @@
         RenderTableCell* nextCell = rtl ? tableElt->cellBefore(this) : tableElt->cellAfter(this);
         if (nextCell && nextCell->style()) {
-            result = compareBorders(result, CollapsedBorderValue(&nextCell->style()->borderLeft(), BCELL));
+            result = rtl ? compareBorders(CollapsedBorderValue(&nextCell->style()->borderLeft(), BCELL), result) : compareBorders(result, CollapsedBorderValue(&nextCell->style()->borderLeft(), BCELL));
             if (!result.exists())
                 return result;
@@ -417 +417 @@
         colElt = tableElt->colElement(col() + (rtl ? -1 : colSpan()), &startColEdge, &endColEdge);
         if (colElt && (!rtl ? startColEdge : endColEdge)) {
-            result = compareBorders(result, CollapsedBorderValue(&colElt->style()->borderLeft(), BCOL));
+            result = rtl ? compareBorders(CollapsedBorderValue(&colElt->style()->borderLeft(), BCOL), result) : compareBorders(result, CollapsedBorderValue(&colElt->style()->borderLeft(), BCOL));
             if (!result.exists())
                 return result;
@@ -440 +440 @@
     if (prevCell) {
         // (2) A previous cell's bottom border.
-        result = compareBorders(result, CollapsedBorderValue(&prevCell->style()->borderBottom(), BCELL));
+        result = compareBorders(CollapsedBorderValue(&prevCell->style()->borderBottom(), BCELL), result);
         if (!result.exists()) 
             return result;
@@ -459 +459 @@
     
         if (prevRow) {
-            result = compareBorders(result, CollapsedBorderValue(&prevRow->style()->borderBottom(), BROW));
+            result = compareBorders(CollapsedBorderValue(&prevRow->style()->borderBottom(), BROW), result);
             if (!result.exists())
                 return result;
@@ -476 +476 @@
         currSection = table()->sectionAbove(currSection);
         if (currSection) {
-            result = compareBorders(result, CollapsedBorderValue(&currSection->style()->borderBottom(), BROWGROUP));
+            result = compareBorders(CollapsedBorderValue(&currSection->style()->borderBottom(), BROWGROUP), result);
             if (!result.exists())
                 return result;