diff -r 10534483575f -r 88b23e2e82e1 uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp
--- a/uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp	Mon Mar 15 12:43:37 2010 +0200
+++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp	Wed Mar 31 23:03:58 2010 +0300
@@ -34,6 +34,15 @@
 
 #include <e32math.h>
 
+#include "alfmoduletestconf.h"
+#ifdef USE_MODULE_TEST_HOOKS_FOR_ALF
+    // Provides TLS object data for test cases.
+    // This is used only if module test hooks are set on.
+    #include "huistatictlsdata.h"
+#endif // USE_MODULE_TEST_HOOKS_FOR_ALF
+// Provides module test hook defines.
+#include "alfmoduletestdefines.h"
+
 
 EXPORT_C CHuiCanvasGc::CHuiCanvasGc():
     iPenColor(KRgbBlack),
@@ -44,7 +53,7 @@
     iHorizontalTextAlign(EHuiAlignHLeft),
     iTextStyleId(EHuiTextStyleNormal),
     iEffectiveOpacityEnabled(ETrue)
-    {	    
+    {
     }
 
 EXPORT_C CHuiCanvasGc::~CHuiCanvasGc()
@@ -673,6 +682,10 @@
         	    {
       		  	iGc->DrawRect(rect);
         	    }
+        	
+            AMT_MAP_INC_VALUE_IF( iVisual, iIntMap, 
+                                  AMT_MAP_CPTR_TO_KEY_CAST( iVisual ),
+                                  EAlfModuleTestTypeCoreToolkitDrawWindow );
 		    }    	    
 		}            
 	}
@@ -1346,7 +1359,11 @@
 
     DisableDelayedClippingIfNeeded(); 
 
-    Cleanup();       
+    Cleanup();
+    
+    AMT_MAP_INC_VALUE_IF( iVisual, iIntMap, 
+                          AMT_MAP_CPTR_TO_KEY_CAST( iVisual ), 
+                          EAlfModuleTestTypeCoreToolkitDrawFromRenderBuffer );
     }
 
 EXPORT_C void CHuiCanvasGc::ClearRenderBuffer( CHuiCanvasRenderBuffer& aImage, const TRect & aRect )