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 remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
toolkit
/
builder
/
builder-api.cpp
diff --git
a/plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp
b/plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp
index
7feb259
..
3c499a4
100644
(file)
--- a/
plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp
+++ b/
plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp
@@
-32,7
+32,6
@@
#include <actors/actor-wrapper.h>
#include <image/image-wrapper.h>
#include <animation/animation-wrapper.h>
#include <actors/actor-wrapper.h>
#include <image/image-wrapper.h>
#include <animation/animation-wrapper.h>
-#include <text/font-wrapper.h>
#include <shader-effects/shader-effect-wrapper.h>
#include <shader-effects/shader-effect-wrapper.h>
@@
-293,11
+292,6
@@
void BuilderApi::Create( const v8::FunctionCallbackInfo< v8::Value >& args )
v8::Local<v8::Object> image = ImageWrapper::WrapImage(isolate, Image::DownCast(handle) );
args.GetReturnValue().Set( image );
}
v8::Local<v8::Object> image = ImageWrapper::WrapImage(isolate, Image::DownCast(handle) );
args.GetReturnValue().Set( image );
}
- if( typeName == "Font ")
- {
- v8::Local<v8::Object> font = FontWrapper::WrapFont(isolate, Font::DownCast(handle) );
- args.GetReturnValue().Set( font );
- }
if( typeName == "Shader")
{
v8::Local<v8::Object> shader = ShaderEffectWrapper::WrapShaderEffect(isolate, ShaderEffect::DownCast( handle ));
if( typeName == "Shader")
{
v8::Local<v8::Object> shader = ShaderEffectWrapper::WrapShaderEffect(isolate, ShaderEffect::DownCast( handle ));