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

11
layout/generic/nsObjectFrame.cpp
View File

@@ -18,7 +18,6 @@
*/
#include "nsHTMLParts.h"
#include "nsLeafFrame.h"
#include "nsCSSLayout.h"
#include "nsIPresContext.h"
#include "nsIPresShell.h"
#include "nsWidgetsCID.h"
@@ -301,16 +300,14 @@ nsObjectFrame::GetDesiredSize(nsIPresContext* aPresContext,
nsHTMLReflowMetrics& aMetrics)
{
// Determine our size stylistically
nsSize styleSize;
PRIntn ss = nsCSSLayout::GetStyleSize(aPresContext, aReflowState, styleSize);
PRBool haveWidth = PR_FALSE;
PRBool haveHeight = PR_FALSE;
if (0 != (ss & NS_SIZE_HAS_WIDTH)) {
aMetrics.width = styleSize.width;
if (aReflowState.HaveConstrainedWidth()) {
aMetrics.width = aReflowState.minWidth;
haveWidth = PR_TRUE;
}
if (0 != (ss & NS_SIZE_HAS_HEIGHT)) {
aMetrics.height = styleSize.height;
if (aReflowState.HaveConstrainedHeight()) {
aMetrics.height = aReflowState.minHeight;
haveHeight = PR_TRUE;
}