Cleaning up RendererFactory API

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / renderer-factory / renderer-factory.cpp

diff --git a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
index f836e8c..cbcadc7 100644 (file)
--- a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
+++ b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
@@ -20,17 +20,22 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/singleton-service.h>
+#include <dali/devel-api/adaptor-framework/environment-variable.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/renderers/renderer-factory-impl.h>
 
-
 namespace Dali
 {
 
 namespace Toolkit
 {
 
+namespace
+{
+  const char * const DALI_DEBUG_RENDERING("DALI_DEBUG_RENDERING");
+}
+
 RendererFactory RendererFactory::Get()
 {
   RendererFactory factory;
@@ -46,10 +51,17 @@ RendererFactory RendererFactory::Get()
       factory = RendererFactory( dynamic_cast<Internal::RendererFactory*>(handle.GetObjectPtr()) );
     }
 
-    if( !factory )
+    if( !factory )// If not, create the RendererFactory and register it as a singleton
     {
-      // If not, create the RendererFactory and register it as a singleton
-      factory = RendererFactory( new Internal::RendererFactory() );
+      // Check whether debug rendering is required
+      if( EnvironmentVariable::GetEnvironmentVariable( DALI_DEBUG_RENDERING ) )
+      {
+        factory = RendererFactory( new Internal::RendererFactory(true) );
+      }
+      else
+      {
+        factory = RendererFactory( new Internal::RendererFactory(false) );
+      }
       singletonService.Register( typeid(RendererFactory), factory );
 
     }
@@ -82,29 +94,19 @@ RendererFactory::RendererFactory(Internal::RendererFactory *impl)
 {
 }
 
-ControlRenderer RendererFactory::GetControlRenderer( const Property::Map& propertyMap )
-{
-  return GetImplementation( *this ).GetControlRenderer( propertyMap );
-}
-
-ControlRenderer RendererFactory::GetControlRenderer( const Vector4& color )
-{
-  return GetImplementation( *this ).GetControlRenderer( color );
-}
-
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const Vector4& color )
+ControlRenderer RendererFactory::CreateControlRenderer( const Property::Map& propertyMap )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, color );
+  return GetImplementation( *this ).CreateControlRenderer( propertyMap );
 }
 
-ControlRenderer RendererFactory::GetControlRenderer( const Image& image )
+ControlRenderer RendererFactory::CreateControlRenderer( const Image& image )
 {
-  return GetImplementation( *this ).GetControlRenderer( image );
+  return GetImplementation( *this ).CreateControlRenderer( image );
 }
 
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const Image& image )
+ControlRenderer RendererFactory::CreateControlRenderer( const std::string& url, ImageDimensions size )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, image );
+  return GetImplementation( *this ).CreateControlRenderer( url, size );
 }
 
 } // namespace Toolkit