X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcommon%2Fcore-impl.h;h=49d7b3339381bb42d96e602cf00becb5e54d340d;hb=refs%2Fchanges%2F45%2F152145%2F7;hp=6e88bc4e56181903853f8adb37bd6868062cd137;hpb=c5ed9f3e34a5f5d8935dfc49fdf0e661379a6941;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h
index 6e88bc4..49d7b33 100644
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CORE_H__
-#define __DALI_INTERNAL_CORE_H__
+#ifndef DALI_INTERNAL_CORE_H
+#define DALI_INTERNAL_CORE_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/internal/event/animation/animation-playlist-declarations.h>
 #include <dali/internal/event/common/stage-def.h>
-#include <dali/internal/update/resources/resource-manager-declarations.h>
 #include <dali/public-api/common/view-mode.h>
 #include <dali/integration-api/resource-policies.h>
 
@@ -51,23 +50,18 @@ 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 RenderTaskProcessor;
 }
 
 /**
@@ -118,6 +112,11 @@ public:
   void SurfaceResized(unsigned int width, unsigned int height);
 
   /**
+   * @copydoc Dali::Integration::Core::SetTopMargin( unsigned int margin )
+   */
+  void SetTopMargin( unsigned int margin );
+
+  /**
    * @copydoc Dali::Integration::Core::SetDpi(unsigned int, unsigned int)
    */
   void SetDpi(unsigned int dpiHorizontal, unsigned int dpiVertical);
@@ -138,16 +137,6 @@ public:
   void Render( Integration::RenderStatus& status );
 
   /**
-   * @copydoc Dali::Integration::Core::Suspend()
-   */
-  void Suspend();
-
-  /**
-   * @copydoc Dali::Integration::Core::Resume()
-   */
-  void Resume();
-
-  /**
    * @copydoc Dali::Integration::Core::SceneCreated()
    */
   void SceneCreated();
@@ -163,11 +152,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;
@@ -232,36 +216,6 @@ private:  // for use by ThreadLocalStorage
   NotificationManager& GetNotificationManager();
 
   /**
-   * Returns the Resource Manager.
-   * @return A reference to the Resource Manager.
-   */
-  ResourceManager& GetResourceManager();
-
-  /**
-   * Returns the Resource client.
-   * @return A reference to the Resource Client.
-   */
-  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.
    */
@@ -274,10 +228,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,27 +252,20 @@ private:
   Integration::PlatformAbstraction&         mPlatform;                    ///< The interface providing platform specific services.
 
   IntrusivePtr<Stage>                       mStage;                       ///< The current stage
-  GestureEventProcessor*                    mGestureEventProcessor;       ///< The gesture event processor
-  EventProcessor*                           mEventProcessor;              ///< The event processor
-  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
-  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.
-
-  bool                                      mIsActive         : 1;        ///< Whether Core is active or suspended
+  IntrusivePtr< RelayoutController >        mRelayoutController;          ///< Size negotiation relayout controller
   bool                                      mProcessingEvent  : 1;        ///< True during ProcessEvents()
 
+  OwnerPointer<SceneGraph::RenderTaskProcessor> mRenderTaskProcessor;         ///< Handles the processing of render tasks
+  OwnerPointer<SceneGraph::RenderManager>       mRenderManager;               ///< Render manager
+  OwnerPointer<SceneGraph::UpdateManager>       mUpdateManager;               ///< Update manager
+  OwnerPointer<SceneGraph::DiscardQueue>        mDiscardQueue;                ///< Used to cleanup nodes & resources when no longer in use.
+  OwnerPointer<ShaderFactory>                   mShaderFactory;               ///< Shader resource factory
+  OwnerPointer<NotificationManager>             mNotificationManager;         ///< Notification manager
+  OwnerPointer<GestureEventProcessor>           mGestureEventProcessor;       ///< The gesture event processor
+  OwnerPointer<EventProcessor>                  mEventProcessor;              ///< The event processor
+
   friend class ThreadLocalStorage;
 
 };
@@ -327,4 +274,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CORE_H__
+#endif // DALI_INTERNAL_CORE_H