merge

content/smil/nsSMILAnimationFunction.cpp

@@ -301,9 +301,7 @@ nsSMILAnimationFunction::ComposeResult(const nsISMILAttr& aSMILAttr,
 
   // If additive animation isn't required or isn't supported, set the value.
   if (!IsAdditive() || NS_FAILED(aResult.SandwichAdd(result))) {
-    aResult.Swap(result);
-    // Note: The old value of aResult is now in |result|, and it will get
-    // cleaned up when |result| goes out of scope, when this function returns.
+    aResult = result;
   }
 }
 

content/svg/content/src/nsSVGAngle.cpp

@@ -453,7 +453,7 @@ nsSVGAngle::SMILOrient::ValueFromString(const nsAString& aStr,
     val.mU.mOrient.mUnit = unitType;
     val.mU.mOrient.mOrientType = nsIDOMSVGMarkerElement::SVG_MARKER_ORIENT_ANGLE;
   }
-  aValue.Swap(val);
+  aValue = val;
   aCanCache = PR_TRUE;
 
   return NS_OK;

content/svg/content/src/nsSVGTransformSMILAttr.cpp

@@ -186,8 +186,8 @@ nsSVGTransformSMILAttr::ParseValue(const nsAString& aSpec,
     return;
   }
 
-  // Success! Populate our outparam with parsed value.
-  aResult.Swap(val);
+  // Success! Initialize our outparam with parsed value.
+  aResult = val;
 }
 
 inline PRBool

content/svg/content/src/nsSVGViewBox.cpp

@@ -284,8 +284,12 @@ nsSVGViewBox::SMILViewBox
     return res;
   }
   nsSMILValue val(&SVGViewBoxSMILType::sSingleton);
+  // Check for OOM when the nsSMILValue ctor called SVGViewBoxSMILType::Init:
+  if (val.IsNull()) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
   *static_cast<nsSVGViewBoxRect*>(val.mU.mPtr) = viewBox;
-  aValue.Swap(val);
+  aValue = val;
   aCanCache = PR_TRUE;
   
   return NS_OK;
@@ -295,7 +299,10 @@ nsSMILValue
 nsSVGViewBox::SMILViewBox::GetBaseValue() const
 {
   nsSMILValue val(&SVGViewBoxSMILType::sSingleton);
-  *static_cast<nsSVGViewBoxRect*>(val.mU.mPtr) = mVal->mBaseVal;
+  // Check for OOM when the nsSMILValue ctor called SVGViewBoxSMILType::Init:
+  if (!val.IsNull()) {
+    *static_cast<nsSVGViewBoxRect*>(val.mU.mPtr) = mVal->mBaseVal;
+  }
   return val;
 }