Bug 680786. nsImageFrame::OnStartContainer should not assume that its intrinsic size has changed. r=roc

This commit is contained in:
Boris Zbarsky 2011-08-23 17:03:02 -04:00
parent c98f58f505
commit af6a97a713

View File

@ -548,10 +548,10 @@ nsImageFrame::OnStartContainer(imgIRequest *aRequest, imgIContainer *aImage)
return NS_OK;
}
UpdateIntrinsicSize(aImage);
UpdateIntrinsicRatio(aImage);
PRBool intrinsicSizeChanged = UpdateIntrinsicSize(aImage);
intrinsicSizeChanged = UpdateIntrinsicRatio(aImage) || intrinsicSizeChanged;
if (mState & IMAGE_GOTINITIALREFLOW) {
if (intrinsicSizeChanged && (mState & IMAGE_GOTINITIALREFLOW)) {
// Now we need to reflow if we have an unconstrained size and have
// already gotten the initial reflow
if (!(mState & IMAGE_SIZECONSTRAINED)) {