| Index: third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
|
| index c985282e70458775447e2ea5a87d26ec4aafc4f9..c073fc05c7df393b27fbe0548625d7df0b180e45 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
|
| @@ -177,26 +177,26 @@ void LayoutTableCell::computeIntrinsicPadding(int rowHeight, SubtreeLayoutScope&
|
|
|
| int intrinsicPaddingBefore = 0;
|
| switch (style()->verticalAlign()) {
|
| - case SUB:
|
| - case SUPER:
|
| - case TEXT_TOP:
|
| - case TEXT_BOTTOM:
|
| - case LENGTH:
|
| - case BASELINE: {
|
| + case VerticalAlignSub:
|
| + case VerticalAlignSuper:
|
| + case VerticalAlignTextTop:
|
| + case VerticalAlignTextBottom:
|
| + case VerticalAlignLength:
|
| + case VerticalAlignBaseline: {
|
| int baseline = cellBaselinePosition();
|
| if (baseline > borderBefore() + paddingBefore())
|
| intrinsicPaddingBefore = section()->rowBaseline(rowIndex()) - (baseline - oldIntrinsicPaddingBefore);
|
| break;
|
| }
|
| - case TOP:
|
| + case VerticalAlignTop:
|
| break;
|
| - case MIDDLE:
|
| + case VerticalAlignMiddle:
|
| intrinsicPaddingBefore = (rowHeight - logicalHeightWithoutIntrinsicPadding) / 2;
|
| break;
|
| - case BOTTOM:
|
| + case VerticalAlignBottom:
|
| intrinsicPaddingBefore = rowHeight - logicalHeightWithoutIntrinsicPadding;
|
| break;
|
| - case BASELINE_MIDDLE:
|
| + case VerticalAlignBaselineMiddle:
|
| break;
|
| }
|
|
|
| @@ -986,7 +986,7 @@ void LayoutTableCell::scrollbarsChanged(bool horizontalScrollbarChanged, bool ve
|
| return;
|
|
|
| // Shrink our intrinsic padding as much as possible to accommodate the scrollbar.
|
| - if (style()->verticalAlign() == MIDDLE) {
|
| + if (style()->verticalAlign() == VerticalAlignMiddle) {
|
| LayoutUnit totalHeight = logicalHeight();
|
| LayoutUnit heightWithoutIntrinsicPadding = totalHeight - intrinsicPaddingBefore() - intrinsicPaddingAfter();
|
| totalHeight -= scrollbarHeight;
|
|
|