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

Switch to nsIPtr for style context ptrs to eliminate leaks

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@499 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl
1998-04-22 06:39:00 +00:00
parent b38d9c1be1
commit de9525ad79
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/content/html/style/src/nsCSSLayout.cpp
View File

@@ -23,9 +23,13 @@
#include "nsIFontMetrics.h"
#include "nsIPresContext.h"
#include "nsRect.h"
#include "nsIPtr.h"
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
NS_DEF_PTR(nsIStyleContext);
NS_DEF_PTR(nsIContent);
// XXX what about ebina's center vs. ncsa-center?
/*
* Notes: It's a known fact that this doesn't do what ebina's layout
@@ -54,17 +58,15 @@ nscoord nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX,
PRIntn kidCount = aChildCount;
while (--kidCount >= 0) {
nscoord kidAscent = *aAscents++;
nsIStyleContext* kidSC;
nsIContent* kidContent;
nsIStyleContextPtr kidSC;
nsIContentPtr kidContent;
kid->GetStyleContext(aCX, kidSC);
kid->GetContent(kidContent);
kid->GetStyleContext(aCX, kidSC.AssignRef());
kid->GetContent(kidContent.AssignRef());
nsStyleMolecule* kidMol =
(nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
PRIntn verticalAlign = kidMol->verticalAlign;
float verticalAlignPct = kidMol->verticalAlignPct;
NS_RELEASE(kidSC);
NS_RELEASE(kidContent);
kid->GetRect(kidRect);
@@ -138,16 +140,14 @@ nscoord nsCSSLayout::VerticallyAlignChildren(nsIPresContext* aCX,
kid = aFirstChild;
while (--kidCount >= 0) {
// Get kid's vertical align style data
nsIStyleContext* kidSC;
nsIContent* kidContent;
nsIStyleContextPtr kidSC;
nsIContentPtr kidContent;
kid->GetStyleContext(aCX, kidSC);
kid->GetContent(kidContent);
kid->GetStyleContext(aCX, kidSC.AssignRef());
kid->GetContent(kidContent.AssignRef());
nsStyleMolecule* kidMol =
(nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
PRIntn verticalAlign = kidMol->verticalAlign;
NS_RELEASE(kidSC);
NS_RELEASE(kidContent);
// Vertically align the child
if (verticalAlign == NS_STYLE_VERTICAL_ALIGN_BOTTOM) {
@@ -219,11 +219,11 @@ void nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX,
nsPoint origin;
nsIFrame* kid = aFirstChild;
while (--aChildCount >= 0) {
nsIContent* kidContent;
nsIStyleContext* kidSC;
nsIContentPtr kidContent;
nsIStyleContextPtr kidSC;
kid->GetContent(kidContent);
kid->GetStyleContext(aCX, kidSC);
kid->GetContent(kidContent.AssignRef());
kid->GetStyleContext(aCX, kidSC.AssignRef());
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
if (NS_STYLE_POSITION_RELATIVE == kidMol->positionFlags) {
kid->GetOrigin(origin);
@@ -231,8 +231,6 @@ void nsCSSLayout::RelativePositionChildren(nsIPresContext* aCX,
nscoord dy = kidMol->top;
kid->MoveTo(origin.x + dx, origin.y + dy);
}
NS_RELEASE(kidContent);
NS_RELEASE(kidSC);
kid->GetNextSibling(kid);
}
}