From 0a3bcdabd8633cf86782d5d1978a458f1f11548f Mon Sep 17 00:00:00 2001
From: "taeyoon0.lee" <taeyoon0.lee@samsung.com>
Date: Wed, 11 Oct 2017 17:34:38 +0900
Subject: [PATCH] Revert "[4.0] When native image is destroyed, It call
 TriggerEventInterface callback."

This reverts commit 3d2425ed78131e450cea9f61ec19d4420e6a7aa4.

Change-Id: I89e88f7733818ab1c466284b127e08fa8ff197b7
---
 .../public-api/adaptor-framework/native-image-source.cpp |  0
 .../public-api/adaptor-framework/native-image-source.h   |  0
 adaptors/tizen/native-image-source-impl-tizen.cpp        | 16 +---------------
 adaptors/tizen/native-image-source-impl.h                |  7 -------
 adaptors/x11/native-image-source-impl-x.cpp              |  0
 adaptors/x11/native-image-source-impl.h                  |  0
 6 files changed, 1 insertion(+), 22 deletions(-)
 mode change 100644 => 100755 adaptors/public-api/adaptor-framework/native-image-source.cpp
 mode change 100644 => 100755 adaptors/public-api/adaptor-framework/native-image-source.h
 mode change 100644 => 100755 adaptors/tizen/native-image-source-impl-tizen.cpp
 mode change 100644 => 100755 adaptors/tizen/native-image-source-impl.h
 mode change 100644 => 100755 adaptors/x11/native-image-source-impl-x.cpp
 mode change 100644 => 100755 adaptors/x11/native-image-source-impl.h

diff --git a/adaptors/public-api/adaptor-framework/native-image-source.cpp b/adaptors/public-api/adaptor-framework/native-image-source.cpp
old mode 100644
new mode 100755
diff --git a/adaptors/public-api/adaptor-framework/native-image-source.h b/adaptors/public-api/adaptor-framework/native-image-source.h
old mode 100644
new mode 100755
diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp
old mode 100644
new mode 100755
index fecf43b..3afb87b
--- a/adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-impl-tizen.cpp
@@ -29,8 +29,6 @@
 #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>
@@ -90,8 +88,7 @@ NativeImageSource::NativeImageSource( unsigned int width, unsigned int height, D
   mColorDepth( depth ),
   mEglImageKHR( NULL ),
   mEglImageExtensions( NULL ),
-  mSetSource( false ),
-  mNotification( NULL )
+  mSetSource( false )
 {
   DALI_ASSERT_ALWAYS( Adaptor::IsAvailable() );
   EglFactory& eglFactory = Adaptor::GetImplementation( Adaptor::Get() ).GetEGLFactory();
@@ -200,11 +197,6 @@ NativeImageSource::~NativeImageSource()
     if( mTbmSurface != NULL )
     {
       tbm_surface_internal_unref( mTbmSurface );
-
-      if (mNotification != NULL) {
-          TriggerEventInterface* triggerEvent = static_cast<TriggerEventInterface* >(mNotification);
-          triggerEvent->Trigger();
-      }
     }
   }
 }
@@ -214,12 +206,6 @@ 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 100644
new mode 100755
index a724d1e..505d8b2
--- a/adaptors/tizen/native-image-source-impl.h
+++ b/adaptors/tizen/native-image-source-impl.h
@@ -63,7 +63,6 @@ public:
    */
   Any GetNativeImageSource() const;
 
-
   /**
    * @copydoc Dali::NativeImageSource::GetPixels()
    */
@@ -156,11 +155,6 @@ public:
    */
   int GetEglImageTextureTarget();
 
-  /**
-   * @copydoc Dali::NativeImageInterface::Extension::SetDestructorNotification((void *notification)
-   */
-  void SetDestructorNotification(void* notification);
-
 private:
 
   /**
@@ -195,7 +189,6 @@ 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 100644
new mode 100755
diff --git a/adaptors/x11/native-image-source-impl.h b/adaptors/x11/native-image-source-impl.h
old mode 100644
new mode 100755
-- 
2.7.4