--- a/perfsrv/memspy/Engine/Source/Helpers/MemSpyEngineHelperHeap.cpp	Fri Oct 08 14:56:39 2010 +0300
+++ b/perfsrv/memspy/Engine/Source/Helpers/MemSpyEngineHelperHeap.cpp	Tue Oct 26 16:20:32 2010 +0300
@@ -927,15 +927,24 @@
 
         _LIT( KItem0_Type_RHeap, "RHeap" );
         _LIT( KItem0_Type_RHybridHeap, "RHybridHeap" );
+        _LIT( KItem0_Type_RHybridHeapRefactored, "RHybridHeap (Refactored)" );
 		if (aInfo.Type() == TMemSpyHeapInfo::ETypeRHeap)
 			{
 	        list->AddItemL( KItem0, KItem0_Type_RHeap );
 			}
-		else
+		else if (aInfo.Type() == TMemSpyHeapInfo::ETypeRHybridHeap)
 			{
 	        list->AddItemL( KItem0, KItem0_Type_RHybridHeap );
 			}
-
+		else if (aInfo.Type() == TMemSpyHeapInfo::ETypeRHeap) 
+		    {
+		    list->AddItemL( KItem0, KItem0_Type_RHybridHeapRefactored );
+		    }
+		else
+		    {
+		    MemSpyEngineUtils::Panic( EMemSpyEnginePanicUnsupportedHeapType );
+		    }
+		
         // Heap size is the size of the heap minus the size of the embedded (in-place) RHeap. 
         _LIT( KItem1, "Heap size" );
         list->AddItemL(KItem1, metaData.iHeapSize);
@@ -1033,6 +1042,7 @@
 
 		_LIT(KRHeap, "RHeap");
 		_LIT(KRHybridHeap, "RHybridHeap");
+		_LIT(KRHybridHeapV2, "RHybridHeap v2");
 		switch (aInfo.Type())
 			{
 			case TMemSpyHeapInfo::ETypeRHeap:
@@ -1041,7 +1051,11 @@
 			case TMemSpyHeapInfo::ETypeRHybridHeap:
 				list.iType.Copy(KRHybridHeap);
 				break;
+            case TMemSpyHeapInfo::ETypeRHybridHeapV2:
+                list.iType.Copy(KRHybridHeapV2);
+                break;
 			default:
+			    MemSpyEngineUtils::Panic( EMemSpyEnginePanicUnsupportedHeapType );
 				break;
 			}
 
@@ -1138,15 +1152,24 @@
         // Type
         _LIT( KMetaData_Type_RHeap,  "Symbian OS RHeap" );
         _LIT( KMetaData_Type_RHybridHeap,  "Symbian OS RHybridHeap" );
+        _LIT( KMetaData_Type_RHybridHeapV2,  "Symbian OS RHybridHeap v2" );
 		if (aInfo.Type() == TMemSpyHeapInfo::ETypeRHeap)
 			{
 	        aList.AddItemL( KMetaData_Type, KMetaData_Type_RHeap );
 			}
-		else
+		else if(aInfo.Type() == TMemSpyHeapInfo::ETypeRHybridHeap)
 			{
 			aList.AddItemL( KMetaData_Type, KMetaData_Type_RHybridHeap );
 			}
-
+		else if(aInfo.Type() == TMemSpyHeapInfo::ETypeRHybridHeapV2)
+		    {
+            aList.AddItemL( KMetaData_Type, KMetaData_Type_RHybridHeapV2 );		    
+		    }
+		else
+		    {
+		    MemSpyEngineUtils::Panic( EMemSpyEnginePanicUnsupportedHeapType );
+		    }
+		
         // VTable
         //_LIT( KMetaData_VTable,  "VTable:" );
         //aList.AddItemHexL( KMetaData_VTable, metaData.VTable() );