mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
Merge 368101 with changes from bug 367442.
This commit is contained in:
parent
f12230e5d8
commit
b14ed6de82
@ -152,14 +152,14 @@ nsSVGForeignObjectFrame::Reflow(nsPresContext* aPresContext,
|
||||
{
|
||||
NS_ASSERTION(!aReflowState.parentReflowState,
|
||||
"should only get reflow from being reflow root");
|
||||
NS_ASSERTION(aReflowState.mComputedWidth == GetSize().width &&
|
||||
NS_ASSERTION(aReflowState.ComputedWidth() == GetSize().width &&
|
||||
aReflowState.mComputedHeight == GetSize().height,
|
||||
"reflow roots should be reflown at existing size and "
|
||||
"svg.css should ensure we have no padding/border/margin");
|
||||
|
||||
DoReflow();
|
||||
|
||||
aDesiredSize.width = aReflowState.mComputedWidth;
|
||||
aDesiredSize.width = aReflowState.ComputedWidth();
|
||||
aDesiredSize.height = aReflowState.mComputedHeight;
|
||||
aDesiredSize.mOverflowArea =
|
||||
nsRect(nsPoint(0, 0), nsSize(aDesiredSize.width, aDesiredSize.height));
|
||||
|
Loading…
Reference in New Issue
Block a user