Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Unified Diff: Source/WebCore/rendering/RenderTable.cpp

Issue 9220007: Merge 104140 - WebKit adds vertical paddings and borders to the fixed width of CSS tables (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderTable.cpp
===================================================================
--- Source/WebCore/rendering/RenderTable.cpp (revision 105206)
+++ Source/WebCore/rendering/RenderTable.cpp (working copy)
@@ -232,11 +232,9 @@
// HTML tables size as though CSS width includes border/padding, CSS tables do not.
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()));
} else {
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698