X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Frelayout-controller-impl.h;h=8339e9905f2abeeb6a855d382426aa22aa0c282e;hp=7f655c59a7a26bbd1cb6c63aa677fbfe8d1abe09;hb=710c2712fb20e905b48a855b218c6cfce8fb2434;hpb=a881757839b7abb008873a68c67e17b3ba39669b

diff --git a/base/dali-toolkit/internal/controls/relayout-controller-impl.h b/base/dali-toolkit/internal/controls/relayout-controller-impl.h
index 7f655c5..8339e99 100644
--- a/base/dali-toolkit/internal/controls/relayout-controller-impl.h
+++ b/base/dali-toolkit/internal/controls/relayout-controller-impl.h
@@ -18,7 +18,13 @@
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali/dali.h>
+#include <dali/public-api/common/vector-wrapper.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
 #include "relayout-controller.h"
 
 namespace Dali
@@ -32,6 +38,9 @@ namespace Internal
 
 class RelayoutController;
 
+typedef std::pair< Dali::Toolkit::Control, Vector2 > ControlSizePair;
+typedef std::vector< ControlSizePair > ControlStack;
+
 /**
  * @copydoc Toolkit::Internal::RelayoutController
  */
@@ -42,8 +51,9 @@ public:
   /**
    * Constructor.
    * We should only create a unique instance.
+   * @param relayoutFlag to avoid unnecessary calls inside a single frame
    */
-  RelayoutControllerImpl();
+  RelayoutControllerImpl( bool& relayoutFlag );
 
 
   /**
@@ -79,7 +89,11 @@ private:
 
 private:
 
-  bool mRelayoutConnection:1; ///< Whether EventProcessingFinishedSignal signal is connected.
+  bool& mRelayoutFlag;               ///< reference to relayout flag to avoid unnecessary calls
+  ControlStack mControlStack;        ///< stack for relayouting
+  ActorSizeContainer mSizecontainer; ///< size container
+  bool mRelayoutConnection:1;        ///< Whether EventProcessingFinishedSignal signal is connected.
+
 };
 
 } // namespace Internal