X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Frenderer-factory%2Frenderer-factory.cpp;h=084ddcbb6245ff4eac46f47dcea7498e4e1b7537;hb=638cc5c949cd2a31ddfd189c30b9a4b37e3e0a29;hp=a5918effb284bc8da99b5a1accf64c368c1e21e1;hpb=018b3b5ba7512694a9b95494493f2ae0477f2746;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 a5918ef..084ddcb 100644
--- 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 );
 
     }
@@ -92,9 +104,14 @@ ControlRenderer RendererFactory::GetControlRenderer( const Vector4& color )
   return GetImplementation( *this ).GetControlRenderer( color );
 }
 
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const Vector4& color )
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Vector4& color )
+{
+  GetImplementation( *this ).ResetRenderer( renderer, actor, color );
+}
+
+ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, color );
+  return GetImplementation( *this ).GetControlRenderer( borderSize, borderColor );
 }
 
 ControlRenderer RendererFactory::GetControlRenderer( const Image& image )
@@ -102,19 +119,24 @@ ControlRenderer RendererFactory::GetControlRenderer( const Image& image )
   return GetImplementation( *this ).GetControlRenderer( image );
 }
 
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const Image& image )
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Image& image )
+{
+  GetImplementation( *this ).ResetRenderer( renderer, actor, image );
+}
+
+ControlRenderer RendererFactory::GetControlRenderer( const std::string& url, ImageDimensions size )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, image );
+  return GetImplementation( *this ).GetControlRenderer( url, size );
 }
 
-ControlRenderer RendererFactory::GetControlRenderer( const std::string& url )
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size )
 {
-  return GetImplementation( *this ).GetControlRenderer( url );
+  GetImplementation( *this ).ResetRenderer( renderer, actor, url, size );
 }
 
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const std::string& url )
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, url );
+  GetImplementation( *this ).ResetRenderer( renderer, actor, propertyMap );
 }
 
 } // namespace Toolkit