Unship frames() animation timing function

alancutter · alancutter · commit f4fc014f1342 · 2017-07-18T00:14:46.000Z
This patch unships the frames() animation timing function due to unresolved issues over the naming. No intent is required as the timing function has not reached the stable channel of Chrome yet. Ongoing spec discussion: w3c/csswg-drafts#1301 TBR=alancutter@chromium.org (cherry picked from commit ffcd346) Bug: 646265 Change-Id: Ice19051813a96eaa55229e46ef6630a75333b5b8 Reviewed-on: https://chromium-review.googlesource.com/552218 Commit-Queue: Alan Cutter <alancutter@chromium.org> Reviewed-by: Suzy Howlett <suzyh@chromium.org> Reviewed-by: Noel Gordon <noel@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#483584} Reviewed-on: https://chromium-review.googlesource.com/574988 Reviewed-by: Alan Cutter <alancutter@chromium.org> Cr-Commit-Position: refs/branch-heads/3112@{#628} Cr-Branched-From: b6460e2-refs/heads/master@{#474897}
diff --git a/third_party/WebKit/LayoutTests/virtual/stable/animations-unprefixed/frames-timing-function.html b/third_party/WebKit/LayoutTests/virtual/stable/animations-unprefixed/frames-timing-function.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
+
+<style>
+#target {
+  transition-timing-function: frames(4);
+  animation-timing-function: frames(4);
+}
+</style>
+
+<div id="target"></div>
+
+<script>
+test(function() {
+  assert_equals(getComputedStyle(target).transitionTimingFunction, 'ease');
+  assert_equals(getComputedStyle(target).animationTimingFunction, 'ease');
+}, 'The frames() timing function is still experimental and should not be exposed to stable.');
+</script>
diff --git a/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.h b/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.h
@@ -27,6 +27,7 @@
 #define CSSTimingFunctionValue_h
 
 #include "core/css/CSSValue.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/TimingFunction.h"
 #include "platform/wtf/PassRefPtr.h"
 
@@ -124,7 +125,9 @@ class CSSFramesTimingFunctionValue : public CSSValue {
 
  private:
   CSSFramesTimingFunctionValue(int frames)
-      : CSSValue(kFramesTimingFunctionClass), frames_(frames) {}
+      : CSSValue(kFramesTimingFunctionClass), frames_(frames) {
+    DCHECK(RuntimeEnabledFeatures::FramesTimingFunctionEnabled());
+  }
 
   int frames_;
 };
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -451,8 +451,10 @@ static CSSValue* ConsumeAnimationTimingFunction(CSSParserTokenRange& range) {
   CSSValueID function = range.Peek().FunctionId();
   if (function == CSSValueSteps)
     return ConsumeSteps(range);
-  if (function == CSSValueFrames)
+  if (RuntimeEnabledFeatures::FramesTimingFunctionEnabled() &&
+      function == CSSValueFrames) {
     return ConsumeFrames(range);
+  }
   if (function == CSSValueCubicBezier)
     return ConsumeCubicBezier(range);
   return nullptr;
diff --git a/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5 b/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.json5
@@ -453,6 +453,10 @@
       settable_from_internals: true,
       status: "experimental",
     },
+    {
+      name: "FramesTimingFunction",
+      status: "experimental",
+    },
     {
       name: "FrameTimingSupport",
       status: "experimental",
diff --git a/third_party/WebKit/Source/platform/animation/TimingFunction.h b/third_party/WebKit/Source/platform/animation/TimingFunction.h
@@ -27,6 +27,7 @@
 
 #include "cc/animation/timing_function.h"
 #include "platform/PlatformExport.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/wtf/Assertions.h"
 #include "platform/wtf/PassRefPtr.h"
 #include "platform/wtf/RefCounted.h"
@@ -214,7 +215,9 @@ class PLATFORM_EXPORT FramesTimingFunction final : public TimingFunction {
  private:
   FramesTimingFunction(int frames)
       : TimingFunction(Type::FRAMES),
-        frames_(cc::FramesTimingFunction::Create(frames)) {}
+        frames_(cc::FramesTimingFunction::Create(frames)) {
+    DCHECK(RuntimeEnabledFeatures::FramesTimingFunctionEnabled());
+  }
 
   std::unique_ptr<cc::FramesTimingFunction> frames_;
 };
diff --git a/third_party/WebKit/Source/platform/animation/TimingFunctionTest.cpp b/third_party/WebKit/Source/platform/animation/TimingFunctionTest.cpp
@@ -32,6 +32,7 @@
 
 #include <sstream>
 #include <string>
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/wtf/text/WTFString.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -51,6 +52,10 @@ namespace {
 
 class TimingFunctionTest : public ::testing::Test {
  public:
+  TimingFunctionTest() {
+    RuntimeEnabledFeatures::SetFramesTimingFunctionEnabled(true);
+  }
+
   void NotEqualHelperLoop(
       Vector<std::pair<std::string, RefPtr<TimingFunction>>>& v) {
     for (size_t i = 0; i < v.size(); ++i) {
