X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fadaptor-impl.h;h=cf81f7ced5ee06a21ad7f797dfb971a242cbcbe5;hb=b120b6474d08f317c671299971dc3bd16d5bbd68;hp=9e4c079ae65c3539367d315bd75ad92ecc87f586;hpb=9ae6083a29d48cc9c23c07f006937ba7411337b0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h index 9e4c079..cf81f7c 100755 --- a/dali/internal/adaptor/common/adaptor-impl.h +++ b/dali/internal/adaptor/common/adaptor-impl.h @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #include #include @@ -54,6 +53,7 @@ namespace Integration class Core; class GlAbstraction; class Processor; +class AddOnManager; } namespace Internal @@ -76,6 +76,7 @@ class LifeCycleObserver; class ObjectProfiler; class SceneHolder; class ConfigurationManager; +enum class ThreadMode; /** * Implementation of the Adaptor class. @@ -99,22 +100,18 @@ public: * @param[in] surface A render surface can be one of the following * - Pixmap, adaptor will use existing Pixmap to draw on to * - Window, adaptor will use existing Window to draw on to - * @param[in] configuration The context loss configuration ( to choose resource discard policy ) * @param[in] environmentOptions A pointer to the environment options. If NULL then one is created. */ static Dali::Adaptor* New( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface* surface, - Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ); /** * Creates a New Adaptor * @param[in] window The window handle - * @param[in] configuration The context loss configuration ( to choose resource discard policy ) * @param[in] environmentOptions A pointer to the environment options. If NULL then one is created. */ static Dali::Adaptor* New( Dali::Integration::SceneHolder window, - Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ); /** @@ -124,33 +121,28 @@ public: * @param[in] surface A render surface can be one of the following * - Pixmap, adaptor will use existing Pixmap to draw on to * - Window, adaptor will use existing Window to draw on to - * @param[in] configuration The context loss configuration ( to choose resource discard policy ) * @param[in] environmentOptions A pointer to the environment options. If NULL then one is created. */ static Dali::Adaptor* New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface* surface, - Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ); /** * Creates a New Adaptor * @param[in] graphicsFactory A factory that creates the graphics interface * @param[in] window The window handle - * @param[in] configuration The context loss configuration ( to choose resource discard policy ) * @param[in] environmentOptions A pointer to the environment options. If NULL then one is created. */ static Dali::Adaptor* New( GraphicsFactory& graphicsFactory, Dali::Integration::SceneHolder window, - Dali::Configuration::ContextLoss configuration, EnvironmentOptions* environmentOptions ); /** * 2-step initialisation, this should be called after creating an adaptor instance. * @param[in] graphicsFactory A factory that creates the graphics interface - * @param[in] configuration The context loss configuration ( to choose resource discard policy ) */ - void Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration::ContextLoss configuration ); + void Initialize( GraphicsFactory& graphicsFactory ); /** * Virtual destructor. @@ -211,12 +203,12 @@ public: // AdaptorInternalServices implementation /** * @copydoc Dali::EventFeeder::FeedWheelEvent() */ - virtual void FeedWheelEvent( WheelEvent& wheelEvent ); + virtual void FeedWheelEvent( Dali::WheelEvent& wheelEvent ); /** * @copydoc Dali::EventFeeder::FeedKeyEvent() */ - virtual void FeedKeyEvent( KeyEvent& keyEvent ); + virtual void FeedKeyEvent( Dali::KeyEvent& keyEvent ); /** * @copydoc Dali::Adaptor::ReplaceSurface() @@ -248,14 +240,8 @@ public: // AdaptorInternalServices implementation /** * Adds a new Window instance to the Adaptor * @param[in] childWindow The child window instance - * @param[in] childWindowName The child window title/name - * @param[in] childWindowClassName The class name that the child window belongs to - * @param[in] childWindowMode The mode of the child window */ - virtual bool AddWindow( Dali::Integration::SceneHolder childWindow, - const std::string& childWindowName, - const std::string& childWindowClassName, - bool childWindowMode ); + virtual bool AddWindow( Dali::Integration::SceneHolder childWindow ); /** * Removes an existing Window instance from the Adaptor @@ -315,6 +301,11 @@ public: // AdaptorInternalServices implementation */ Dali::SceneHolderList GetSceneHolders() const; + /** + * @copydoc Dali::Adaptor::GetObjectRegistry() + */ + Dali::ObjectRegistry GetObjectRegistry() const; + public: /** @@ -685,8 +676,12 @@ private: // Data SystemTrace mSystemTracer; ///< System tracer ObjectProfiler* mObjectProfiler; ///< Tracks object lifetime for profiling SocketFactory mSocketFactory; ///< Socket factory + ThreadMode mThreadMode; ///< The thread mode const bool mEnvironmentOptionsOwned:1; ///< Whether we own the EnvironmentOptions (and thus, need to delete it) bool mUseRemoteSurface:1; ///< whether the remoteSurface is used or not + Dali::LayoutDirection::Type mRootLayoutDirection; ///< LayoutDirection of window + + std::unique_ptr mAddOnManager; ///< Pointer to the addon manager public: inline static Adaptor& GetImplementation(Dali::Adaptor& adaptor) { return *adaptor.mImpl; }