Add SVGAngle::IsNumeric

When checking the 'orient' enumeration value the most common query is if
is an <angle> value. Since SVGAngle::IsAngle() sounds a bit too
tautological name it IsNumeric() instead.

Change-Id: I8b5add56dd510fe05545264dd91da9bd89527971
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2207176
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Reviewed-by: Stephen Chenney <schenney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770041}

third_party/blink/renderer/core/animation/svg_angle_interpolation_type.cc

@@ -19,8 +19,7 @@ InterpolationValue SVGAngleInterpolationType::MaybeConvertNeutral(
 
 InterpolationValue SVGAngleInterpolationType::MaybeConvertSVGValue(
     const SVGPropertyBase& svg_value) const {
-  if (To<SVGAngle>(svg_value).OrientType()->EnumValue() !=
-      kSVGMarkerOrientAngle)
+  if (!To<SVGAngle>(svg_value).IsNumeric())
     return nullptr;
   return InterpolationValue(
       std::make_unique<InterpolableNumber>(To<SVGAngle>(svg_value).Value()));

third_party/blink/renderer/core/svg/svg_angle.cc

@@ -366,21 +366,19 @@ void SVGAngle::Add(SVGPropertyBase* other, SVGElement*) {
 
   // Only respect by animations, if from and by are both specified in angles
   // (and not, for example, 'auto').
-  if (OrientType()->EnumValue() != kSVGMarkerOrientAngle ||
-      other_angle->OrientType()->EnumValue() != kSVGMarkerOrientAngle)
+  if (!IsNumeric() || !other_angle->IsNumeric())
     return;
 
   SetValue(Value() + other_angle->Value());
 }
 
 void SVGAngle::Assign(const SVGAngle& other) {
-  SVGMarkerOrientType other_orient_type = other.OrientType()->EnumValue();
-  if (other_orient_type == kSVGMarkerOrientAngle) {
+  if (other.IsNumeric()) {
     NewValueSpecifiedUnits(other.UnitType(), other.ValueInSpecifiedUnits());
     return;
   }
   value_in_specified_units_ = 0;
-  orient_type_->SetEnumValue(other_orient_type);
+  orient_type_->SetEnumValue(other.OrientType()->EnumValue());
 }
 
 void SVGAngle::CalculateAnimatedValue(
@@ -393,13 +391,10 @@ void SVGAngle::CalculateAnimatedValue(
     SVGElement*) {
   auto* from_angle = To<SVGAngle>(from);
   auto* to_angle = To<SVGAngle>(to);
-  SVGMarkerOrientType from_orient_type = from_angle->OrientType()->EnumValue();
-  SVGMarkerOrientType to_orient_type = to_angle->OrientType()->EnumValue();
 
   // We can only interpolate between two SVGAngles with orient-type 'angle',
   // all other cases will use discrete animation.
-  if (from_orient_type != to_orient_type ||
-      from_orient_type != kSVGMarkerOrientAngle) {
+  if (!from_angle->IsNumeric() || !to_angle->IsNumeric()) {
     Assign(percentage < 0.5f ? *from_angle : *to_angle);
     return;
   }
@@ -417,11 +412,14 @@ float SVGAngle::CalculateDistance(SVGPropertyBase* other, SVGElement*) {
 }
 
 void SVGAngle::OrientTypeChanged() {
-  if (OrientType()->EnumValue() == kSVGMarkerOrientAuto ||
-      OrientType()->EnumValue() == kSVGMarkerOrientAutoStartReverse) {
-    unit_type_ = kSvgAngletypeUnspecified;
-    value_in_specified_units_ = 0;
-  }
+  if (IsNumeric())
+    return;
+  unit_type_ = kSvgAngletypeUnspecified;
+  value_in_specified_units_ = 0;
+}
+
+bool SVGAngle::IsNumeric() const {
+  return orient_type_->EnumValue() == kSVGMarkerOrientAngle;
 }
 
 }  // namespace blink

third_party/blink/renderer/core/svg/svg_angle.h

@@ -109,6 +109,7 @@ class SVGAngle final : public SVGPropertyHelper<SVGAngle> {
   const SVGEnumeration<SVGMarkerOrientType>* OrientType() const {
     return orient_type_.Get();
   }
+  bool IsNumeric() const;
   void OrientTypeChanged();
 
   // SVGPropertyBase:

third_party/blink/renderer/core/svg/svg_animated_angle.cc

@@ -61,7 +61,7 @@ bool SVGAnimatedAngle::NeedsSynchronizeAttribute() const {
 void SVGAnimatedAngle::SynchronizeAttribute() {
   // If the value is not an <angle> we synchronize the value of the wrapped
   // enumeration.
-  if (BaseValue()->OrientType()->EnumValue() != kSVGMarkerOrientAngle) {
+  if (!BaseValue()->IsNumeric()) {
     orient_type_->SynchronizeAttribute();
     return;
   }