Merge "Support Asynchronous Loading of Animated Image" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / gaussian-blur-view / gaussian-blur-view.h

diff --git a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h
index 9b7824c..9f48329 100644 (file)
--- a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h
+++ b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H
 
 /*
- * Copyright (c) 2019 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.
@@ -188,35 +188,6 @@ public:
                               bool blurUserImage = false);
 
   /**
-   * @DEPRECATED_1_1.28 Use Actor::Add(Actor) instead
-   * @brief Adds a child Actor to this Actor.
-   * @SINCE_1_0.0
-   * @param [in] child The child.
-   * @pre This Actor (the parent) has been initialized.
-   * @pre The child actor has been initialized.
-   * @pre The child actor is not the same as the parent actor.
-   * @pre The actor is not the Root actor
-   * @post The child will be referenced by its parent. This means that the child will be kept alive,
-   * even if the handle passed into this method is reset or destroyed.
-   * @note If the child already has a parent, it will be removed from old parent
-   * and reparented to this actor. This may change childs position, color, shader effect,
-   * scale etc as it now inherits them from this actor.
-   */
-  void Add(Actor child);
-
-  /**
-   * @DEPRECATED_1_1.28 Use Actor::Remove(Actor) instead
-   * @brief Removes a child Actor from this Actor.
-   *
-   * If the actor was not a child of this actor, this is a no-op.
-   * @SINCE_1_0.0
-   * @param [in] child The child.
-   * @pre This Actor (the parent) has been initialized.
-   * @pre The child actor is not the same as the parent actor.
-   */
-  void Remove(Actor child);
-
-  /**
    * @brief Start rendering the GaussianBlurView. Must be called after you Add() it to the stage.
    * @SINCE_1_0.0
    */
@@ -226,7 +197,6 @@ public:
    * @brief Render the GaussianBlurView once.
    *
    * Must be called after you Add() it to the stage.
-   * Only works with a gaussian blur view created with blurUserImage = true.
    * Listen to the Finished signal to determine when the rendering has completed.
    * @SINCE_1_0.0
    */