Revert "[Tizen] Fix API name and crash issue of Evas-plugin"

This reverts commit 8203d871912f9bd37d213f2de49d22a3e69ce085.

diff --git a/dali-extension/devel-api/evas-plugin/evas-plugin.cpp b/dali-extension/devel-api/evas-plugin/evas-plugin.cpp
index e0bbc37..e409419 100755 (executable)
--- a/dali-extension/devel-api/evas-plugin/evas-plugin.cpp
+++ b/dali-extension/devel-api/evas-plugin/evas-plugin.cpp
@@ -75,9 +75,9 @@ void EvasPlugin::Stop()
   Internal::GetImplementation(*this).Stop();
 }
 
-Evas_Object* EvasPlugin::GetDaliAccessEvasObject()
+Evas_Object* EvasPlugin::GetAccessEvasObject()
 {
-  return Internal::GetImplementation(*this).GetDaliAccessEvasObject();
+  return Internal::GetImplementation(*this).GetAccessEvasObject();
 }
 
 Evas_Object* EvasPlugin::GetDaliEvasObject()

diff --git a/dali-extension/devel-api/evas-plugin/evas-plugin.h b/dali-extension/devel-api/evas-plugin/evas-plugin.h
old mode 100755 (executable)
new mode 100644 (file)
index fcf7acb..1d496c9
--- a/dali-extension/devel-api/evas-plugin/evas-plugin.h
+++ b/dali-extension/devel-api/evas-plugin/evas-plugin.h
@@ -246,7 +246,7 @@ public:
   void Stop();
 
   /**
-   * @brief This returns the Evas_Object* which is created internally for accessibility.
+   * @brief This returns the Evas_Object* which is created internally
    *
    * Applications should append this access object to custom focus chain for accessibility
    *
@@ -254,7 +254,7 @@ public:
    *
    * @return Evas_Object* Elm access object which Dali image Evas object is registered
    */
-  Evas_Object* GetDaliAccessEvasObject();
+  Evas_Object* GetAccessEvasObject();
 
   /**
    * @brief This returns the Evas_Object* which is created internally

diff --git a/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp b/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp
index 970c9db..f3666e9 100755 (executable)
--- a/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp
+++ b/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp
@@ -40,7 +40,7 @@ struct EvasPlugin::Impl
   : mEvasPlugin(evasPlugin)
   , mEcoreEvas(NULL)
   , mImageEvasObject(NULL)
-  , mDaliAccessEvasObject(NULL)
+  , mAccessEvasObject(NULL)
   , mDaliEvasObject(NULL)
   {
     Evas* evas = evas_object_evas_get(parentEvasObject);
@@ -56,7 +56,7 @@ struct EvasPlugin::Impl
     evas_object_size_hint_align_set(mImageEvasObject, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
     // Register the elm access to image evas object
-    mDaliAccessEvasObject = elm_access_object_register(mImageEvasObject, parentEvasObject);
+    mAccessEvasObject = elm_access_object_register(mImageEvasObject, parentEvasObject);
 
     // Create a button and set style as "focus", if does not want to show the focus, then "transparent"
     mDaliEvasObject = elm_button_add(parentEvasObject);
@@ -85,7 +85,7 @@ struct EvasPlugin::Impl
 
     // Unregister elm_access_object
     elm_access_object_unregister(mImageEvasObject);
-    mDaliAccessEvasObject = NULL;
+    mAccessEvasObject = NULL;
 
     // Delete the image evas object
     evas_object_del(mImageEvasObject);
@@ -139,7 +139,7 @@ struct EvasPlugin::Impl
   EvasPlugin* mEvasPlugin;
   Ecore_Evas* mEcoreEvas;
   Evas_Object* mImageEvasObject;
-  Evas_Object* mDaliAccessEvasObject;
+  Evas_Object* mAccessEvasObject;
   Evas_Object* mDaliEvasObject;
 };
 
@@ -213,15 +213,14 @@ EvasPlugin::~EvasPlugin()
   delete mRenderNotification;
   mRenderNotification = NULL;
 
-  // the singleton service should be unregistered before adaptor deletion
-  mSingletonService.UnregisterAll();
-
   delete mAdaptor;
   mAdaptor = NULL;
 
   delete mTBMRenderSurface;
   mTBMRenderSurface = NULL;
 
+  mSingletonService.UnregisterAll();
+
   delete mImpl;
   mImpl = NULL;
 #endif
@@ -234,7 +233,7 @@ void EvasPlugin::Run()
   {
     if (!mEvasEventHandler)
     {
-      mEvasEventHandler = new Extension::Internal::EvasEventHandler(mImpl->mImageEvasObject, mImpl->mDaliAccessEvasObject, mImpl->mDaliEvasObject, *this);
+      mEvasEventHandler = new Extension::Internal::EvasEventHandler(mImpl->mImageEvasObject, mImpl->mAccessEvasObject, mImpl->mDaliEvasObject, *this);
     }
 
     // Start the adaptor
@@ -245,8 +244,6 @@ void EvasPlugin::Run()
     mAdaptor->NotifySceneCreated();
 
     mState = RUNNING;
-
-    DALI_LOG_RELEASE_INFO("EvasPlugin::Run");
   }
 #endif
 }
@@ -260,8 +257,6 @@ void EvasPlugin::Pause()
     mAdaptor->Pause();
 
     mPauseSignal.Emit();
-
-    DALI_LOG_RELEASE_INFO("EvasPlugin::Pause");
   }
 }
 
@@ -274,8 +269,6 @@ void EvasPlugin::Resume()
     mResumeSignal.Emit();
 
     mState = RUNNING;
-
-    DALI_LOG_RELEASE_INFO("EvasPlugin::Resume");
   }
 }
 
@@ -289,15 +282,13 @@ void EvasPlugin::Stop()
     mState = STOPPED;
 
     mTerminateSignal.Emit();
-
-    DALI_LOG_RELEASE_INFO("EvasPlugin::Stop");
   }
 #endif
 }
 
-Evas_Object* EvasPlugin::GetDaliAccessEvasObject()
+Evas_Object* EvasPlugin::GetAccessEvasObject()
 {
-  return mImpl->mDaliAccessEvasObject;
+  return mImpl->mAccessEvasObject;
 }
 
 Evas_Object* EvasPlugin::GetDaliEvasObject()
@@ -381,8 +372,6 @@ void EvasPlugin::OnEvasObjectMove(const Rect<int>& geometry)
 
 void EvasPlugin::OnEvasObjectResize(const Rect<int>& geometry)
 {
-  DALI_LOG_RELEASE_INFO("EvasPlugin::OnEvasObjectResize (%d x %d)", geometry.width, geometry.height);
-
   if (geometry.width <= 1 || geometry.height <= 1)
   {
     // skip meaningless resize signal
@@ -427,8 +416,6 @@ void EvasPlugin::OnEvasObjectFocusIn()
     mFocusedSignal.Emit();
 
     mIsFocus = true;
-
-    DALI_LOG_RELEASE_INFO("EvasPlugin::OnEvasObjectFocusIn");
   }
 }
 
@@ -455,8 +442,6 @@ void EvasPlugin::OnEvasObjectFocusOut()
     Clipboard::Get().HideClipboard();
 
     mUnFocusedSignal.Emit();
-
-    DALI_LOG_RELEASE_INFO("EvasPlugin::OnEvasObjectFocusOut");
   }
 }
 
@@ -505,7 +490,7 @@ bool EvasPlugin::OnElmAccessActionScroll(AccessActionInfo& accessActionInfo)
 
   Evas_Coord rel_x, rel_y;
   Evas_Coord obj_x,  obj_y, obj_w, obj_h;
-  Evas_Object* eo = this->GetDaliAccessEvasObject();
+  Evas_Object* eo = this->GetAccessEvasObject();
 
   if(eo)
   {

diff --git a/dali-extension/internal/evas-plugin/evas-plugin-impl.h b/dali-extension/internal/evas-plugin/evas-plugin-impl.h
index 39925f6..15239fd 100755 (executable)
--- a/dali-extension/internal/evas-plugin/evas-plugin-impl.h
+++ b/dali-extension/internal/evas-plugin/evas-plugin-impl.h
@@ -122,9 +122,9 @@ public:
   void Stop();
 
   /**
-   * @copydoc Dali::Extension::EvasPlugin::GetDaliAccessEvasObject()
+   * @copydoc Dali::Extension::EvasPlugin::GetAccessEvasObject()
    */
-  Evas_Object* GetDaliAccessEvasObject();
+  Evas_Object* GetAccessEvasObject();
 
   /**
    * @copydoc Dali::Extension::EvasPlugin::GetDaliEvasObject()