Added support for non-inherited flags in ComputedStyleBase

third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl

 {% from 'macros.tmpl' import license %}
 {{license()}}
 
 #ifndef ComputedStyleBase_h
 #define ComputedStyleBase_h
 
 #include "core/ComputedStyleBaseConstants.h"
 #include "core/CoreExport.h"
 
 {# Returns the default value for the field, converted to fit in the storage container. #}
@@ skipping 65 matching lines @@
         return true
         {% for field in fields if not field.property['inherited'] %}
             && {{field.name}} == o.{{field.name}}
         {% endfor %}
             && true;
     }
 
     void setBitDefaults()
     {
         {% for field in fields %}
-        reset{{field.property['upper_camel_name']}}();
+        {{field.resetter_method_name}}();
         {% endfor %}
     }
 
     enum IsAtShadowBoundary {
         AtShadowBoundary,
         NotAtShadowBoundary,
     };
     void inheritFrom(const ComputedStyleBase& inheritParent, IsAtShadowBoundary isAtShadowBoundary = NotAtShadowBoundary);
 
+    void copyNonInheritedFromCached(const ComputedStyleBase& other);
+
     // Fields.
     // TODO(sashab): Remove initialFoo() static methods and update callers to
     // use resetFoo(), which can be more efficient.
     {% for field in fields %}
     // {{field.property['name']}}
-    inline static {{field.type}} initial{{field.property['upper_camel_name']}}() { return {{field.default_value}}; }
-    {{field.type}} {{field.property['lower_camel_name']}}() const { return static_cast<{{field.type}}>({{field.name}}); }
-    void set{{field.property['upper_camel_name']}}({{field.type}} v) { {{field.name}} = static_cast<unsigned>(v); }
-    inline void reset{{field.property['upper_camel_name']}}() { {{field.name}} = {{default_value(field)}}; }
+    inline static {{field.type}} {{field.initial_method_name}}() { return {{field.default_value}}; }
+    {{field.type}} {{field.getter_method_name}}() const { return static_cast<{{field.type}}>({{field.name}}); }
+    void {{field.setter_method_name}}({{field.type}} v) { {{field.name}} = static_cast<unsigned>(v); }
+    inline void {{field.resetter_method_name}}() { {{field.name}} = {{default_value(field)}}; }
 
     {% endfor %}
 protected:
     // Storage.
     {% for field in fields %}
     unsigned {{field.name}} : {{field.size}}; // {{field.type}}
     {% endfor %}
 };
 
 } // namespace blink
 
 #endif // ComputedStyleBase_h

[sashab, 2016/09/22 06:00:42]

// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef ComputedStyleBase_h
#define ComputedStyleBase_h

#include "core/ComputedStyleBaseConstants.h"
#include "core/CoreExport.h"


namespace blink {

// The generated portion of ComputedStyle. For more info, see the header comment
// in ComputedStyle.h.
class CORE_EXPORT ComputedStyleBase {
public:
    ALWAYS_INLINE ComputedStyleBase() :
        m_floating(static_cast<unsigned>(EFloat::None)),
        m_visibility(static_cast<unsigned>(EVisibility::Visible))
    {}
    ~ComputedStyleBase() {}

    ALWAYS_INLINE ComputedStyleBase(const ComputedStyleBase& o) :
        m_floating(o.m_floating),
        m_visibility(o.m_visibility)
    {}

    bool operator==(const ComputedStyleBase& o) const
    {
        return true
            && m_floating == o.m_floating
            && m_visibility == o.m_visibility
            && true;
    }

    bool operator!=(const ComputedStyleBase& o) const { return !(*this == o); }

    inline bool inheritedEqual(const ComputedStyleBase& o) const
    {
        return true
            && m_visibility == o.m_visibility
            && true;
    }

    inline bool independentInheritedEqual(const ComputedStyleBase& o) const
    {
        return true
            && m_visibility == o.m_visibility
            && true;
    }

    inline bool nonIndependentInheritedEqual(const ComputedStyleBase& o) const
    {
        return true
            && true;
    }

    inline bool nonInheritedEqual(const ComputedStyleBase& o) const
    {
        return true
            && m_floating == o.m_floating
            && true;
    }

    void setBitDefaults()
    {
        resetFloating();
        resetVisibility();
    }

    enum IsAtShadowBoundary {
        AtShadowBoundary,
        NotAtShadowBoundary,
    };
    void inheritFrom(const ComputedStyleBase& inheritParent, IsAtShadowBoundary
isAtShadowBoundary = NotAtShadowBoundary);

    void copyNonInheritedFromCached(const ComputedStyleBase& other);

    // Fields.
    // TODO(sashab): Remove initialFoo() static methods and update callers to
    // use resetFoo(), which can be more efficient.
    // float
    inline static EFloat initialFloating() { return EFloat::None; }
    EFloat floating() const { return static_cast<EFloat>(m_floating); }
    void setFloating(EFloat v) { m_floating = static_cast<unsigned>(v); }
    inline void resetFloating() { m_floating =
static_cast<unsigned>(EFloat::None); }

    // visibility
    inline static EVisibility initialVisibility() { return EVisibility::Visible;
}
    EVisibility visibility() const { return
static_cast<EVisibility>(m_visibility); }
    void setVisibility(EVisibility v) { m_visibility = static_cast<unsigned>(v);
}
    inline void resetVisibility() { m_visibility =
static_cast<unsigned>(EVisibility::Visible); }

protected:
    // Storage.
    unsigned m_floating : 2; // EFloat
    unsigned m_visibility : 2; // EVisibility
};

} // namespace blink

#endif // ComputedStyleBase_h