X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Feffects-view%2Feffects-view-impl.h;h=9a5f6a2e988ab4b6be035912c757ec16193995b8;hb=ed40c470e7713deb2a976212b49c771514b99302;hp=bf106e686abd213c68177d9eb7dc1c0214bb6119;hpb=f31a7b83577275e88914a00f37c4ff5224336553;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 bf106e6..9a5f6a2 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -26,8 +26,7 @@ // INTERNAL INCLUDES #include #include -#include -#include +#include namespace Dali { @@ -215,11 +214,11 @@ private: // attributes/properties ///////////////////////////////////////////////////////////// // for rendering all user added children to offscreen target - FrameBufferImage mImageForChildren; - Toolkit::Visual mRendererForChildren; - RenderTask mRenderTaskForChildren; - CameraActor mCameraForChildren; - Actor mChildrenRoot; // for creating a subtree for all user added child actors + FrameBufferImage mImageForChildren; + Toolkit::Visual::Base mVisualForChildren; + RenderTask mRenderTaskForChildren; + CameraActor mCameraForChildren; + Actor mChildrenRoot; // for creating a subtree for all user added child actors ///////////////////////////////////////////////////////////// // background fill color @@ -231,8 +230,8 @@ private: // attributes/properties Vector2 mLastSize; ///////////////////////////////////////////////////////////// // post blur image - FrameBufferImage mImagePostFilter; - Toolkit::Visual mRendererPostFilter; + FrameBufferImage mImagePostFilter; + Toolkit::Visual::Base mVisualPostFilter; Vector mFilters; @@ -276,4 +275,3 @@ inline const Toolkit::Internal::EffectsView& GetImpl( const Toolkit::EffectsView } // namespace Dali #endif // __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ -