Moved table-layout 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 180 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.
 
   // inherit
   struct InheritedData {
     bool operator==(const InheritedData& other) const {
+      // Generated properties are compared in ComputedStyleBase
       return (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
              (m_cursorStyle == other.m_cursorStyle) &&
              (m_insideLink == other.m_insideLink);
     }
 
     bool operator!=(const InheritedData& other) const {
       return !(*this == other);
     }
 
     unsigned m_hasSimpleUnderline : 1;  // True if 'underline solid' is the only
                                         // text decoration on this element.
     unsigned m_cursorStyle : 6;     // ECursor
 
     // non CSS2 inherited
     unsigned m_insideLink : 2;     // EInsideLink
   } m_inheritedData;
 
   // don't inherit
   struct NonInheritedData {
     // 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_overflowX == other.m_overflowX &&
              m_overflowY == other.m_overflowY &&
              m_verticalAlign == other.m_verticalAlign &&
              m_position == other.m_position &&
-             m_tableLayout == other.m_tableLayout &&
              // hasViewportUnits
              m_breakBefore == other.m_breakBefore &&
              m_breakAfter == other.m_breakAfter &&
              m_breakInside == other.m_breakInside;
       // 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_overflowX : 3;         // EOverflow
     unsigned m_overflowY : 3;         // EOverflow
     unsigned m_verticalAlign : 4;     // EVerticalAlign
     unsigned m_position : 3;          // EPosition
-    unsigned m_tableLayout : 1;       // ETableLayout
 
     // 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_breakBefore : 4;  // EBreak
     unsigned m_breakAfter : 4;   // EBreak
@@ skipping 20 matching lines @@
 
     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!
 
   void setBitDefaults() {
+    // Generated properties are updated in ComputedStyleBase
     ComputedStyleBase::setBitDefaults();
     m_inheritedData.m_hasSimpleUnderline = false;
     m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
     m_inheritedData.m_insideLink =
         static_cast<unsigned>(EInsideLink::kNotInsideLink);
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             static_cast<unsigned>(initialDisplay());
     m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
     m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
     m_nonInheritedData.m_verticalAlign =
         static_cast<unsigned>(initialVerticalAlign());
     m_nonInheritedData.m_position = initialPosition();
-    m_nonInheritedData.m_tableLayout =
-        static_cast<unsigned>(initialTableLayout());
     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;
     m_nonInheritedData.m_variableReference = false;
     m_nonInheritedData.m_unique = false;
     m_nonInheritedData.m_emptyState = false;
     m_nonInheritedData.m_hasViewportUnits = false;
@@ skipping 1423 matching lines @@
   }
   PageSizeType getPageSizeType() const {
     return static_cast<PageSizeType>(m_rareNonInheritedData->m_pageSizeType);
   }
   void setPageSize(const FloatSize& s) {
     SET_VAR(m_rareNonInheritedData, m_pageSize, s);
   }
   void setPageSizeType(PageSizeType t) {
     SET_VAR(m_rareNonInheritedData, m_pageSizeType, t);
   }
-  // table-layout
-  static ETableLayout initialTableLayout() { return ETableLayout::kAuto; }
-  ETableLayout tableLayout() const {
-    return static_cast<ETableLayout>(m_nonInheritedData.m_tableLayout);
-  }
-  void setTableLayout(ETableLayout v) {
-    m_nonInheritedData.m_tableLayout = static_cast<unsigned>(v);
-  }
 
   // Text decoration properties.
   // text-decoration-line
   static TextDecoration initialTextDecoration() { return TextDecorationNone; }
   TextDecoration getTextDecoration() const {
     return static_cast<TextDecoration>(m_visual->textDecoration);
   }
   void setTextDecoration(TextDecoration v) {
     SET_VAR(m_visual, textDecoration, v);
   }
@@ skipping 2150 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