Moved clear 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 208 matching lines @@
   struct NonInheritedData {
     // Compare computed styles, differences in inherited bits or other flags
     // should not cause an inequality.
     bool operator==(const NonInheritedData& other) const {
       return m_effectiveDisplay == other.m_effectiveDisplay &&
              m_originalDisplay == other.m_originalDisplay &&
              m_overflowAnchor == other.m_overflowAnchor &&
              m_overflowX == other.m_overflowX &&
              m_overflowY == other.m_overflowY &&
              m_verticalAlign == other.m_verticalAlign &&
-             m_clear == other.m_clear && m_position == other.m_position &&
+             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_overflowAnchor : 2;    // EOverflowAnchor
     unsigned m_overflowX : 3;         // EOverflow
     unsigned m_overflowY : 3;         // EOverflow
     unsigned m_verticalAlign : 4;     // EVerticalAlign
-    unsigned m_clear : 2;             // EClear
     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
 
@@ skipping 37 matching lines @@
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             static_cast<unsigned>(initialDisplay());
     m_nonInheritedData.m_overflowAnchor =
         static_cast<unsigned>(initialOverflowAnchor());
     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_clear = static_cast<unsigned>(initialClear());
     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;
@@ skipping 432 matching lines @@
   }
   void setBoxShadow(PassRefPtr<ShadowList>);
 
   // box-sizing (aka -webkit-box-sizing)
   static EBoxSizing initialBoxSizing() { return EBoxSizing::kContentBox; }
   EBoxSizing boxSizing() const { return m_box->boxSizing(); }
   void setBoxSizing(EBoxSizing s) {
     SET_VAR(m_box, m_boxSizing, static_cast<unsigned>(s));
   }
 
-  // clear
-  static EClear initialClear() { return EClear::kNone; }
-  EClear clear() const {
-    return static_cast<EClear>(m_nonInheritedData.m_clear);
-  }
-  void setClear(EClear v) {
-    m_nonInheritedData.m_clear = static_cast<unsigned>(v);
-  }
-
   // Page break properties.
   // break-after (shorthand for page-break-after and -webkit-column-break-after)
   static EBreak initialBreakAfter() { return BreakAuto; }
   EBreak breakAfter() const {
     return static_cast<EBreak>(m_nonInheritedData.m_breakAfter);
   }
   void setBreakAfter(EBreak b) {
     DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore);
     m_nonInheritedData.m_breakAfter = b;
   }
@@ skipping 3161 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