diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 9ca3f8e3344..4e31b02f854 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -662,15 +662,12 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, } } - if (lowImage != nsnull && lowSrcLinesLoaded > 0) { - //inner.height = lowSrcLinesLoaded; + if (image != nsnull && imgSrcLinesLoaded > 0) { + aRenderingContext.DrawImage(image, inner); + } else if (lowImage != nsnull && lowSrcLinesLoaded > 0) { aRenderingContext.DrawImage(lowImage, inner); } - if (image != nsnull && imgSrcLinesLoaded > 0) { - //inner.height = imgSrcLinesLoaded; - aRenderingContext.DrawImage(image, inner); - } } nsImageMap* map = GetImageMap(); diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 9ca3f8e3344..4e31b02f854 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -662,15 +662,12 @@ nsImageFrame::Paint(nsIPresContext* aPresContext, } } - if (lowImage != nsnull && lowSrcLinesLoaded > 0) { - //inner.height = lowSrcLinesLoaded; + if (image != nsnull && imgSrcLinesLoaded > 0) { + aRenderingContext.DrawImage(image, inner); + } else if (lowImage != nsnull && lowSrcLinesLoaded > 0) { aRenderingContext.DrawImage(lowImage, inner); } - if (image != nsnull && imgSrcLinesLoaded > 0) { - //inner.height = imgSrcLinesLoaded; - aRenderingContext.DrawImage(image, inner); - } } nsImageMap* map = GetImageMap();