projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable -Wold-style-cast in Adaptor
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
common
/
adaptor-impl.h
diff --git
a/adaptors/common/adaptor-impl.h
b/adaptors/common/adaptor-impl.h
index
8bf062b
..
4cbbdc2
100644
(file)
--- a/
adaptors/common/adaptor-impl.h
+++ b/
adaptors/common/adaptor-impl.h
@@
-2,7
+2,7
@@
#define __DALI_INTERNAL_ADAPTOR_IMPL_H__
/*
#define __DALI_INTERNAL_ADAPTOR_IMPL_H__
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-66,7
+66,7
@@
class EglFactory;
class GestureManager;
class GlImplementation;
class GlSyncImplementation;
class GestureManager;
class GlImplementation;
class GlSyncImplementation;
-class
UpdateRender
Controller;
+class
Thread
Controller;
class TriggerEvent;
class CallbackManager;
class FeedbackPluginProxy;
class TriggerEvent;
class CallbackManager;
class FeedbackPluginProxy;
@@
-132,6
+132,11
@@
public:
*/
static bool IsAvailable();
*/
static bool IsAvailable();
+ /**
+ * @copydoc Dali::Core::SceneCreated();
+ */
+ void SceneCreated();
+
public: // AdaptorInternalServices implementation
/**
* @copydoc Dali::Adaptor::Start()
public: // AdaptorInternalServices implementation
/**
* @copydoc Dali::Adaptor::Start()
@@
-154,6
+159,16
@@
public: // AdaptorInternalServices implementation
virtual void Stop();
/**
virtual void Stop();
/**
+ * @copydoc Dali::Adaptor::ContextLost()
+ */
+ virtual void ContextLost();
+
+ /**
+ * @copydoc Dali::Adaptor::ContextRegained()
+ */
+ virtual void ContextRegained();
+
+ /**
* @copydoc Dali::EventFeeder::FeedTouchPoint()
*/
virtual void FeedTouchPoint( TouchPoint& point, int timeStamp );
* @copydoc Dali::EventFeeder::FeedTouchPoint()
*/
virtual void FeedTouchPoint( TouchPoint& point, int timeStamp );
@@
-206,9
+221,9
@@
public: // AdaptorInternalServices implementation
virtual bool AddIdle( CallbackBase* callback );
/**
virtual bool AddIdle( CallbackBase* callback );
/**
- * @copydoc
Internal::Framework::CallFromMainLoop
()
+ * @copydoc
Dali::Adaptor::RemoveIdle
()
*/
*/
- virtual
bool CallFromMainLoop
( CallbackBase* callback );
+ virtual
void RemoveIdle
( CallbackBase* callback );
public:
public:
@@
-278,6
+293,12
@@
public:
*/
Any GetNativeWindowHandle();
*/
Any GetNativeWindowHandle();
+ /**
+ * Sets use remote surface for eglSurface output
+ * @param[in] useRemoteSurface True if the remote surface is used
+ */
+ void SetUseRemoteSurface(bool useRemoteSurface);
+
public:
/**
public:
/**
@@
-305,6
+326,11
@@
public:
void RequestUpdateOnce();
/**
void RequestUpdateOnce();
/**
+ * Request adaptor to update indicator's height
+ */
+ void IndicatorSizeChanged(int height);
+
+ /**
* @copydoc Dali::Adaptor::NotifySceneCreated()
*/
void NotifySceneCreated();
* @copydoc Dali::Adaptor::NotifySceneCreated()
*/
void NotifySceneCreated();
@@
-314,6
+340,16
@@
public:
*/
void NotifyLanguageChanged();
*/
void NotifyLanguageChanged();
+ /**
+ * Gets AppId of current application
+ */
+ void GetAppId( std::string& appId );
+
+ /**
+ * Informs core the surface size has changed
+ */
+ void SurfaceSizeChanged( const PositionSize& positionSize );
+
public: //AdaptorInternalServices
/**
public: //AdaptorInternalServices
/**
@@
-334,7
+370,7
@@
public: //AdaptorInternalServices
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetTriggerEventInterface()
*/
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetTriggerEventInterface()
*/
- virtual TriggerEventInterface& Get
TriggerEventInterface
();
+ virtual TriggerEventInterface& Get
ProcessCoreEventsTrigger
();
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetTriggerEventFactoryInterface()
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetTriggerEventFactoryInterface()
@@
-464,17
+500,17
@@
private:
private:
/**
private:
/**
- * Informs core the surface size has changed
- */
- void SurfaceSizeChanged(const PositionSize& positionSize);
-
- /**
* Assigns the render surface to the adaptor
*
*/
void SetSurface(RenderSurface *surface);
/**
* Assigns the render surface to the adaptor
*
*/
void SetSurface(RenderSurface *surface);
/**
+ * called after surface is created
+ */
+ void SurfaceInitialized();
+
+ /**
* Sends an notification message from main loop idle handler
*/
void ProcessCoreEventsFromIdle();
* Sends an notification message from main loop idle handler
*/
void ProcessCoreEventsFromIdle();
@@
-519,7
+555,7
@@
private: // Data
Dali::Adaptor& mAdaptor; ///< Reference to public adaptor instance.
State mState; ///< Current state of the adaptor
Dali::Integration::Core* mCore; ///< Dali Core
Dali::Adaptor& mAdaptor; ///< Reference to public adaptor instance.
State mState; ///< Current state of the adaptor
Dali::Integration::Core* mCore; ///< Dali Core
-
UpdateRenderController* mUpdateRenderController; ///< Controls update/render
threads
+
ThreadController* mThreadController; ///< Controls the
threads
VSyncMonitor* mVSyncMonitor; ///< Monitors VSync events
GlImplementation* mGLES; ///< GL implementation
GlSyncImplementation* mGlSync; ///< GL Sync implementation
VSyncMonitor* mVSyncMonitor; ///< Monitors VSync events
GlImplementation* mGLES; ///< GL implementation
GlSyncImplementation* mGlSync; ///< GL Sync implementation
@@
-527,12
+563,12
@@
private: // Data
Any mNativeWindow; ///< window identifier
RenderSurface* mSurface; ///< Current surface
Any mNativeWindow; ///< window identifier
RenderSurface* mSurface; ///< Current surface
- TizenPlatform::TizenPlatformAbstraction*
mPlatformAbstraction; ///< Platform abstraction
+ TizenPlatform::TizenPlatformAbstraction* mPlatformAbstraction; ///< Platform abstraction
EventHandler* mEventHandler; ///< event handler
CallbackManager* mCallbackManager; ///< Used to install callbacks
bool mNotificationOnIdleInstalled; ///< whether the idle handler is installed to send an notification event
EventHandler* mEventHandler; ///< event handler
CallbackManager* mCallbackManager; ///< Used to install callbacks
bool mNotificationOnIdleInstalled; ///< whether the idle handler is installed to send an notification event
- TriggerEvent
*
mNotificationTrigger; ///< Notification event trigger
+ TriggerEvent
Interface*
mNotificationTrigger; ///< Notification event trigger
GestureManager* mGestureManager; ///< Gesture manager
FeedbackPluginProxy* mDaliFeedbackPlugin; ///< Used to access feedback support
FeedbackController* mFeedbackController; ///< Plays feedback effects for Dali-Toolkit UI Controls.
GestureManager* mGestureManager; ///< Gesture manager
FeedbackPluginProxy* mDaliFeedbackPlugin; ///< Used to access feedback support
FeedbackController* mFeedbackController; ///< Plays feedback effects for Dali-Toolkit UI Controls.
@@
-548,6
+584,7
@@
private: // Data
ObjectProfiler* mObjectProfiler; ///< Tracks object lifetime for profiling
SocketFactory mSocketFactory; ///< Socket factory
const bool mEnvironmentOptionsOwned:1; ///< Whether we own the EnvironmentOptions (and thus, need to delete it)
ObjectProfiler* mObjectProfiler; ///< Tracks object lifetime for profiling
SocketFactory mSocketFactory; ///< Socket factory
const bool mEnvironmentOptionsOwned:1; ///< Whether we own the EnvironmentOptions (and thus, need to delete it)
+ bool mUseRemoteSurface; ///< whether the remoteSurface is used or not
public:
inline static Adaptor& GetImplementation(Dali::Adaptor& adaptor) {return *adaptor.mImpl;}
};
public:
inline static Adaptor& GetImplementation(Dali::Adaptor& adaptor) {return *adaptor.mImpl;}
};