Revert "[Tizen] Not execute the remove callback"

[platform/core/uifw/dali-core.git] / dali / internal / event / events / actor-observer.cpp

diff --git a/dali/internal/event/events/actor-observer.cpp b/dali/internal/event/events/actor-observer.cpp
index 42b9120..aa8395e 100644 (file)
--- a/dali/internal/event/events/actor-observer.cpp
+++ b/dali/internal/event/events/actor-observer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -16,64 +16,79 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/actor-observer.h>
 #include <dali/integration-api/debug.h>
 #include <dali/internal/event/actors/actor-impl.h>
+#include <dali/internal/event/events/actor-observer.h>
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace
 {
 #if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_ACTOR_OBSERVER" );
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_ACTOR_OBSERVER");
 #endif // defined(DEBUG_ENABLED)
-}
+} // namespace
 
 ActorObserver::ActorObserver()
-: mActor ( NULL ),
-  mActorDisconnected( false ),
-  mRemoveCallback( NULL )
+: ActorObserver(nullptr)
 {
-  DALI_LOG_TRACE_METHOD( gLogFilter );
 }
 
-ActorObserver::ActorObserver( CallbackBase* callback )
-: mActor ( NULL ),
-  mActorDisconnected( false ),
-  mRemoveCallback( callback )
+ActorObserver::ActorObserver(CallbackBase* callback)
+: mActor(nullptr),
+  mActorDisconnected(false),
+  mRemoveCallback(callback)
 {
+  DALI_LOG_TRACE_METHOD(gLogFilter);
 }
 
 ActorObserver::~ActorObserver()
 {
-  DALI_LOG_TRACE_METHOD( gLogFilter );
-  SetActor( NULL );
+  DALI_LOG_TRACE_METHOD(gLogFilter);
+  SetActor(nullptr);
 
   delete mRemoveCallback;
 }
 
-Actor* ActorObserver::GetActor()
+ActorObserver::ActorObserver(ActorObserver&& other)
+: ActorObserver(nullptr)
 {
-  return mActorDisconnected ? NULL : mActor;
+  operator=(std::move(other));
 }
 
-void ActorObserver::SetActor( Actor* actor )
+ActorObserver& ActorObserver::operator=(ActorObserver&& other)
 {
-  DALI_LOG_TRACE_METHOD( gLogFilter );
+  if(this != &other)
+  {
+    SetActor(other.mActor);
+    mActorDisconnected = other.mActorDisconnected;
+    mRemoveCallback    = other.mRemoveCallback;
+    other.ResetActor();
+    other.mRemoveCallback = nullptr;
+  }
+  return *this;
+}
+
+Actor* ActorObserver::GetActor() const
+{
+  return mActorDisconnected ? nullptr : mActor;
+}
 
-  if ( mActor != actor )
+void ActorObserver::SetActor(Actor* actor)
+{
+  DALI_LOG_TRACE_METHOD(gLogFilter);
+
+  if(mActor != actor)
   {
     ResetActor();
 
     mActor = actor;
 
-    if ( mActor )
+    if(mActor)
     {
-      mActor->AddObserver( *this );
+      mActor->AddObserver(*this);
       DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Start Observing:            %p\n", mActor);
     }
   }
@@ -84,24 +99,34 @@ void ActorObserver::SetActor( Actor* actor )
 
 void ActorObserver::ResetActor()
 {
-  if ( mActor )
+  if(mActor)
   {
     DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Stop Observing:             %p\n", mActor);
-    mActor->RemoveObserver( *this );
-    mActor = NULL;
+    mActor->RemoveObserver(*this);
+    mActor             = nullptr;
+    mActorDisconnected = false;
+  }
+}
+
+void ActorObserver::SceneObjectAdded(Object& object)
+{
+  DALI_LOG_TRACE_METHOD(gLogFilter);
+
+  if(mActor == &object)
+  {
     mActorDisconnected = false;
   }
 }
 
-void ActorObserver::SceneObjectRemoved( Object& object )
+void ActorObserver::SceneObjectRemoved(Object& object)
 {
-  DALI_LOG_TRACE_METHOD( gLogFilter );
+  DALI_LOG_TRACE_METHOD(gLogFilter);
 
-  if ( mActor == &object )
+  if(mActor == &object)
   {
-    if ( mRemoveCallback )
+    if(mRemoveCallback)
     {
-//      CallbackBase::Execute( *mRemoveCallback, mActor );
+      CallbackBase::Execute(*mRemoveCallback, mActor);
     }
 
     // do not call object.RemoveObserver here, object is currently iterating through observers
@@ -111,16 +136,15 @@ void ActorObserver::SceneObjectRemoved( Object& object )
 
 void ActorObserver::ObjectDestroyed(Object& object)
 {
-  DALI_LOG_TRACE_METHOD( gLogFilter );
+  DALI_LOG_TRACE_METHOD(gLogFilter);
 
-  if ( mActor == &object )
+  if(mActor == &object)
   {
     DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Stop Observing:             %p\n", mActor);
-    mActor = NULL;
+    mActor = nullptr;
   }
 }
 
 } // namespace Internal
 
 } // namespace Dali
-