X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisual-factory%2Fvisual-factory.cpp;h=6575c7d9744458046b0131fafb47883e579dc086;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hp=ca763e92b12c7f6c473f89083bc061ecbabe3cc5;hpb=1972f043026a3e1bdcaad71c17859a8f324d1e6d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
index ca763e9..6575c7d 100644
--- a/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
+++ b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
@@ -1,5 +1,5 @@
- /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+/*
+ * Copyright (c) 2020 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,21 +19,19 @@
 #include "visual-factory.h"
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/singleton-service.h>
 #include <dali/devel-api/adaptor-framework/environment-variable.h>
+#include <dali/devel-api/common/singleton-service.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/visual-factory-impl.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace
 {
-  const char * const DALI_DEBUG_RENDERING("DALI_DEBUG_RENDERING");
+const char* const DALI_DEBUG_RENDERING("DALI_DEBUG_RENDERING");
 }
 
 VisualFactory VisualFactory::Get()
@@ -41,29 +39,28 @@ VisualFactory VisualFactory::Get()
   VisualFactory factory;
 
   // Check whether the VisualFactory is already created
-  SingletonService singletonService( SingletonService::Get() );
-  if( singletonService )
+  SingletonService singletonService(SingletonService::Get());
+  if(singletonService)
   {
-    BaseHandle handle = singletonService.GetSingleton( typeid(VisualFactory) );
-    if( handle )
+    BaseHandle handle = singletonService.GetSingleton(typeid(VisualFactory));
+    if(handle)
     {
       //If so, downcast the handle of singleton to VisualFactory
-      factory = VisualFactory( dynamic_cast<Internal::VisualFactory*>(handle.GetObjectPtr()) );
+      factory = VisualFactory(dynamic_cast<Internal::VisualFactory*>(handle.GetObjectPtr()));
     }
 
-    if( !factory )// If not, create the VisualFactory and register it as a singleton
+    if(!factory) // If not, create the VisualFactory and register it as a singleton
     {
       // Check whether debug rendering is required
-      if( EnvironmentVariable::GetEnvironmentVariable( DALI_DEBUG_RENDERING ) )
+      if(EnvironmentVariable::GetEnvironmentVariable(DALI_DEBUG_RENDERING))
       {
-        factory = VisualFactory( new Internal::VisualFactory(true) );
+        factory = VisualFactory(new Internal::VisualFactory(true));
       }
       else
       {
-        factory = VisualFactory( new Internal::VisualFactory(false) );
+        factory = VisualFactory(new Internal::VisualFactory(false));
       }
-      singletonService.Register( typeid(VisualFactory), factory );
-
+      singletonService.Register(typeid(VisualFactory), factory);
     }
   }
 
@@ -78,35 +75,40 @@ VisualFactory::~VisualFactory()
 {
 }
 
-VisualFactory::VisualFactory( const VisualFactory& handle )
-: BaseHandle( handle )
+VisualFactory::VisualFactory(const VisualFactory& handle)
+: BaseHandle(handle)
 {
 }
 
-VisualFactory& VisualFactory::operator=( const VisualFactory& handle )
+VisualFactory& VisualFactory::operator=(const VisualFactory& handle)
 {
-  BaseHandle::operator=( handle );
+  BaseHandle::operator=(handle);
   return *this;
 }
 
-VisualFactory::VisualFactory(Internal::VisualFactory *impl)
+VisualFactory::VisualFactory(Internal::VisualFactory* impl)
 : BaseHandle(impl)
 {
 }
 
-Visual VisualFactory::CreateVisual( const Property::Map& propertyMap )
+Visual::Base VisualFactory::CreateVisual(const Property::Map& propertyMap)
+{
+  return GetImplementation(*this).CreateVisual(propertyMap);
+}
+
+Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageDimensions size)
 {
-  return GetImplementation( *this ).CreateVisual( propertyMap );
+  return GetImplementation(*this).CreateVisual(url, size);
 }
 
-Visual VisualFactory::CreateVisual( const Image& image )
+void VisualFactory::SetPreMultiplyOnLoad(bool preMultiply)
 {
-  return GetImplementation( *this ).CreateVisual( image );
+  GetImplementation(*this).SetPreMultiplyOnLoad(preMultiply);
 }
 
-Visual VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
+bool VisualFactory::GetPreMultiplyOnLoad() const
 {
-  return GetImplementation( *this ).CreateVisual( url, size );
+  return GetImplementation(*this).GetPreMultiplyOnLoad();
 }
 
 } // namespace Toolkit