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

This reverts commit 11a5ed9ee8bfbf433097fd76314d78cea489961a.

diff --git a/dali/internal/window-system/common/gl-window-impl.cpp b/dali/internal/window-system/common/gl-window-impl.cpp
index d9b96f7..8ac0e17 100644 (file)
--- a/dali/internal/window-system/common/gl-window-impl.cpp
+++ b/dali/internal/window-system/common/gl-window-impl.cpp
@@ -94,9 +94,6 @@ GlWindow::GlWindow()
   mFocusChangeSignal(),
   mResizedSignal(),
   mVisibilityChangedSignal(),
-  mGLInitCallback( 0 ),
-  mGLRenderFrameCallback( 0 ),
-  mGLTerminateCallback( 0 ),
   mGLRenderCallback( nullptr ),
   mEGLSurface( nullptr ),
   mEGLContext( nullptr ),
@@ -116,10 +113,7 @@ GlWindow::~GlWindow()
     mEventHandler->RemoveObserver( *this );
   }
 
-  if( mGLTerminateCallback )
-  {
-    mGLTerminateCallback();
-  }
+  mGLTerminateCallback();
 
   if( mIsEGLInitialize )
   {
@@ -773,17 +767,11 @@ bool GlWindow::RunCallback()
 
   if( !mInitCallback )
   {
-    if( mGLInitCallback )
-    {
-      mGLInitCallback();
-    }
+    mGLInitCallback();
     mInitCallback = true;
   }
 
-  if( mGLRenderFrameCallback )
-  {
-    mGLRenderFrameCallback();
-  }
+  mGLRenderFrameCallback();
 
   if( mIsWindowRotated )
   {