Merge "(AnimatedVectorImageVisual) Change renderer on stage again" into devel/master

diff --combined dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
index 7aaff56,f0ec2cd..5d871f0
--- 1/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
--- 2/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 +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 +27,7 @@@
  #include <dali-toolkit/internal/visuals/visual-base-impl.h>
  #include <dali-toolkit/internal/visuals/visual-url.h>
  #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-actions-devel.h>
+ #include <dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h>
  
  namespace Dali
  {
@@@ -83,17 -84,17 +84,17 @@@ public:  // from Visua
    /**
     * @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 +115,27 @@@
    /**
     * @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 +165,9 @@@
  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;
  };