Chromium Code Reviews| Index: Source/core/layout/LayoutTableCell.h |
| diff --git a/Source/core/layout/LayoutTableCell.h b/Source/core/layout/LayoutTableCell.h |
| index 456cb3f6f5fefb0786bd8f132659c7fc852152cd..d682e6f27dd671e6316e610b320525b5593279cf 100644 |
| --- a/Source/core/layout/LayoutTableCell.h |
| +++ b/Source/core/layout/LayoutTableCell.h |
| @@ -100,9 +100,11 @@ public: |
| return styleWidth; |
| } |
| - int logicalHeightFromStyle() const |
| + LayoutUnit logicalHeightFromStyle() const |
|
mstensho (USE GERRIT)
2015/07/12 19:38:55
Why change the return type here? The table code se
rhogan
2015/07/13 18:28:21
One of the two callers, LayoutTableCell::cellBasel
mstensho (USE GERRIT)
2015/07/14 08:45:29
I don't know how that type soup is resolved, but h
|
| { |
| - int styleLogicalHeight = valueForLength(style()->logicalHeight(), 0); |
| + Length height = style()->logicalHeight(); |
| + LayoutUnit styleLogicalHeight = height.isIntrinsic() ? LayoutUnit() : valueForLength(height, LayoutUnit()); |
| + |
| // 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) |