X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-url.cpp;h=30d9c0248f62ce8da505a7d2fa352c54bf1bf6da;hp=70c6dc23abdf5c6e710dbddd8618900398361879;hb=e15a4820108d180331611d918b383771f16c1c9e;hpb=a88db82a75443d573185aea2938f1f0be141ca64 diff --git a/dali-toolkit/internal/visuals/visual-url.cpp b/dali-toolkit/internal/visuals/visual-url.cpp index 70c6dc2..30d9c02 100644 --- a/dali-toolkit/internal/visuals/visual-url.cpp +++ b/dali-toolkit/internal/visuals/visual-url.cpp @@ -20,10 +20,6 @@ // EXTERNAL HEADERS #include // for toupper() -// INTERNAL HEADERS -#include -#include - namespace Dali { namespace Toolkit @@ -228,14 +224,6 @@ VisualUrl::VisualUrl(const std::string& url) // TEXTURE and BUFFER location url doesn't need type resolving, REGULAR_IMAGE is fine mType = ResolveType(url); } - else - { - Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get(); - if(factory) - { - GetImplementation(factory).GetTextureManager().UseExternalResource(*this); - } - } } } @@ -244,69 +232,19 @@ VisualUrl::VisualUrl(const VisualUrl& url) mType(url.mType), mLocation(url.mLocation) { - if(VisualUrl::TEXTURE == mLocation || VisualUrl::BUFFER == mLocation) - { - Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get(); - if(factory) - { - GetImplementation(factory).GetTextureManager().UseExternalResource(*this); - } - } } VisualUrl::~VisualUrl() { - if(VisualUrl::TEXTURE == mLocation) - { - Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get(); - if(factory) - { - GetImplementation(factory).GetTextureManager().RemoveExternalTexture(mUrl); - } - } - else if(VisualUrl::BUFFER == mLocation) - { - Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get(); - if(factory) - { - GetImplementation(factory).GetTextureManager().RemoveExternalEncodedImageBuffer(mUrl); - } - } } VisualUrl& VisualUrl::operator=(const VisualUrl& url) { if(&url != this) { - if(VisualUrl::TEXTURE == mLocation) - { - Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get(); - if(factory) - { - GetImplementation(factory).GetTextureManager().RemoveExternalTexture(mUrl); - } - } - else if(VisualUrl::BUFFER == mLocation) - { - Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get(); - if(factory) - { - GetImplementation(factory).GetTextureManager().RemoveExternalEncodedImageBuffer(mUrl); - } - } - mUrl = url.mUrl; mType = url.mType; mLocation = url.mLocation; - - if(VisualUrl::TEXTURE == mLocation || VisualUrl::BUFFER == mLocation) - { - Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get(); - if(factory) - { - GetImplementation(factory).GetTextureManager().UseExternalResource(*this); - } - } } return *this; }