X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Feffects-view%2Feffects-view-impl.h;h=6abeb206d4fbe0ada0af35010e1c33c2ab1ad7da;hb=5075ccc3be07ba0da557493efc026ecb2a5373fe;hp=54527d325da727d97516b609c6cb9b19339f5b13;hpb=b97b29c76acefabbae2c0a4e9ecc261bf9dd8036;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
index 54527d3..6abeb20 100644
--- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
+++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
@@ -22,11 +22,12 @@
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/rendering/renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/effects-view/effects-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 namespace Dali
 {
@@ -57,15 +58,6 @@ public:
   EffectsView();
 
   /**
-   * Constructor.
-   * @copydoc Toolkit::EffectsView New(const unsigned int,const float,const Pixel::Format,const float,const float)
-   */
-  EffectsView(const unsigned int numSamples, const float blurBellCurveWidth, const int spread,
-              const Pixel::Format pixelFormat,
-              const float downsampleWidthScale, const float downsampleHeightScale,
-              FrameBufferImage image);
-
-  /**
    * A reference counted object may only be deleted by calling Unreference()
    */
   virtual ~EffectsView();
@@ -128,32 +120,32 @@ private: // From Control
   /**
    * @copydoc Toolkit::Internal::Control::OnInitialize()
    */
-  virtual void OnInitialize();
+  void OnInitialize() override;
 
   /**
    * @copydoc CustomActorImpl::OnSizeSet( const Vector3& targetSize )
    */
-  virtual void OnSizeSet( const Vector3& targetSize );
+  void OnSizeSet( const Vector3& targetSize ) override;
 
   /**
-   * @copydoc Toolkit::Internal::Control::OnStageConnection
+   * @copydoc Toolkit::Internal::Control::OnSceneConnection
    */
-  virtual void OnStageConnection( int depth );
+  void OnSceneConnection( int depth ) override;
 
   /**
-   * @copydoc Toolkit::Internal::Control::OnStageDisconnection
+   * @copydoc Toolkit::Internal::Control::OnSceneDisconnection
    */
-  virtual void OnStageDisconnection();
+  void OnSceneDisconnection() override;
 
   /**
    * @copydoc Toolkit::Internal::Control::OnChildAdd
    */
-  virtual void OnChildAdd( Actor& child );
+  void OnChildAdd( Actor& child ) override;
 
   /**
    * @copydoc Toolkit::Internal::Control::OnChildRemove
    */
-  virtual void OnChildRemove( Actor& child );
+  void OnChildRemove( Actor& child ) override;
 
 private:
 
@@ -214,8 +206,8 @@ private: // attributes/properties
 
   /////////////////////////////////////////////////////////////
   // for rendering all user added children to offscreen target
-  FrameBufferImage      mImageForChildren;
-  Toolkit::Visual::Base mVisualForChildren;
+  FrameBuffer           mFrameBufferForChildren;
+  Renderer              mRendererForChildren;
   RenderTask            mRenderTaskForChildren;
   CameraActor           mCameraForChildren;
   Actor                 mChildrenRoot; // for creating a subtree for all user added child actors
@@ -230,8 +222,8 @@ private: // attributes/properties
   Vector2 mLastSize;
   /////////////////////////////////////////////////////////////
   // post blur image
-  FrameBufferImage      mImagePostFilter;
-  Toolkit::Visual::Base mVisualPostFilter;
+  FrameBuffer           mFrameBufferPostFilter;
+  Renderer              mRendererPostFilter;
 
   Vector<ImageFilter*> mFilters;