X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.h;h=8fa2e5ef54626012fc1532b3c15171020ecb67af;hp=6105867d20391803be5f196bd083316bf08dc0a6;hb=b86fa7f2bedebe580b0e9a20f9b42cf2d628fafa;hpb=248c644059d4784ab65fe3d2690022c2888edd3b

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h
index 6105867..8fa2e5e 100644
--- a/dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-impl.h
@@ -130,15 +130,15 @@ public:
   int GetDepthIndex() const;
 
   /**
-   * @copydoc Toolkit::Visual::Base::SetOnStage
+   * @copydoc Toolkit::Visual::Base::SetOnScene
    * @pre Impl->mGeometry must be created before this method is called
    */
-  void SetOnStage( Actor& actor );
+  void SetOnScene( Actor& actor );
 
   /**
-   * @copydoc Toolkit::Visual::Base::SetOffStage
+   * @copydoc Toolkit::Visual::Base::SetOffScene
    */
-  void SetOffStage( Actor& actor );
+  void SetOffScene( Actor& actor );
 
   /**
    * @copydoc Toolkit::Visual::Base::CreatePropertyMap
@@ -170,6 +170,13 @@ public:
   bool IsPreMultipliedAlphaEnabled() const;
 
   /**
+   * @brief Query whether advanced blend equation is applied.
+   *
+   * @return True is advanced blend equation is applied, false otherwise.
+   */
+  bool IsAdvancedBlendEquationApplied() const;
+
+  /**
    * @brief Sets properties of custom shader
    * @param[in] propertyMap Property map containing the custom shader data
    */
@@ -293,7 +300,7 @@ public:
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual ~Base();
+  ~Base() override;
 
 protected:
 
@@ -327,20 +334,20 @@ protected:
   virtual void OnSetTransform() = 0;
 
   /**
-   * @brief Called by SetOnStage() allowing sub classes to respond to the SetOnStage event
+   * @brief Called by SetOnScene() allowing sub classes to respond to the SetOnScene event
    *
    * @note The derived class is required to create the renderer, and add it to the actor when all the resources are in place.
    *
    * @param[in] actor The actor applying this visual.
    */
-  virtual void DoSetOnStage( Actor& actor ) = 0;
+  virtual void DoSetOnScene( Actor& actor ) = 0;
 
   /**
-   * @brief Called by SetOffStage() allowing sub classes to respond to the SetOffStage event
+   * @brief Called by SetOffScene() allowing sub classes to respond to the SetOffScene event
    *
    * @param[in] actor The actor applying this visual.
    */
-  virtual void DoSetOffStage( Actor& actor );
+  virtual void DoSetOffScene( Actor& actor );
 
   /**
    * @brief Called by DoAction() allowing sub classes to do the given action.
@@ -353,11 +360,11 @@ protected:
 protected:
 
   /**
-   * @brief Gets the on stage state for this Visual
+   * @brief Gets the on scene state for this Visual
    *
-   * @return Returns true if this Visual is on stage, false if it is off the stage
+   * @return Returns true if this Visual is on the scene, false if it is off the scene
    */
-  bool IsOnStage() const;
+  bool IsOnScene() const;
 
   /**
    * @brief Query whether the corners of the visual requires to be rounded.