Commit 19f63a03 authored by Abhijeet Kandalkar's avatar Abhijeet Kandalkar Committed by Commit Bot

Remove DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS (8/n)

The goal of this CL is to use new downcast helper and remove
DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS from t_p/b/r/c/animation to
adopt new downcast helpers.

This CL removes DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS for below
classes.
- CompositorKeyframeColor,
- CompositorKeyframeDouble,
- CompositorKeyframeFilterOperations,
- CompositorKeyframeTransform

Bug: 891908
Change-Id: I2b34d477f21cb0aa016f78f7d7292c55809abaf5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1983680Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Commit-Queue: Abhijeet Kandalkar <abhijeet@igalia.com>
Cr-Commit-Position: refs/heads/master@{#728219}
parent b8300073
......@@ -237,7 +237,7 @@ CompositorAnimations::CheckCanStartEffectOnCompositor(
case CSSPropertyID::kTranslate:
case CSSPropertyID::kTransform:
if (keyframe->GetCompositorKeyframeValue() &&
ToCompositorKeyframeTransform(
To<CompositorKeyframeTransform>(
keyframe->GetCompositorKeyframeValue())
->GetTransformOperations()
.DependsOnBoxSize()) {
......@@ -246,7 +246,7 @@ CompositorAnimations::CheckCanStartEffectOnCompositor(
break;
case CSSPropertyID::kFilter:
if (keyframe->GetCompositorKeyframeValue() &&
ToCompositorKeyframeFilterOperations(
To<CompositorKeyframeFilterOperations>(
keyframe->GetCompositorKeyframeValue())
->Operations()
.HasFilterThatMovesPixels()) {
......@@ -586,7 +586,7 @@ void AddKeyframeToCurve(CompositorFilterAnimationCurve& curve,
CompositorFilterKeyframe filter_keyframe(
keyframe->Offset(),
builder.BuildFilterOperations(
ToCompositorKeyframeFilterOperations(value)->Operations()),
To<CompositorKeyframeFilterOperations>(value)->Operations()),
keyframe_timing_function);
curve.AddKeyframe(filter_keyframe);
}
......@@ -596,7 +596,7 @@ void AddKeyframeToCurve(CompositorFloatAnimationCurve& curve,
const CompositorKeyframeValue* value,
const TimingFunction& keyframe_timing_function) {
CompositorFloatKeyframe float_keyframe(
keyframe->Offset(), ToCompositorKeyframeDouble(value)->ToDouble(),
keyframe->Offset(), To<CompositorKeyframeDouble>(value)->ToDouble(),
keyframe_timing_function);
curve.AddKeyframe(float_keyframe);
}
......@@ -606,7 +606,7 @@ void AddKeyframeToCurve(CompositorColorAnimationCurve& curve,
const CompositorKeyframeValue* value,
const TimingFunction& keyframe_timing_function) {
CompositorColorKeyframe color_keyframe(
keyframe->Offset(), ToCompositorKeyframeColor(value)->ToColor(),
keyframe->Offset(), To<CompositorKeyframeColor>(value)->ToColor(),
keyframe_timing_function);
curve.AddKeyframe(color_keyframe);
}
......@@ -617,7 +617,7 @@ void AddKeyframeToCurve(CompositorTransformAnimationCurve& curve,
const TimingFunction& keyframe_timing_function) {
CompositorTransformOperations ops;
ToCompositorTransformOperations(
ToCompositorKeyframeTransform(value)->GetTransformOperations(), &ops);
To<CompositorKeyframeTransform>(value)->GetTransformOperations(), &ops);
CompositorTransformKeyframe transform_keyframe(
keyframe->Offset(), std::move(ops), keyframe_timing_function);
......
......@@ -25,7 +25,12 @@ class CORE_EXPORT CompositorKeyframeColor final
SkColor color_;
};
DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS(CompositorKeyframeColor, IsColor());
template <>
struct DowncastTraits<CompositorKeyframeColor> {
static bool AllowFrom(const CompositorKeyframeValue& value) {
return value.IsColor();
}
};
} // namespace blink
......
......@@ -24,8 +24,12 @@ class CORE_EXPORT CompositorKeyframeDouble final
double number_;
};
DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS(CompositorKeyframeDouble,
IsDouble());
template <>
struct DowncastTraits<CompositorKeyframeDouble> {
static bool AllowFrom(const CompositorKeyframeValue& value) {
return value.IsDouble();
}
};
} // namespace blink
......
......@@ -34,8 +34,12 @@ class CompositorKeyframeFilterOperations final
Member<FilterOperationsWrapper> operation_wrapper_;
};
DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS(CompositorKeyframeFilterOperations,
IsFilterOperations());
template <>
struct DowncastTraits<CompositorKeyframeFilterOperations> {
static bool AllowFrom(const CompositorKeyframeValue& value) {
return value.IsFilterOperations();
}
};
} // namespace blink
......
......@@ -31,8 +31,12 @@ class CORE_EXPORT CompositorKeyframeTransform final
const double zoom_;
};
DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS(CompositorKeyframeTransform,
IsTransform());
template <>
struct DowncastTraits<CompositorKeyframeTransform> {
static bool AllowFrom(const CompositorKeyframeValue& value) {
return value.IsTransform();
}
};
} // namespace blink
......
......@@ -34,11 +34,6 @@ class CORE_EXPORT CompositorKeyframeValue
virtual Type GetType() const = 0;
};
#define DEFINE_COMPOSITOR_KEYFRAME_VALUE_TYPE_CASTS(thisType, predicate) \
DEFINE_TYPE_CASTS(thisType, CompositorKeyframeValue, value, \
value->predicate, value.predicate)
} // namespace blink
#endif // THIRD_PARTY_BLINK_RENDERER_CORE_ANIMATION_CSS_COMPOSITOR_KEYFRAME_VALUE_H_
......@@ -429,7 +429,7 @@ bool KeyframeEffect::AnimationsPreserveAxisAlignment(
continue;
DCHECK(value->IsTransform());
const auto& transform_operations =
ToCompositorKeyframeTransform(value)->GetTransformOperations();
To<CompositorKeyframeTransform>(value)->GetTransformOperations();
if (!transform_operations.PreservesAxisAlignment())
return false;
}
......
......@@ -706,7 +706,7 @@ TEST_F(AnimationKeyframeEffectModel, CompositorSnapshotUpdateCustomProperty) {
// Test value holds the correct number type
EXPECT_TRUE(value);
EXPECT_TRUE(value->IsDouble());
EXPECT_EQ(ToCompositorKeyframeDouble(value)->ToDouble(), 100);
EXPECT_EQ(To<CompositorKeyframeDouble>(value)->ToDouble(), 100);
}
TEST_F(AnimationKeyframeEffectModel, CompositorUpdateColorProperty) {
......@@ -751,22 +751,22 @@ TEST_F(AnimationKeyframeEffectModel, CompositorUpdateColorProperty) {
// Test rgb color input
EXPECT_TRUE(value_rgb);
EXPECT_TRUE(value_rgb->IsColor());
EXPECT_EQ(ToCompositorKeyframeColor(value_rgb)->ToColor(), SK_ColorGREEN);
EXPECT_EQ(To<CompositorKeyframeColor>(value_rgb)->ToColor(), SK_ColorGREEN);
// Test hsl color input
EXPECT_TRUE(value_hsl);
EXPECT_TRUE(value_hsl->IsColor());
EXPECT_EQ(ToCompositorKeyframeColor(value_hsl)->ToColor(), SK_ColorGREEN);
EXPECT_EQ(To<CompositorKeyframeColor>(value_hsl)->ToColor(), SK_ColorGREEN);
// Test named color input
EXPECT_TRUE(value_name);
EXPECT_TRUE(value_name->IsColor());
EXPECT_EQ(ToCompositorKeyframeColor(value_name)->ToColor(), SK_ColorGREEN);
EXPECT_EQ(To<CompositorKeyframeColor>(value_name)->ToColor(), SK_ColorGREEN);
// Test hex color input
EXPECT_TRUE(value_hex);
EXPECT_TRUE(value_hex->IsColor());
EXPECT_EQ(ToCompositorKeyframeColor(value_hex)->ToColor(), SK_ColorGREEN);
EXPECT_EQ(To<CompositorKeyframeColor>(value_hex)->ToColor(), SK_ColorGREEN);
// currentcolor is a CSSIdentifierValue not a color
EXPECT_FALSE(value_curr);
......@@ -779,11 +779,13 @@ TEST_F(AnimationKeyframeEffectModel, CompositorUpdateColorProperty) {
EXPECT_TRUE(value_mixed0);
EXPECT_TRUE(value_mixed0->IsColor());
EXPECT_EQ(ToCompositorKeyframeColor(value_mixed0)->ToColor(), SK_ColorBLACK);
EXPECT_EQ(To<CompositorKeyframeColor>(value_mixed0)->ToColor(),
SK_ColorBLACK);
EXPECT_TRUE(value_mixed1);
EXPECT_TRUE(value_mixed1->IsColor());
EXPECT_EQ(ToCompositorKeyframeColor(value_mixed1)->ToColor(), SK_ColorGREEN);
EXPECT_EQ(To<CompositorKeyframeColor>(value_mixed1)->ToColor(),
SK_ColorGREEN);
}
} // namespace blink
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment