Commit 68f86dff authored by Stuart Langley's avatar Stuart Langley Committed by Commit Bot

Put CSSCrossfadeValue into the blink::cssvalue namespace.

Bug: 667961
Change-Id: Ifed211edbc99290178daf60c39c7ff0e013213b7
Reviewed-on: https://chromium-review.googlesource.com/558308
Commit-Queue: Stuart Langley <slangley@chromium.org>
Reviewed-by: default avatarmeade_UTC10 <meade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485179}
parent c32115b7
...@@ -38,7 +38,7 @@ class CSSImageNonInterpolableValue : public NonInterpolableValue { ...@@ -38,7 +38,7 @@ class CSSImageNonInterpolableValue : public NonInterpolableValue {
return start_; return start_;
if (progress >= 1) if (progress >= 1)
return end_; return end_;
return CSSCrossfadeValue::Create( return cssvalue::CSSCrossfadeValue::Create(
start_, end_, start_, end_,
CSSPrimitiveValue::Create(progress, CSSPrimitiveValue::Create(progress,
CSSPrimitiveValue::UnitType::kNumber)); CSSPrimitiveValue::UnitType::kNumber));
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "platform/wtf/text/StringBuilder.h" #include "platform/wtf/text/StringBuilder.h"
namespace blink { namespace blink {
namespace cssvalue {
static bool SubimageIsPending(CSSValue* value) { static bool SubimageIsPending(CSSValue* value) {
if (value->IsImageValue()) if (value->IsImageValue())
...@@ -302,4 +303,5 @@ DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue) { ...@@ -302,4 +303,5 @@ DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue) {
CSSImageGeneratorValue::TraceAfterDispatch(visitor); CSSImageGeneratorValue::TraceAfterDispatch(visitor);
} }
} // namespace cssvalue
} // namespace blink } // namespace blink
...@@ -37,8 +37,10 @@ namespace blink { ...@@ -37,8 +37,10 @@ namespace blink {
class CrossfadeSubimageObserverProxy; class CrossfadeSubimageObserverProxy;
namespace cssvalue {
class CORE_EXPORT CSSCrossfadeValue final : public CSSImageGeneratorValue { class CORE_EXPORT CSSCrossfadeValue final : public CSSImageGeneratorValue {
friend class CrossfadeSubimageObserverProxy; friend class blink::CrossfadeSubimageObserverProxy;
USING_PRE_FINALIZER(CSSCrossfadeValue, Dispose); USING_PRE_FINALIZER(CSSCrossfadeValue, Dispose);
public: public:
...@@ -116,6 +118,7 @@ class CORE_EXPORT CSSCrossfadeValue final : public CSSImageGeneratorValue { ...@@ -116,6 +118,7 @@ class CORE_EXPORT CSSCrossfadeValue final : public CSSImageGeneratorValue {
DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, IsCrossfadeValue()); DEFINE_CSS_VALUE_TYPE_CASTS(CSSCrossfadeValue, IsCrossfadeValue());
} // namespace cssvalue
} // namespace blink } // namespace blink
#endif // CSSCrossfadeValue_h #endif // CSSCrossfadeValue_h
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
namespace blink { namespace blink {
using cssvalue::ToCSSCrossfadeValue;
CSSImageGeneratorValue::CSSImageGeneratorValue(ClassType class_type) CSSImageGeneratorValue::CSSImageGeneratorValue(ClassType class_type)
: CSSValue(class_type) {} : CSSValue(class_type) {}
......
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