From fb1c8ede06b06918f67723b017ec0b9a26c7bfc8 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Tue, 19 Jan 1999 05:17:39 +0000 Subject: [PATCH] Part of the fix for bug #2485 git-svn-id: svn://10.0.0.236/trunk@17998 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsImageFrame.cpp | 3 +++ mozilla/layout/html/base/src/nsImageFrame.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 381288c8185..173bf6079a9 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -194,6 +194,9 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext, // Determine whether the image has fixed content width and height PRBool fixedContentWidth = aReflowState.HaveFixedContentWidth(); PRBool fixedContentHeight = aReflowState.HaveFixedContentHeight(); + if (NS_INTRINSICSIZE == aReflowState.computedWidth) { + fixedContentWidth = PR_FALSE; + } if (NS_INTRINSICSIZE == aReflowState.computedHeight) { fixedContentHeight = PR_FALSE; } diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 381288c8185..173bf6079a9 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -194,6 +194,9 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext, // Determine whether the image has fixed content width and height PRBool fixedContentWidth = aReflowState.HaveFixedContentWidth(); PRBool fixedContentHeight = aReflowState.HaveFixedContentHeight(); + if (NS_INTRINSICSIZE == aReflowState.computedWidth) { + fixedContentWidth = PR_FALSE; + } if (NS_INTRINSICSIZE == aReflowState.computedHeight) { fixedContentHeight = PR_FALSE; }