diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
| commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
| tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/third_party/blink/renderer/core/animation/css_interpolation_type.h | |
| parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
| download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz | |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/animation/css_interpolation_type.h')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/animation/css_interpolation_type.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/chromium/third_party/blink/renderer/core/animation/css_interpolation_type.h b/chromium/third_party/blink/renderer/core/animation/css_interpolation_type.h index 38b44c9a91e..ae8df46e78c 100644 --- a/chromium/third_party/blink/renderer/core/animation/css_interpolation_type.h +++ b/chromium/third_party/blink/renderer/core/animation/css_interpolation_type.h @@ -32,6 +32,26 @@ class CORE_EXPORT CSSInterpolationType : public InterpolationType { const InterpolationValue& underlying) const = 0; }; + virtual InterpolationValue MaybeConvertNeutral( + const InterpolationValue& underlying, + ConversionCheckers&) const = 0; + virtual InterpolationValue MaybeConvertInitial(const StyleResolverState&, + ConversionCheckers&) const = 0; + virtual InterpolationValue MaybeConvertInherit(const StyleResolverState&, + ConversionCheckers&) const = 0; + virtual InterpolationValue MaybeConvertValue(const CSSValue&, + const StyleResolverState*, + ConversionCheckers&) const = 0; + virtual const CSSValue* CreateCSSValue(const InterpolableValue&, + const NonInterpolableValue*, + const StyleResolverState&) const { + // TODO(alancutter): Implement this for all subclasses and make this an + // abstract declaration so the return type can be changed to + // const CSSValue&. + NOTREACHED(); + return nullptr; + } + protected: CSSInterpolationType(PropertyHandle, const PropertyRegistration* = nullptr); @@ -43,16 +63,7 @@ class CORE_EXPORT CSSInterpolationType : public InterpolationType { const InterpolationEnvironment&, const InterpolationValue& underlying, ConversionCheckers&) const final; - virtual InterpolationValue MaybeConvertNeutral( - const InterpolationValue& underlying, - ConversionCheckers&) const = 0; - virtual InterpolationValue MaybeConvertInitial(const StyleResolverState&, - ConversionCheckers&) const = 0; - virtual InterpolationValue MaybeConvertInherit(const StyleResolverState&, - ConversionCheckers&) const = 0; - virtual InterpolationValue MaybeConvertValue(const CSSValue&, - const StyleResolverState*, - ConversionCheckers&) const = 0; + virtual void AdditiveKeyframeHook(InterpolationValue&) const {} InterpolationValue MaybeConvertUnderlyingValue( @@ -80,16 +91,6 @@ class CORE_EXPORT CSSInterpolationType : public InterpolationType { CSSVariableResolver&, ConversionCheckers&) const; - virtual const CSSValue* CreateCSSValue(const InterpolableValue&, - const NonInterpolableValue*, - const StyleResolverState&) const { - // TODO(alancutter): Implement this for all subclasses and make this an - // abstract declaration so the return type can be changed to - // const CSSValue&. - NOTREACHED(); - return nullptr; - } - const PropertyRegistration& Registration() const { DCHECK(GetProperty().IsCSSCustomProperty()); return *registration_; |