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=130d2f45a833cc899d2f42ad6e021ccb62321976;hpb=27619bbc4c1d443e89a6cdd116e544f6d9657fa4;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h index 130d2f4..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. @@ -20,11 +20,12 @@ // INTERNAL INCLUDES #include +#include #include #include #include -#include #include +#include namespace Dali { @@ -49,24 +50,18 @@ namespace Internal class NotificationManager; class AnimationPlaylist; class PropertyNotificationManager; -class Context; class EventProcessor; class GestureEventProcessor; -class ResourceClient; -class ResourceManager; -class FrameTime; -class FontFactory; -class ImageFactory; -class ModelFactory; class ShaderFactory; class TouchResampler; -class EmojiFactory; +class RelayoutController; namespace SceneGraph { class UpdateManager; class RenderManager; class DiscardQueue; +class RenderTaskProcessor; } /** @@ -83,7 +78,8 @@ public: Integration::PlatformAbstraction& platform, Integration::GlAbstraction& glAbstraction, Integration::GlSyncAbstraction& glSyncAbstraction, - Integration::GestureManager& gestureManager ); + Integration::GestureManager& gestureManager, + ResourcePolicy::DataRetention dataRetentionPolicy ); /** * Destructor @@ -91,14 +87,24 @@ public: ~Core(); /** + * @copydoc Dali::Integration::Core::GetContextNotifier() + */ + Integration::ContextNotifierInterface* GetContextNotifier(); + + /** * @copydoc Dali::Integration::Core::ContextCreated() */ void ContextCreated(); /** - * @copydoc Dali::Integration::Core::ContextToBeDestroyed() + * @copydoc Dali::Integration::Core::ContextDestroyed() + */ + void ContextDestroyed(); + + /** + * @copydoc Dali::Integration::Core::RecoverFromContextLoss() */ - void ContextToBeDestroyed(); + void RecoverFromContextLoss(); /** * @copydoc Dali::Integration::Core::SurfaceResized(unsigned int, unsigned int) @@ -106,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); @@ -118,7 +129,7 @@ public: /** * @copydoc Dali::Integration::Core::Update() */ - void Update( Integration::UpdateStatus& status ); + void Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds, unsigned int nextVSyncTimeMilliseconds, Integration::UpdateStatus& status ); /** * @copydoc Dali::Integration::Core::Render() @@ -126,14 +137,9 @@ public: void Render( Integration::RenderStatus& status ); /** - * @copydoc Dali::Integration::Core::Suspend() - */ - void Suspend(); - - /** - * @copydoc Dali::Integration::Core::Resume() + * @copydoc Dali::Integration::Core::SceneCreated() */ - void Resume(); + void SceneCreated(); /** * @copydoc Dali::Integration::Core::QueueEvent(const Integration::Event&) @@ -146,31 +152,11 @@ 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; /** - * @copydoc Dali::Integration::Core::Sleep() - */ - void Sleep(); - - /** - * @copydoc Dali::Integration::Core::Wake() - */ - void WakeUp(); - - /** - * @copydoc Dali::Integration::Core::VSync() - */ - void VSync( unsigned int frameNumber, unsigned int seconds, unsigned int microseconds ); - - /** * @copydoc Dali::Integration::Core::GetSystemOverlay() */ Integration::SystemOverlay& GetSystemOverlay(); @@ -230,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. */ @@ -272,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: @@ -296,28 +252,20 @@ private: Integration::PlatformAbstraction& mPlatform; ///< The interface providing platform specific services. IntrusivePtr 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 mPropertyNotificationManager; ///< For safe signal emmision of property changed notifications - FrameTime* mFrameTime; ///< Time when we render - 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 mRenderTaskProcessor; ///< Handles the processing of render tasks + OwnerPointer mRenderManager; ///< Render manager + OwnerPointer mUpdateManager; ///< Update manager + OwnerPointer mDiscardQueue; ///< Used to cleanup nodes & resources when no longer in use. + OwnerPointer mShaderFactory; ///< Shader resource factory + OwnerPointer mNotificationManager; ///< Notification manager + OwnerPointer mGestureEventProcessor; ///< The gesture event processor + OwnerPointer mEventProcessor; ///< The event processor + friend class ThreadLocalStorage; }; @@ -326,4 +274,4 @@ private: } // namespace Dali -#endif // __DALI_INTERNAL_CORE_H__ +#endif // DALI_INTERNAL_CORE_H