Index: Source/core/layout/LayoutTableCell.h |
diff --git a/Source/core/layout/LayoutTableCell.h b/Source/core/layout/LayoutTableCell.h |
index 456cb3f6f5fefb0786bd8f132659c7fc852152cd..ddad9cd7dcf47739c58ecaabca4e5439181cd554 100644 |
--- a/Source/core/layout/LayoutTableCell.h |
+++ b/Source/core/layout/LayoutTableCell.h |
@@ -100,9 +100,16 @@ public: |
return styleWidth; |
} |
+ int computeLogicalHeightFromCellStyle(const Length& height) const |
+ { |
+ if (height.isIntrinsic()) |
+ return computeIntrinsicLogicalContentHeightUsing(height, logicalHeight() - borderAndPaddingLogicalHeight(), borderAndPaddingLogicalHeight()); |
+ return valueForLength(height, 0); |
+ } |
+ |
int logicalHeightFromStyle() const |
{ |
- int styleLogicalHeight = valueForLength(style()->logicalHeight(), 0); |
+ int styleLogicalHeight = computeLogicalHeightFromCellStyle(style()->logicalHeight()); |
mstensho (USE GERRIT)
2015/07/07 07:11:39
Any reason why we shouldn't just treat intrinsic v
rhogan
2015/07/07 18:40:02
Sure, but we treat them this way when they're set
|
// In strict mode, box-sizing: content-box do the right thing and actually add in the border and padding. |
// Call computedCSSPadding* directly to avoid including implicitPadding. |
if (!document().inQuirksMode() && style()->boxSizing() != BORDER_BOX) |