X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=9e5238da552759d0523b1fbeae427c88c383a7bb;hp=d3be0b4dea4e97d2a63a6cd3f3a702619d111a99;hb=16912baf519a33ab99788619118df99c854076de;hpb=33f29d762e4410026a85521f05b7b66aa2d087d1 diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index d3be0b4..9e5238d 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -19,7 +19,6 @@ // EXTERNAL INCLUDES #include -#include #include #include #include @@ -165,6 +164,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property break; } case VisualUrl::GIF: + case VisualUrl::WEBP: { visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, propertyMap ); break; @@ -314,24 +314,6 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property return Toolkit::Visual::Base( visualPtr.Get() ); } -Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) -{ - Visual::BasePtr visualPtr; - - if( image ) - { - visualPtr = ImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), image ); - } - - if( mDebugEnabled ) - { - //Create a WireframeVisual if we have debug enabled - visualPtr = WireframeVisual::New( GetFactoryCache(), visualPtr ); - } - - return Toolkit::Visual::Base( visualPtr.Get() ); -} - Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) { Visual::BasePtr visualPtr; @@ -353,6 +335,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image break; } case VisualUrl::GIF: + case VisualUrl::WEBP: { visualPtr = AnimatedImageVisual::New( GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl ); break;