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

Workaround for non-optimal port management, cleaned up some TARGET_CARBON #ifdefs, which could leak regions, or at share port-owned clip regions with the global pool.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@44030 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com
1999-08-21 23:41:34 +00:00
parent 3d123a8048
commit 8696a67955
1 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
mozilla/gfx/src/mac/nsRenderingContextMac.cpp
View File

@@ -36,6 +36,52 @@
#define STACK_TREASHOLD 1000
//------------------------------------------------------------------------
// Carbon compatible accessor functions
//------------------------------------------------------------------------
#if !TARGET_CARBON
inline void GetPortClipRegion(GrafPtr port, RgnHandle clipRgn)
{
::CopyRgn(port->clipRgn, clipRgn);
}
inline void GetPortBounds(GrafPtr port, Rect* portRect)
{
*portRect = port->portRect;
}
inline void SetPortWindowPort(WindowRef window)
{
::SetPort(window);
}
#endif
//------------------------------------------------------------------------
// utility port setting class
//------------------------------------------------------------------------
class StPortSetter {
public:
StPortSetter(WindowPtr destWindowPort)
{
::GetPort(&mOldPort);
::SetPortWindowPort(destWindowPort);
}
~StPortSetter()
{
::SetPort(mOldPort);
}
protected:
GrafPtr mOldPort;
};
//------------------------------------------------------------------------
nsRenderingContextMac::nsRenderingContextMac()
{
NS_INIT_REFCNT();
@@ -171,13 +217,8 @@ void nsRenderingContextMac::SelectDrawingSurface(nsDrawingSurfaceMac* aSurface,
if (!mSavePort) {
::GetPort(&mSavePort);
if (mSavePort) {
#if TARGET_CARBON
if (mSavePort)
::GetPortBounds(mSavePort, &mSavePortRect);
#else
mSavePortRect = mSavePort->portRect;
#endif
}
}
// if surface is changing, be extra conservative about graphic state changes.
@@ -380,19 +421,13 @@ NS_IMETHODIMP nsRenderingContextMac::CopyOffScreenBits(nsDrawingSurface aSrcSurf
::SetRect(&macDstRect, dstRect.x, dstRect.y, dstRect.x + dstRect.width, dstRect.y + dstRect.height);
// get the source clip region
#if TARGET_CARBON
RgnHandle clipRgn = sNativeRegionPool.GetNewRegion();
#else
RgnHandle clipRgn = nsnull;
#endif
StRegionFromPool clipRgn;
if (!clipRgn) return NS_ERROR_OUT_OF_MEMORY;
if (aCopyFlags & NS_COPYBITS_USE_SOURCE_CLIP_REGION) {
#if TARGET_CARBON
::GetPortClipRegion(srcPort, clipRgn);
#else
clipRgn = srcPort->clipRgn;
#endif
} else
clipRgn = mGS->mMainRegion;
::CopyRgn(mGS->mMainRegion, clipRgn);
// get the destination port and surface
GrafPtr destPort;
@@ -413,6 +448,9 @@ NS_IMETHODIMP nsRenderingContextMac::CopyOffScreenBits(nsDrawingSurface aSrcSurf
SelectDrawingSurface(destSurface);
}
// make sure the current port is correct. where else does this need to be done?
StPortSetter setter(destPort);
// set the right colors for CopyBits
RGBColor foreColor;
Boolean changedForeColor = false;
@@ -446,11 +484,6 @@ NS_IMETHODIMP nsRenderingContextMac::CopyOffScreenBits(nsDrawingSurface aSrcSurf
srcCopy,
clipRgn);
#if TARGET_CARBON
if (clipRgn != nsnull)
sNativeRegionPool.ReleaseRegion(clipRgn);
#endif
// restore colors and surface
if (changedForeColor)
::RGBForeColor(&foreColor);