| Index: third_party/WebKit/Source/core/css/CSSQuadValue.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSQuadValue.h b/third_party/WebKit/Source/core/css/CSSQuadValue.h
|
| index b86bd7788e440e131b38f61c7ec7760a306c3dac..0d9acabfd47c680cb7ef44100852bccd1aed4232 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSQuadValue.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSQuadValue.h
|
| @@ -22,7 +22,6 @@
|
| #define CSSQuadValue_h
|
|
|
| #include "core/CoreExport.h"
|
| -#include "core/css/CSSPrimitiveValue.h"
|
| #include "core/css/CSSValue.h"
|
| #include "wtf/RefPtr.h"
|
|
|
| @@ -35,15 +34,15 @@ public:
|
| SerializeAsQuad
|
| };
|
|
|
| - static CSSQuadValue* create(CSSPrimitiveValue* top, CSSPrimitiveValue* right, CSSPrimitiveValue* bottom, CSSPrimitiveValue* left, TypeForSerialization serializationType)
|
| + static CSSQuadValue* create(CSSValue* top, CSSValue* right, CSSValue* bottom, CSSValue* left, TypeForSerialization serializationType)
|
| {
|
| return new CSSQuadValue(top, right, bottom, left, serializationType);
|
| }
|
|
|
| - CSSPrimitiveValue* top() const { return m_top.get(); }
|
| - CSSPrimitiveValue* right() const { return m_right.get(); }
|
| - CSSPrimitiveValue* bottom() const { return m_bottom.get(); }
|
| - CSSPrimitiveValue* left() const { return m_left.get(); }
|
| + CSSValue* top() const { return m_top.get(); }
|
| + CSSValue* right() const { return m_right.get(); }
|
| + CSSValue* bottom() const { return m_bottom.get(); }
|
| + CSSValue* left() const { return m_left.get(); }
|
|
|
| TypeForSerialization serializationType() { return m_serializationType; }
|
|
|
| @@ -60,7 +59,7 @@ public:
|
| DECLARE_TRACE_AFTER_DISPATCH();
|
|
|
| protected:
|
| - CSSQuadValue(CSSPrimitiveValue* top, CSSPrimitiveValue* right, CSSPrimitiveValue* bottom, CSSPrimitiveValue* left, TypeForSerialization serializationType)
|
| + CSSQuadValue(CSSValue* top, CSSValue* right, CSSValue* bottom, CSSValue* left, TypeForSerialization serializationType)
|
| : CSSValue(QuadClass)
|
| , m_serializationType(serializationType)
|
| , m_top(top)
|
| @@ -70,10 +69,10 @@ protected:
|
|
|
| private:
|
| TypeForSerialization m_serializationType;
|
| - Member<CSSPrimitiveValue> m_top;
|
| - Member<CSSPrimitiveValue> m_right;
|
| - Member<CSSPrimitiveValue> m_bottom;
|
| - Member<CSSPrimitiveValue> m_left;
|
| + Member<CSSValue> m_top;
|
| + Member<CSSValue> m_right;
|
| + Member<CSSValue> m_bottom;
|
| + Member<CSSValue> m_left;
|
| };
|
|
|
| DEFINE_CSS_VALUE_TYPE_CASTS(CSSQuadValue, isQuadValue());
|
|
|