X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fdali-wrapper.cpp;h=93c85fceacba1b03c0bc2936cf08204001c79b99;hb=a2fc5fd1c64132c393330dde2fac210f58ac5525;hp=f67455159aa6b38744f88a9b8f1ad5eb38b397f2;hpb=56d412791a44c2a79135d2293c13fddb135c9d54;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/plugins/dali-script-v8/src/dali-wrapper.cpp b/plugins/dali-script-v8/src/dali-wrapper.cpp index f674551..93c85fc 100644 --- a/plugins/dali-script-v8/src/dali-wrapper.cpp +++ b/plugins/dali-script-v8/src/dali-wrapper.cpp @@ -24,10 +24,10 @@ #include #include #include -#include #include +#include +#include #include -#include #include #include #include @@ -60,7 +60,8 @@ const ApiFunction ConstructorFunctionTable[]= { "Rotation", PropertyValueWrapper::NewRotation}, { "Matrix", PropertyValueWrapper::NewMatrix}, { "Path", PathWrapper::NewPath }, - { "PathConstraint", PathConstraintWrapper::NewPathConstraint }, + { "PathConstrainer", PathConstrainerWrapper::NewPathConstrainer}, + { "LinearConstrainer", LinearConstrainerWrapper::NewLinearConstrainer}, { "Actor", ActorWrapper::NewActor }, { "TextActor", ActorWrapper::NewActor }, { "ImageActor", ActorWrapper::NewActor }, @@ -72,7 +73,6 @@ const ApiFunction ConstructorFunctionTable[]= { "BufferImage", ImageWrapper::NewImage }, { "NinePatchImage", ImageWrapper::NewImage }, { "FrameBufferImage", ImageWrapper::NewImage }, - { "ImageAttributes", ImageAttributesWrapper::NewImageAttributes }, { "Animation", AnimationWrapper::NewAnimation}, { "ShaderEffect", ShaderEffectWrapper::NewShaderEffect}, { "Builder", BuilderWrapper::NewBuilder}, @@ -143,16 +143,16 @@ void DaliWrapper::Shutdown() } } -void DaliWrapper::ExecuteBuffer(const std::string &sourceCode, const std::string &sourceFileName) +bool DaliWrapper::ExecuteBuffer(const std::string &sourceCode, const std::string &sourceFileName) { - mModuleLoader.ExecuteScript( mIsolate, sourceCode, sourceFileName ); + return mModuleLoader.ExecuteScript( mIsolate, sourceCode, sourceFileName ); } -void DaliWrapper::ExecuteFile( const std::string& sourceFileName ) +bool DaliWrapper::ExecuteFile( const std::string& sourceFileName ) { DALI_LOG_INFO( gLogExecuteFilter, Debug::Verbose, "Executing source file %s \n",sourceFileName.c_str() ); - mModuleLoader.ExecuteScriptFromFile( mIsolate, sourceFileName ); + return mModuleLoader.ExecuteScriptFromFile( mIsolate, sourceFileName ); } GarbageCollectorInterface& DaliWrapper::GetDaliGarbageCollector()