diff -r db5c883ad1c5 -r 1902ade171ab svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h --- a/svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h Tue Aug 31 16:06:58 2010 +0300 +++ b/svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h Wed Sep 01 12:20:46 2010 +0100 @@ -68,7 +68,6 @@ class CSvgTimer; // temporary for debugging -class CSvgtBitmap; //This includes the main rendering loop. /** @@ -328,8 +327,6 @@ */ void GenerateMask( CFbsBitmap* aMask ); - void GenerateMask(CSvgtBitmap* aMask); - /** * Set background color * @@ -368,9 +365,6 @@ 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. * @@ -617,10 +611,6 @@ TBool IsSVGEnginePaused(); void SetBitmapHeader(const TDesC* aHeaderData); - - void EnableTargetRendering(TBool aTargetRendering ); - TBool IsTargetRenderingEnabled() const; - public: // Functions from base classes // From CSvgElementImpl /** @@ -926,7 +916,7 @@ CFbsBitmap* iFrameBuffer; CFbsBitmap* iMask; - + TSize iFrameBufferSize; //NGA TDisplayMode iRenderDspMode; TDisplayMode iMaskDspMode; @@ -941,10 +931,6 @@ TPtrC iLinkShow; TBool iShowDebugInfo; - //M2G: target bitmap buffer and mask buffer - CSvgtBitmap* iTargetBitmapBuffer; - CSvgtBitmap* iTargetMaskBuffer; - TGfxRectangle2D iClipRect; TSvgEngineState iSvgEngineState; TAnimStatus iAnimationState; @@ -974,7 +960,6 @@ //Stores Font Type information as passed by CSvgEngineInterfaceImpl CSvgBitmapFontProvider *iSvgBitmapFontProvider; - TBool iIsTargetRenderingEnabled; public: TBool iCustomOption; TBool iFrameBufferOverridesViewport;