Changeset 104140 in webkit

Timestamp:

Jan 5, 2012 4:23:43 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

WebKit adds vertical paddings and borders to the fixed width of CSS tables
​https://bugs.webkit.org/show_bug.cgi?id=74955

Patch by Max Vujovic <​mvujovic@adobe.com> on 2012-01-05
Reviewed by Julien Chaffraix.

Source/WebCore:

Test: fast/table/css-table-width.html

• rendering/RenderTable.cpp:

(WebCore::RenderTable::computeLogicalWidth):

Changed the width calculation for CSS tables to take into account horizontal
paddings and borders instead of vertical paddings and borders.

LayoutTests:

Added tests to check that the fixed width style is applied correctly to
CSS tables with respect to table paddings and borders.

• fast/table/css-table-width-expected.txt: Added.
• fast/table/css-table-width.html: Added.
• fast/table/script-tests/css-table-width.js: Added.

(computeCSSTableOffsetWidth):
(computeCSSTableOffsetHeight):
(computeCSSTableProperty):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/css-table-width-expected.txt (added)
• LayoutTests/fast/table/css-table-width.html (added)
• LayoutTests/fast/table/script-tests/css-table-width.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTable.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-05  Max Vujovic  <mvujovic@adobe.com>
+
+        WebKit adds vertical paddings and borders to the fixed width of CSS tables
+        https://bugs.webkit.org/show_bug.cgi?id=74955
+
+        Reviewed by Julien Chaffraix.
+
+        Added tests to check that the fixed width style is applied correctly to 
+        CSS tables with respect to table paddings and borders.
+
+        * fast/table/css-table-width-expected.txt: Added.
+        * fast/table/css-table-width.html: Added.
+        * fast/table/script-tests/css-table-width.js: Added.
+        (computeCSSTableOffsetWidth):
+        (computeCSSTableOffsetHeight):
+        (computeCSSTableProperty):
+
 2012-01-05  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-05  Max Vujovic  <mvujovic@adobe.com>
+
+        WebKit adds vertical paddings and borders to the fixed width of CSS tables
+        https://bugs.webkit.org/show_bug.cgi?id=74955
+
+        Reviewed by Julien Chaffraix.
+
+        Test: fast/table/css-table-width.html
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::computeLogicalWidth):
+
+            Changed the width calculation for CSS tables to take into account horizontal
+            paddings and borders instead of vertical paddings and borders.
+
 2012-01-05  Peter Beverloo  <peter@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -234 +234 @@
         LayoutUnit borders = 0;
         if (logicalWidthType != Percent && (!node() || !node()->hasTagName(tableTag))) {
-            bool collapsing = collapseBorders();
-            LayoutUnit borderAndPaddingBefore = borderBefore() + (collapsing ? 0 : paddingBefore());
-            LayoutUnit borderAndPaddingAfter = borderAfter() + (collapsing ? 0 : paddingAfter());
-            borders = borderAndPaddingBefore + borderAndPaddingAfter;
-        }
+            recalcBordersInRowDirection();
+            borders = borderStart() + borderEnd() + (collapseBorders() ? 0 : paddingStart() + paddingEnd());
+         }
         setLogicalWidth(style()->logicalWidth().calcMinValue(containerWidthInInlineDirection) + borders);
         setLogicalWidth(max(minPreferredLogicalWidth(), logicalWidth()));