[dali_2.3.41] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / animated-vector-image / animated-vector-image-visual.h

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 a1e7480..183ea2c 100644 (file)
--- 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
@@ -53,7 +53,7 @@ using AnimatedVectorImageVisualPtr = IntrusivePtr<AnimatedVectorImageVisual>;
  * | url                      | STRING           |
  *
  */
  * | url                      | STRING           |
  *
  */

-class AnimatedVectorImageVisual : public Visual::Base, public ConnectionTracker, public VectorAnimationManager::LifecycleObserver
+class AnimatedVectorImageVisual : public Visual::Base, public ConnectionTracker

 {
 public:
   /**
 {
 public:
   /**


@@ -99,12 +99,6 @@ public: // from Visual
    */
   void EnablePreMultipliedAlpha(bool preMultiplied) override;
 
    */
   void EnablePreMultipliedAlpha(bool preMultiplied) override;
 

-protected: // From VectorAnimationManager::LifecycleObserver:
-  /**
-   * @copydoc VectorAnimationManager::LifecycleObserver::VectorAnimationManagerDestroyed()
-   */
-  void VectorAnimationManagerDestroyed() override;
-

 protected:
   /**
    * @brief Constructor.
 protected:
   /**
    * @brief Constructor.


@@ -164,7 +158,7 @@ protected:
   /**
    * @copydoc Visual::Base::OnDoActionExtension
    */
   /**
    * @copydoc Visual::Base::OnDoActionExtension
    */

-  void OnDoActionExtension(const Property::Index actionId, Dali::Any attributes) override;
+  void OnDoActionExtension(const Property::Index actionId, const Dali::Any& attributes) override;

 
 private:
   /**
 
 private:
   /**


@@ -220,12 +214,7 @@ private:
   /**
    * @brief Callback when the visibility of the actor is changed.
    */
   /**
    * @brief Callback when the visibility of the actor is changed.
    */

-  void OnControlVisibilityChanged(Actor actor, bool visible, DevelActor::VisibilityChange::Type type);
-
-  /**
-   * @brief Callback when the visibility of the window is changed.
-   */
-  void OnWindowVisibilityChanged(Window window, bool visible);
+  void OnControlInheritedVisibilityChanged(Actor actor, bool visible);

 
   /**
    * @brief Callback when the event is processed.
 
   /**
    * @brief Callback when the event is processed.


@@ -251,12 +240,12 @@ private:
   WeakHandle<Actor>                  mPlacementActor;
   DevelImageVisual::PlayState::Type  mPlayState;
   CallbackBase*                      mEventCallback; // Not owned
   WeakHandle<Actor>                  mPlacementActor;
   DevelImageVisual::PlayState::Type  mPlayState;
   CallbackBase*                      mEventCallback; // Not owned

+  float                              mFrameSpeedFactor;

 
   uint32_t mLastSentPlayStateId;
 
   bool mLoadFailed : 1;
   bool mRendererAdded : 1;
 
   uint32_t mLastSentPlayStateId;
 
   bool mLoadFailed : 1;
   bool mRendererAdded : 1;

-  bool mCoreShutdown : 1;

   bool mRedrawInScalingDown : 1;
   bool mEnableFrameCache : 1;
   bool mUseNativeImage : 1;
   bool mRedrawInScalingDown : 1;
   bool mEnableFrameCache : 1;
   bool mUseNativeImage : 1;