Changed EVerticalAlign to an enum class and renamed its members

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 311 matching lines @@
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             static_cast<unsigned>(initialDisplay());
     m_nonInheritedData.m_overflowAnchor =
         static_cast<unsigned>(initialOverflowAnchor());
     m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
     m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
-    m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
+    m_nonInheritedData.m_verticalAlign =
+        static_cast<unsigned>(initialVerticalAlign());
     m_nonInheritedData.m_clear = initialClear();
     m_nonInheritedData.m_position = initialPosition();
     m_nonInheritedData.m_tableLayout = initialTableLayout();
     m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
     m_nonInheritedData.m_breakBefore = initialBreakBefore();
     m_nonInheritedData.m_breakAfter = initialBreakAfter();
     m_nonInheritedData.m_breakInside = initialBreakInside();
     m_nonInheritedData.m_styleType = PseudoIdNone;
     m_nonInheritedData.m_pseudoBits = 0;
     m_nonInheritedData.m_explicitInheritance = false;
@@ skipping 1528 matching lines @@
   }
 
   // unicode-bidi
   static EUnicodeBidi initialUnicodeBidi() { return UBNormal; }
   EUnicodeBidi unicodeBidi() const {
     return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi);
   }
   void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; }
 
   // vertical-align
-  static EVerticalAlign initialVerticalAlign() { return VerticalAlignBaseline; }
+  static EVerticalAlign initialVerticalAlign() {
+    return EVerticalAlign::Baseline;
+  }
   EVerticalAlign verticalAlign() const {
     return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign);
   }
   const Length& getVerticalAlignLength() const {
     return m_box->verticalAlign();
   }
   void setVerticalAlign(EVerticalAlign v) {
-    m_nonInheritedData.m_verticalAlign = v;
+    m_nonInheritedData.m_verticalAlign = static_cast<unsigned>(v);
   }
   void setVerticalAlignLength(const Length& length) {
-    setVerticalAlign(VerticalAlignLength);
+    setVerticalAlign(EVerticalAlign::Length);
     SET_VAR(m_box, m_verticalAlign, length);
   }
 
   // will-change
   const Vector<CSSPropertyID>& willChangeProperties() const {
     return m_rareNonInheritedData->m_willChange->m_properties;
   }
   bool willChangeContents() const {
     return m_rareNonInheritedData->m_willChange->m_contents;
   }
@@ skipping 2082 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h