Back out bug 928798 (f532e4f26307).

This commit is contained in:
Cameron McCormack 2013-11-01 14:01:34 +11:00
parent fe27b88820
commit 56c88d861c

View File

@ -3810,8 +3810,9 @@ nsSVGTextFrame2::GetBBoxContribution(const gfxMatrix &aToBBoxUserspace,
NS_ASSERTION(GetFirstPrincipalChild(), "must have a child frame");
SVGBBox bbox;
if (NS_SUBTREE_DIRTY(this)) {
// Return an empty bbox if this frame's subtree is dirty. This may be called
nsIFrame* kid = GetFirstPrincipalChild();
if (kid && NS_SUBTREE_DIRTY(kid)) {
// Return an empty bbox if our kid's subtree is dirty. This may be called
// in that situation, e.g. when we're building a display list after an
// interrupted reflow. This can also be called during reflow before we've
// been reflowed, e.g. if an earlier sibling is calling FinishAndStoreOverflow and