--- a/svgtopt/gfx2d/inc/Gfx2dGcOpenVG.h	Tue Aug 31 16:06:58 2010 +0300
+++ b/svgtopt/gfx2d/inc/Gfx2dGcOpenVG.h	Wed Sep 01 12:20:46 2010 +0100
@@ -26,8 +26,6 @@
 #include "VGSurface.h"
 #include <VG/openvg.h>
 
-class CSvgtBitmap;
-
 const TUint8 KMediaAnimationVisible =  2;
   
 /**
@@ -49,7 +47,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 aRenderOption = ETrue );
+         static CGfx2dGcOpenVG* NewL( const TSize aBufferSize, TFontSpec& aFontSpec, CSvgBitmapFontProvider* aSvgBitmapFontProvider,SVGRendererId aRendererType,TBool aIsMain = ETrue );
          void                 GetFontScaled( TFloatFixPt aHeight, const TDesC& aTypefaceName, CFont*& aFont, TFontSpec& aFontSpec );
 
         /**
@@ -354,10 +352,7 @@
          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
@@ -375,8 +370,7 @@
           * @return
           */
 		 void GenerateMask(CFbsBitmap* aMask);
-		 void GenerateMask(CSvgtBitmap* aMask);
-		  
+
 		  /**
          * Set the fill opacity value
         *
@@ -516,12 +510,6 @@
         // 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;
@@ -547,6 +535,10 @@
         TFontSpec                       iFontSpec;
         //OpenVG stuff
 
+        TDisplayMode    iDisplayMode;
+        TBool iGraphicsContextCreated;
+        TBool iIsMainContext;
+
         VGPaint							iFillPaint;
         VGPaint							iStrokePaint;
         VGPath                          iPath;