Bug 576044 (9/12): Add an AddLonghandProperty method to nsCSSExpandedDataBlock. r=dbaron a2.0=dbaron

layout/style/nsCSSDataBlock.cpp

@@ -491,6 +491,16 @@ nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
     *aImportantBlock = result_important.forget();
 }
 
+void
+nsCSSExpandedDataBlock::AddLonghandProperty(nsCSSProperty aProperty,
+                                            const nsCSSValue& aValue)
+{
+    NS_ASSERTION(!nsCSSProps::IsShorthand(aProperty), "property out of range");
+    nsCSSValue& storage = *static_cast<nsCSSValue*>(PropertyAt(aProperty));
+    storage = aValue;
+    SetPropertyBit(aProperty);
+}
+
 void
 nsCSSExpandedDataBlock::Clear()
 {

layout/style/nsCSSDataBlock.h

@@ -189,6 +189,12 @@ public:
     void Compress(nsCSSCompressedDataBlock **aNormalBlock,
                   nsCSSCompressedDataBlock **aImportantBlock);
 
+    /**
+     * Copy a value into this expanded block.  This does NOT destroy
+     * the source value object.  |aProperty| cannot be a shorthand.
+     */
+    void AddLonghandProperty(nsCSSProperty aProperty, const nsCSSValue& aValue);
+
     /**
      * Clear the state of this expanded block.
      */

layout/style/nsCSSParser.cpp

@@ -4993,12 +4993,7 @@ CSSParserImpl::ParseChoice(nsCSSValue aValues[],
 void
 CSSParserImpl::AppendValue(nsCSSProperty aPropID, const nsCSSValue& aValue)
 {
-  NS_ASSERTION(0 <= aPropID && aPropID < eCSSProperty_COUNT_no_shorthands,
-               "property out of range");
-  nsCSSValue& storage =
-      *static_cast<nsCSSValue*>(mTempData.PropertyAt(aPropID));
-  storage = aValue;
-  mTempData.SetPropertyBit(aPropID);
+  mTempData.AddLonghandProperty(aPropID, aValue);
 }
 
 /**