Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post-merge compilation fixes, and better merging with recent major changes.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/REFLOW_20060119_BRANCH@187936 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2006-01-21 00:43:29 +00:00
parent ed9653dc42
commit 4a0dc3b587
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/layout/generic/nsObjectFrame.cpp
View File

@@ -617,32 +617,18 @@ nsObjectFrame::CreateWidget(nscoord aWidth,
/* virtual */ nscoord
nsObjectFrame::GetMinWidth(nsIRenderingContext *aRenderingContext)
{
// XXX Add DISPLAY_MIN_WIDTH(this, result) after merging.
nscoord result = 0;
if (IsHidden(PR_FALSE))
return 0;
nsIFrame * child = mFrames.FirstChild();
if (IsBroken() && !child) {
nsHTMLReflowMetrics metrics;
nsHTMLReflowState rs(GetPresContext(), this, aRenderingContext,
nsSize(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE));
CreateDefaultFrames(GetPresContext(), metrics, rs);
child = mFrames.FirstChild();
// XXX SizeAnchor stuff
if (!IsHidden(PR_FALSE)) {
nsIAtom *atom = mContent->Tag();
if (atom == nsHTMLAtoms::applet || atom == nsHTMLAtoms::embed) {
float p2t = GetPresContext()->ScaledPixelsToTwips();
result = NSIntPixelsToTwips(EMBED_DEF_WIDTH, p2t);
}
}
if (child)
return child->GetMinWidth(aRenderingContext);
nsIAtom *atom = mContent->Tag();
if (atom == nsHTMLAtoms::applet || atom == nsHTMLAtoms::embed) {
float p2t = GetPresContext()->ScaledPixelsToTwips();
return NSIntPixelsToTwips(EMBED_DEF_WIDTH, p2t);
}
return 0;
DISPLAY_MIN_WIDTH(this, result);
return result;
}
/* virtual */ nscoord