| Index: third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp b/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp
|
| index c0542816d7c7ff36615b19d855013eb122527f0b..a7d9998037c932c76757b1059aa2e83b12065194 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp
|
| @@ -630,45 +630,45 @@ LayoutUnit RootInlineBox::verticalPositionForBox(InlineBox* box, VerticalPositio
|
|
|
| LayoutUnit verticalPosition;
|
| EVerticalAlign verticalAlign = boxModel.style()->verticalAlign();
|
| - if (verticalAlign == TOP || verticalAlign == BOTTOM)
|
| + if (verticalAlign == VerticalAlignTop || verticalAlign == VerticalAlignBottom)
|
| return LayoutUnit();
|
|
|
| LineLayoutItem parent = boxModel.parent();
|
| - if (parent.isLayoutInline() && parent.style()->verticalAlign() != TOP && parent.style()->verticalAlign() != BOTTOM)
|
| + if (parent.isLayoutInline() && parent.style()->verticalAlign() != VerticalAlignTop && parent.style()->verticalAlign() != VerticalAlignBottom)
|
| verticalPosition = box->parent()->logicalTop();
|
|
|
| - if (verticalAlign != BASELINE) {
|
| + if (verticalAlign != VerticalAlignBaseline) {
|
| const Font& font = parent.style(firstLine)->font();
|
| const FontMetrics& fontMetrics = font.fontMetrics();
|
| int fontSize = font.fontDescription().computedPixelSize();
|
|
|
| LineDirectionMode lineDirection = parent.isHorizontalWritingMode() ? HorizontalLine : VerticalLine;
|
|
|
| - if (verticalAlign == SUB) {
|
| + if (verticalAlign == VerticalAlignSub) {
|
| verticalPosition += fontSize / 5 + 1;
|
| - } else if (verticalAlign == SUPER) {
|
| + } else if (verticalAlign == VerticalAlignSuper) {
|
| verticalPosition -= fontSize / 3 + 1;
|
| - } else if (verticalAlign == TEXT_TOP) {
|
| + } else if (verticalAlign == VerticalAlignTextTop) {
|
| verticalPosition += boxModel.baselinePosition(baselineType(), firstLine, lineDirection) - fontMetrics.ascent(baselineType());
|
| - } else if (verticalAlign == MIDDLE) {
|
| + } else if (verticalAlign == VerticalAlignMiddle) {
|
| verticalPosition = LayoutUnit((verticalPosition - LayoutUnit(fontMetrics.xHeight() / 2)
|
| - boxModel.lineHeight(firstLine, lineDirection) / 2
|
| + boxModel.baselinePosition(baselineType(), firstLine, lineDirection)).round());
|
| - } else if (verticalAlign == TEXT_BOTTOM) {
|
| + } else if (verticalAlign == VerticalAlignTextBottom) {
|
| verticalPosition += fontMetrics.descent(baselineType());
|
| // lineHeight - baselinePosition is always 0 for replaced elements (except inline blocks), so don't bother wasting time in that case.
|
| if (!boxModel.isAtomicInlineLevel() || boxModel.isInlineBlockOrInlineTable())
|
| verticalPosition -= (boxModel.lineHeight(firstLine, lineDirection) - boxModel.baselinePosition(baselineType(), firstLine, lineDirection));
|
| - } else if (verticalAlign == BASELINE_MIDDLE) {
|
| + } else if (verticalAlign == VerticalAlignBaselineMiddle) {
|
| verticalPosition += -boxModel.lineHeight(firstLine, lineDirection) / 2 + boxModel.baselinePosition(baselineType(), firstLine, lineDirection);
|
| - } else if (verticalAlign == LENGTH) {
|
| + } else if (verticalAlign == VerticalAlignLength) {
|
| LayoutUnit lineHeight;
|
| // Per http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align: 'Percentages: refer to the 'line-height' of the element itself'.
|
| - if (boxModel.style()->verticalAlignLength().hasPercent())
|
| + if (boxModel.style()->getVerticalAlignLength().hasPercent())
|
| lineHeight = LayoutUnit(boxModel.style()->computedLineHeight());
|
| else
|
| lineHeight = boxModel.lineHeight(firstLine, lineDirection);
|
| - verticalPosition -= valueForLength(boxModel.style()->verticalAlignLength(), lineHeight);
|
| + verticalPosition -= valueForLength(boxModel.style()->getVerticalAlignLength(), lineHeight);
|
| }
|
| }
|
|
|
|
|