X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Ftext-backend-impl.cpp;h=0e0d3a8684a97eec0a229a5e87deba44dc7dadcd;hb=f6004b92a7b8ea0feed9c468943a3c369da4501e;hp=776d4081f2cd5ffc917d3646912aad154b278561;hpb=b766a879a8f8b55a7017847894a2f1bc7edd83d8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
index 776d408..0e0d3a8 100644
--- a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -19,32 +19,31 @@
 #include <dali-toolkit/internal/text/rendering/text-backend-impl.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/common/singleton-service.h>
 #include <dali/integration-api/debug.h>
-#include <dali/devel-api/adaptor-framework/singleton-service.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/rendering-backend.h>
+#include <dali-toolkit/devel-api/text/rendering-backend.h>
 #include <dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h>
+#ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING
+#include <dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h>
+#endif
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Text
 {
-
 namespace Internal
 {
-
 struct Backend::Impl
 {
   int temp; // placeholder for future backend implemenations
 };
 
 Backend::Backend()
-: mImpl( NULL )
+: mImpl(NULL)
 {
   mImpl = new Impl();
 }
@@ -58,42 +57,52 @@ Dali::Toolkit::Text::Backend Backend::Get()
 {
   Dali::Toolkit::Text::Backend backendHandle;
 
-  Dali::SingletonService service( SingletonService::Get() );
-  if ( service )
+  Dali::SingletonService service(SingletonService::Get());
+  if(service)
   {
     // Check whether the singleton is already created
-    Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::Toolkit::Text::Backend ) );
+    Dali::BaseHandle handle = service.GetSingleton(typeid(Dali::Toolkit::Text::Backend));
     if(handle)
     {
       // If so, downcast the handle
-      Backend* impl = dynamic_cast< Dali::Toolkit::Text::Internal::Backend* >( handle.GetObjectPtr() );
-      backendHandle = Dali::Toolkit::Text::Backend( impl );
+      Backend* impl = dynamic_cast<Dali::Toolkit::Text::Internal::Backend*>(handle.GetObjectPtr());
+      backendHandle = Dali::Toolkit::Text::Backend(impl);
     }
     else // create and register the object
     {
-      backendHandle = Dali::Toolkit::Text::Backend( new Backend );
-      service.Register( typeid( backendHandle ), backendHandle );
+      backendHandle = Dali::Toolkit::Text::Backend(new Backend);
+      service.Register(typeid(backendHandle), backendHandle);
     }
   }
 
   return backendHandle;
 }
 
-RendererPtr Backend::NewRenderer( unsigned int renderingType )
+RendererPtr Backend::NewRenderer(unsigned int renderingType)
 {
   RendererPtr renderer;
 
-  switch( renderingType )
+  switch(renderingType)
   {
-    case Dali::Toolkit::Text::RENDERING_SHARED_ATLAS:
+    case Dali::Toolkit::DevelText::RENDERING_SHARED_ATLAS:
     {
       renderer = Dali::Toolkit::Text::AtlasRenderer::New();
     }
     break;
 
+    case Dali::Toolkit::DevelText::RENDERING_VECTOR_BASED:
+    {
+#ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING
+      renderer = Dali::Toolkit::Text::VectorBasedRenderer::New();
+#else
+      renderer = Dali::Toolkit::Text::AtlasRenderer::New(); // Fallback to bitmap-based rendering
+#endif
+    }
+    break;
+
     default:
     {
-      DALI_LOG_WARNING( "Unknown renderer type: %d", renderingType );
+      DALI_LOG_WARNING("Unknown renderer type: %d\n", renderingType);
       break;
     }
   }