Index: Source/core/layout/LayoutTableCell.h |
diff --git a/Source/core/layout/LayoutTableCell.h b/Source/core/layout/LayoutTableCell.h |
index 456cb3f6f5fefb0786bd8f132659c7fc852152cd..ba5eaf6301c9b2009dc7350ad39622744ba3e482 100644 |
--- a/Source/core/layout/LayoutTableCell.h |
+++ b/Source/core/layout/LayoutTableCell.h |
@@ -100,9 +100,17 @@ public: |
return styleWidth; |
} |
+ int computeLogicalHeightFromCellStyle(const Length& height) const |
mstensho (USE GERRIT)
2015/07/09 08:22:16
I don't like the name. It essentially means the sa
|
+ { |
+ int maximumHeight = 0; |
mstensho (USE GERRIT)
2015/07/09 08:22:16
This one is always 0, so I don't see any need for
|
+ if (height.isIntrinsic()) |
+ return maximumHeight; |
+ return valueForLength(height, maximumHeight); |
+ } |
+ |
int logicalHeightFromStyle() const |
{ |
- int styleLogicalHeight = valueForLength(style()->logicalHeight(), 0); |
mstensho (USE GERRIT)
2015/07/09 08:22:16
Note that "LayoutUnit()" is cheaper than "0", when
|
+ int styleLogicalHeight = computeLogicalHeightFromCellStyle(style()->logicalHeight()); |
// 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) |