Merge mozilla-central to mozilla-inbound

This commit is contained in:
Ed Morley 2012-06-25 17:23:37 +01:00
commit 49ae1e0275
2 changed files with 7 additions and 0 deletions

View File

@ -19,6 +19,7 @@ body {
width: 100%;
padding: 6px 9px;
display: -moz-box;
vertical-align: top;
}
body[dir=rtl] > #header {

View File

@ -701,6 +701,12 @@ nsSVGUtils::InvalidateBounds(nsIFrame *aFrame, bool aDuringUpdate,
aFrame = aFrame->GetParent();
}
if (!aFrame) {
// We seem to be able to get here, even though SVG frames are never created
// without an ancestor nsSVGOuterSVGFrame. See bug 767996.
return;
}
NS_ASSERTION(aFrame->GetStateBits() & NS_STATE_IS_OUTER_SVG,
"SVG frames must always have an nsSVGOuterSVGFrame ancestor!");
invalidArea.MoveBy(aFrame->GetContentRect().TopLeft() - aFrame->GetPosition());