diff -r 83d2d132aa58 -r f5bac0badc7e uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp
--- a/uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp	Fri Apr 16 15:56:24 2010 +0300
+++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvasgc.cpp	Mon May 03 13:22:43 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()
@@ -640,6 +649,10 @@
     DisableDelayedClippingIfNeeded();                
 
     Cleanup();
+    
+    AMT_MAP_SET_VALUE_IF( iVisual && aRects.Count() > 0, iRectMap, 
+                          AMT_MAP_CPTR_TO_KEY_CAST( iVisual ), aRects[ aRects.Count() - 1 ].Round(),
+                          EAlfModuleTestTypeCoreToolkitDrawWindow );
 	}
 
 EXPORT_C void CHuiCanvasGc::DoDrawRects(RArray<THuiRealRect>& aRects)
@@ -1346,7 +1359,12 @@
 
     DisableDelayedClippingIfNeeded(); 
 
-    Cleanup();       
+    Cleanup();
+    
+    AMT_MAP_SET_VALUE_IF( iVisual, iRectMap,
+                          AMT_MAP_CPTR_TO_KEY_CAST( iVisual ),
+                          destinationRect.Round(), 
+                          EAlfModuleTestTypeCoreToolkitDrawFromRenderBuffer );
     }
 
 EXPORT_C void CHuiCanvasGc::ClearRenderBuffer( CHuiCanvasRenderBuffer& aImage, const TRect & aRect )