Changed EVerticalAlign to an enum class and renamed its members

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

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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,
@@ skipping 70 matching lines @@
     box = box->parent();
   }
 }
 
 static inline bool hasIdenticalLineHeightProperties(
     const ComputedStyle& parentStyle,
     const ComputedStyle& childStyle,
     bool isRoot) {
   return parentStyle.hasIdenticalAscentDescentAndLineGap(childStyle) &&
          parentStyle.lineHeight() == childStyle.lineHeight() &&
-         (parentStyle.verticalAlign() == VerticalAlignBaseline || isRoot) &&
-         childStyle.verticalAlign() == VerticalAlignBaseline;
+         (parentStyle.verticalAlign() == EVerticalAlign::Baseline || isRoot) &&
+         childStyle.verticalAlign() == EVerticalAlign::Baseline;
 }
 
 void InlineFlowBox::addToLine(InlineBox* child) {
   ASSERT(!child->parent());
   ASSERT(!child->nextOnLine());
   ASSERT(!child->prevOnLine());
   checkConsistency();
 
   child->setParent(this);
   if (!m_firstChild) {
@@ skipping 421 matching lines @@
                                               int& maxDescent,
                                               int maxPositionTop,
                                               int maxPositionBottom) {
   int originalMaxAscent = maxAscent;
   int originalMaxDescent = maxDescent;
   for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
     // The computed lineheight needs to be extended for the
     // positioned elements
     if (curr->getLineLayoutItem().isOutOfFlowPositioned())
       continue;  // Positioned placeholders don't affect calculations.
-    if (curr->verticalAlign() == VerticalAlignTop ||
-        curr->verticalAlign() == VerticalAlignBottom) {
+    if (curr->verticalAlign() == EVerticalAlign::Top ||
+        curr->verticalAlign() == EVerticalAlign::Bottom) {
       int lineHeight = curr->lineHeight().round();
-      if (curr->verticalAlign() == VerticalAlignTop) {
+      if (curr->verticalAlign() == EVerticalAlign::Top) {
         if (maxAscent + maxDescent < lineHeight)
           maxDescent = lineHeight - maxAscent;
       } else {
         if (maxAscent + maxDescent < lineHeight)
           maxAscent = lineHeight - maxDescent;
       }
 
       if (maxAscent + maxDescent >= std::max(maxPositionTop, maxPositionBottom))
         break;
       maxAscent = originalMaxAscent;
@@ skipping 82 matching lines @@
     // positive if the child box's baseline is below the root box's baseline.
     curr->setLogicalTop(
         rootBox->verticalPositionForBox(curr, verticalPositionCache));
 
     int ascent = 0;
     int descent = 0;
     rootBox->ascentAndDescentForBox(curr, textBoxDataMap, ascent, descent,
                                     affectsAscent, affectsDescent);
 
     LayoutUnit boxHeight(ascent + descent);
-    if (curr->verticalAlign() == VerticalAlignTop) {
+    if (curr->verticalAlign() == EVerticalAlign::Top) {
       if (maxPositionTop < boxHeight)
         maxPositionTop = boxHeight;
-    } else if (curr->verticalAlign() == VerticalAlignBottom) {
+    } else if (curr->verticalAlign() == EVerticalAlign::Bottom) {
       if (maxPositionBottom < boxHeight)
         maxPositionBottom = boxHeight;
     } else if (!inlineFlowBox || noQuirksMode ||
                inlineFlowBox->hasTextChildren() ||
                (inlineFlowBox->descendantsHaveSameLineHeightAndBaseline() &&
                 inlineFlowBox->hasTextDescendants()) ||
                inlineFlowBox->boxModelObject()
                    .hasInlineDirectionBordersOrPadding()) {
       // Note that these values can be negative. Even though we only affect the
       // maxAscent and maxDescent values if our box (excluding line-height) was
@@ skipping 67 matching lines @@
 
     if (descendantsHaveSameLineHeightAndBaseline()) {
       curr->moveInBlockDirection(
           adjustmentForChildrenWithSameLineHeightAndBaseline);
       continue;
     }
 
     InlineFlowBox* inlineFlowBox =
         curr->isInlineFlowBox() ? toInlineFlowBox(curr) : nullptr;
     bool childAffectsTopBottomPos = true;
-    if (curr->verticalAlign() == VerticalAlignTop) {
+    if (curr->verticalAlign() == EVerticalAlign::Top) {
       curr->setLogicalTop(top);
-    } else if (curr->verticalAlign() == VerticalAlignBottom) {
+    } else if (curr->verticalAlign() == EVerticalAlign::Bottom) {
       curr->setLogicalTop((top + maxHeight - curr->lineHeight()));
     } else {
       if (!noQuirksMode && inlineFlowBox && !inlineFlowBox->hasTextChildren() &&
           !curr->boxModelObject().hasInlineDirectionBordersOrPadding() &&
           !(inlineFlowBox->descendantsHaveSameLineHeightAndBaseline() &&
             inlineFlowBox->hasTextDescendants()))
         childAffectsTopBottomPos = false;
       int posAdjust = maxAscent - curr->baselinePosition(baselineType);
       curr->setLogicalTop(curr->logicalTop() + top + posAdjust);
     }
@@ skipping 904 matching lines @@
     ASSERT(child->prevOnLine() == prev);
     prev = child;
   }
   ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 }  // namespace blink