Changed EVerticalAlign to an enum class and renamed its members

third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp

 /*
  * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 664 matching lines @@
   bool isLayoutInline = boxModel.isLayoutInline();
   if (isLayoutInline && !firstLine) {
     LayoutUnit verticalPosition =
         LayoutUnit(verticalPositionCache.get(boxModel, baselineType()));
     if (verticalPosition != PositionUndefined)
       return verticalPosition;
   }
 
   LayoutUnit verticalPosition;
   EVerticalAlign verticalAlign = boxModel.style()->verticalAlign();
-  if (verticalAlign == VerticalAlignTop || verticalAlign == VerticalAlignBottom)
+  if (verticalAlign == EVerticalAlign::Top ||
+      verticalAlign == EVerticalAlign::Bottom)
     return LayoutUnit();
 
   LineLayoutItem parent = boxModel.parent();
   if (parent.isLayoutInline() &&
-      parent.style()->verticalAlign() != VerticalAlignTop &&
-      parent.style()->verticalAlign() != VerticalAlignBottom)
+      parent.style()->verticalAlign() != EVerticalAlign::Top &&
+      parent.style()->verticalAlign() != EVerticalAlign::Bottom)
     verticalPosition = box->parent()->logicalTop();
 
-  if (verticalAlign != VerticalAlignBaseline) {
+  if (verticalAlign != EVerticalAlign::Baseline) {
     const Font& font = parent.style(firstLine)->font();
     const SimpleFontData* fontData = font.primaryFont();
     DCHECK(fontData);
     if (!fontData)
       return LayoutUnit();
 
     const FontMetrics& fontMetrics = fontData->getFontMetrics();
     int fontSize = font.getFontDescription().computedPixelSize();
 
     LineDirectionMode lineDirection =
         parent.isHorizontalWritingMode() ? HorizontalLine : VerticalLine;
 
-    if (verticalAlign == VerticalAlignSub) {
+    if (verticalAlign == EVerticalAlign::Sub) {
       verticalPosition += fontSize / 5 + 1;
-    } else if (verticalAlign == VerticalAlignSuper) {
+    } else if (verticalAlign == EVerticalAlign::Super) {
       verticalPosition -= fontSize / 3 + 1;
-    } else if (verticalAlign == VerticalAlignTextTop) {
+    } else if (verticalAlign == EVerticalAlign::TextTop) {
       verticalPosition +=
           boxModel.baselinePosition(baselineType(), firstLine, lineDirection) -
           fontMetrics.ascent(baselineType());
-    } else if (verticalAlign == VerticalAlignMiddle) {
+    } else if (verticalAlign == EVerticalAlign::Middle) {
       verticalPosition = LayoutUnit(
           (verticalPosition - LayoutUnit(fontMetrics.xHeight() / 2) -
            boxModel.lineHeight(firstLine, lineDirection) / 2 +
            boxModel.baselinePosition(baselineType(), firstLine, lineDirection))
               .round());
-    } else if (verticalAlign == VerticalAlignTextBottom) {
+    } else if (verticalAlign == EVerticalAlign::TextBottom) {
       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 == VerticalAlignBaselineMiddle) {
+    } else if (verticalAlign == EVerticalAlign::BaselineMiddle) {
       verticalPosition +=
           -boxModel.lineHeight(firstLine, lineDirection) / 2 +
           boxModel.baselinePosition(baselineType(), firstLine, lineDirection);
-    } else if (verticalAlign == VerticalAlignLength) {
+    } else if (verticalAlign == EVerticalAlign::Length) {
       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()->getVerticalAlignLength().isPercentOrCalc())
         lineHeight = LayoutUnit(boxModel.style()->computedLineHeight());
       else
         lineHeight = boxModel.lineHeight(firstLine, lineDirection);
       verticalPosition -= valueForLength(
           boxModel.style()->getVerticalAlignLength(), lineHeight);
     }
@@ skipping 36 matching lines @@
   }
   endBox = nullptr;
   return nullptr;
 }
 
 const char* RootInlineBox::boxName() const {
   return "RootInlineBox";
 }
 
 }  // namespace blink