Examine parentBorder only when parentContext is non-null. (Bug 749860) r=bzbarsky

This commit is contained in:
L. David Baron 2012-04-27 21:56:31 -07:00
parent cb2d54d2a3
commit bad1e080cc

View File

@ -5644,14 +5644,14 @@ nsRuleNode::ComputeBorderData(void* aStartStruct,
case eCSSUnit_Inherit: {
canStoreInRuleTree = false;
nsBorderColors *parentColors;
parentBorder->GetCompositeColors(side, &parentColors);
if (parentColors) {
border->EnsureBorderColors();
border->ClearBorderColors(side);
border->mBorderColors[side] = parentColors->Clone();
} else {
border->ClearBorderColors(side);
border->ClearBorderColors(side);
if (parentContext) {
nsBorderColors *parentColors;
parentBorder->GetCompositeColors(side, &parentColors);
if (parentColors) {
border->EnsureBorderColors();
border->mBorderColors[side] = parentColors->Clone();
}
}
break;
}