X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbloom-view%2Fbloom-view-impl.h;h=3b44b51a74547e68d5bd739269506e10bdf09f12;hb=aa05fcf7ac4aef5d56a2a581c9103a160c4f052c;hp=ea3f7e5c3cf086e1ca36c0bdb8bc1d54cb38b385;hpb=6084b902e588a8ed1b8ec0dd7aacae8775006ef6;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 ea3f7e5..3b44b51 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h @@ -85,14 +85,14 @@ private: virtual void OnSizeSet(const Vector3& targetSize); /** - * @copydoc Control::OnControlChildAdd() + * @copydoc Control::OnChildAdd() */ - virtual void OnControlChildAdd( Actor& child ); + virtual void OnChildAdd( Actor& child ); /** - * @copydoc Control::OnControlChildRemove() + * @copydoc Control::OnChildRemove() */ - virtual void OnControlChildRemove( Actor& child ); + virtual void OnChildRemove( Actor& child ); void AllocateResources(); void CreateRenderTasks(); @@ -139,7 +139,7 @@ private: // for extracting bright parts of image to an offscreen target FrameBufferImage mBloomExtractTarget; // for rendering bright parts of image into separate texture, also used as target for gaussian blur RenderTask mBloomExtractTask; - Toolkit::ImageView mBloomExtractImageActor; + Toolkit::ImageView mBloomExtractImageView; ///////////////////////////////////////////////////////////// // for blurring extracted bloom @@ -149,12 +149,12 @@ private: // for compositing bloom and children renders to offscreen target RenderTask mCompositeTask; - Toolkit::ImageView mCompositeImageActor; + Toolkit::ImageView mCompositeImageView; ///////////////////////////////////////////////////////////// // for holding blurred result FrameBufferImage mOutputRenderTarget; - Toolkit::ImageView mTargetImageActor; + Toolkit::ImageView mTargetImageView; ///////////////////////////////////////////////////////////// // Properties for setting by user, e.g. by animations