Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 14:46:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 2535 (memory leak) with nsCOMPtr

Browse Source
This commit is contained in:
pinkerton%netscape.com 1999-01-25 17:44:21 +00:00
parent 3759b987f5
commit f7d44a90e1
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gfx/src/mac/nsRenderingContextMac.cpp
View File

@ -25,6 +25,7 @@
#include "nsTransform2D.h"
#include "nsVoidArray.h"
#include "nsGfxCIID.h"
#include "nsCOMPtr.h"
//#define USE_ATSUI_HACK
@ -411,29 +412,32 @@ NS_IMETHODIMP nsRenderingContextMac::Init(nsIDeviceContext* aContext, nsIWidget*
SelectDrawingSurface(mFrontSurface);
// clip out the children from the GS main region
nsIEnumerator* children = aWindow->GetChildren();
if (children)
nsCOMPtr<nsIEnumerator> children ( dont_AddRef(aWindow->GetChildren()) );
if (children)
{
RgnHandle myRgn = ::NewRgn();
RgnHandle childRgn = ::NewRgn();
::CopyRgn(mGS->mMainRegion, myRgn);
nsIWidget* child;
children->First();
do
{
if (NS_SUCCEEDED(children->CurrentItem((nsISupports **)&child)))
{
nsRect childRect;
Rect macRect;
child->GetBounds(childRect);
::SetRect(&macRect, childRect.x, childRect.y, childRect.x + childRect.width, childRect.y + childRect.height);
::RectRgn(childRgn, &macRect);
::DiffRgn(myRgn, childRgn, myRgn);
}
}
while (NS_SUCCEEDED(children->Next()));
delete children;
nsCOMPtr<nsISupports> child;
if ( NS_SUCCEEDED(children->CurrentItem(getter_AddRefs(child))) )
{
// thanks to sdr@camsoft.com for pointing out a memory leak here,
// leading to the use of nsCOMPtr
nsCOMPtr<nsIWidget> childWidget ( child );
if ( childWidget ) {
nsRect childRect;
Rect macRect;
childWidget->GetBounds(childRect);
::SetRect(&macRect, childRect.x, childRect.y, childRect.x + childRect.width, childRect.y + childRect.height);
::RectRgn(childRgn, &macRect);
::DiffRgn(myRgn, childRgn, myRgn);
}
}
} while (NS_SUCCEEDED(children->Next()));
::CopyRgn(myRgn, mGS->mMainRegion);
::CopyRgn(myRgn, mGS->mClipRegion);