зеркало из https://github.com/mozilla/gecko-dev.git
Cleaning up
This commit is contained in:
Родитель
033412d2fc
Коммит
77d2952691
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче