--- a/webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp	Mon Jun 21 16:54:17 2010 +0300
+++ b/webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp	Thu Jul 15 19:53:20 2010 +0300
@@ -54,13 +54,13 @@
 EXPORT_C void MemoryManager::CreateFastAllocator()
     {
     // create the right memory pool
-    MEM_LOGF(_L8("MemoryManager::CreateFastAllocator - s_pool=%x"), s_pool);
+    MEM_LOG_CREATE();    
 #ifdef __NEW_ALLOCATOR__
     CMemoryPool *pool = new CNewSymbianHeapPool();
     pool->Create();
     RSymbianDlAllocatorWrapper* allocator = new RSymbianDlAllocatorWrapper((CNewSymbianHeapPool*)pool);
+    User::SwitchAllocator(allocator);
     MEM_LOGF(_L8("MemoryManager::CreateFastAllocator - new pool=%x, allocator=%x"), pool, allocator);
-    User::SwitchAllocator(allocator);
 #endif
     }
 
@@ -86,7 +86,7 @@
 EXPORT_C RAllocator* MemoryManager::SwitchToFastAllocator()
     {
     // create the right memory pool
-    //__ASSERT_DEBUG( s_pool == 0, User::Panic( KMemManPanicDes, 0 ) );
+    __ASSERT_DEBUG( s_pool == 0, User::Panic( KMemManPanicDes, 0 ) );
     MEM_LOGF(_L8("MemoryManager::SwitchToFastAllocator - s_pool=%x"), s_pool);
 #ifdef __NEW_ALLOCATOR__
     s_pool = new CNewSymbianHeapPool();
@@ -143,7 +143,6 @@
 //-----------------------------------------------------------------------------
 EXPORT_C void MemoryManager::AddCollector( MMemoryCollector* aCollector )
     {
-    MEM_LOGF(_L8("MemoryManager::AddCollector - s_pool=%x"), s_pool);
     Pool()->AddCollector( aCollector );
     }
 
@@ -160,7 +159,6 @@
 //-----------------------------------------------------------------------------
 EXPORT_C void MemoryManager::AddStopper( MOOMStopper* aStopper )
     {
-    MEM_LOGF(_L8("MemoryManager::AddStopper - s_pool=%x"), s_pool);
     Pool()->AddStopper( aStopper );
     }
 
@@ -244,3 +242,11 @@
     return Pool()->MemorySize( aPtr );
     }
 
+
+EXPORT_C void MemoryManager::DumpMemoryLogs()
+    {
+#if defined(OOM_LOGGING) && defined (__NEW_ALLOCATOR__)
+    CNewSymbianHeapPool *hPool = (CNewSymbianHeapPool *)Pool();
+    hPool->DumpHeapLogs(0);
+#endif    
+    }