Merge "Make Update() function of frame callback is called for every frame." into...

diff --combined dali/internal/update/manager/update-manager.cpp
index 39e9f56,86aa746..f8df0f4
--- 1/dali/internal/update/manager/update-manager.cpp
--- 2/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@@ -509,7 -509,7 +509,7 @@@ void UpdateManager::AddScene( OwnerPoin
  void UpdateManager::RemoveScene( Scene* scene )
  {
    // Initialize the context from render manager
 -  typedef MessageValue1< RenderManager, SceneGraph::Scene* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, SceneGraph::Scene*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -605,7 -605,8 +605,7 @@@ void UpdateManager::SetShaderProgram( S
  {
    if( shaderData )
    {
 -
 -    typedef MessageValue3< Shader, Internal::ShaderDataPtr, ProgramCache*, bool> DerivedType;
 +    using DerivedType = MessageValue3<Shader, Internal::ShaderDataPtr, ProgramCache*, bool>;
  
      // Reserve some memory inside the render queue
      uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -891,6 -892,7 +891,7 @@@ uint32_t UpdateManager::Update( float e
        (mImpl->nodeDirtyFlags & RenderableUpdateFlags) ||    // ..nodes were dirty in previous frame OR
        IsAnimationRunning()                            ||    // ..at least one animation is running OR
        mImpl->messageQueue.IsSceneUpdateRequired()     ||    // ..a message that modifies the scene graph node tree is queued OR
+       mImpl->frameCallbackProcessor                   ||    // ..a frame callback processor is existed OR
        gestureUpdated;                                       // ..a gesture property was updated
  
    bool keepRendererRendering = false;
@@@ -1108,7 -1110,7 +1109,7 @@@ void UpdateManager::SetDefaultSurfaceRe
  {
    mImpl->surfaceRectChanged = true;
  
 -  typedef MessageValue1< RenderManager, Rect<int32_t> > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Rect<int32_t> >;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1119,7 -1121,7 +1120,7 @@@
  
  void UpdateManager::SurfaceReplaced( Scene* scene )
  {
 -  typedef MessageValue1< RenderManager, Scene* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Scene*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1192,7 -1194,7 +1193,7 @@@ void UpdateManager::RemoveFrameCallback
  void UpdateManager::AddSampler( OwnerPointer< Render::Sampler >& sampler )
  {
    // Message has ownership of Sampler while in transit from update to render
 -  typedef MessageValue1< RenderManager, OwnerPointer< Render::Sampler > > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::Sampler> >;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1203,7 -1205,7 +1204,7 @@@
  
  void UpdateManager::RemoveSampler( Render::Sampler* sampler )
  {
 -  typedef MessageValue1< RenderManager, Render::Sampler* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Render::Sampler*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1214,7 -1216,7 +1215,7 @@@
  
  void UpdateManager::SetFilterMode( Render::Sampler* sampler, uint32_t minFilterMode, uint32_t magFilterMode )
  {
 -  typedef MessageValue3< RenderManager, Render::Sampler*, uint32_t, uint32_t > DerivedType;
 +  using DerivedType = MessageValue3<RenderManager, Render::Sampler*, uint32_t, uint32_t>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1225,7 -1227,7 +1226,7 @@@
  
  void UpdateManager::SetWrapMode( Render::Sampler* sampler, uint32_t rWrapMode, uint32_t sWrapMode, uint32_t tWrapMode )
  {
 -  typedef MessageValue4< RenderManager, Render::Sampler*, uint32_t, uint32_t, uint32_t > DerivedType;
 +  using DerivedType = MessageValue4<RenderManager, Render::Sampler*, uint32_t, uint32_t, uint32_t>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1237,7 -1239,7 +1238,7 @@@
  void UpdateManager::AddVertexBuffer( OwnerPointer< Render::VertexBuffer >& vertexBuffer )
  {
    // Message has ownership of format while in transit from update -> render
 -  typedef MessageValue1< RenderManager, OwnerPointer< Render::VertexBuffer > > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::VertexBuffer> >;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1248,7 -1250,7 +1249,7 @@@
  
  void UpdateManager::RemoveVertexBuffer( Render::VertexBuffer* vertexBuffer )
  {
 -  typedef MessageValue1< RenderManager, Render::VertexBuffer* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Render::VertexBuffer*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1260,7 -1262,7 +1261,7 @@@
  void UpdateManager::SetVertexBufferFormat( Render::VertexBuffer* vertexBuffer, OwnerPointer< Render::VertexBuffer::Format>& format )
  {
    // Message has ownership of format while in transit from update -> render
 -  typedef MessageValue2< RenderManager, Render::VertexBuffer*, OwnerPointer< Render::VertexBuffer::Format > > DerivedType;
 +  using DerivedType = MessageValue2<RenderManager, Render::VertexBuffer*, OwnerPointer<Render::VertexBuffer::Format> >;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1272,7 -1274,7 +1273,7 @@@
  void UpdateManager::SetVertexBufferData( Render::VertexBuffer* vertexBuffer, OwnerPointer< Vector<uint8_t> >& data, uint32_t size )
  {
    // Message has ownership of format while in transit from update -> render
 -  typedef MessageValue3< RenderManager, Render::VertexBuffer*, OwnerPointer< Dali::Vector<uint8_t> >, uint32_t > DerivedType;
 +  using DerivedType = MessageValue3<RenderManager, Render::VertexBuffer*, OwnerPointer<Dali::Vector<uint8_t> >, uint32_t>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1284,7 -1286,7 +1285,7 @@@
  void UpdateManager::AddGeometry( OwnerPointer< Render::Geometry >& geometry )
  {
    // Message has ownership of format while in transit from update -> render
 -  typedef MessageValue1< RenderManager, OwnerPointer< Render::Geometry > > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::Geometry> >;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1295,7 -1297,7 +1296,7 @@@
  
  void UpdateManager::RemoveGeometry( Render::Geometry* geometry )
  {
 -  typedef MessageValue1< RenderManager, Render::Geometry* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Render::Geometry*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1306,7 -1308,7 +1307,7 @@@
  
  void UpdateManager::SetGeometryType( Render::Geometry* geometry, uint32_t geometryType )
  {
 -  typedef MessageValue2< RenderManager, Render::Geometry*, uint32_t > DerivedType;
 +  using DerivedType = MessageValue2<RenderManager, Render::Geometry*, uint32_t>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1317,7 -1319,7 +1318,7 @@@
  
  void UpdateManager::SetIndexBuffer( Render::Geometry* geometry, Dali::Vector<uint16_t>& indices )
  {
 -  typedef IndexBufferMessage< RenderManager > DerivedType;
 +  using DerivedType = IndexBufferMessage<RenderManager>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1328,7 -1330,7 +1329,7 @@@
  
  void UpdateManager::RemoveVertexBuffer( Render::Geometry* geometry, Render::VertexBuffer* vertexBuffer )
  {
 -  typedef MessageValue2< RenderManager, Render::Geometry*, Render::VertexBuffer* > DerivedType;
 +  using DerivedType = MessageValue2<RenderManager, Render::Geometry*, Render::VertexBuffer*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1339,7 -1341,7 +1340,7 @@@
  
  void UpdateManager::AttachVertexBuffer( Render::Geometry* geometry, Render::VertexBuffer* vertexBuffer )
  {
 -  typedef MessageValue2< RenderManager, Render::Geometry*, Render::VertexBuffer* > DerivedType;
 +  using DerivedType = MessageValue2<RenderManager, Render::Geometry*, Render::VertexBuffer*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1351,7 -1353,7 +1352,7 @@@
  void UpdateManager::AddTexture( OwnerPointer< Render::Texture >& texture )
  {
    // Message has ownership of Texture while in transit from update -> render
 -  typedef MessageValue1< RenderManager, OwnerPointer< Render::Texture > > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::Texture> >;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1362,7 -1364,7 +1363,7 @@@
  
  void UpdateManager::RemoveTexture( Render::Texture* texture)
  {
 -  typedef MessageValue1< RenderManager, Render::Texture* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Render::Texture*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1373,7 -1375,7 +1374,7 @@@
  
  void UpdateManager::UploadTexture( Render::Texture* texture, PixelDataPtr pixelData, const Texture::UploadParams& params )
  {
 -  typedef MessageValue3< RenderManager, Render::Texture*, PixelDataPtr, Texture::UploadParams > DerivedType;
 +  using DerivedType = MessageValue3<RenderManager, Render::Texture*, PixelDataPtr, Texture::UploadParams>;
  
    // Reserve some memory inside the message queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1384,7 -1386,7 +1385,7 @@@
  
  void UpdateManager::GenerateMipmaps( Render::Texture* texture )
  {
 -  typedef MessageValue1< RenderManager, Render::Texture* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Render::Texture*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1395,7 -1397,7 +1396,7 @@@
  
  void UpdateManager::AddFrameBuffer( OwnerPointer< Render::FrameBuffer >& frameBuffer )
  {
 -  typedef MessageValue1< RenderManager, OwnerPointer< Render::FrameBuffer > > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, OwnerPointer<Render::FrameBuffer> >;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1406,7 -1408,7 +1407,7 @@@
  
  void UpdateManager::RemoveFrameBuffer( Render::FrameBuffer* frameBuffer)
  {
 -  typedef MessageValue1< RenderManager, Render::FrameBuffer* > DerivedType;
 +  using DerivedType = MessageValue1<RenderManager, Render::FrameBuffer*>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1417,7 -1419,7 +1418,7 @@@
  
  void UpdateManager::AttachColorTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel, uint32_t layer )
  {
 -  typedef MessageValue4< RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t, uint32_t > DerivedType;
 +  using DerivedType = MessageValue4<RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t, uint32_t>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1428,7 -1430,7 +1429,7 @@@
  
  void UpdateManager::AttachDepthTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel )
  {
 -  typedef MessageValue3< RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t > DerivedType;
 +  using DerivedType = MessageValue3<RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );
@@@ -1439,7 -1441,7 +1440,7 @@@
  
  void UpdateManager::AttachDepthStencilTextureToFrameBuffer( Render::FrameBuffer* frameBuffer, Render::Texture* texture, uint32_t mipmapLevel )
  {
 -  typedef MessageValue3< RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t > DerivedType;
 +  using DerivedType = MessageValue3<RenderManager, Render::FrameBuffer*, Render::Texture*, uint32_t>;
  
    // Reserve some memory inside the render queue
    uint32_t* slot = mImpl->renderQueue.ReserveMessageSlot( mSceneGraphBuffers.GetUpdateBufferIndex(), sizeof( DerivedType ) );