X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-actor-utils.h;h=be085bf922ab9f15320266ff56671f53607a3651;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hp=c5c5d0a363eb49a066a143ff2bc4556cc731d552;hpb=726e147d14bb18ef193b102a36d8068b62db89ed;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h index c5c5d0a..be085bf 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TEST_ACTOR_UTILS_H__ -#define __DALI_TEST_ACTOR_UTILS_H__ +#ifndef DALI_TEST_ACTOR_UTILS_H +#define DALI_TEST_ACTOR_UTILS_H /* - * Copyright (c) 2016 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. @@ -23,9 +23,9 @@ namespace Dali { - class Actor; class Image; +class Texture; /** * @brief Creates a simple renderable-actor with solid colored quad. @@ -38,7 +38,7 @@ Actor CreateRenderableActor(); * @param[in] texture Texture to set. * @return An actor with a renderer. */ -Actor CreateRenderableActor( Image texture ); +Actor CreateRenderableActor(Texture texture); /** * @brief Creates a renderable-actor with a texture and custom shaders. @@ -47,15 +47,8 @@ Actor CreateRenderableActor( Image texture ); * @param[in] fragmentShader The fragment-shader. * @return An actor with a renderer. */ -Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ); - -/** - * @brief Retrieves the texture used in a renderable actor (if available). - * @return The texture used by the actor. - * @note Assumes the actor only has one renderer, and that renderer only has one texture. - */ -Image GetTexture( Actor actor ); +Actor CreateRenderableActor(Texture texture, const std::string& vertexShader, const std::string& fragmentShader); } // namespace Dali -#endif // __DALI_TEST_ACTOR_UTILS_H__ +#endif // DALI_TEST_ACTOR_UTILS_H