Merge branch 'devel/master' into tizen

[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 45e2be5..dc08bb9 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>
@@ -53,15 +49,11 @@ ContextNotifierInterface* Core::GetContextNotifier()
   return mImpl->GetContextNotifier();
 }
 
-// @todo Rename to ResetGlContext
 void Core::ContextCreated()
 {
   mImpl->ContextCreated();
 }
 
-// @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();
@@ -92,6 +84,11 @@ void Core::Resume()
   mImpl->Resume();
 }
 
+void Core::SceneCreated()
+{
+  mImpl->SceneCreated();
+}
+
 void Core::QueueEvent(const Event& event)
 {
   mImpl->QueueEvent(event);
@@ -102,11 +99,6 @@ void Core::ProcessEvents()
   mImpl->ProcessEvents();
 }
 
-void Core::UpdateTouchData(const TouchData& touch)
-{
-  mImpl->UpdateTouchData(touch);
-}
-
 unsigned int Core::GetMaximumUpdateCount() const
 {
   return mImpl->GetMaximumUpdateCount();