| Index: third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
|
| index 546cbdf38ca7242ebc9fc82f34a86c7c6fae95db..bd245349b8cfb2e4719b58c7af5016cdcf6b35b0 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
|
| @@ -200,22 +200,22 @@ public:
|
| bool isValueID() const { return type() == UnitType::ValueID; }
|
| bool colorIsDerivedFromElement() const;
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSValueID valueID)
|
| + static RawPtr<CSSPrimitiveValue> createIdentifier(CSSValueID valueID)
|
| {
|
| - return adoptRefWillBeNoop(new CSSPrimitiveValue(valueID));
|
| + return new CSSPrimitiveValue(valueID);
|
| }
|
| - static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(double value, UnitType type)
|
| + static RawPtr<CSSPrimitiveValue> create(double value, UnitType type)
|
| {
|
| - return adoptRefWillBeNoop(new CSSPrimitiveValue(value, type));
|
| + return new CSSPrimitiveValue(value, type);
|
| }
|
| - static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const Length& value, float zoom)
|
| + static RawPtr<CSSPrimitiveValue> create(const Length& value, float zoom)
|
| {
|
| - return adoptRefWillBeNoop(new CSSPrimitiveValue(value, zoom));
|
| + return new CSSPrimitiveValue(value, zoom);
|
| }
|
| - template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(T value)
|
| + template<typename T> static RawPtr<CSSPrimitiveValue> create(T value)
|
| {
|
| static_assert(!std::is_same<T, CSSValueID>::value, "Do not call create() with a CSSValueID; call createIdentifier() instead");
|
| - return adoptRefWillBeNoop(new CSSPrimitiveValue(value));
|
| + return new CSSPrimitiveValue(value);
|
| }
|
|
|
| ~CSSPrimitiveValue();
|
| @@ -265,10 +265,10 @@ private:
|
| template<typename T> CSSPrimitiveValue(T* val)
|
| : CSSValue(PrimitiveClass)
|
| {
|
| - init(PassRefPtrWillBeRawPtr<T>(val));
|
| + init(RawPtr<T>(val));
|
| }
|
|
|
| - template<typename T> CSSPrimitiveValue(PassRefPtrWillBeRawPtr<T> val)
|
| + template<typename T> CSSPrimitiveValue(RawPtr<T> val)
|
| : CSSValue(PrimitiveClass)
|
| {
|
| init(val);
|
| @@ -280,7 +280,7 @@ private:
|
|
|
| void init(UnitType);
|
| void init(const Length&);
|
| - void init(PassRefPtrWillBeRawPtr<CSSCalcValue>);
|
| + void init(RawPtr<CSSCalcValue>);
|
|
|
| double computeLengthDouble(const CSSToLengthConversionData&) const;
|
|
|
|
|