Generate the storage of pseudoBits and styleType 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 215 matching lines @@
     unsigned m_insideLink : 2;     // EInsideLink
   } m_inheritedData;
 
   // don't inherit
   struct NonInheritedData {
     NonInheritedData()
         : m_effectiveDisplay(static_cast<unsigned>(initialDisplay())),
           m_originalDisplay(static_cast<unsigned>(initialDisplay())),
           m_verticalAlign(static_cast<unsigned>(initialVerticalAlign())),
           m_hasViewportUnits(false),
-          m_styleType(PseudoIdNone),
-          m_pseudoBits(0),
           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 &&
              m_verticalAlign == other.m_verticalAlign;
       // Differences in the following fields do not cause inequality:
@@ skipping 17 matching lines @@
 
     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;
 
-    // 32 bits
-
-    unsigned m_styleType : 6;  // PseudoId
-    unsigned m_pseudoBits : 8;
-
-    // 64 bits
-
     mutable unsigned m_hasRemUnits : 1;
 
     // If you add more style bits here, you will also need to update
     // ComputedStyle::copyNonInheritedFromCached() 68 bits
   } m_nonInheritedData;
 
   // !END SYNC!
 
  private:
   // TODO(sashab): Move these private members to the bottom of ComputedStyle.
@@ skipping 45 matching lines @@
   StyleSelfAlignmentData resolvedJustifySelf(
       ItemPosition normalValueBehaviour,
       const ComputedStyle* parentStyle = nullptr) const;
 
   StyleDifference visualInvalidationDiff(const ComputedStyle&) const;
 
   void inheritFrom(const ComputedStyle& inheritParent,
                    IsAtShadowBoundary = NotAtShadowBoundary);
   void copyNonInheritedFromCached(const ComputedStyle&);
 
-  PseudoId styleType() const {
-    return static_cast<PseudoId>(m_nonInheritedData.m_styleType);
-  }
-  void setStyleType(PseudoId styleType) {
-    m_nonInheritedData.m_styleType = styleType;
-  }
+  PseudoId styleType() const { return static_cast<PseudoId>(m_styleType); }
+  void setStyleType(PseudoId styleType) { m_styleType = styleType; }
 
   ComputedStyle* getCachedPseudoStyle(PseudoId) const;
   ComputedStyle* addCachedPseudoStyle(PassRefPtr<ComputedStyle>);
   void removeCachedPseudoStyle(PseudoId);
 
   const PseudoStyleCache* cachedPseudoStyles() const {
     return m_cachedPseudoStyles.get();
   }
 
   /**
@@ skipping 3398 matching lines @@
 
 inline bool ComputedStyle::setTextOrientation(TextOrientation textOrientation) {
   if (compareEqual(m_rareInheritedData->m_textOrientation, textOrientation))
     return false;
 
   m_rareInheritedData.access()->m_textOrientation = textOrientation;
   return true;
 }
 
 inline bool ComputedStyle::hasAnyPublicPseudoStyles() const {
-  return m_nonInheritedData.m_pseudoBits;
+  return m_pseudoBits;
 }
 
 inline bool ComputedStyle::hasPseudoStyle(PseudoId pseudo) const {
   DCHECK(pseudo >= FirstPublicPseudoId);
   DCHECK(pseudo < FirstInternalPseudoId);
-  return (1 << (pseudo - FirstPublicPseudoId)) &
-         m_nonInheritedData.m_pseudoBits;
+  return (1 << (pseudo - FirstPublicPseudoId)) & m_pseudoBits;
 }
 
 inline void ComputedStyle::setHasPseudoStyle(PseudoId pseudo) {
   DCHECK(pseudo >= FirstPublicPseudoId);
   DCHECK(pseudo < FirstInternalPseudoId);
-  m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
+  m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
-  return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
+  return m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h