Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/framework/osp/uifw into tizen_2.1

Change-Id: I8cab8a008f0e7c84c1d6e77f22208f3d2c4af4cc
Signed-off-by: Bongjoo Seo <bongjoo.seo@samsung.com>

diff --cc src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.cpp
index 9f2a5bb,7396123..f43a8ce
--- 1/src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.cpp
--- 2/src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.cpp
+++ b/src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.cpp
@@@ -48,6 -48,6 +48,7 @@@ _EflVisualElementSurfaceImpl::_EflVisua
        : _VisualElementSurfaceImpl(size)
        , __pEvasImage(null)
        , __pBuffer(null)
++      , __fromOutside(false)
  {
        ClearLastResult();
  
@@@ -86,6 -86,6 +87,7 @@@
  
        evas_object_resize(__pEvasImage, outputSize.width, outputSize.height);
        evas_object_image_data_set(__pEvasImage, reinterpret_cast<void*>(__pBuffer));
++
  #if 1 // Todo : Temporary code(regarding the visibility of evas source object)
        evas_object_show(__pEvasImage);
        evas_object_move(__pEvasImage, -999999, -999999);
@@@ -101,6 -101,6 +103,7 @@@ _EflVisualElementSurfaceImpl::_EflVisua
        : _VisualElementSurfaceImpl(size)
        , __pEvasImage(null)
        , __pBuffer(null)
++      , __fromOutside(true)
  {
        ClearLastResult();
  
@@@ -111,6 -111,6 +114,7 @@@
                __pEvasImage = reinterpret_cast<Evas_Object*>(object);
        }
        SysTryReturnVoidResult(NID_UI_ANIM, __pEvasImage, E_SYSTEM, "[E_SYSTEM] A system error has been occurred. Failed to create a new surface.");
++
  #if 1 // Todo : Temporary code(regarding the visibility of evas source object)
        evas_object_show(__pEvasImage);
        evas_object_move(__pEvasImage, -999999, -999999);
@@@ -149,10 -149,7 +153,9 @@@ _EflVisualElementSurfaceImpl::~_EflVisu
        if (__pEvasImage != null)
        {
                evas_object_hide(__pEvasImage);
 -              if (__pBuffer)
 +
-               // * DO NOT delete object which has a native surface
-               // because it has been created from other modules.
-               if (!evas_object_image_native_surface_get(__pEvasImage))
++              // * DO NOT delete object which has been created from other modules.
++              if (!__fromOutside)
                {
                        evas_object_image_data_set(__pEvasImage, null);
                        evas_object_del(__pEvasImage);

diff --cc src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.h
index 563766e,563766e..6a94810
--- 1/src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.h
--- 2/src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.h
+++ b/src/ui/animations/FUiAnim_EflVisualElementSurfaceImpl.h
@@@ -63,6 -63,6 +63,7 @@@ private
  private:
        Evas_Object* __pEvasImage;
        unsigned char* __pBuffer;
++      bool __fromOutside;
  
        friend class _VisualElementSurfaceImpl;
        friend class _VisualElementImpl;