From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Wed, 12 Feb 2020 04:36:02 +0000 (+0900)
Subject: Revert "[Tizen] Temporarily modified so that window is no null"
X-Git-Tag: accepted/tizen/unified/20200214.050222~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7aa3faac1fecbb3968c3943dece65b2eb87dfcc0;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Revert "[Tizen] Temporarily modified so that window is no null"

This reverts commit bec0e206518ebea4800a46b9b976b8f268ef7661.
---

diff --git a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
index 2b4b480..ff22534 100644
--- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
+++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
@@ -55,9 +55,9 @@ int OnInstanceInit(widget_base_instance_h instanceHandle, bundle *content, int w
   }
   else
   {
-    if(Internal::Adaptor::Adaptor::GetImplementation(application->GetAdaptor()).IsMultipleWindowSupported())
+    window = Dali::Window::New(PositionSize(0,0,w,h) ,"", false);
+    if( window )
     {
-      window = Dali::Window::New(PositionSize(0,0,w,h) ,"", false);
       DALI_LOG_RELEASE_INFO("Widget Instance create new Window  (win:%p, cnt:%d) (%dx%d) (id:%s )\n", window, application->GetWidgetCount(), w, h, std::string(id).c_str());
     }
     else
diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp
index 9da92dd..08562d0 100644
--- a/dali/public-api/adaptor-framework/window.cpp
+++ b/dali/public-api/adaptor-framework/window.cpp
@@ -34,27 +34,39 @@ class DALI_INTERNAL DragAndDropDetector : public BaseHandle {}; // Empty class o
 Window Window::New(PositionSize posSize, const std::string& name, bool isTransparent)
 {
   Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, "", isTransparent);
+
   Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
-  Integration::SceneHolder sceneHolder = Integration::SceneHolder( window );
-  Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, "", isTransparent );
-  if( !Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() )
+  if( Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() )
+  {
+    Integration::SceneHolder sceneHolder = Integration::SceneHolder( window );
+    Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, "", isTransparent );
+
+    return Window(window);
+  }
+  else
   {
     DALI_LOG_ERROR("This device can't support multiple windows.\n");
+    return Window();
   }
-  return Window(window);
 }
 
 Window Window::New(PositionSize posSize, const std::string& name, const std::string& className, bool isTransparent)
 {
   Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, isTransparent);
+
   Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
-  Integration::SceneHolder sceneHolder = Integration::SceneHolder( window );
-  Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, className, isTransparent );
-  if( !Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() )
+  if( Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() )
+  {
+    Integration::SceneHolder sceneHolder = Integration::SceneHolder( window );
+    Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, className, isTransparent );
+
+    return Window(window);
+  }
+  else
   {
     DALI_LOG_ERROR("This device can't support multiple windows.\n");
+    return Window();
   }
-  return Window(window);
 }
 
 Window::Window()