projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Change Adaptor implementation API in toolkit for multiple windows." into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-url.h
diff --git
a/dali-toolkit/internal/visuals/visual-url.h
b/dali-toolkit/internal/visuals/visual-url.h
index
b261813
..
f3af2e0
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-url.h
+++ b/
dali-toolkit/internal/visuals/visual-url.h
@@
-40,7
+40,8
@@
public:
REGULAR_IMAGE,
N_PATCH,
SVG,
REGULAR_IMAGE,
N_PATCH,
SVG,
- GIF
+ GIF,
+ JSON
};
enum ProtocolType
};
enum ProtocolType
@@
-107,7
+108,7
@@
public:
/**
* @return the location part of the url
*/
/**
* @return the location part of the url
*/
- std::string GetLocation();
+ std::string GetLocation()
const
;
/**
* Helper to create a URL of type TEXTURE
/**
* Helper to create a URL of type TEXTURE