Make PropertyReference value() return a const CSSValue&

third_party/WebKit/Source/core/css/StylePropertySet.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 45 matching lines @@
         {
         }
 
         CSSPropertyID id() const { return static_cast<CSSPropertyID>(propertyMetadata().m_propertyID); }
         CSSPropertyID shorthandID() const { return propertyMetadata().shorthandID(); }
 
         bool isImportant() const { return propertyMetadata().m_important; }
         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: Remove this.
-        CSSProperty toCSSProperty() const { return CSSProperty(propertyMetadata(), *propertyValue()); }
+        CSSProperty toCSSProperty() const { return CSSProperty(propertyMetadata(), propertyValue()); }
 
         const StylePropertyMetadata& propertyMetadata() const;
 
     private:
-        const CSSValue* propertyValue() const;
+        const CSSValue& propertyValue() const;
 
         Member<const StylePropertySet> m_propertySet;
         unsigned m_index;
     };
 
     unsigned propertyCount() const;
     bool isEmpty() const;
     PropertyReference propertyAt(unsigned index) const { return PropertyReference(*this, index); }
 
     template<typename T> // CSSPropertyID or AtomicString
@@ skipping 28 matching lines @@
     bool isMutable() const { return m_isMutable; }
 
     bool hasFailedOrCanceledSubresources() const;
 
     static unsigned averageSizeInBytes();
 
 #ifndef NDEBUG
     void showStyle();
 #endif
 
-    bool propertyMatches(CSSPropertyID, const CSSValue*) const;
+    bool propertyMatches(CSSPropertyID, const CSSValue&) const;
 
     DECLARE_TRACE();
     DEFINE_INLINE_TRACE_AFTER_DISPATCH() { }
 
 protected:
 
     enum { MaxArraySize = (1 << 28) - 1 };
 
     StylePropertySet(CSSParserMode cssParserMode)
         : m_cssParserMode(cssParserMode)
@@ skipping 60 matching lines @@
 
     unsigned propertyCount() const { return m_propertyVector.size(); }
 
     // Returns whether this style set was changed.
     bool addParsedProperties(const HeapVector<CSSProperty, 256>&);
     bool addRespectingCascade(const CSSProperty&);
 
     // These expand shorthand properties into multiple properties.
     bool setProperty(CSSPropertyID unresolvedProperty, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
     bool setProperty(const AtomicString& customPropertyName, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
+    // TODO(sashab): Make this take a const CSSValue&
     void setProperty(CSSPropertyID, const CSSValue*, bool important = false);
 
     // These do not. FIXME: This is too messy, we can do better.
     bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
     bool setProperty(const CSSProperty&, CSSProperty* slot = 0);
 
     template<typename T> // CSSPropertyID or AtomicString
     bool removeProperty(T property, String* returnText = 0);
     bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
     void removeEquivalentProperties(const StylePropertySet*);
@@ skipping 40 matching lines @@
     return toMutableStylePropertySet(set.get());
 }
 
 inline const StylePropertyMetadata& StylePropertySet::PropertyReference::propertyMetadata() const
 {
     if (m_propertySet->isMutable())
         return toMutableStylePropertySet(*m_propertySet).m_propertyVector.at(m_index).metadata();
     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();
-    return toImmutableStylePropertySet(*m_propertySet).valueArray()[m_index];
+        return *toMutableStylePropertySet(*m_propertySet).m_propertyVector.at(m_index).value();
+    return *toImmutableStylePropertySet(*m_propertySet).valueArray()[m_index];
 }
 
 inline unsigned StylePropertySet::propertyCount() const
 {
     if (m_isMutable)
         return toMutableStylePropertySet(this)->m_propertyVector.size();
     return m_arraySize;
 }
 
 inline bool StylePropertySet::isEmpty() const
 {
     return !propertyCount();
 }
 
 template<typename T>
 inline int StylePropertySet::findPropertyIndex(T property) const
 {
     if (m_isMutable)
         return toMutableStylePropertySet(this)->findPropertyIndex(property);
     return toImmutableStylePropertySet(this)->findPropertyIndex(property);
 }
 
 } // namespace blink
 
 #endif // StylePropertySet_h