Merge "use modern construct 'nullptr' instead of 'NULL' or '0'" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / update / common / scene-graph-scene.h

diff --git a/dali/internal/update/common/scene-graph-scene.h b/dali/internal/update/common/scene-graph-scene.h
index a94becc..97af1d5 100644 (file)
--- a/dali/internal/update/common/scene-graph-scene.h
+++ b/dali/internal/update/common/scene-graph-scene.h
@@ -19,10 +19,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/scene.h>
-#include <dali/integration-api/gl-defines.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/event/common/event-thread-services.h>
-#include <dali/internal/render/gl-resources/context.h>
 #include <dali/internal/render/common/render-instruction-container.h>
 #include <dali/public-api/common/vector-wrapper.h>
 
@@ -60,11 +58,6 @@ public:
   void Initialize( Context& context );
 
   /**
-   * Called by RenderManager to inform the scene that the context has been destroyed
-   */
-  void GlContextDestroyed();
-
-  /**
    * Gets the context holding the GL state of rendering for the scene
    * @return the context
    */
@@ -124,7 +117,7 @@ public:
 
 private:
 
-  Context*                    mContext;   ///< The context holding the GL state of rendering for the scene
+  Context*                    mContext;   ///< The context holding the GL state of rendering for the scene, not owned
 
   // Render instructions describe what should be rendered during RenderManager::RenderScene()
   // Update manager updates instructions for the next frame while we render the current one
@@ -138,7 +131,7 @@ private:
 /// Messages
 inline void AddFrameRenderedCallbackMessage( EventThreadServices& eventThreadServices, const Scene& scene, const CallbackBase* callback, int32_t frameId )
 {
-  typedef MessageValue2< Scene, CallbackBase*, int32_t > LocalType;
+  using LocalType = MessageValue2<Scene, CallbackBase*, int32_t>;
 
   // Reserve some memory inside the message queue
   uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
@@ -149,7 +142,7 @@ inline void AddFrameRenderedCallbackMessage( EventThreadServices& eventThreadSer
 
 inline void AddFramePresentedCallbackMessage( EventThreadServices& eventThreadServices, const Scene& scene, const CallbackBase* callback, int32_t frameId )
 {
-  typedef MessageValue2< Scene, CallbackBase*, int32_t > LocalType;
+  using LocalType = MessageValue2<Scene, CallbackBase*, int32_t>;
 
   // Reserve some memory inside the message queue
   uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );