Moved overflow-x and overflow-y 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 206 matching lines @@
   } 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 &&
              // 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
 
     // 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
 
@@ skipping 32 matching lines @@
     // 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_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;
@@ skipping 1136 matching lines @@
   static int initialOutlineOffset() { return 0; }
   int outlineOffset() const {
     if (m_rareNonInheritedData->m_outline.style() == BorderStyleNone)
       return 0;
     return m_rareNonInheritedData->m_outline.offset();
   }
   void setOutlineOffset(int v) {
     SET_VAR(m_rareNonInheritedData, m_outline.m_offset, v);
   }
 
-  // overflow-x
-  static EOverflow initialOverflowX() { return EOverflow::kVisible; }
-  EOverflow overflowX() const {
-    return static_cast<EOverflow>(m_nonInheritedData.m_overflowX);
-  }
-  void setOverflowX(EOverflow v) {
-    m_nonInheritedData.m_overflowX = static_cast<unsigned>(v);
-  }
-
-  // overflow-y
-  static EOverflow initialOverflowY() { return EOverflow::kVisible; }
-  EOverflow overflowY() const {
-    return static_cast<EOverflow>(m_nonInheritedData.m_overflowY);
-  }
-  void setOverflowY(EOverflow v) {
-    m_nonInheritedData.m_overflowY = static_cast<unsigned>(v);
-  }
-
   // Padding properties.
   static Length initialPadding() { return Length(Fixed); }
 
   // padding-bottom
   const Length& paddingBottom() const { return m_surround->padding.bottom(); }
   void setPaddingBottom(const Length& v) {
     SET_VAR(m_surround, padding.m_bottom, v);
   }
 
   // padding-left
@@ skipping 2422 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