X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fanimated-vector-image-visual.h;h=5d871f0d48c16e96a3f838e4b7b101721c71d596;hp=28d79a4b29c353e36f57be52747931111b23140e;hb=7c1ca2d9ab3bc63f3dc164c4f5d4ea0d8bf5ba3e;hpb=f558388c388bcdf4939ca7af098cbcfc1631ad89 diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h index 28d79a4..5d871f0 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -27,6 +27,7 @@ #include #include #include +#include namespace Dali { @@ -83,17 +84,17 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ) override; + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const override; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const override; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -114,27 +115,27 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ) override; + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ) override; + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ) override; + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform() override; + void OnSetTransform() override; /** * @copydoc Visual::Base::OnDoAction */ - virtual void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override; + void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override; private: @@ -164,12 +165,9 @@ private: private: ImageVisualShaderFactory& mImageVisualShaderFactory; VisualUrl mUrl; + VectorRasterizeThread mVectorRasterizeThread; Vector2 mVisualSize; - Vector2 mPlayRange; WeakHandle< Actor > mPlacementActor; - std::unique_ptr< VectorRasterizeThread > mVectorRasterizeThread; - - int32_t mLoopCount; DevelAnimatedVectorImageVisual::Action::Type mActionStatus; };