| Index: Source/core/css/StylePropertySet.h
|
| diff --git a/Source/core/css/StylePropertySet.h b/Source/core/css/StylePropertySet.h
|
| index 34f1d947ed090bb6ac31f38eff0ef3f2e1a4c010..bc717e84f3f8ebe117aa3f2eed077c2768461b67 100644
|
| --- a/Source/core/css/StylePropertySet.h
|
| +++ b/Source/core/css/StylePropertySet.h
|
| @@ -70,17 +70,17 @@ public:
|
| bool isInherited() const { return propertyMetadata().m_inherited; }
|
| bool isImplicit() const { return propertyMetadata().m_implicit; }
|
|
|
| - const CSSValue* value() const { return propertyValue(); }
|
| + const CSSValue value() const { return propertyValue(); }
|
| // FIXME: We should try to remove this mutable overload.
|
| - CSSValue* value() { return const_cast<CSSValue*>(propertyValue()); }
|
| + CSSValue value() { return propertyValue(); }
|
|
|
| // FIXME: Remove this.
|
| - CSSProperty toCSSProperty() const { return CSSProperty(propertyMetadata(), const_cast<CSSValue*>(propertyValue())); }
|
| + CSSProperty toCSSProperty() const { return CSSProperty(propertyMetadata(), propertyValue()); }
|
|
|
| const StylePropertyMetadata& propertyMetadata() const;
|
|
|
| private:
|
| - const CSSValue* propertyValue() const;
|
| + const CSSValue propertyValue() const;
|
|
|
| const StylePropertySet& m_propertySet;
|
| unsigned m_index;
|
| @@ -92,7 +92,7 @@ public:
|
| int findPropertyIndex(CSSPropertyID) const;
|
| bool hasProperty(CSSPropertyID property) const { return findPropertyIndex(property) != -1; }
|
|
|
| - PassRefPtrWillBeRawPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
|
| + NullableCSSValue getPropertyCSSValue(CSSPropertyID) const;
|
| String getPropertyValue(CSSPropertyID) const;
|
|
|
| bool propertyIsImportant(CSSPropertyID) const;
|
| @@ -118,7 +118,7 @@ public:
|
| void showStyle();
|
| #endif
|
|
|
| - bool propertyMatches(CSSPropertyID, const CSSValue*) const;
|
| + bool propertyMatches(CSSPropertyID, const CSSValue) const;
|
|
|
| DECLARE_TRACE();
|
| DEFINE_INLINE_TRACE_AFTER_DISPATCH() { }
|
| @@ -153,7 +153,7 @@ public:
|
|
|
| unsigned propertyCount() const { return m_arraySize; }
|
|
|
| - const RawPtrWillBeMember<CSSValue>* valueArray() const;
|
| + const CSSValue* valueArray() const;
|
| const StylePropertyMetadata* metadataArray() const;
|
| int findPropertyIndex(CSSPropertyID) const;
|
|
|
| @@ -170,14 +170,14 @@ private:
|
| ImmutableStylePropertySet(const CSSProperty*, unsigned count, CSSParserMode);
|
| };
|
|
|
| -inline const RawPtrWillBeMember<CSSValue>* ImmutableStylePropertySet::valueArray() const
|
| +inline const CSSValue* ImmutableStylePropertySet::valueArray() const
|
| {
|
| - return reinterpret_cast<const RawPtrWillBeMember<CSSValue>*>(const_cast<const void**>(&(this->m_storage)));
|
| + return reinterpret_cast<const CSSValue*>(const_cast<const void**>(&(this->m_storage)));
|
| }
|
|
|
| inline const StylePropertyMetadata* ImmutableStylePropertySet::metadataArray() const
|
| {
|
| - return reinterpret_cast<const StylePropertyMetadata*>(&reinterpret_cast<const char*>(&(this->m_storage))[m_arraySize * sizeof(RawPtrWillBeMember<CSSValue>)]);
|
| + return reinterpret_cast<const StylePropertyMetadata*>(&reinterpret_cast<const char*>(&(this->m_storage))[m_arraySize * sizeof(CSSValue)]);
|
| }
|
|
|
| DEFINE_TYPE_CASTS(ImmutableStylePropertySet, StylePropertySet, set, !set->isMutable(), !set.isMutable());
|
| @@ -196,7 +196,7 @@ public:
|
|
|
| // These expand shorthand properties into multiple properties.
|
| bool setProperty(CSSPropertyID unresolvedProperty, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
|
| - void setProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important = false);
|
| + void setProperty(CSSPropertyID, CSSValue, bool important = false);
|
|
|
| // These do not. FIXME: This is too messy, we can do better.
|
| bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
|
| @@ -255,7 +255,7 @@ inline const StylePropertyMetadata& StylePropertySet::PropertyReference::propert
|
| return toImmutableStylePropertySet(m_propertySet).metadataArray()[m_index];
|
| }
|
|
|
| -inline const CSSValue* StylePropertySet::PropertyReference::propertyValue() const
|
| +inline const CSSValue StylePropertySet::PropertyReference::propertyValue() const
|
| {
|
| if (m_propertySet.isMutable())
|
| return toMutableStylePropertySet(m_propertySet).m_propertyVector.at(m_index).value();
|
|
|