[4.0] When native image is destroyed, It call TriggerEventInterface callback.

This reverts commit 42a87676ee90611c5f6085187919fb11e10b19f5.

Change-Id: I1efc39efdfcaf4b95829056626490e9a0964ba89

diff --git a/adaptors/public-api/adaptor-framework/native-image-source.cpp b/adaptors/public-api/adaptor-framework/native-image-source.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/adaptors/public-api/adaptor-framework/native-image-source.h b/adaptors/public-api/adaptor-framework/native-image-source.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 3afb87b..fecf43b
--- a/adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-impl-tizen.cpp
@@ -29,6 +29,8 @@
 #include <gl/egl-factory.h>
 #include <adaptor-impl.h>
 #include <render-surface.h>
+#include <trigger-event-factory.h>
+
 
 // Allow this to be encoded and saved:
 #include <bitmap-saver.h>
@@ -88,7 +90,8 @@ NativeImageSource::NativeImageSource( unsigned int width, unsigned int height, D
   mColorDepth( depth ),
   mEglImageKHR( NULL ),
   mEglImageExtensions( NULL ),
-  mSetSource( false )
+  mSetSource( false ),
+  mNotification( NULL )
 {
   DALI_ASSERT_ALWAYS( Adaptor::IsAvailable() );
   EglFactory& eglFactory = Adaptor::GetImplementation( Adaptor::Get() ).GetEGLFactory();
@@ -197,6 +200,11 @@ NativeImageSource::~NativeImageSource()
     if( mTbmSurface != NULL )
     {
       tbm_surface_internal_unref( mTbmSurface );
+
+      if (mNotification != NULL) {
+          TriggerEventInterface* triggerEvent = static_cast<TriggerEventInterface* >(mNotification);
+          triggerEvent->Trigger();
+      }
     }
   }
 }
@@ -206,6 +214,12 @@ Any NativeImageSource::GetNativeImageSource() const
   return Any( mTbmSurface );
 }
 
+
+void NativeImageSource::SetDestructorNotification(void* notification)
+{
+  mNotification = notification;
+}
+
 bool NativeImageSource::GetPixels(std::vector<unsigned char>& pixbuf, unsigned& width, unsigned& height, Pixel::Format& pixelFormat) const
 {
   if( mTbmSurface != NULL )

diff --git a/adaptors/tizen/native-image-source-impl.h b/adaptors/tizen/native-image-source-impl.h
old mode 100755 (executable)
new mode 100644 (file)
index 505d8b2..a724d1e
--- a/adaptors/tizen/native-image-source-impl.h
+++ b/adaptors/tizen/native-image-source-impl.h
@@ -63,6 +63,7 @@ public:
    */
   Any GetNativeImageSource() const;
 
+
   /**
    * @copydoc Dali::NativeImageSource::GetPixels()
    */
@@ -155,6 +156,11 @@ public:
    */
   int GetEglImageTextureTarget();
 
+  /**
+   * @copydoc Dali::NativeImageInterface::Extension::SetDestructorNotification((void *notification)
+   */
+  void SetDestructorNotification(void* notification);
+
 private:
 
   /**
@@ -189,6 +195,7 @@ private:
   void* mEglImageKHR;                         ///< From EGL extension
   EglImageExtensions* mEglImageExtensions;    ///< The EGL Image Extensions
   bool mSetSource;
+  void *mNotification;
 };
 
 } // namespace Adaptor

diff --git a/adaptors/x11/native-image-source-impl-x.cpp b/adaptors/x11/native-image-source-impl-x.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/adaptors/x11/native-image-source-impl.h b/adaptors/x11/native-image-source-impl.h
old mode 100755 (executable)
new mode 100644 (file)