Moved display property to be generated 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 188 matching lines @@
   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_effectiveDisplay(static_cast<unsigned>(initialDisplay())),
-          m_originalDisplay(static_cast<unsigned>(initialDisplay())),
+        : m_originalDisplay(static_cast<unsigned>(initialDisplay())),
           m_verticalAlign(static_cast<unsigned>(initialVerticalAlign())),
           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_effectiveDisplay == other.m_effectiveDisplay &&
-             m_originalDisplay == other.m_originalDisplay &&
+      return m_originalDisplay == other.m_originalDisplay &&
              m_verticalAlign == other.m_verticalAlign;
       // 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_effectiveDisplay : 5;  // EDisplay
     unsigned m_originalDisplay : 5;   // EDisplay
     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;
 
@@ skipping 544 matching lines @@
     SET_VAR(m_rareNonInheritedData, m_contain, contain);
   }
 
   // content
   ContentData* contentData() const {
     return m_rareNonInheritedData->m_content.get();
   }
   void setContent(ContentData*);
 
   // display
-  static EDisplay initialDisplay() { return EDisplay::kInline; }
-  EDisplay display() const {
-    return static_cast<EDisplay>(m_nonInheritedData.m_effectiveDisplay);
-  }
   EDisplay originalDisplay() const {
     return static_cast<EDisplay>(m_nonInheritedData.m_originalDisplay);
   }
-  void setDisplay(EDisplay v) {
-    m_nonInheritedData.m_effectiveDisplay = static_cast<unsigned>(v);
-  }
   void setOriginalDisplay(EDisplay v) {
     m_nonInheritedData.m_originalDisplay = static_cast<unsigned>(v);
   }
 
   // Flex properties.
   // flex-basis (aka -webkit-flex-basis)
   static Length initialFlexBasis() { return Length(Auto); }
   const Length& flexBasis() const {
     return m_rareNonInheritedData->m_flexibleBox->m_flexBasis;
   }
@@ skipping 2923 matching lines @@
   m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h