X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fdali-wrapper.cpp;h=93c85fceacba1b03c0bc2936cf08204001c79b99;hp=38231b83add921b39477ee63870b7fc40b7ad2df;hb=ab869e145811677c75d4c0ce33c83ea72fcc9b86;hpb=e4e5db1d2d7997e7bf803a531048d8dcb959083b diff --git a/plugins/dali-script-v8/src/dali-wrapper.cpp b/plugins/dali-script-v8/src/dali-wrapper.cpp index 38231b8..93c85fc 100644 --- a/plugins/dali-script-v8/src/dali-wrapper.cpp +++ b/plugins/dali-script-v8/src/dali-wrapper.cpp @@ -25,8 +25,9 @@ #include #include #include +#include +#include #include -#include #include #include #include @@ -59,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 }, @@ -141,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()