Kaydet (Commit) 54687db0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Add CG_TRACEs to this (OS X -only) file, too, for completeness

Change-Id: Ib97ca36821b00b40bdda68da6ca0b4b7f789386c
üst 89a8511b
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "vcl/svapp.hxx" #include "vcl/svapp.hxx"
#include "quartz/salgdi.h" #include "quartz/salgdi.h"
#include "quartz/utils.h"
#include "osx/salframe.h" #include "osx/salframe.h"
#include "osx/saldata.hxx" #include "osx/saldata.hxx"
...@@ -77,11 +78,13 @@ void AquaSalGraphics::UnsetState() ...@@ -77,11 +78,13 @@ void AquaSalGraphics::UnsetState()
{ {
if( mrContext ) if( mrContext )
{ {
CG_TRACE( "CGContextRestoreGState(" << mrContext << ")" );
CGContextRestoreGState( mrContext ); CGContextRestoreGState( mrContext );
mrContext = 0; mrContext = 0;
} }
if( mxClipPath ) if( mxClipPath )
{ {
CG_TRACE( "CGPathRelease(" << mxClipPath << ")" );
CGPathRelease( mxClipPath ); CGPathRelease( mxClipPath );
mxClipPath = NULL; mxClipPath = NULL;
} }
...@@ -115,19 +118,27 @@ bool AquaSalGraphics::CheckContext() ...@@ -115,19 +118,27 @@ bool AquaSalGraphics::CheckContext()
NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getNSWindow()]; NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getNSWindow()];
CGContextRef xCGContext = reinterpret_cast<CGContextRef>([pNSGContext graphicsPort]); CGContextRef xCGContext = reinterpret_cast<CGContextRef>([pNSGContext graphicsPort]);
mxLayer = CGLayerCreateWithContext( xCGContext, aLayerSize, NULL ); mxLayer = CGLayerCreateWithContext( xCGContext, aLayerSize, NULL );
CG_TRACE( "CGLayerCreateWithContext(" << xCGContext << "," << aLayerSize << ",NULL) = " << mxLayer );
if( mxLayer ) if( mxLayer )
{
mrContext = CGLayerGetContext( mxLayer ); mrContext = CGLayerGetContext( mxLayer );
CG_TRACE( "CGLayerGetContext(" << mxLayer << ") = " << mrContext );
}
if( mrContext ) if( mrContext )
{ {
// copy original layer to resized layer // copy original layer to resized layer
if( rReleaseLayer ) if( rReleaseLayer )
{
CG_TRACE( "CGContextDrawLayerAtPoint(" << mrContext << "," << CGPointZero << "," << rReleaseLayer << ")" );
CGContextDrawLayerAtPoint( mrContext, CGPointZero, rReleaseLayer ); CGContextDrawLayerAtPoint( mrContext, CGPointZero, rReleaseLayer );
}
CGContextTranslateCTM( mrContext, 0, nHeight ); CGContextTranslateCTM( mrContext, 0, nHeight );
CGContextScaleCTM( mrContext, 1.0, -1.0 ); CGContextScaleCTM( mrContext, 1.0, -1.0 );
CGContextSetFillColorSpace( mrContext, GetSalData()->mxRGBSpace ); CGContextSetFillColorSpace( mrContext, GetSalData()->mxRGBSpace );
CGContextSetStrokeColorSpace( mrContext, GetSalData()->mxRGBSpace ); CGContextSetStrokeColorSpace( mrContext, GetSalData()->mxRGBSpace );
CG_TRACE( "CGContextSaveGState(" << mrContext << ") " << ++mnContextStackDepth );
CGContextSaveGState( mrContext ); CGContextSaveGState( mrContext );
SetState(); SetState();
...@@ -138,10 +149,16 @@ bool AquaSalGraphics::CheckContext() ...@@ -138,10 +149,16 @@ bool AquaSalGraphics::CheckContext()
} }
if( rReleaseLayer ) if( rReleaseLayer )
{
CG_TRACE( "CGLayerRelease(" << rReleaseLayer << ")" );
CGLayerRelease( rReleaseLayer ); CGLayerRelease( rReleaseLayer );
}
else if( rReleaseContext ) else if( rReleaseContext )
{
CG_TRACE( "CGContextRelease(" << rReleaseContext << ")" );
CGContextRelease( rReleaseContext ); CGContextRelease( rReleaseContext );
} }
}
DBG_ASSERT( mrContext || mbPrinter, "<<<WARNING>>> AquaSalGraphics::CheckContext() FAILED!!!!\n" ); DBG_ASSERT( mrContext || mbPrinter, "<<<WARNING>>> AquaSalGraphics::CheckContext() FAILED!!!!\n" );
return (mrContext != NULL); return (mrContext != NULL);
...@@ -181,17 +198,22 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) ...@@ -181,17 +198,22 @@ void AquaSalGraphics::UpdateWindow( NSRect& )
if( (mxLayer != NULL) && (pContext != NULL) ) if( (mxLayer != NULL) && (pContext != NULL) )
{ {
CGContextRef rCGContext = reinterpret_cast<CGContextRef>([pContext graphicsPort]); CGContextRef rCGContext = reinterpret_cast<CGContextRef>([pContext graphicsPort]);
CG_TRACE( "[[NSGraphicsContext currentContext] graphicsPort] = " << rCGContext );
CGMutablePathRef rClip = mpFrame->getClipPath(); CGMutablePathRef rClip = mpFrame->getClipPath();
if( rClip ) if( rClip )
{ {
CGContextSaveGState( rCGContext ); CGContextSaveGState( rCGContext );
CG_TRACE( "CGContextBeginPath(" << rCGContext << ")" );
CGContextBeginPath( rCGContext ); CGContextBeginPath( rCGContext );
CG_TRACE( "CGContextAddPath(" << rCGContext << "," << rClip << ")" );
CGContextAddPath( rCGContext, rClip ); CGContextAddPath( rCGContext, rClip );
CG_TRACE( "CGContextClip(" << rCGContext << ")" );
CGContextClip( rCGContext ); CGContextClip( rCGContext );
} }
ApplyXorContext(); ApplyXorContext();
CG_TRACE( "CGContextDrawLayerAtPoint(" << rCGContext << "," << CGPointZero << "," << mxLayer << ")" );
CGContextDrawLayerAtPoint( rCGContext, CGPointZero, mxLayer ); CGContextDrawLayerAtPoint( rCGContext, CGPointZero, mxLayer );
if( rClip ) // cleanup clipping if( rClip ) // cleanup clipping
CGContextRestoreGState( rCGContext ); CGContextRestoreGState( rCGContext );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment