Revert "Unship frames() animation timing function"

Alex Mineer · Alex Mineer · commit fd23350d864d · 2017-07-18T18:51:37.000Z
This reverts commit f4fc014. Reason for revert: Causing build failure: ../../third_party/WebKit/Source/platform/animation/TimingFunction.h:219:12: error: 'FramesTimingFunctionEnabled' is not a member of 'blink::RuntimeEnabledFeatures' DCHECK(RuntimeEnabledFeatures::FramesTimingFunctionEnabled()); ^ https://uberchromegw.corp.google.com/i/official.android.continuous/builders/beta-arm/builds/8762/steps/Build%20libchrome.so/logs/stdio BUG=646265 Original change's description: > Unship frames() animation timing function > > 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} TBR=noel@chromium.org,alancutter@chromium.org,suzyh@chromium.org Change-Id: I85ff5ade3dbc64c82fda8f0271d617ab4f744f22 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 646265 Reviewed-on: https://chromium-review.googlesource.com/576350 Reviewed-by: Alex Mineer <amineer@chromium.org> Cr-Commit-Position: refs/branch-heads/3112@{#637} 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
diff --git a/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.h b/third_party/WebKit/Source/core/css/CSSTimingFunctionValue.h
@@ -27,7 +27,6 @@
 #define CSSTimingFunctionValue_h
 
 #include "core/css/CSSValue.h"
-#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/TimingFunction.h"
 #include "platform/wtf/PassRefPtr.h"
 
@@ -125,9 +124,7 @@ class CSSFramesTimingFunctionValue : public CSSValue {
 
  private:
   CSSFramesTimingFunctionValue(int frames)
-      : CSSValue(kFramesTimingFunctionClass), frames_(frames) {
-    DCHECK(RuntimeEnabledFeatures::FramesTimingFunctionEnabled());
-  }
+      : CSSValue(kFramesTimingFunctionClass), frames_(frames) {}
 
   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,10 +451,8 @@ static CSSValue* ConsumeAnimationTimingFunction(CSSParserTokenRange& range) {
   CSSValueID function = range.Peek().FunctionId();
   if (function == CSSValueSteps)
     return ConsumeSteps(range);
-  if (RuntimeEnabledFeatures::FramesTimingFunctionEnabled() &&
-      function == CSSValueFrames) {
+  if (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,10 +453,6 @@
       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,7 +27,6 @@
 
 #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"
@@ -215,9 +214,7 @@ class PLATFORM_EXPORT FramesTimingFunction final : public TimingFunction {
  private:
   FramesTimingFunction(int frames)
       : TimingFunction(Type::FRAMES),
-        frames_(cc::FramesTimingFunction::Create(frames)) {
-    DCHECK(RuntimeEnabledFeatures::FramesTimingFunctionEnabled());
-  }
+        frames_(cc::FramesTimingFunction::Create(frames)) {}
 
   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,7 +32,6 @@
 
 #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"
@@ -52,10 +51,6 @@ 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) {
