diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-20 09:47:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-07 11:15:42 +0000 |
commit | 189d4fd8fad9e3c776873be51938cd31a42b6177 (patch) | |
tree | 6497caeff5e383937996768766ab3bb2081a40b2 /chromium/third_party/blink/renderer/platform/animation/compositor_color_animation_curve.cc | |
parent | 8bc75099d364490b22f43a7ce366b366c08f4164 (diff) | |
download | qtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz |
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/animation/compositor_color_animation_curve.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/platform/animation/compositor_color_animation_curve.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/platform/animation/compositor_color_animation_curve.cc b/chromium/third_party/blink/renderer/platform/animation/compositor_color_animation_curve.cc index 5e9b97c40d9..cadf710668a 100644 --- a/chromium/third_party/blink/renderer/platform/animation/compositor_color_animation_curve.cc +++ b/chromium/third_party/blink/renderer/platform/animation/compositor_color_animation_curve.cc @@ -8,24 +8,24 @@ #include <utility> #include "base/memory/ptr_util.h" -#include "cc/animation/animation_curve.h" -#include "cc/animation/keyframed_animation_curve.h" -#include "cc/animation/timing_function.h" +#include "ui/gfx/animation/keyframe/animation_curve.h" +#include "ui/gfx/animation/keyframe/keyframed_animation_curve.h" +#include "ui/gfx/animation/keyframe/timing_function.h" namespace blink { CompositorColorAnimationCurve::CompositorColorAnimationCurve() - : curve_(cc::KeyframedColorAnimationCurve::Create()) {} + : curve_(gfx::KeyframedColorAnimationCurve::Create()) {} CompositorColorAnimationCurve::CompositorColorAnimationCurve( - std::unique_ptr<cc::KeyframedColorAnimationCurve> curve) + std::unique_ptr<gfx::KeyframedColorAnimationCurve> curve) : curve_(std::move(curve)) {} CompositorColorAnimationCurve::~CompositorColorAnimationCurve() = default; std::unique_ptr<CompositorColorAnimationCurve> CompositorColorAnimationCurve::CreateForTesting( - std::unique_ptr<cc::KeyframedColorAnimationCurve> curve) { + std::unique_ptr<gfx::KeyframedColorAnimationCurve> curve) { return base::WrapUnique(new CompositorColorAnimationCurve(std::move(curve))); } @@ -57,7 +57,7 @@ SkColor CompositorColorAnimationCurve::GetValue(double time) const { return curve_->GetValue(base::TimeDelta::FromSecondsD(time)); } -std::unique_ptr<cc::AnimationCurve> +std::unique_ptr<gfx::AnimationCurve> CompositorColorAnimationCurve::CloneToAnimationCurve() const { return curve_->Clone(); } |