X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fimage%2Fimage-wrapper.cpp;h=2ada2c7814e86d59ff66f543aafaa28c8011489f;hp=f4da93ef66a4e66390de37e8c02049a1614a00a6;hb=b0d0b451bd3414c8f502810f45fcacba2882d717;hpb=59056922c2ee74a2aeaf5a2a15882c576a52856e diff --git a/plugins/dali-script-v8/src/image/image-wrapper.cpp b/plugins/dali-script-v8/src/image/image-wrapper.cpp index f4da93e..2ada2c7 100644 --- a/plugins/dali-script-v8/src/image/image-wrapper.cpp +++ b/plugins/dali-script-v8/src/image/image-wrapper.cpp @@ -24,9 +24,7 @@ #include #include #include -#include #include -#include #include #include @@ -38,10 +36,8 @@ namespace V8Plugin v8::Persistent ImageWrapper::mImageTemplate; v8::Persistent ImageWrapper::mResourceImageTemplate; -v8::Persistent ImageWrapper::mNinePatchImageTemplate; v8::Persistent ImageWrapper::mBufferImageTemplate; v8::Persistent ImageWrapper::mFrameBufferImageTemplate; -v8::Persistent ImageWrapper::mNativeImageTemplate; /** * pointer to a persistent template handle @@ -58,10 +54,8 @@ const ImageTemplate ImageTemplateLookup[]= { { &ImageWrapper::mImageTemplate }, // IMAGE { &ImageWrapper::mResourceImageTemplate }, // RESOURCE_IMAGE - { &ImageWrapper::mNinePatchImageTemplate }, // NINE PATCH IMAGE { &ImageWrapper::mBufferImageTemplate }, // BITMAP_IMAGE { &ImageWrapper::mFrameBufferImageTemplate }, // FRAME_BUFFER_IMAGE - { &ImageWrapper::mNativeImageTemplate }, // NATIVE_IMAGE }; @@ -77,9 +71,7 @@ enum ImageApiBitMask IMAGE_API = 1 << 0, BITMAP_IMAGE_API = 1 << 1, RESOURCE_IMAGE_API = 1 << 2, - NINE_PATCH_IMAGE_API = 1 << 3, - FRAME_BUFFER_IMAGE_API = 1 << 4, - NATIVE_IMAGE_API = 1 << 5, + FRAME_BUFFER_IMAGE_API = 1 << 3, }; @@ -101,11 +93,8 @@ const ImageApiStruct ImageApiLookup[]= { {"Image", ImageWrapper::IMAGE, ImageApi::New, IMAGE_API }, {"ResourceImage", ImageWrapper::RESOURCE_IMAGE, ResourceImageApi::New, IMAGE_API | RESOURCE_IMAGE_API }, - {"NinePatchImage", ImageWrapper::NINE_PATCH_IMAGE, NinePatchImageApi::New, IMAGE_API | RESOURCE_IMAGE_API | NINE_PATCH_IMAGE_API }, {"BufferImage", ImageWrapper::BITMAP_IMAGE, BufferImageApi::New, IMAGE_API | BITMAP_IMAGE_API }, {"FrameBufferImage",ImageWrapper::FRAME_BUFFER_IMAGE, FrameBufferImageApi::New, IMAGE_API | FRAME_BUFFER_IMAGE_API }, - {"NativeImage", ImageWrapper::NATIVE_IMAGE, NativeImageApi::New, IMAGE_API | NATIVE_IMAGE_API }, - }; const unsigned int ImageApiLookupCount = sizeof(ImageApiLookup)/sizeof(ImageApiLookup[0]); @@ -140,19 +129,12 @@ const ImageFunctions ImageFunctionTable[]= **************************************/ { "GetWidth", ImageApi::GetWidth , IMAGE_API }, { "GetHeight", ImageApi::GetHeight, IMAGE_API }, - { "GetReleasePolicy", ImageApi::GetReleasePolicy, IMAGE_API }, // resource-image API { "GetLoadingState", ResourceImageApi::GetLoadingState, RESOURCE_IMAGE_API }, { "GetUrl", ResourceImageApi::GetUrl, RESOURCE_IMAGE_API }, - { "GetLoadPolicy", ResourceImageApi::GetLoadPolicy, RESOURCE_IMAGE_API }, { "Reload", ResourceImageApi::Reload, RESOURCE_IMAGE_API }, - // nine-patch API - { "GetStretchBorders", NinePatchImageApi::GetStretchBorders, NINE_PATCH_IMAGE_API }, - { "GetChildRectangle", NinePatchImageApi::GetChildRectangle, NINE_PATCH_IMAGE_API }, - { "CreateCroppedBufferImage",NinePatchImageApi::CreateCroppedBufferImage, NINE_PATCH_IMAGE_API }, - // buffer image API { "GetBuffer", BufferImageApi::GetBuffer, BITMAP_IMAGE_API }, { "GetBufferSize", BufferImageApi::GetBufferSize, BITMAP_IMAGE_API }, @@ -233,8 +215,7 @@ v8::Handle ImageWrapper::MakeImageTemplate( v8::Isolate* iso // add intercepts for Signals on ResourceImage, we can't use HandleWrapper::AddIntercepts because Image doesn't inherit // from Handle ( just baseHandle) - if (( imageType == RESOURCE_IMAGE ) || - ( imageType == NINE_PATCH_IMAGE )) + if ( imageType == RESOURCE_IMAGE ) { ObjectTemplateHelper::AddSignalConnectAndDisconnect( isolate, objTemplate ); }