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
Revert "[Tizen] Revert "Support multiple window rendering""
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
adaptor
/
common
/
adaptor-impl.h
diff --git
a/dali/internal/adaptor/common/adaptor-impl.h
b/dali/internal/adaptor/common/adaptor-impl.h
index
af7eb87
..
428680c
100755
(executable)
--- a/
dali/internal/adaptor/common/adaptor-impl.h
+++ b/
dali/internal/adaptor/common/adaptor-impl.h
@@
-49,7
+49,7
@@
namespace Dali
{
namespace Dali
{
-class RenderSurface;
+class RenderSurface
Interface
;
class Window;
namespace Integration
class Window;
namespace Integration
@@
-106,7
+106,7
@@
public:
* @param[in] environmentOptions A pointer to the environment options. If NULL then one is created.
*/
static Dali::Adaptor* New( Any nativeWindow,
* @param[in] environmentOptions A pointer to the environment options. If NULL then one is created.
*/
static Dali::Adaptor* New( Any nativeWindow,
-
RenderSu
rface* surface,
+
Dali::RenderSurfaceInte
rface* surface,
Dali::Configuration::ContextLoss configuration,
EnvironmentOptions* environmentOptions );
Dali::Configuration::ContextLoss configuration,
EnvironmentOptions* environmentOptions );
@@
-132,7
+132,7
@@
public:
*/
static Dali::Adaptor* New( GraphicsFactory& graphicsFactory,
Any nativeWindow,
*/
static Dali::Adaptor* New( GraphicsFactory& graphicsFactory,
Any nativeWindow,
-
RenderSu
rface* surface,
+
Dali::RenderSurfaceInte
rface* surface,
Dali::Configuration::ContextLoss configuration,
EnvironmentOptions* environmentOptions );
Dali::Configuration::ContextLoss configuration,
EnvironmentOptions* environmentOptions );
@@
-224,12
+224,12
@@
public: // AdaptorInternalServices implementation
/**
* @copydoc AdaptorInterface::ReplaceSurface()
*/
/**
* @copydoc AdaptorInterface::ReplaceSurface()
*/
- virtual void ReplaceSurface( Any nativeWindow,
RenderSu
rface& surface );
+ virtual void ReplaceSurface( Any nativeWindow,
Dali::RenderSurfaceInte
rface& surface );
/**
* @copydoc Dali::Adaptor::GetSurface()
*/
/**
* @copydoc Dali::Adaptor::GetSurface()
*/
- virtual
RenderSu
rface& GetSurface() const;
+ virtual
Dali::RenderSurfaceInte
rface& GetSurface() const;
/**
* @copydoc Dali::Adaptor::ReleaseSurfaceLock()
/**
* @copydoc Dali::Adaptor::ReleaseSurfaceLock()
@@
-283,6
+283,12
@@
public: // AdaptorInternalServices implementation
*/
void SetPreRenderCallback( CallbackBase* callback );
*/
void SetPreRenderCallback( CallbackBase* callback );
+ /**
+ * Removes an existing Window instance from the Adaptor
+ * @param[in] childWindow The Window instance
+ */
+ bool RemoveWindow( Dali::Internal::Adaptor::Window* childWindow );
+
public:
/**
public:
/**
@@
-380,11
+386,6
@@
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();
@@
-402,12
+403,12
@@
public:
/**
* Informs core the surface size has changed
*/
/**
* Informs core the surface size has changed
*/
- void SurfaceResizePrepare( SurfaceSize surfaceSize );
+ void SurfaceResizePrepare(
Dali::RenderSurfaceInterface* surface,
SurfaceSize surfaceSize );
/**
* Informs ThreadController the surface size has changed
*/
/**
* Informs ThreadController the surface size has changed
*/
- void SurfaceResizeComplete( SurfaceSize surfaceSize );
+ void SurfaceResizeComplete(
Dali::RenderSurfaceInterface* surface,
SurfaceSize surfaceSize );
/**
* Sets layout direction of root by system language
/**
* Sets layout direction of root by system language
@@
-470,7
+471,7
@@
public: //AdaptorInternalServices
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetRenderSurfaceInterface()
*/
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetRenderSurfaceInterface()
*/
- virtual
RenderSu
rface* GetRenderSurfaceInterface();
+ virtual
Dali::RenderSurfaceInte
rface* GetRenderSurfaceInterface();
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetVSyncMonitorInterface()
/**
* @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetVSyncMonitorInterface()
@@
-565,7
+566,7
@@
private:
* Assigns the render surface to the adaptor
*
*/
* Assigns the render surface to the adaptor
*
*/
- void SetSurface(
RenderSu
rface *surface);
+ void SetSurface(
Dali::RenderSurfaceInte
rface *surface);
/**
* called after surface is created
/**
* called after surface is created
@@
-615,7
+616,7
@@
private:
* - Window, adaptor will use existing Window to draw on to
* @param[in] environmentOptions A pointer to the environment options. If NULL then one is created.
*/
* - Window, adaptor will use existing Window to draw on to
* @param[in] environmentOptions A pointer to the environment options. If NULL then one is created.
*/
- Adaptor( Any nativeWindow, Dali::Adaptor& adaptor,
RenderSu
rface* surface, EnvironmentOptions* environmentOptions );
+ Adaptor( Any nativeWindow, Dali::Adaptor& adaptor,
Dali::RenderSurfaceInte
rface* surface, EnvironmentOptions* environmentOptions );
private: // Types
private: // Types
@@
-636,7
+637,8
@@
private: // Types
std::string class_name; ///< Class name that the window belongs to
bool window_mode; ///< Display mode of the window
Any nativeWindow; ///< window identifier
std::string class_name; ///< Class name that the window belongs to
bool window_mode; ///< Display mode of the window
Any nativeWindow; ///< window identifier
- RenderSurface* surface; ///< The surface the Window is bound to
+ uint32_t id; ///< unique Window ID
+ Dali::RenderSurfaceInterface* surface; ///< The surface the Window is bound to
} WindowPane;
typedef std::vector<WindowPane> WindowFrames;
} WindowPane;
typedef std::vector<WindowPane> WindowFrames;