Commit f9517ac9 authored by Zhuoyu Qian's avatar Zhuoyu Qian Committed by Commit Bot

Put CSS*TimingFunctionValue into the blink::cssvalue namespace.

This is part of the gradual process of putting all types that derive
from CSSValue into blink::cssvalue:: namespace.

Bug: 667961
Signed-off-by: default avatarZhuoyu Qian <zhuoyu.qian@samsung.com>
Change-Id: Ifaaa877a2395e1eb876624b2f351d6ace325b913
Reviewed-on: https://chromium-review.googlesource.com/892547
Commit-Queue: nainar <nainar@chromium.org>
Reviewed-by: default avatarStuart Langley <slangley@chromium.org>
Reviewed-by: default avatarnainar <nainar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532833}
parent 4beaeb27
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "platform/wtf/text/WTFString.h" #include "platform/wtf/text/WTFString.h"
namespace blink { namespace blink {
namespace cssvalue {
String CSSCubicBezierTimingFunctionValue::CustomCSSText() const { String CSSCubicBezierTimingFunctionValue::CustomCSSText() const {
return "cubic-bezier(" + String::Number(x1_) + ", " + String::Number(y1_) + return "cubic-bezier(" + String::Number(x1_) + ", " + String::Number(y1_) +
...@@ -70,4 +71,5 @@ bool CSSFramesTimingFunctionValue::Equals( ...@@ -70,4 +71,5 @@ bool CSSFramesTimingFunctionValue::Equals(
return frames_ == other.frames_; return frames_ == other.frames_;
} }
} // namespace cssvalue
} // namespace blink } // namespace blink
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "platform/runtime_enabled_features.h" #include "platform/runtime_enabled_features.h"
namespace blink { namespace blink {
namespace cssvalue {
class CSSCubicBezierTimingFunctionValue : public CSSValue { class CSSCubicBezierTimingFunctionValue : public CSSValue {
public: public:
...@@ -135,6 +136,7 @@ class CSSFramesTimingFunctionValue : public CSSValue { ...@@ -135,6 +136,7 @@ class CSSFramesTimingFunctionValue : public CSSValue {
DEFINE_CSS_VALUE_TYPE_CASTS(CSSFramesTimingFunctionValue, DEFINE_CSS_VALUE_TYPE_CASTS(CSSFramesTimingFunctionValue,
IsFramesTimingFunctionValue()); IsFramesTimingFunctionValue());
} // namespace cssvalue
} // namespace blink } // namespace blink
#endif #endif
...@@ -144,7 +144,8 @@ CSSValue* ConsumeSteps(CSSParserTokenRange& range) { ...@@ -144,7 +144,8 @@ CSSValue* ConsumeSteps(CSSParserTokenRange& range) {
return nullptr; return nullptr;
range = range_copy; range = range_copy;
return CSSStepsTimingFunctionValue::Create(steps->GetIntValue(), position); return cssvalue::CSSStepsTimingFunctionValue::Create(steps->GetIntValue(),
position);
} }
CSSValue* ConsumeFrames(CSSParserTokenRange& range) { CSSValue* ConsumeFrames(CSSParserTokenRange& range) {
...@@ -166,7 +167,7 @@ CSSValue* ConsumeFrames(CSSParserTokenRange& range) { ...@@ -166,7 +167,7 @@ CSSValue* ConsumeFrames(CSSParserTokenRange& range) {
return nullptr; return nullptr;
range = range_copy; range = range_copy;
return CSSFramesTimingFunctionValue::Create(frames_int); return cssvalue::CSSFramesTimingFunctionValue::Create(frames_int);
} }
CSSValue* ConsumeCubicBezier(CSSParserTokenRange& range) { CSSValue* ConsumeCubicBezier(CSSParserTokenRange& range) {
...@@ -186,7 +187,7 @@ CSSValue* ConsumeCubicBezier(CSSParserTokenRange& range) { ...@@ -186,7 +187,7 @@ CSSValue* ConsumeCubicBezier(CSSParserTokenRange& range) {
CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args) && CSSPropertyParserHelpers::ConsumeCommaIncludingWhitespace(args) &&
CSSPropertyParserHelpers::ConsumeNumberRaw(args, y2) && args.AtEnd()) { CSSPropertyParserHelpers::ConsumeNumberRaw(args, y2) && args.AtEnd()) {
range = range_copy; range = range_copy;
return CSSCubicBezierTimingFunctionValue::Create(x1, y1, x2, y2); return cssvalue::CSSCubicBezierTimingFunctionValue::Create(x1, y1, x2, y2);
} }
return nullptr; return nullptr;
......
...@@ -1466,7 +1466,7 @@ CSSValue* ComputedStyleUtils::CreateTimingFunctionValue( ...@@ -1466,7 +1466,7 @@ CSSValue* ComputedStyleUtils::CreateTimingFunctionValue(
} }
return CSSIdentifierValue::Create(value_id); return CSSIdentifierValue::Create(value_id);
} }
return CSSCubicBezierTimingFunctionValue::Create( return cssvalue::CSSCubicBezierTimingFunctionValue::Create(
bezier_timing_function->X1(), bezier_timing_function->Y1(), bezier_timing_function->X1(), bezier_timing_function->Y1(),
bezier_timing_function->X2(), bezier_timing_function->Y2()); bezier_timing_function->X2(), bezier_timing_function->Y2());
} }
...@@ -1481,7 +1481,7 @@ CSSValue* ComputedStyleUtils::CreateTimingFunctionValue( ...@@ -1481,7 +1481,7 @@ CSSValue* ComputedStyleUtils::CreateTimingFunctionValue(
position == StepsTimingFunction::StepPosition::END); position == StepsTimingFunction::StepPosition::END);
if (steps > 1) if (steps > 1)
return CSSStepsTimingFunctionValue::Create(steps, position); return cssvalue::CSSStepsTimingFunctionValue::Create(steps, position);
CSSValueID value_id = position == StepsTimingFunction::StepPosition::START CSSValueID value_id = position == StepsTimingFunction::StepPosition::START
? CSSValueStepStart ? CSSValueStepStart
: CSSValueStepEnd; : CSSValueStepEnd;
...@@ -1492,7 +1492,7 @@ CSSValue* ComputedStyleUtils::CreateTimingFunctionValue( ...@@ -1492,7 +1492,7 @@ CSSValue* ComputedStyleUtils::CreateTimingFunctionValue(
const FramesTimingFunction* frames_timing_function = const FramesTimingFunction* frames_timing_function =
ToFramesTimingFunction(timing_function); ToFramesTimingFunction(timing_function);
int frames = frames_timing_function->NumberOfFrames(); int frames = frames_timing_function->NumberOfFrames();
return CSSFramesTimingFunctionValue::Create(frames); return cssvalue::CSSFramesTimingFunctionValue::Create(frames);
} }
default: default:
......
...@@ -458,8 +458,8 @@ scoped_refptr<TimingFunction> CSSToStyleMap::MapAnimationTimingFunction( ...@@ -458,8 +458,8 @@ scoped_refptr<TimingFunction> CSSToStyleMap::MapAnimationTimingFunction(
} }
if (value.IsCubicBezierTimingFunctionValue()) { if (value.IsCubicBezierTimingFunctionValue()) {
const CSSCubicBezierTimingFunctionValue& cubic_timing_function = const cssvalue::CSSCubicBezierTimingFunctionValue& cubic_timing_function =
ToCSSCubicBezierTimingFunctionValue(value); cssvalue::ToCSSCubicBezierTimingFunctionValue(value);
return CubicBezierTimingFunction::Create( return CubicBezierTimingFunction::Create(
cubic_timing_function.X1(), cubic_timing_function.Y1(), cubic_timing_function.X1(), cubic_timing_function.Y1(),
cubic_timing_function.X2(), cubic_timing_function.Y2()); cubic_timing_function.X2(), cubic_timing_function.Y2());
...@@ -469,14 +469,14 @@ scoped_refptr<TimingFunction> CSSToStyleMap::MapAnimationTimingFunction( ...@@ -469,14 +469,14 @@ scoped_refptr<TimingFunction> CSSToStyleMap::MapAnimationTimingFunction(
return CSSTimingData::InitialTimingFunction(); return CSSTimingData::InitialTimingFunction();
if (value.IsFramesTimingFunctionValue()) { if (value.IsFramesTimingFunctionValue()) {
const CSSFramesTimingFunctionValue& frames_timing_function = const cssvalue::CSSFramesTimingFunctionValue& frames_timing_function =
ToCSSFramesTimingFunctionValue(value); cssvalue::ToCSSFramesTimingFunctionValue(value);
return FramesTimingFunction::Create( return FramesTimingFunction::Create(
frames_timing_function.NumberOfFrames()); frames_timing_function.NumberOfFrames());
} }
const CSSStepsTimingFunctionValue& steps_timing_function = const cssvalue::CSSStepsTimingFunctionValue& steps_timing_function =
ToCSSStepsTimingFunctionValue(value); cssvalue::ToCSSStepsTimingFunctionValue(value);
if (steps_timing_function.GetStepPosition() == if (steps_timing_function.GetStepPosition() ==
StepsTimingFunction::StepPosition::MIDDLE) { StepsTimingFunction::StepPosition::MIDDLE) {
if (!allow_step_middle) { if (!allow_step_middle) {
......
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