[Tizen] ecore-wl2: applying ecore-wl2

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / adaptor-impl.cpp

diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index fcf9724..3fa8e3f 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,6 +123,9 @@ void Adaptor::Initialize( Dali::Configuration::ContextLoss configuration )
     mPerformanceInterface = PerformanceInterfaceFactory::CreateInterface( *this, *mEnvironmentOptions );
   }
 
+  mEnvironmentOptions->CreateTraceManager( mPerformanceInterface );
+  mEnvironmentOptions->InstallTraceFunction(); // install tracing for main thread
+
   mCallbackManager = CallbackManager::New();
 
   PositionSize size = mSurface->GetPositionSize();
@@ -301,7 +304,11 @@ void Adaptor::Start()
 
   unsigned int dpiHor, dpiVer;
   dpiHor = dpiVer = 0;
-  Dali::DisplayConnection::GetDpi(dpiHor, dpiVer);
+#ifdef ECORE_WL2
+  Dali::DisplayConnection::GetDpi( mNativeWindow, dpiHor, dpiVer );
+#else
+  Dali::DisplayConnection::GetDpi( dpiHor, dpiVer );
+#endif
 
   // tell core about the DPI value
   mCore->SetDpi(dpiHor, dpiVer);