corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed nsCSSLayout::GetStyleSize and converted callers to use state in the html reflow state

Browse Source
This commit is contained in:
kipp@netscape.com
1998-10-12 17:00:32 +00:00
parent 7a692c6767
commit a16b0dd7bf
29 changed files with 348 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
layout/html/document/src/nsFrameFrame.cpp
View File

@@ -35,7 +35,6 @@
#include "nsStyleCoord.h"
#include "nsIStyleContext.h"
#include "nsStyleConsts.h"
#include "nsCSSLayout.h"
#include "nsIDocumentLoader.h"
#include "nsIPref.h"
#include "nsFrameSetFrame.h"
@@ -236,19 +235,19 @@ nsHTMLFrameOuterFrame::GetDesiredSize(nsIPresContext* aPresContext,
// <frame> processing does not use this routine, only <iframe>
float p2t = aPresContext->GetPixelsToTwips();
nsSize size;
PRIntn ss = nsCSSLayout::GetStyleSize(aPresContext, aReflowState, size);
// XXX this needs to be changed from (200,200) to a better default for inline frames
if (0 == (ss & NS_SIZE_HAS_WIDTH)) {
size.width = NSIntPixelsToTwips(200, p2t);
if (aReflowState.HaveConstrainedWidth()) {
aDesiredSize.width = aReflowState.minWidth;
}
if (0 == (ss & NS_SIZE_HAS_HEIGHT)) {
size.height = NSIntPixelsToTwips(200, p2t);
else {
aDesiredSize.width = NSIntPixelsToTwips(200, p2t);
}
if (aReflowState.HaveConstrainedHeight()) {
aDesiredSize.height = aReflowState.minHeight;
}
else {
aDesiredSize.height = NSIntPixelsToTwips(200, p2t);
}
aDesiredSize.width = size.width;
aDesiredSize.height = size.height;
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.descent = 0;
}