Merge changes I02677edb,If59805d2 into devel/master

[platform/core/uifw/dali-core.git] / dali / integration-api / core.cpp

diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp
index 186209d..b8914d6 100644 (file)
--- a/dali/integration-api/core.cpp
+++ b/dali/integration-api/core.cpp
@@ -18,10 +18,6 @@
 // CLASS HEADER
 #include <dali/integration-api/core.h>
 
-// EXTERNAL INCLUDES
-#include <iostream>
-#include <stdarg.h>
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/integration-api/events/event.h>
@@ -34,27 +30,11 @@ namespace Dali
 namespace Integration
 {
 
-namespace KeepUpdating
-{
-
-const unsigned int NOT_REQUESTED = 0x00; ///< Zero means that no further updates are required
-
-// Bit-field values
-const unsigned int STAGE_KEEP_RENDERING   = 0x01;  ///< Stage::KeepRendering() is being used
-const unsigned int INCOMING_MESSAGES      = 0x02;  ///< Event-thread is sending messages to update-thread
-const unsigned int ANIMATIONS_RUNNING     = 0x04;  ///< Animations are ongoing
-const unsigned int DYNAMICS_CHANGED       = 0x08;  ///< A dynamics simulation is running
-const unsigned int LOADING_RESOURCES      = 0x10;  ///< Resources are being loaded
-const unsigned int MONITORING_PERFORMANCE = 0x20;  ///< The --enable-performance-monitor option is being used
-const unsigned int RENDER_TASK_SYNC       = 0x40;  ///< The refresh once render task is waiting for render sync
-
-} // namespace KeepUpdating
-
 Core* Core::New(RenderController& renderController, PlatformAbstraction& platformAbstraction,
-                GlAbstraction& glAbstraction, GlSyncAbstraction& glSyncAbstraction, GestureManager& gestureManager)
+                GlAbstraction& glAbstraction, GlSyncAbstraction& glSyncAbstraction, GestureManager& gestureManager, ResourcePolicy::DataRetention policy )
 {
   Core* instance = new Core;
-  instance->mImpl = new Internal::Core( renderController, platformAbstraction, glAbstraction, glSyncAbstraction, gestureManager );
+  instance->mImpl = new Internal::Core( renderController, platformAbstraction, glAbstraction, glSyncAbstraction, gestureManager, policy );
 
   return instance;
 }
@@ -64,14 +44,28 @@ Core::~Core()
   delete mImpl;
 }
 
+ContextNotifierInterface* Core::GetContextNotifier()
+{
+  return mImpl->GetContextNotifier();
+}
+
+// @todo Rename to ResetGlContext
 void Core::ContextCreated()
 {
   mImpl->ContextCreated();
 }
 
-void Core::ContextToBeDestroyed()
+// @todo Replace with StopRendering that prevents RenderManager from rendering
+// until we get ResetGLContext again, change ContextCreated to reset gpu buffer cache,
+// gl texture id's
+void Core::ContextDestroyed()
+{
+  mImpl->ContextDestroyed();
+}
+
+void Core::RecoverFromContextLoss()
 {
-  mImpl->ContextToBeDestroyed();
+  mImpl->RecoverFromContextLoss();
 }
 
 void Core::SurfaceResized(unsigned int width, unsigned int height)
@@ -94,6 +88,11 @@ void Core::Resume()
   mImpl->Resume();
 }
 
+void Core::SceneCreated()
+{
+  mImpl->SceneCreated();
+}
+
 void Core::QueueEvent(const Event& event)
 {
   mImpl->QueueEvent(event);