--- a/svgtopt/gfx2d/inc/Gfx2dGcOpenVG.h	Tue May 11 17:02:26 2010 +0300
+++ b/svgtopt/gfx2d/inc/Gfx2dGcOpenVG.h	Tue Aug 31 16:06:58 2010 +0300
@@ -26,6 +26,8 @@
 #include "VGSurface.h"
 #include <VG/openvg.h>
 
+class CSvgtBitmap;
+
 const TUint8 KMediaAnimationVisible =  2;
   
 /**
@@ -47,7 +49,7 @@
          */
          static CGfx2dGcOpenVG* NewL( const TSize aBufferSize, TFontSpec& aFontSpec, CSvgBitmapFontProvider* aSvgBitmapFontProvider, TBool aIsMain = ETrue );
 
-         static CGfx2dGcOpenVG* NewL( const TSize aBufferSize, TFontSpec& aFontSpec, CSvgBitmapFontProvider* aSvgBitmapFontProvider,SVGRendererId aRendererType,TBool aIsMain = ETrue );
+         static CGfx2dGcOpenVG* NewL( const TSize aBufferSize, TFontSpec& aFontSpec, CSvgBitmapFontProvider* aSvgBitmapFontProvider,SVGRendererId aRendererType,TBool aRenderOption = ETrue );
          void                 GetFontScaled( TFloatFixPt aHeight, const TDesC& aTypefaceName, CFont*& aFont, TFontSpec& aFontSpec );
 
         /**
@@ -352,7 +354,10 @@
          void UpdateFramebufferL( CFbsBitmap* aBitmap, CFbsBitmap* aMask );
 
          void UpdateFramebufferL( CFbsBitmap* aBitmap, CFbsBitmap* aMask,TSize BitmapSize,TDisplayMode aBitmapDspMode,TDisplayMode aMaskDspMode );
-        /**
+
+         void UpdateFramebufferL( CSvgtBitmap* aBitmap, CSvgtBitmap* aMask );
+         void UpdateFramebufferL( CSvgtBitmap* aBitmap, CSvgtBitmap* aMask,TSize BitmapSize,TDisplayMode aBitmapDspMode,TDisplayMode aMaskDspMode );
+         /**
          * Blend aFrameBuffer with background buffer using the opacity value
          *
          * @since 1.0
@@ -370,7 +375,8 @@
           * @return
           */
 		 void GenerateMask(CFbsBitmap* aMask);
-
+		 void GenerateMask(CSvgtBitmap* aMask);
+		  
 		  /**
          * Set the fill opacity value
         *
@@ -510,6 +516,12 @@
         // Color conversion/copy to Symbian bitmap is needed as final step
         TSize                           iColorBufferSize;
 
+        TDisplayMode    iDisplayMode;
+        
+        // M2G: Variable to specify the target rendering option (rendering onto bitmap or onto target)
+        TBool iRenderOption;
+        TBool iGraphicsContextCreated;
+                
         TGfxRectangle2D                 iClip;
         MGfxPaint*                      iFillColor;
         TFloatFixPt						iFillOpacity;
@@ -535,10 +547,6 @@
         TFontSpec                       iFontSpec;
         //OpenVG stuff
 
-        TDisplayMode    iDisplayMode;
-        TBool iGraphicsContextCreated;
-        TBool iIsMainContext;
-
         VGPaint							iFillPaint;
         VGPaint							iStrokePaint;
         VGPath                          iPath;