From be4ee64028665c440bab586cb4cdd5b0a2d1022c Mon Sep 17 00:00:00 2001
From: taeyoon <taeyoon0.lee@samsung.com>
Date: Wed, 30 Dec 2015 11:34:42 +0900
Subject: [PATCH] Revert "Revert "Revert "[3.0] Fix crash in wayland"""

This reverts commit 18e20762d22e38c4e6ddffa9cfd53e1b14ce3c2c.

Change-Id: I5167faf135df2d6f13894db6ea0d6a8ea22f2068
---
 adaptors/tizen/framework-tizen.cpp            |  8 ++------
 adaptors/wayland/window-impl-wl.cpp           |  2 --
 adaptors/wayland/window-render-surface-wl.cpp | 18 ++++--------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp
index d6833f5..6dd9cb0 100644
--- a/adaptors/tizen/framework-tizen.cpp
+++ b/adaptors/tizen/framework-tizen.cpp
@@ -26,7 +26,6 @@
 #ifdef OVER_TIZEN_SDK_2_2
 #include <system_info.h>
 #include <app_control_internal.h>
-#include <bundle_internal.h>
 #endif
 
 #include <dali/integration-api/debug.h>
@@ -91,6 +90,8 @@ struct Framework::Impl
 #else
     mEventCallback.app_control = AppControl;
 
+    ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, AppBatteryLow, data);
+    ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, AppMemoryLow, data);
     ui_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], APP_EVENT_DEVICE_ORIENTATION_CHANGED, AppDeviceRotated, data);
     ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, AppLanguageChanged, data);
     ui_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, AppRegionChanged, data);
@@ -314,7 +315,6 @@ void Framework::Run()
   {
     DALI_LOG_ERROR("Framework::Run(), ui_app_main() is failed. err = %d", ret);
   }
-
 #endif
 
   mRunning = false;
@@ -322,11 +322,7 @@ void Framework::Run()
 
 void Framework::Quit()
 {
-#ifndef OVER_TIZEN_SDK_2_2
   app_efl_exit();
-#else
-  ui_app_exit();
-#endif
 }
 
 bool Framework::IsMainLoopRunning()
diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp
index c3811f5..fc325ed 100644
--- a/adaptors/wayland/window-impl-wl.cpp
+++ b/adaptors/wayland/window-impl-wl.cpp
@@ -63,8 +63,6 @@ struct Window::EventHandler
    */
   EventHandler( Window* window )
   : mWindow( window ),
-    mWindowPropertyHandler( NULL ),
-    mClientMessagehandler( NULL ),
     mEcoreWindow( 0 )
   {
   }
diff --git a/adaptors/wayland/window-render-surface-wl.cpp b/adaptors/wayland/window-render-surface-wl.cpp
index 77657e7..38a2d44 100644
--- a/adaptors/wayland/window-render-surface-wl.cpp
+++ b/adaptors/wayland/window-render-surface-wl.cpp
@@ -50,8 +50,7 @@ WindowRenderSurface::WindowRenderSurface( Dali::PositionSize positionSize,
                                           const std::string& name,
                                           bool isTransparent)
 : EcoreWlRenderSurface( positionSize, surface, name, isTransparent ),
-  mEglWindow( NULL ),
-  mNeedToApproveDeiconify( false )
+  mNeedToApproveDeiconify(false)
 {
   DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
   Init( surface );
@@ -59,12 +58,6 @@ WindowRenderSurface::WindowRenderSurface( Dali::PositionSize positionSize,
 
 WindowRenderSurface::~WindowRenderSurface()
 {
-  if( mEglWindow != NULL )
-  {
-    wl_egl_window_destroy(mEglWindow);
-    mEglWindow = NULL;
-  }
-
   if( mOwnSurface )
   {
     ecore_wl_window_free( mWlWindow );
@@ -120,18 +113,15 @@ void WindowRenderSurface::DestroyEglSurface( EglInterface& eglIf )
 
   Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( eglIf );
   eglImpl.DestroySurface();
+  wl_egl_window_destroy(mEglWindow);
+  mEglWindow = NULL;
 }
 
 bool WindowRenderSurface::ReplaceEGLSurface( EglInterface& egl )
 {
   DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
 
-  if( mEglWindow != NULL )
-  {
-    wl_egl_window_destroy(mEglWindow);
-    mEglWindow = NULL;
-  }
-
+  wl_egl_window_destroy(mEglWindow);
   mEglWindow = wl_egl_window_create(ecore_wl_window_surface_get(mWlWindow), mPosition.width, mPosition.height);
 
   Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
-- 
2.7.4