--- a/graphicstest/uibench/src/trenderorientation.h	Tue Jul 20 13:27:44 2010 +0300
+++ b/graphicstest/uibench/src/trenderorientation.h	Fri Jul 30 11:41:40 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -25,10 +25,13 @@
 #include <e32property.h>
 #include "te_graphicsperformanceSuiteStepBase.h"
 
-class CWindowStuff : public CBase
+/**
+CTWindowSet contains a window server session, a group window and a child window.
+ */
+class CTWindowSet : public CBase
     {
 public:
-    ~CWindowStuff();
+    ~CTWindowSet();
     void ConstructL();
     void Destroy();
 
@@ -43,6 +46,9 @@
     RWindow         iChildWindow;    
     };
 
+/**
+Test case to test the performance of various use cases which affect the render orientation RProperty
+*/
 class CTRenderOrientation : public CTe_graphicsperformanceSuiteStepBase
     {
 public:
@@ -56,22 +62,23 @@
     virtual TVerdict doTestStepL();
 
 private:
-    enum TWindowThing
+    enum TWindowSet
         {
         // One per orientation
-        EFirstWindowThing,
-        ESecondWindowThing,
-        EThirdWindowThing,
-        EFourthWindowThing,
+        EFirstWindowSet,
+        ESecondWindowSet,
+        EThirdWindowSet,
+        EFourthWindowSet,
         
-        ENumWindowThings
+        ENumWindowSets
         };
     
     enum TTestPhase
         {
-        EIndicatedOrientationChange,
-        EWindowOrdinalChange,
-        EThemeOrientationChange,
+        EIndicatedOrientationChange,    // window indicates a new render orientation
+        EWindowOrdinalChange,           // window order changed, render orientation dictated by a different window with a different orientation
+        EThemeOrientationChange,        // theme orientation changed, render orienation dictated by this due to relevant window being set to EDisplayOrientationAuto
+        EThemeOrientationChangeOnly,    // theme orientation change only, to compare timings to above
         
         ENumTestPhases
         };    
@@ -84,13 +91,13 @@
     void                ThemeServerProperty(const TDesC& aCmd);
     
 private:    
-    CWindowStuff    iWindowStuff[ENumWindowThings];
+    CTWindowSet     iWindowSet[ENumWindowSets];
     RProperty       iWsRenderOrientationProperty;
     RProperty       iThemeOrientationProperty;
     
     RTimer          iTimeoutTimer;
     TRequestStatus  iTimeoutStatus;
-    TRequestStatus  iRenderOrientationStatus;
+    TRequestStatus  iOrientationStatus;
     TInt            iTimingsTaken;
     };