X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbloom-view%2Fbloom-view-impl.h;h=09732e08fb1947ac9686b91de647a37f553b63cf;hb=666b4b2f13d2f417557180a8440c6686c5dbfe83;hp=71ed4c73ff46f95ab3d3e8dbe07d017b4c99367b;hpb=f7c8e7d9a0d3e179e4d9916d2ee11312c4911c1f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
index 71ed4c7..09732e0 100644
--- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
+++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
@@ -23,7 +23,7 @@
 #include <cmath>
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/rendering/frame-buffer.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -82,18 +82,18 @@ public:
 
 private:
 
-  virtual void OnInitialize();
-  virtual void OnSizeSet(const Vector3& targetSize);
+  void OnInitialize() override;
+  void OnSizeSet(const Vector3& targetSize) override;
 
   /**
    * @copydoc Control::OnChildAdd()
    */
-  virtual void OnChildAdd( Actor& child );
+  void OnChildAdd( Actor& child ) override;
 
   /**
    * @copydoc Control::OnChildRemove()
    */
-  virtual void OnChildRemove( Actor& child );
+  void OnChildRemove( Actor& child ) override;
 
   void AllocateResources();
   void CreateRenderTasks();
@@ -133,14 +133,14 @@ private:
 
   /////////////////////////////////////////////////////////////
   // for rendering all user added children to offscreen target
-  FrameBufferImage mRenderTargetForRenderingChildren;
+  FrameBuffer mRenderTargetForRenderingChildren;
   RenderTask mRenderChildrenTask;
 
   /////////////////////////////////////////////////////////////
   // for extracting bright parts of image to an offscreen target
   FrameBuffer mBloomExtractTarget; // for rendering bright parts of image into separate texture, also used as target for gaussian blur
   RenderTask mBloomExtractTask;
-  Toolkit::ImageView mBloomExtractImageView;
+  Actor mBloomExtractActor;
 
   /////////////////////////////////////////////////////////////
   // for blurring extracted bloom
@@ -150,12 +150,12 @@ private:
   // for compositing bloom and children renders to offscreen target
   RenderTask mCompositeTask;
 
-  Toolkit::ImageView mCompositeImageView;
+  Actor mCompositeActor;
 
   /////////////////////////////////////////////////////////////
   // for holding blurred result
-  FrameBufferImage mOutputRenderTarget;
-  Toolkit::ImageView mTargetImageView;
+  FrameBuffer mOutputRenderTarget;
+  Actor mTargetActor;
 
   /////////////////////////////////////////////////////////////
   // Properties for setting by user, e.g. by animations