Revert "[Tizen] Fix the converity issue of GlWindow"

This reverts commit 25b4786df440068898fa25202130e65ef4d4a1c9.

diff --git a/dali/internal/window-system/common/gl-window-impl.cpp b/dali/internal/window-system/common/gl-window-impl.cpp
index 09d1d4d..25c7fe2 100644 (file)
--- a/dali/internal/window-system/common/gl-window-impl.cpp
+++ b/dali/internal/window-system/common/gl-window-impl.cpp
@@ -95,9 +95,6 @@ GlWindow::GlWindow()
   mFocusChangeSignal(),
   mResizedSignal(),
   mVisibilityChangedSignal(),
-  mGLInitCallback( 0 ),
-  mGLRenderFrameCallback( 0 ),
-  mGLTerminateCallback( 0 ),
   mGLRenderCallback( nullptr ),
   mEGLSurface( nullptr ),
   mEGLContext( nullptr ),
@@ -117,10 +114,7 @@ GlWindow::~GlWindow()
     mEventHandler->RemoveObserver( *this );
   }
 
-  if( mGLTerminateCallback )
-  {
-    mGLTerminateCallback();
-  }
+  mGLTerminateCallback();
 
   if( mIsEGLInitialize )
   {
@@ -776,17 +770,11 @@ bool GlWindow::RunCallback()
 
   if( !mInitCallback )
   {
-    if( mGLInitCallback )
-    {
-      mGLInitCallback();
-    }
+    mGLInitCallback();
     mInitCallback = true;
   }
 
-  if( mGLRenderFrameCallback )
-  {
-    mGLRenderFrameCallback();
-  }
+  mGLRenderFrameCallback();
 
   if( mIsWindowRotated )
   {