Avoid deprecated CSSInterpolationEnvironment constructor

The CSSInterpolationEnvironment constructor that accepts a
CSSVariableResolver should only be used when the CSSCascade flag is
disabled.

Change-Id: I7a7b984c16dcc684e5d76d412a0e1565d7efb1c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302113
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: Xiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: Robert Flack <flackr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789558}

third_party/blink/renderer/core/animation/css_interpolation_environment.h

@@ -7,6 +7,7 @@
 
 #include "third_party/blink/renderer/core/animation/interpolation_environment.h"
 #include "third_party/blink/renderer/core/css/resolver/style_resolver_state.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 
 namespace blink {
 
@@ -23,7 +24,9 @@ class CSSInterpolationEnvironment : public InterpolationEnvironment {
       : InterpolationEnvironment(map),
         state_(&state),
         style_(state.Style()),
-        variable_resolver_(variable_resolver) {}
+        variable_resolver_(variable_resolver) {
+    DCHECK(!RuntimeEnabledFeatures::CSSCascadeEnabled());
+  }
 
   explicit CSSInterpolationEnvironment(const InterpolationTypesMap& map,
                                        StyleResolverState& state,
@@ -33,7 +36,9 @@ class CSSInterpolationEnvironment : public InterpolationEnvironment {
         state_(&state),
         style_(state.Style()),
         cascade_(cascade),
-        cascade_resolver_(cascade_resolver) {}
+        cascade_resolver_(cascade_resolver) {
+    DCHECK(RuntimeEnabledFeatures::CSSCascadeEnabled());
+  }
 
   explicit CSSInterpolationEnvironment(const InterpolationTypesMap& map,
                                        const ComputedStyle& style)

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

@@ -8,6 +8,7 @@
 #include "third_party/blink/renderer/core/animation/interpolation_environment.h"
 #include "third_party/blink/renderer/core/animation/interpolation_type.h"
 #include "third_party/blink/renderer/core/css/resolver/style_resolver_state.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 
 namespace blink {
 
@@ -48,9 +49,15 @@ TransitionInterpolation::CurrentNonInterpolableValue() const {
 void TransitionInterpolation::Apply(StyleResolverState& state) const {
   CSSInterpolationTypesMap map(state.GetDocument().GetPropertyRegistry(),
                                state.GetDocument());
-  CSSInterpolationEnvironment environment(map, state, nullptr);
-  type_.Apply(CurrentInterpolableValue(), CurrentNonInterpolableValue(),
-              environment);
+  if (RuntimeEnabledFeatures::CSSCascadeEnabled()) {
+    CSSInterpolationEnvironment environment(map, state, nullptr, nullptr);
+    type_.Apply(CurrentInterpolableValue(), CurrentNonInterpolableValue(),
+                environment);
+  } else {
+    CSSInterpolationEnvironment environment(map, state, nullptr);
+    type_.Apply(CurrentInterpolableValue(), CurrentNonInterpolableValue(),
+                environment);
+  }
 }
 
 std::unique_ptr<TypedInterpolationValue>

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

@@ -17,6 +17,7 @@
 #include "third_party/blink/renderer/core/css/resolver/style_resolver.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/style/computed_style.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 
 namespace blink {
 
@@ -47,9 +48,16 @@ void TransitionKeyframe::AddKeyframePropertiesToV8Object(
   StyleResolverState state(document, *element);
   state.SetStyle(ComputedStyle::Create());
   CSSInterpolationTypesMap map(document.GetPropertyRegistry(), document);
-  CSSInterpolationEnvironment environment(map, state, nullptr);
-  value_->GetType().Apply(value_->GetInterpolableValue(),
-                          value_->GetNonInterpolableValue(), environment);
+
+  if (RuntimeEnabledFeatures::CSSCascadeEnabled()) {
+    CSSInterpolationEnvironment environment(map, state, nullptr, nullptr);
+    value_->GetType().Apply(value_->GetInterpolableValue(),
+                            value_->GetNonInterpolableValue(), environment);
+  } else {
+    CSSInterpolationEnvironment environment(map, state, nullptr);
+    value_->GetType().Apply(value_->GetInterpolableValue(),
+                            value_->GetNonInterpolableValue(), environment);
+  }
 
   const ComputedStyle* style = state.Style();
   String property_value =