Added support for non-inherited flags 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
  * License as published by the Free Software Foundation; either
@@ skipping 233 matching lines @@
         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_floating == other.m_floating
                 && m_tableLayout == other.m_tableLayout
                 && m_unicodeBidi == other.m_unicodeBidi
                 // 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_floating : 2; // EFloat
         unsigned m_tableLayout : 1; // ETableLayout
         unsigned m_unicodeBidi : 3; // EUnicodeBidi
 
         // 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
@@ skipping 66 matching lines @@
         m_inheritedData.m_insideLink = NotInsideLink;
         m_inheritedData.m_writingMode = initialWritingMode();
 
         m_nonInheritedData.m_effectiveDisplay = m_nonInheritedData.m_originalDisplay = initialDisplay();
         m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor();
         m_nonInheritedData.m_overflowX = initialOverflowX();
         m_nonInheritedData.m_overflowY = initialOverflowY();
         m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
         m_nonInheritedData.m_clear = initialClear();
         m_nonInheritedData.m_position = initialPosition();
-        m_nonInheritedData.m_floating = static_cast<unsigned>(initialFloating());
         m_nonInheritedData.m_tableLayout = initialTableLayout();
         m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
         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;
@@ skipping 440 matching lines @@
 
     // -webkit-box-reflect
     static StyleReflection* initialBoxReflect() { return 0; }
     StyleReflection* boxReflect() const { return m_rareNonInheritedData->m_boxReflect.get(); }
     void setBoxReflect(PassRefPtr<StyleReflection> reflect)
     {
         if (m_rareNonInheritedData->m_boxReflect != reflect)
             m_rareNonInheritedData.access()->m_boxReflect = reflect;
     }
 
-    // float
-    static EFloat initialFloating() { return EFloat::None; }
-    EFloat floating() const { return static_cast<EFloat>(m_nonInheritedData.m_floating); }
-    void setFloating(EFloat v) { m_nonInheritedData.m_floating = static_cast<unsigned>(v); }
-
     // Grid properties.
     static Vector<GridTrackSize> initialGridAutoRepeatTracks() { return Vector<GridTrackSize>(); /* none */ }
     static size_t initialGridAutoRepeatInsertionPoint() { return 0; }
     static AutoRepeatType initialGridAutoRepeatType() { return NoAutoRepeat; }
     static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLinesMap(); }
     static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesMap(); }
     static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return OrderedNamedGridLines(); }
     static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return OrderedNamedGridLines(); }
     static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap(); }
     static size_t initialNamedGridAreaCount() { return 0; }
@@ skipping 1783 matching lines @@
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const
 {
     return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 } // namespace blink
 
 #endif // ComputedStyle_h