projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CanvasView: Refactoring to get rasterized buffer
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-canvas-renderer.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
index
5849f99
..
43aa8ce
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
@@
-39,7
+39,7
@@
class CanvasRenderer: public Dali::BaseObject
public:
CanvasRenderer( const Vector2& size )
: mDrawable(nullptr),
public:
CanvasRenderer( const Vector2& size )
: mDrawable(nullptr),
- m
PixelBuffer( Devel::PixelBuffer::New(size.width, size.height, Dali::Pixel::RGBA8888
) ),
+ m
Texture ( Dali::Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, size.width, size.height
) ),
mSize(size),
mViewBox(size)
{
mSize(size),
mViewBox(size)
{
@@
-59,6
+59,11
@@
public:
return true;
}
return true;
}
+ Dali::Texture GetRasterizedTexture()
+ {
+ return mTexture;
+ }
+
bool Rasterize()
{
return true;
bool Rasterize()
{
return true;
@@
-88,13
+93,16
@@
public:
return false;
}
return false;
}
-
Devel::PixelBuffer GetPixelBuffer
()
+
bool RemoveAllDrawables
()
{
{
- return mPixelBuffer;
+ if (mDrawable)
+ {
+ return true;
+ }
+ return false;
}
}
-
- bool SetSize(const Vector2& size)
+ bool SetSize(Vector2 size)
{
mSize = size;
// For negative test
{
mSize = size;
// For negative test
@@
-105,10
+113,9
@@
public:
return true;
}
return true;
}
- const Vector2& GetSize()
+ Vector2 GetSize() const
{
{
- mSize = Vector2(200, 200);
- return mSize;
+ return Vector2(200, 200);
}
bool SetViewBox(const Vector2& viewBox)
}
bool SetViewBox(const Vector2& viewBox)
@@
-129,7
+136,7
@@
public:
public:
Dali::CanvasRenderer::Drawable* mDrawable;
public:
Dali::CanvasRenderer::Drawable* mDrawable;
- D
evel::PixelBuffer mPixelBuffer
;
+ D
ali::Texture mTexture
;
Vector2 mSize;
Vector2 mViewBox;
};
Vector2 mSize;
Vector2 mViewBox;
};
@@
-192,9
+199,9
@@
bool CanvasRenderer::Rasterize()
return Internal::Adaptor::GetImplementation(*this).Rasterize();
}
return Internal::Adaptor::GetImplementation(*this).Rasterize();
}
-D
evel::PixelBuffer CanvasRenderer::GetPixelBuffer
()
+D
ali::Texture CanvasRenderer::GetRasterizedTexture
()
{
{
- return Internal::Adaptor::GetImplementation(*this).Get
PixelBuffer
();
+ return Internal::Adaptor::GetImplementation(*this).Get
RasterizedTexture
();
}
bool CanvasRenderer::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
}
bool CanvasRenderer::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
@@
-207,12
+214,17
@@
bool CanvasRenderer::RemoveDrawable(Dali::CanvasRenderer::Drawable& drawable)
return Internal::Adaptor::GetImplementation(*this).RemoveDrawable(drawable);
}
return Internal::Adaptor::GetImplementation(*this).RemoveDrawable(drawable);
}
-bool CanvasRenderer::SetSize(const Vector2& size)
+bool CanvasRenderer::RemoveAllDrawables()
+{
+ return Internal::Adaptor::GetImplementation(*this).RemoveAllDrawables();
+}
+
+bool CanvasRenderer::SetSize(Vector2 size)
{
return Internal::Adaptor::GetImplementation(*this).SetSize(size);
}
{
return Internal::Adaptor::GetImplementation(*this).SetSize(size);
}
-const Vector2& CanvasRenderer::GetSize()
+Vector2 CanvasRenderer::GetSize() const
{
return Internal::Adaptor::GetImplementation(*this).GetSize();
}
{
return Internal::Adaptor::GetImplementation(*this).GetSize();
}