| Index: Source/core/css/CSSProperty.h
|
| diff --git a/Source/core/css/CSSProperty.h b/Source/core/css/CSSProperty.h
|
| index eadaa077fd948412d13042de52f0da114725766d..e662b2f45e23c2ff6f7a5b9af21bf1f23d14b0f5 100644
|
| --- a/Source/core/css/CSSProperty.h
|
| +++ b/Source/core/css/CSSProperty.h
|
| @@ -56,14 +56,14 @@ struct StylePropertyMetadata {
|
| class CSSProperty {
|
| ALLOW_ONLY_INLINE_ALLOCATION();
|
| public:
|
| - CSSProperty(CSSPropertyID propertyID, PassRefPtrWillBeRawPtr<CSSValue> value, bool important = false, bool isSetFromShorthand = false, int indexInShorthandsVector = 0, bool implicit = false)
|
| + CSSProperty(CSSPropertyID propertyID, CSSValue value, bool important = false, bool isSetFromShorthand = false, int indexInShorthandsVector = 0, bool implicit = false)
|
| : m_metadata(propertyID, isSetFromShorthand, indexInShorthandsVector, important, implicit, CSSPropertyMetadata::isInheritedProperty(propertyID))
|
| , m_value(value)
|
| {
|
| }
|
|
|
| // FIXME: Remove this.
|
| - CSSProperty(StylePropertyMetadata metadata, CSSValue* value)
|
| + CSSProperty(StylePropertyMetadata metadata, CSSValue value)
|
| : m_metadata(metadata)
|
| , m_value(value)
|
| {
|
| @@ -74,7 +74,7 @@ public:
|
| CSSPropertyID shorthandID() const { return m_metadata.shorthandID(); };
|
| bool isImportant() const { return m_metadata.m_important; }
|
|
|
| - CSSValue* value() const { return m_value.get(); }
|
| + const CSSValue& value() const { return m_value; }
|
|
|
| static CSSPropertyID resolveDirectionAwareProperty(CSSPropertyID, TextDirection, WritingMode);
|
| static bool isAffectedByAllProperty(CSSPropertyID);
|
| @@ -87,11 +87,12 @@ public:
|
|
|
| private:
|
| StylePropertyMetadata m_metadata;
|
| - RefPtrWillBeMember<CSSValue> m_value;
|
| + CSSValue m_value;
|
| };
|
|
|
| } // namespace blink
|
|
|
| +// TODO(sashab): Shouldn't initialize CSSProperty with null, since it contains a CSSValue.
|
| WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSProperty);
|
|
|
| #endif // CSSProperty_h
|
|
|