merge commit

This commit is contained in:
Ben Hearsum 2010-02-19 08:48:14 -05:00
commit 2ab53f03ad

View file

@ -277,7 +277,7 @@ nsSVGViewBox::SMILViewBox
} }
nsSMILValue val(&SVGViewBoxSMILType::sSingleton); nsSMILValue val(&SVGViewBoxSMILType::sSingleton);
// Check for OOM when the nsSMILValue ctor called SVGViewBoxSMILType::Init: // Check for OOM when the nsSMILValue ctor called SVGViewBoxSMILType::Init:
if (!val.mU.mPtr) { if (val.IsNull()) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
} }
*static_cast<nsSVGViewBoxRect*>(val.mU.mPtr) = viewBox; *static_cast<nsSVGViewBoxRect*>(val.mU.mPtr) = viewBox;
@ -291,7 +291,7 @@ nsSVGViewBox::SMILViewBox::GetBaseValue() const
{ {
nsSMILValue val(&SVGViewBoxSMILType::sSingleton); nsSMILValue val(&SVGViewBoxSMILType::sSingleton);
// Check for OOM when the nsSMILValue ctor called SVGViewBoxSMILType::Init: // Check for OOM when the nsSMILValue ctor called SVGViewBoxSMILType::Init:
if (val.mU.mPtr) { if (!val.IsNull()) {
*static_cast<nsSVGViewBoxRect*>(val.mU.mPtr) = mVal->mBaseVal; *static_cast<nsSVGViewBoxRect*>(val.mU.mPtr) = mVal->mBaseVal;
} }
return val; return val;