Merge "Follow the include-order coding conventions" into tizen

[platform/core/uifw/dali-core.git] / dali / internal / common / core-impl.h

diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h
index 130d2f4..6e88bc4 100644 (file)
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -20,11 +20,13 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
+#include <dali/integration-api/context-notifier.h>
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/internal/event/animation/animation-playlist-declarations.h>
 #include <dali/internal/event/common/stage-def.h>
 #include <dali/internal/update/resources/resource-manager-declarations.h>
 #include <dali/public-api/common/view-mode.h>
+#include <dali/integration-api/resource-policies.h>
 
 namespace Dali
 {
@@ -54,7 +56,6 @@ class EventProcessor;
 class GestureEventProcessor;
 class ResourceClient;
 class ResourceManager;
-class FrameTime;
 class FontFactory;
 class ImageFactory;
 class ModelFactory;
@@ -83,7 +84,8 @@ public:
         Integration::PlatformAbstraction& platform,
         Integration::GlAbstraction& glAbstraction,
         Integration::GlSyncAbstraction& glSyncAbstraction,
-        Integration::GestureManager& gestureManager );
+        Integration::GestureManager& gestureManager,
+        ResourcePolicy::DataRetention dataRetentionPolicy );
 
   /**
    * Destructor
@@ -91,14 +93,24 @@ public:
   ~Core();
 
   /**
+   * @copydoc Dali::Integration::Core::GetContextNotifier()
+   */
+  Integration::ContextNotifierInterface* GetContextNotifier();
+
+  /**
    * @copydoc Dali::Integration::Core::ContextCreated()
    */
   void ContextCreated();
 
   /**
-   * @copydoc Dali::Integration::Core::ContextToBeDestroyed()
+   * @copydoc Dali::Integration::Core::ContextDestroyed()
    */
-  void ContextToBeDestroyed();
+  void ContextDestroyed();
+
+  /**
+   * @copydoc Dali::Integration::Core::RecoverFromContextLoss()
+   */
+  void RecoverFromContextLoss();
 
   /**
    * @copydoc Dali::Integration::Core::SurfaceResized(unsigned int, unsigned int)
@@ -118,7 +130,7 @@ public:
   /**
    * @copydoc Dali::Integration::Core::Update()
    */
-  void Update( Integration::UpdateStatus& status );
+  void Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds, unsigned int nextVSyncTimeMilliseconds, Integration::UpdateStatus& status );
 
   /**
    * @copydoc Dali::Integration::Core::Render()
@@ -136,6 +148,11 @@ public:
   void Resume();
 
   /**
+   * @copydoc Dali::Integration::Core::SceneCreated()
+   */
+  void SceneCreated();
+
+  /**
    * @copydoc Dali::Integration::Core::QueueEvent(const Integration::Event&)
    */
   void QueueEvent( const Integration::Event& event );
@@ -156,21 +173,6 @@ public:
   unsigned int GetMaximumUpdateCount() const;
 
   /**
-   * @copydoc Dali::Integration::Core::Sleep()
-   */
-  void Sleep();
-
-  /**
-   * @copydoc Dali::Integration::Core::Wake()
-   */
-  void WakeUp();
-
-  /**
-   * @copydoc Dali::Integration::Core::VSync()
-   */
-  void VSync( unsigned int frameNumber, unsigned int seconds, unsigned int microseconds );
-
-  /**
    * @copydoc Dali::Integration::Core::GetSystemOverlay()
    */
   Integration::SystemOverlay& GetSystemOverlay();
@@ -305,7 +307,6 @@ private:
   NotificationManager*                      mNotificationManager;         ///< Notification manager
   AnimationPlaylistOwner                    mAnimationPlaylist;           ///< For 'Fire and forget' animation support
   OwnerPointer<PropertyNotificationManager> mPropertyNotificationManager; ///< For safe signal emmision of property changed notifications
-  FrameTime*                                mFrameTime;                   ///< Time when we render
   FontFactory*                              mFontFactory;                 ///< font resource factory
   ImageFactory*                             mImageFactory;                ///< Image resource factory
   ModelFactory*                             mModelFactory;                ///< Model resource factory