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=70c6dc23abdf5c6e710dbddd8618900398361879;hp=1979f780dceb119b31226e5e2f90d341fdf88e77;hb=a4b26c19783f73d4e0f3a9fdd23f5a1810406734;hpb=b0faad981257720e1a5fb15af45647f30b669adf

diff --git a/dali-toolkit/internal/visuals/visual-url.cpp b/dali-toolkit/internal/visuals/visual-url.cpp
index 1979f78..70c6dc2 100644
--- a/dali-toolkit/internal/visuals/visual-url.cpp
+++ b/dali-toolkit/internal/visuals/visual-url.cpp
@@ -38,15 +38,28 @@ VisualUrl::ProtocolType ResolveLocation(const std::string& url)
   const uint32_t length  = url.size();
   if((length > 7) && urlCStr[5] == ':' && urlCStr[6] == '/' && urlCStr[7] == '/')
   {
-    // https://
-    if(('h' == tolower(urlCStr[0])) &&
-       ('t' == tolower(urlCStr[1])) &&
-       ('t' == tolower(urlCStr[2])) &&
-       ('p' == tolower(urlCStr[3])) &&
-       ('s' == tolower(urlCStr[4])))
+    // https:// or enbuf://
+    const char hOre = tolower(urlCStr[0]);
+    const char tOrn = tolower(urlCStr[1]);
+    const char tOrb = tolower(urlCStr[2]);
+    const char pOru = tolower(urlCStr[3]);
+    const char sOrf = tolower(urlCStr[4]);
+    if(('h' == hOre) &&
+       ('t' == tOrn) &&
+       ('t' == tOrb) &&
+       ('p' == pOru) &&
+       ('s' == sOrf))
     {
       return VisualUrl::REMOTE;
     }
+    if(('e' == hOre) &&
+       ('n' == tOrn) &&
+       ('b' == tOrb) &&
+       ('u' == pOru) &&
+       ('f' == sOrf))
+    {
+      return VisualUrl::BUFFER;
+    }
   }
   else if((length > 6) && urlCStr[4] == ':' && urlCStr[5] == '/' && urlCStr[6] == '/')
   {
@@ -73,18 +86,20 @@ VisualUrl::ProtocolType ResolveLocation(const std::string& url)
   else if((length > 5) && urlCStr[3] == ':' && urlCStr[4] == '/' && urlCStr[5] == '/')
   {
     // ftp:// or ssh://
-    const char fOrS = tolower(urlCStr[0]);
-    if(('f' == fOrS) || ('s' == fOrS))
+    const char fOrs = tolower(urlCStr[0]);
+    const char tOrs = tolower(urlCStr[1]);
+    const char pOrh = tolower(urlCStr[2]);
+    if(('f' == fOrs) &&
+       ('t' == tOrs) &&
+       ('p' == pOrh))
     {
-      const char tOrs = tolower(urlCStr[1]);
-      if(('t' == tOrs) || ('s' == tOrs))
-      {
-        const char pOrh = tolower(urlCStr[2]);
-        if(('p' == pOrh) || ('h' == pOrh))
-        {
-          return VisualUrl::REMOTE;
-        }
-      }
+      return VisualUrl::REMOTE;
+    }
+    if(('s' == fOrs) &&
+       ('s' == tOrs) &&
+       ('h' == pOrh))
+    {
+      return VisualUrl::REMOTE;
     }
   }
   return VisualUrl::LOCAL;
@@ -208,9 +223,9 @@ VisualUrl::VisualUrl(const std::string& url)
   if(!url.empty())
   {
     mLocation = ResolveLocation(url);
-    if(VisualUrl::TEXTURE != mLocation)
+    if(VisualUrl::TEXTURE != mLocation && VisualUrl::BUFFER != mLocation)
     {
-      // TEXTURE location url doesn't need type resolving, REGULAR_IMAGE is fine
+      // TEXTURE and BUFFER location url doesn't need type resolving, REGULAR_IMAGE is fine
       mType = ResolveType(url);
     }
     else
@@ -218,7 +233,7 @@ VisualUrl::VisualUrl(const std::string& url)
       Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get();
       if(factory)
       {
-        GetImplementation(factory).GetTextureManager().UseExternalTexture(*this);
+        GetImplementation(factory).GetTextureManager().UseExternalResource(*this);
       }
     }
   }
@@ -229,12 +244,12 @@ VisualUrl::VisualUrl(const VisualUrl& url)
   mType(url.mType),
   mLocation(url.mLocation)
 {
-  if(VisualUrl::TEXTURE == mLocation)
+  if(VisualUrl::TEXTURE == mLocation || VisualUrl::BUFFER == mLocation)
   {
     Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get();
     if(factory)
     {
-      GetImplementation(factory).GetTextureManager().UseExternalTexture(*this);
+      GetImplementation(factory).GetTextureManager().UseExternalResource(*this);
     }
   }
 }
@@ -249,6 +264,14 @@ VisualUrl::~VisualUrl()
       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)
@@ -263,17 +286,25 @@ VisualUrl& VisualUrl::operator=(const VisualUrl& url)
         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)
+    if(VisualUrl::TEXTURE == mLocation || VisualUrl::BUFFER == mLocation)
     {
       Toolkit::VisualFactory factory = Toolkit::VisualFactory::Get();
       if(factory)
       {
-        GetImplementation(factory).GetTextureManager().UseExternalTexture(*this);
+        GetImplementation(factory).GetTextureManager().UseExternalResource(*this);
       }
     }
   }
@@ -305,6 +336,11 @@ bool VisualUrl::IsLocalResource() const
   return mLocation == VisualUrl::LOCAL;
 }
 
+bool VisualUrl::IsBufferResource() const
+{
+  return mLocation == VisualUrl::BUFFER;
+}
+
 std::string VisualUrl::GetLocation() const
 {
   return GetLocation(mUrl);
@@ -315,6 +351,11 @@ std::string VisualUrl::CreateTextureUrl(const std::string& location)
   return "dali://" + location;
 }
 
+std::string VisualUrl::CreateBufferUrl(const std::string& location)
+{
+  return "enbuf://" + location;
+}
+
 VisualUrl::ProtocolType VisualUrl::GetProtocolType(const std::string& url)
 {
   return ResolveLocation(url);
@@ -330,7 +371,6 @@ std::string VisualUrl::GetLocation(const std::string& url)
   return url;
 }
 
-
 } // namespace Internal
 
 } // namespace Toolkit