| Index: third_party/WebKit/Source/core/css/PropertyRegistry.h
|
| diff --git a/third_party/WebKit/Source/core/css/PropertyRegistry.h b/third_party/WebKit/Source/core/css/PropertyRegistry.h
|
| index 0c331229bcb34bd7dba0be9e038f23fa04ffb289..6941e6bc8e11e4e7f5eef76fcb482299770e82f5 100644
|
| --- a/third_party/WebKit/Source/core/css/PropertyRegistry.h
|
| +++ b/third_party/WebKit/Source/core/css/PropertyRegistry.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef PropertyRegistry_h
|
| #define PropertyRegistry_h
|
|
|
| +#include "core/animation/InterpolationType.h"
|
| +#include "core/animation/InterpolationTypesMap.h"
|
| #include "core/css/CSSSyntaxDescriptor.h"
|
| #include "core/css/CSSValue.h"
|
| #include "core/css/CSSVariableData.h"
|
| @@ -24,11 +26,13 @@ class PropertyRegistry : public GarbageCollected<PropertyRegistry> {
|
| Registration(const CSSSyntaxDescriptor& syntax,
|
| bool inherits,
|
| const CSSValue* initial,
|
| - PassRefPtr<CSSVariableData> initialVariableData)
|
| + PassRefPtr<CSSVariableData> initialVariableData,
|
| + InterpolationTypes interpolationTypes)
|
| : m_syntax(syntax),
|
| m_inherits(inherits),
|
| m_initial(initial),
|
| - m_initialVariableData(initialVariableData) {}
|
| + m_initialVariableData(initialVariableData),
|
| + m_interpolationTypes(std::move(interpolationTypes)) {}
|
|
|
| const CSSSyntaxDescriptor& syntax() const { return m_syntax; }
|
| bool inherits() const { return m_inherits; }
|
| @@ -36,6 +40,9 @@ class PropertyRegistry : public GarbageCollected<PropertyRegistry> {
|
| CSSVariableData* initialVariableData() const {
|
| return m_initialVariableData.get();
|
| }
|
| + const InterpolationTypes& interpolationTypes() const {
|
| + return m_interpolationTypes;
|
| + }
|
|
|
| DEFINE_INLINE_TRACE() { visitor->trace(m_initial); }
|
|
|
| @@ -44,13 +51,15 @@ class PropertyRegistry : public GarbageCollected<PropertyRegistry> {
|
| const bool m_inherits;
|
| const Member<const CSSValue> m_initial;
|
| const RefPtr<CSSVariableData> m_initialVariableData;
|
| + const InterpolationTypes m_interpolationTypes;
|
| };
|
|
|
| void registerProperty(const AtomicString&,
|
| const CSSSyntaxDescriptor&,
|
| bool inherits,
|
| const CSSValue* initial,
|
| - PassRefPtr<CSSVariableData> initialVariableData);
|
| + PassRefPtr<CSSVariableData> initialVariableData,
|
| + InterpolationTypes);
|
| const Registration* registration(const AtomicString&) const;
|
| size_t registrationCount() const { return m_registrations.size(); }
|
|
|
|
|