Generate keyword part of vertical-align property in ComputedStyleBase.

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 187 matching lines @@
   // list of associated pseudo styles
   std::unique_ptr<PseudoStyleCache> m_cachedPseudoStyles;
 
   DataRef<SVGComputedStyle> m_svgStyle;
 
   // !START SYNC!: Keep this in sync with the copy constructor in
   // ComputedStyle.cpp.
 
   // don't inherit
   struct NonInheritedData {
-    NonInheritedData()
-        : m_verticalAlign(static_cast<unsigned>(initialVerticalAlign())),
-          m_hasViewportUnits(false),
-          m_hasRemUnits(false) {}
+    NonInheritedData() : m_hasViewportUnits(false), m_hasRemUnits(false) {}
 
     // Compare computed styles, differences in inherited bits or other flags
     // should not cause an inequality.
     bool operator==(const NonInheritedData& other) const {
       // Generated properties are compared in ComputedStyleBase
-      return m_verticalAlign == other.m_verticalAlign;
+      return true;
       // Differences in the following fields do not cause inequality:
       // hasViewportUnits
       // styleType
       // pseudoBits
       // explicitInheritance
       // unique
       // emptyState
       // affectedByFocus
       // affectedByHover
       // affectedByActive
       // affectedByDrag
       // isLink
       // isInherited flags
     }
 
     bool operator!=(const NonInheritedData& other) const {
       return !(*this == other);
     }
 
-    unsigned m_verticalAlign : 4;     // EVerticalAlign
-
     // This is set if we used viewport units when resolving a length.
     // It is mutable so we can pass around const ComputedStyles to resolve
     // lengths.
     mutable unsigned m_hasViewportUnits : 1;
 
     mutable unsigned m_hasRemUnits : 1;
 
     // If you add more style bits here, you will also need to update
     // ComputedStyle::copyNonInheritedFromCached() 68 bits
   } m_nonInheritedData;
@@ skipping 1420 matching lines @@
   }
   void setTouchAction(TouchAction t) {
     SET_VAR(m_rareNonInheritedData, m_touchAction, t);
   }
 
   // vertical-align
   static EVerticalAlign initialVerticalAlign() {
     return EVerticalAlign::kBaseline;
   }
   EVerticalAlign verticalAlign() const {
-    return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign);
+    return static_cast<EVerticalAlign>(m_verticalAlign);
   }
   const Length& getVerticalAlignLength() const {
     return m_box->verticalAlign();
   }
   void setVerticalAlign(EVerticalAlign v) {
-    m_nonInheritedData.m_verticalAlign = static_cast<unsigned>(v);
+    m_verticalAlign = static_cast<unsigned>(v);
   }
   void setVerticalAlignLength(const Length& length) {
     setVerticalAlign(EVerticalAlign::kLength);
     SET_VAR(m_box, m_verticalAlign, length);
   }
 
   // will-change
   const Vector<CSSPropertyID>& willChangeProperties() const {
     return m_rareNonInheritedData->m_willChange->m_properties;
   }
@@ skipping 2032 matching lines @@
   m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h