From 86e05235be36d4da171a1fd11083c6f25e427e0c Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Tue, 6 Apr 1999 01:16:53 +0000 Subject: [PATCH] Cleaning up git-svn-id: svn://10.0.0.236/trunk@26397 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsImageFrame.cpp | 6 ------ mozilla/layout/generic/nsObjectFrame.cpp | 6 ------ mozilla/layout/html/base/src/nsImageFrame.cpp | 6 ------ mozilla/layout/html/base/src/nsObjectFrame.cpp | 6 ------ 4 files changed, 24 deletions(-) diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index ff9170cda69..ccd72d0420d 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -252,12 +252,6 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext, fixedContentHeight = PR_FALSE; } - //~~~ - if(aDesiredSize.width == NS_UNCONSTRAINEDSIZE) - fixedContentWidth = PR_FALSE; - if(aDesiredSize.height == NS_UNCONSTRAINEDSIZE) - fixedContentHeight = PR_FALSE; - // Choose reflow size if (fixedContentWidth || fixedContentHeight) { if (fixedContentWidth && fixedContentHeight) { diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 1a0f6ead959..27672837ad5 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -666,12 +666,6 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, nsReflowStatus status; - if(PR_TRUE)//reflowReason == eReflowReason_Initial) - { - kidDesiredSize.width = NS_UNCONSTRAINEDSIZE; - kidDesiredSize.height = NS_UNCONSTRAINEDSIZE; - } - ReflowChild(child, aPresContext, kidDesiredSize, kidReflowState, status); nsRect rect(0, 0, kidDesiredSize.width, kidDesiredSize.height); diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index ff9170cda69..ccd72d0420d 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -252,12 +252,6 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext, fixedContentHeight = PR_FALSE; } - //~~~ - if(aDesiredSize.width == NS_UNCONSTRAINEDSIZE) - fixedContentWidth = PR_FALSE; - if(aDesiredSize.height == NS_UNCONSTRAINEDSIZE) - fixedContentHeight = PR_FALSE; - // Choose reflow size if (fixedContentWidth || fixedContentHeight) { if (fixedContentWidth && fixedContentHeight) { diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 1a0f6ead959..27672837ad5 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -666,12 +666,6 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, nsReflowStatus status; - if(PR_TRUE)//reflowReason == eReflowReason_Initial) - { - kidDesiredSize.width = NS_UNCONSTRAINEDSIZE; - kidDesiredSize.height = NS_UNCONSTRAINEDSIZE; - } - ReflowChild(child, aPresContext, kidDesiredSize, kidReflowState, status); nsRect rect(0, 0, kidDesiredSize.width, kidDesiredSize.height);