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=dc35220642843148aab619ca8ef78e541be05856;hb=453a02269ec66b61d23debab49fd2e7afed7d9e1;hpb=a00bbe499550a054e6692eb46b32f8c1548f3647 diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index dc35220..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,32 +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 ) - { - NinePatchImage npatchImage = NinePatchImage::DownCast( image ); - if( npatchImage ) - { - visualPtr = NPatchVisual::New( GetFactoryCache(), npatchImage ); - } - else - { - 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; @@ -361,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;