Revert "[3.0] Version downgrade (1.2.0 to 1.1.45)"

[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 b456e82..d40f827 100644 (file)
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -51,23 +51,22 @@ namespace Internal
 class NotificationManager;
 class AnimationPlaylist;
 class PropertyNotificationManager;
-class Context;
 class EventProcessor;
 class GestureEventProcessor;
 class ResourceClient;
 class ResourceManager;
-class FontFactory;
 class ImageFactory;
-class ModelFactory;
 class ShaderFactory;
 class TouchResampler;
-class EmojiFactory;
+class RelayoutController;
 
 namespace SceneGraph
 {
 class UpdateManager;
 class RenderManager;
 class DiscardQueue;
+class TextureCacheDispatcher;
+class GeometryBatcher;
 }
 
 /**
@@ -148,6 +147,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 );
@@ -158,11 +162,6 @@ public:
   void ProcessEvents();
 
   /**
-   * @copydoc Dali::Integration::Core::UpdateTouchData(const Integration::TouchData&)
-   */
-  void UpdateTouchData(const Integration::TouchData& touch);
-
-  /**
    * @copydoc Dali::Integration::Core::GetMaximumUpdateCount()
    */
   unsigned int GetMaximumUpdateCount() const;
@@ -239,24 +238,12 @@ private:  // for use by ThreadLocalStorage
   ResourceClient& GetResourceClient();
 
   /**
-   * Returns the Font factory
-   * @return A reference to the Font factory.
-   */
-  FontFactory& GetFontFactory();
-
-  /**
    * Returns the Image factory
    * @return A reference to the Image factory.
    */
   ImageFactory& GetImageFactory();
 
   /**
-   * Returns the Model factory
-   * @return A reference to the Model factory.
-   */
-  ModelFactory& GetModelFactory();
-
-  /**
    * Returns the Shader factory
    * @return A reference to the Shader binary factory.
    */
@@ -269,10 +256,10 @@ private:  // for use by ThreadLocalStorage
   GestureEventProcessor& GetGestureEventProcessor();
 
   /**
-   * Returns the Emoji factory.
-   * @return a reference to the Emoji factory.
+   * Return the relayout controller
+   * @Return Return a reference to the relayout controller
    */
-  EmojiFactory& GetEmojiFactory();
+  RelayoutController& GetRelayoutController();
 
 private:
 
@@ -298,19 +285,17 @@ private:
   SceneGraph::UpdateManager*                mUpdateManager;               ///< Update manager
   SceneGraph::RenderManager*                mRenderManager;               ///< Render manager
   SceneGraph::DiscardQueue*                 mDiscardQueue;                ///< Used to cleanup nodes & resources when no longer in use.
-  ResourcePostProcessList*                  mResourcePostProcessQueue;    ///< Stores resource ids which require post processing after render
+  SceneGraph::TextureCacheDispatcher*       mTextureCacheDispatcher;      ///< Used to send messages to TextureCache
+  LockedResourceQueue*                      mTextureUploadedQueue;        ///< Stores resource ids which require post processing after render
   NotificationManager*                      mNotificationManager;         ///< Notification manager
   AnimationPlaylistOwner                    mAnimationPlaylist;           ///< For 'Fire and forget' animation support
   OwnerPointer<PropertyNotificationManager> mPropertyNotificationManager; ///< For safe signal emmision of property changed notifications
-  FontFactory*                              mFontFactory;                 ///< font resource factory
   ImageFactory*                             mImageFactory;                ///< Image resource factory
-  ModelFactory*                             mModelFactory;                ///< Model resource factory
   ShaderFactory*                            mShaderFactory;               ///< Shader resource factory
   ResourceClient*                           mResourceClient;              ///< Asynchronous Resource Loading
   ResourceManager*                          mResourceManager;             ///< Asynchronous Resource Loading
-  TouchResampler*                           mTouchResampler;              ///< Resamples touches to correct frame rate.
-  EmojiFactory*                             mEmojiFactory;                ///< Emoji resource factory.
-
+  IntrusivePtr< RelayoutController >        mRelayoutController;          ///< Size negotiation relayout controller
+  SceneGraph::GeometryBatcher*              mGeometryBatcher;             ///< Instance of the geometry batcher
   bool                                      mIsActive         : 1;        ///< Whether Core is active or suspended
   bool                                      mProcessingEvent  : 1;        ///< True during ProcessEvents()