| Index: Source/core/css/CSSPrimitiveValue.h
|
| diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
|
| index 8d3e9dc0a7d7496af072df64700c9d91c54bca29..0f2d7e0c6cb902c22284e9d5ef8049ed2bab1529 100644
|
| --- a/Source/core/css/CSSPrimitiveValue.h
|
| +++ b/Source/core/css/CSSPrimitiveValue.h
|
| @@ -43,7 +43,7 @@ class Pair;
|
| class Quad;
|
| class RGBColor;
|
| class Rect;
|
| -class LayoutStyle;
|
| +class ComputedStyle;
|
|
|
| // Dimension calculations are imprecise, often resulting in values of e.g.
|
| // 44.99998. We need to go ahead and round if we're really close to the next
|
| @@ -240,7 +240,7 @@ public:
|
| {
|
| return adoptRefWillBeNoop(new CSSPrimitiveValue(value, zoom));
|
| }
|
| - static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const LengthSize& value, const LayoutStyle& style)
|
| + static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const LengthSize& value, const ComputedStyle& style)
|
| {
|
| return adoptRefWillBeNoop(new CSSPrimitiveValue(value, style));
|
| }
|
| @@ -334,7 +334,7 @@ private:
|
| CSSPrimitiveValue(int parserOperator, UnitType);
|
| CSSPrimitiveValue(unsigned color, UnitType); // RGB value
|
| CSSPrimitiveValue(const Length&, float zoom);
|
| - CSSPrimitiveValue(const LengthSize&, const LayoutStyle&);
|
| + CSSPrimitiveValue(const LengthSize&, const ComputedStyle&);
|
| CSSPrimitiveValue(const String&, UnitType);
|
| CSSPrimitiveValue(double, UnitType);
|
|
|
| @@ -356,7 +356,7 @@ private:
|
| template<typename T> operator T*(); // compile-time guard
|
|
|
| void init(const Length&);
|
| - void init(const LengthSize&, const LayoutStyle&);
|
| + void init(const LengthSize&, const ComputedStyle&);
|
| void init(PassRefPtrWillBeRawPtr<Counter>);
|
| void init(PassRefPtrWillBeRawPtr<Rect>);
|
| void init(PassRefPtrWillBeRawPtr<Pair>);
|
|
|