From 4177506b453c984bc094c8e3397ee4e37196fa59 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Mon, 14 Aug 2000 22:01:05 +0000 Subject: [PATCH] it was incorrctly painting both images b=48156 r=kmcclusk git-svn-id: svn://10.0.0.236/trunk@76296 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsImageFrame.cpp | 9 +++------ mozilla/layout/html/base/src/nsImageFrame.cpp | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) 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();