diff -r 30f62d96b898 -r 8d23fe8ae91b windowing/windowserver/nga/CLIENT/RBUFFER.CPP
--- a/windowing/windowserver/nga/CLIENT/RBUFFER.CPP	Thu Apr 08 12:02:10 2010 +0100
+++ b/windowing/windowserver/nga/CLIENT/RBUFFER.CPP	Thu Apr 08 12:06:20 2010 +0100
@@ -44,6 +44,9 @@
 	#endif
 	iBuf(NULL,0,0), iNext(NULL), iPreviousHandle(0), iBufSize(0), iMaxBufSize(EMinBufferSize),
 	iDirectAcessCount(0), iInvalidBitmapArray(EFalse), iWindowSizeCache(NULL)
+#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
+, iWindowNativeSizeCache(NULL)
+#endif // SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
 	{
 	}
 
@@ -100,6 +103,14 @@
 	    delete iWindowSizeCache;
 	    iWindowSizeCache = NULL;
 	    }
+#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
+	if (iWindowNativeSizeCache)
+	    {
+	    iWindowNativeSizeCache->Close();
+	    delete iWindowNativeSizeCache;
+	    iWindowNativeSizeCache = NULL;
+	    }
+#endif // SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
 	}
 
 void RWsBuffer::Destroy()
@@ -463,3 +474,14 @@
         iWindowSizeCache = new (ELeave) RHashMap<TInt, TWindowSizeCacheEntry>();        
         }
     }
+
+#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
+void RWsBuffer::EnableWindowNativeSizeCacheL()
+    {
+    if (iWindowNativeSizeCache == NULL)
+        {
+        iWindowNativeSizeCache = new (ELeave) RHashMap<TInt, TWindowSizeCacheEntry>();        
+        }
+    }
+#endif // SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
+