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
(Canvas Renderer) Moved Devel Headers into sub-folder to improve SAM score
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
canvas-renderer
/
ubuntu
/
canvas-renderer-impl-ubuntu.h
diff --git
a/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
b/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
index
22aeb10
..
e766d12
100644
(file)
--- a/
dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
+++ b/
dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
@@
-2,7
+2,7
@@
#define DALI_INTERNAL_UBUNTU_CANVAS_RENDERER_IMPL_UBUNTU_H
/*
#define DALI_INTERNAL_UBUNTU_CANVAS_RENDERER_IMPL_UBUNTU_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-24,13
+24,14
@@
#endif
#include <dali/devel-api/threading/mutex.h>
#include <dali/public-api/object/weak-handle.h>
#endif
#include <dali/devel-api/threading/mutex.h>
#include <dali/public-api/object/weak-handle.h>
+#include <dali/public-api/rendering/texture.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
-#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
#include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>
#include <dali/internal/canvas-renderer/common/drawable-group-impl.h>
#include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>
#include <dali/internal/canvas-renderer/common/drawable-group-impl.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
namespace Dali
{
namespace Dali
{
@@
-57,9
+58,9
@@
public:
bool Commit() override;
/**
bool Commit() override;
/**
- * @copydoc Dali::CanvasRenderer::Get
PixelBuffer
()
+ * @copydoc Dali::CanvasRenderer::Get
RasterizedTexture
()
*/
*/
- D
evel::PixelBuffer GetPixelBuffer
() override;
+ D
ali::Texture GetRasterizedTexture
() override;
/**
* @copydoc Dali::CanvasRenderer::AddDrawable()
/**
* @copydoc Dali::CanvasRenderer::AddDrawable()
@@
-77,14
+78,24
@@
public:
bool Rasterize() override;
/**
bool Rasterize() override;
/**
+ * @copydoc Dali::CanvasRenderer::RemoveDrawable()
+ */
+ bool RemoveDrawable(Dali::CanvasRenderer::Drawable& drawable) override;
+
+ /**
+ * @copydoc Dali::CanvasRenderer::RemoveAllDrawables()
+ */
+ bool RemoveAllDrawables() override;
+
+ /**
* @copydoc Dali::CanvasRenderer::SetSize()
*/
* @copydoc Dali::CanvasRenderer::SetSize()
*/
- bool SetSize(
const Vector2&
size) override;
+ bool SetSize(
Vector2
size) override;
/**
* @copydoc Dali::CanvasRenderer::GetSize()
*/
/**
* @copydoc Dali::CanvasRenderer::GetSize()
*/
-
const Vector2& GetSize()
override;
+
Vector2 GetSize() const
override;
/**
* @copydoc Dali::CanvasRenderer::SetViewBox()
/**
* @copydoc Dali::CanvasRenderer::SetViewBox()
@@
-152,10
+163,10
@@
private:
#endif
private:
#endif
private:
- Devel::PixelBuffer mPixelBuffer;
- Dali::Mutex mMutex;
-
#ifdef THORVG_SUPPORT
#ifdef THORVG_SUPPORT
+ Devel::PixelBuffer mPixelBuffer;
+ Dali::Texture mRasterizedTexture;
+ Dali::Mutex mMutex;
std::unique_ptr<tvg::SwCanvas> mTvgCanvas;
tvg::Scene* mTvgRoot;
#endif
std::unique_ptr<tvg::SwCanvas> mTvgCanvas;
tvg::Scene* mTvgRoot;
#endif