diff -r d9136d2e599b -r 3ce935e8106e svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h --- a/svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h Fri Jun 25 18:09:18 2010 +0100 +++ b/svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h Thu Jul 22 16:43:33 2010 +0100 @@ -68,6 +68,7 @@ class CSvgTimer; // temporary for debugging +class CSvgtBitmap; //This includes the main rendering loop. /** @@ -327,6 +328,8 @@ */ void GenerateMask( CFbsBitmap* aMask ); + void GenerateMask(CSvgtBitmap* aMask); + /** * Set background color * @@ -365,6 +368,9 @@ void SetGdiContextL(CFbsBitmap* aCurrentBitmap, CFbsBitmap* aMask = NULL); void SetGdiContextL(CFbsBitmap* aCurrentBitmap, CFbsBitmap* aMask,TSize aCurrentBitmapSize,TDisplayMode aRenderDspMode,TDisplayMode aMaskDspMode); + + void SetGdiContextL(CSvgtBitmap* aCurrentBitmap, CSvgtBitmap* aMask = NULL); + /** * Start the Engine so that the first frame is drawn when the call is finished. * @@ -611,6 +617,10 @@ TBool IsSVGEnginePaused(); void SetBitmapHeader(const TDesC* aHeaderData); + + void EnableTargetRendering(TBool aTargetRendering ); + TBool IsTargetRenderingEnabled() const; + public: // Functions from base classes // From CSvgElementImpl /** @@ -916,7 +926,7 @@ CFbsBitmap* iFrameBuffer; CFbsBitmap* iMask; - + TSize iFrameBufferSize; //NGA TDisplayMode iRenderDspMode; TDisplayMode iMaskDspMode; @@ -931,6 +941,10 @@ TPtrC iLinkShow; TBool iShowDebugInfo; + //M2G: target bitmap buffer and mask buffer + CSvgtBitmap* iTargetBitmapBuffer; + CSvgtBitmap* iTargetMaskBuffer; + TGfxRectangle2D iClipRect; TSvgEngineState iSvgEngineState; TAnimStatus iAnimationState; @@ -960,6 +974,7 @@ //Stores Font Type information as passed by CSvgEngineInterfaceImpl CSvgBitmapFontProvider *iSvgBitmapFontProvider; + TBool iIsTargetRenderingEnabled; public: TBool iCustomOption; TBool iFrameBufferOverridesViewport;