Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / tizen-wayland / widget-application-impl-tizen.cpp

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 7c12ef9..b9354c6 100644 (file)
--- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
+++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
@@ -21,12 +21,12 @@
 // INTERNAL INCLUDE
 #include <dali/public-api/adaptor-framework/widget.h>
 #include <dali/public-api/adaptor-framework/widget-impl.h>
+#include <dali/internal/system/common/environment-variables.h>
 #include <dali/internal/system/tizen-wayland/widget-controller-tizen.h>
 
-#ifdef WIDGET_SUPPOERTED
+// EXTERNAL INCLUDES
 #include <bundle.h>
 #include <widget_base.h>
-#endif
 
 namespace Dali
 {
@@ -34,7 +34,6 @@ namespace Dali
 namespace Internal
 {
 
-#ifdef WIDGET_SUPPOERTED
 namespace
 {
 
@@ -192,15 +191,18 @@ int OnInstanceUpdate(widget_base_instance_h instanceHandle, bundle *content, int
   return 0;
 }
 
-} // anonymous namespace
+unsigned int GetEnvWidgetRenderRefreshRate()
+{
+  const char* envVariable = std::getenv( DALI_WIDGET_REFRESH_RATE );
 
-#endif
+  return envVariable ? std::atoi( envVariable ) : 1u; // Default 60 fps
+}
+
+} // anonymous namespace
 
 namespace Adaptor
 {
 
-#ifdef WIDGET_SUPPOERTED
-
 WidgetApplicationPtr WidgetApplicationTizen::New(
   int* argc,
   char **argv[],
@@ -282,7 +284,12 @@ void WidgetApplicationTizen::DeleteWidget( widget_base_instance_h widgetBaseInst
   }
 }
 
-#endif
+void WidgetApplicationTizen::OnInit()
+{
+  WidgetApplication::OnInit();
+
+  Dali::Adaptor::Get().SetRenderRefreshRate( GetEnvWidgetRenderRefreshRate() );
+}
 
 // factory function, must be implemented
 namespace WidgetApplicationFactory
@@ -295,11 +302,7 @@ namespace WidgetApplicationFactory
  */
 Dali::Internal::Adaptor::WidgetApplicationPtr Create( int* argc, char **argv[], const std::string& stylesheet )
 {
-#ifdef WIDGET_SUPPOERTED
   return WidgetApplicationTizen::New( argc, argv, stylesheet );
-#else
-  return nullptr;
-#endif
 }
 
 } // namespace Factory