X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fubuntu-x11%2Fpixmap-render-surface-ecore-x.h;h=b88c3f6afc3111b978a5359a334d46bbcccd53ef;hb=fb301c1dd3260b09cf0fe34f01068e3dc20a0ca2;hp=05e850fc9b0590b1eb3dada78376bcdca8bfa225;hpb=516d09c20a2a640d72bf04524ffeefd16d042963;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h index 05e850f..b88c3f6 100644 --- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h @@ -2,7 +2,7 @@ #define DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -62,112 +62,106 @@ public: // from WindowRenderSurface /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::GetSurface() */ - virtual Any GetSurface() override; + Any GetSurface() override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::SetRenderNotification() */ - virtual void SetRenderNotification( TriggerEventInterface* renderNotification ) override; + void SetRenderNotification( TriggerEventInterface* renderNotification ) override; -public: // from Dali::Integration::RenderSurface +public: // from Dali::RenderSurfaceInterface /** - * @copydoc Dali::Integration::RenderSurface::GetPositionSize() + * @copydoc Dali::RenderSurfaceInterface::GetPositionSize() */ - virtual PositionSize GetPositionSize() const override; + PositionSize GetPositionSize() const override; /** - * @copydoc Dali::Integration::RenderSurface::GetDpi() + * @copydoc Dali::RenderSurfaceInterface::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** - * @brief Return the orientation of the surface. - * @return The orientation + * @copydoc Dali::RenderSurfaceInterface::InitializeGraphics() */ - virtual int GetOrientation() const override; + void InitializeGraphics() override; /** - * @copydoc Dali::Integration::RenderSurface::InitializeGraphics() + * @copydoc Dali::RenderSurfaceInterface::CreateSurface() */ - virtual void InitializeGraphics() override; + void CreateSurface() override; /** - * @copydoc Dali::Integration::RenderSurface::CreateSurface() + * @copydoc Dali::RenderSurfaceInterface::DestroySurface() */ - virtual void CreateSurface() override; + void DestroySurface() override; /** - * @copydoc Dali::Integration::RenderSurface::DestroySurface() + * @copydoc Dali::RenderSurfaceInterface::ReplaceGraphicsSurface() */ - virtual void DestroySurface() override; + bool ReplaceGraphicsSurface() override; /** - * @copydoc Dali::Integration::RenderSurface::ReplaceGraphicsSurface() - */ - virtual bool ReplaceGraphicsSurface() override; - - /** - * @copydoc Dali::Integration::RenderSurface::MoveResize() + * @copydoc Dali::RenderSurfaceInterface::MoveResize() */ virtual void MoveResize( Dali::PositionSize positionSize) override {} /** - * @copydoc Dali::Integration::RenderSurface::StartRender() + * @copydoc Dali::RenderSurfaceInterface::StartRender() */ - virtual void StartRender() override; + void StartRender() override; /** - * @copydoc Dali::Integration::RenderSurface::PreRender() + * @copydoc Dali::RenderSurfaceInterface::PreRender() */ - virtual bool PreRender( bool resizingSurface ) override; + bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override; /** - * @copydoc Dali::Integration::RenderSurface::PostRender() + * @copydoc Dali::RenderSurfaceInterface::PostRender() */ - virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) override; + void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override; /** - * @copydoc Dali::Integration::RenderSurface::StopRender() + * @copydoc Dali::RenderSurfaceInterface::StopRender() */ - virtual void StopRender() override; + void StopRender() override; /** - * @copydoc Dali::Integration::RenderSurface::SetThreadSynchronization + * @copydoc Dali::RenderSurfaceInterface::SetThreadSynchronization */ - virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override; + void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override; /** - * @copydoc Dali::Integration::RenderSurface::GetSurfaceType() + * @copydoc Dali::RenderSurfaceInterface::GetSurfaceType() */ - virtual Integration::RenderSurface::Type GetSurfaceType() override; + Dali::RenderSurfaceInterface::Type GetSurfaceType() override; /** - * @copydoc Dali::Integration::RenderSurface::MakeContextCurrent() + * @copydoc Dali::RenderSurfaceInterface::MakeContextCurrent() */ - virtual void MakeContextCurrent() override; + void MakeContextCurrent() override; private: // from PixmapRenderSurface /** - * @copydoc Dali::Integration::RenderSurface::ReleaseLock() + * @copydoc Dali::RenderSurfaceInterface::ReleaseLock() */ - virtual void ReleaseLock() override; + void ReleaseLock() override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize() */ - virtual void Initialize( Any surface ) override; + void Initialize( Any surface ) override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize() */ - virtual void CreateRenderable() override; + void CreateRenderable() override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize() */ - virtual void UseExistingRenderable( unsigned int surfaceId ) override; + void UseExistingRenderable( unsigned int surfaceId ) override; private: