CSSValue Immediates: Add move operators to CSSPrimitiveValue

Source/core/css/StylePropertySet.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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.
@@ skipping 119 matching lines @@
         m_propertyVector = toMutableStylePropertySet(other).m_propertyVector;
     } else {
         m_propertyVector.reserveInitialCapacity(other.propertyCount());
         for (unsigned i = 0; i < other.propertyCount(); ++i)
             m_propertyVector.uncheckedAppend(other.propertyAt(i).toCSSProperty());
     }
 }
 
 String StylePropertySet::getPropertyValue(CSSPropertyID propertyID) const
 {
-    NullableCSSValue value = getPropertyCSSValue(propertyID);
+    const NullableCSSValue& value = getPropertyCSSValue(propertyID);
     if (value)
         return value->cssText();
 
     return StylePropertySerializer(*this).getPropertyValue(propertyID);
 }
 
-NullableCSSValue StylePropertySet::getPropertyCSSValue(CSSPropertyID propertyID) const
+const NullableCSSValue StylePropertySet::getPropertyCSSValue(CSSPropertyID propertyID) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
     if (foundPropertyIndex == -1)
         return nullptr;
-    return propertyAt(foundPropertyIndex).value();
+    return *reinterpret_cast<const NullableCSSValue*>(&propertyAt(foundPropertyIndex).value());
 }
 
 DEFINE_TRACE(StylePropertySet)
 {
     if (m_isMutable)
         toMutableStylePropertySet(this)->traceAfterDispatch(visitor);
     else
         toImmutableStylePropertySet(this)->traceAfterDispatch(visitor);
 }
 
@@ skipping 80 matching lines @@
     // Setting the value to an empty string just removes the property in both IE and Gecko.
     // Setting it to null seems to produce less consistent results, but we treat it just the same.
     if (value.isEmpty())
         return removeProperty(resolveCSSPropertyID(unresolvedProperty));
 
     // When replacing an existing property value, this moves the property to the end of the list.
     // Firefox preserves the position, and MSIE moves the property to the beginning.
     return CSSParser::parseValue(this, unresolvedProperty, value, important, cssParserMode(), contextStyleSheet);
 }
 
+void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, const CSSPrimitiveValue& prpValue, bool important)
+{
+    setProperty(propertyID, *reinterpret_cast<const CSSValue*>(&prpValue), important);
+}
+
 void MutableStylePropertySet::setProperty(CSSPropertyID propertyID, const CSSValue& prpValue, bool important)
 {
     StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
     if (!shorthand.length()) {
         setProperty(CSSProperty(propertyID, prpValue, important));
         return;
     }
 
     removePropertiesInSet(shorthand.properties(), shorthand.length());
 
@@ skipping 164 matching lines @@
 PassRefPtrWillBeRawPtr<MutableStylePropertySet> StylePropertySet::mutableCopy() const
 {
     return adoptRefWillBeNoop(new MutableStylePropertySet(*this));
 }
 
 PassRefPtrWillBeRawPtr<MutableStylePropertySet> StylePropertySet::copyPropertiesInSet(const Vector<CSSPropertyID>& properties) const
 {
     WillBeHeapVector<CSSProperty, 256> list;
     list.reserveInitialCapacity(properties.size());
     for (unsigned i = 0; i < properties.size(); ++i) {
-        NullableCSSValue value = getPropertyCSSValue(properties[i]);
+        const NullableCSSValue& value = getPropertyCSSValue(properties[i]);
         if (value)
             list.append(CSSProperty(properties[i], *value, false));
     }
     return MutableStylePropertySet::create(list.data(), list.size());
 }
 
 CSSStyleDeclaration* MutableStylePropertySet::ensureCSSStyleDeclaration()
 {
     // FIXME: get rid of this weirdness of a CSSStyleDeclaration inside of a
     // style property set.
@@ skipping 60 matching lines @@
 {
     return adoptRefWillBeNoop(new MutableStylePropertySet(cssParserMode));
 }
 
 PassRefPtrWillBeRawPtr<MutableStylePropertySet> MutableStylePropertySet::create(const CSSProperty* properties, unsigned count)
 {
     return adoptRefWillBeNoop(new MutableStylePropertySet(properties, count));
 }
 
 } // namespace blink