From 65906438940775bcc9cfcf3b42d8538e0edbaa41 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Sat, 10 Jun 2023 13:57:33 +0300 Subject: [PATCH] Refactoring --- DesktopEditor/doctrenderer/doctrenderer.pro | 8 +-- DesktopEditor/doctrenderer/embed/Default.cpp | 4 +- .../doctrenderer/embed/MemoryStreamEmbed.h | 2 +- .../doctrenderer/embed/NativeControlEmbed.h | 7 +- .../doctrenderer/embed/TextMeasurerEmbed.cpp | 1 + .../doctrenderer/embed/TextMeasurerEmbed.h | 1 - .../embed/jsc/jsc_MemoryStream.mm | 46 ------------- .../embed/jsc/jsc_MemoryStreamEmbed.mm | 63 ++++++++++++++++++ .../embed/jsc/jsc_NativeControl.mm | 6 -- .../doctrenderer/embed/v8/v8_MemoryStream.cpp | 58 ---------------- .../embed/v8/v8_MemoryStreamEmbed.cpp | 66 +++++++++++++++++++ .../embed/v8/v8_NativeControl.cpp | 49 -------------- 12 files changed, 140 insertions(+), 171 deletions(-) delete mode 100644 DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStream.mm create mode 100644 DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStreamEmbed.mm delete mode 100644 DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp create mode 100644 DesktopEditor/doctrenderer/embed/v8/v8_MemoryStreamEmbed.cpp diff --git a/DesktopEditor/doctrenderer/doctrenderer.pro b/DesktopEditor/doctrenderer/doctrenderer.pro index b37c70b29a..bc4ffcfffb 100644 --- a/DesktopEditor/doctrenderer/doctrenderer.pro +++ b/DesktopEditor/doctrenderer/doctrenderer.pro @@ -76,21 +76,21 @@ include($$PWD/js_internal/js_base.pri) # ALL THESE WILL BE REPLACED TO ADD_FILES_FOR_EMBEDDED_CLASS_HEADER() !use_javascript_core { SOURCES += \ - embed/v8/v8_MemoryStream.cpp \ + embed/v8/v8_MemoryStreamEmbed.cpp \ embed/v8/v8_NativeControl.cpp \ embed/v8/v8_NativeBuilder.cpp \ embed/v8/v8_Graphics.cpp \ embed/v8/v8_Pointer.cpp \ - embed/v8/v8_TextMeasurer.cpp + embed/v8/v8_TextMeasurer.cpp } else { OBJECTIVE_SOURCES += ../common/Mac/NSString+StringUtils.mm OBJECTIVE_SOURCES += \ embed/jsc/jsc_Graphics.mm \ - embed/jsc/jsc_MemoryStream.mm \ + embed/jsc/jsc_MemoryStreamEmbed.mm \ embed/jsc/jsc_NativeControl.mm \ embed/jsc/jsc_NativeBuilder.mm \ embed/jsc/jsc_Pointer.mm \ - embed/jsc/jsc_TextMeasurer.mm + embed/jsc/jsc_TextMeasurer.mm } ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/HashEmbed.h) diff --git a/DesktopEditor/doctrenderer/embed/Default.cpp b/DesktopEditor/doctrenderer/embed/Default.cpp index 0f4d76dbf6..39fc6f1aeb 100644 --- a/DesktopEditor/doctrenderer/embed/Default.cpp +++ b/DesktopEditor/doctrenderer/embed/Default.cpp @@ -2,7 +2,7 @@ #include "./ZipEmbed.h" //#include "./TextMeasurerEmbed.h" -//#include "./MemoryStreamEmbed.h" +#include "./MemoryStreamEmbed.h" #include "./HashEmbed.h" namespace NSJSBase @@ -10,8 +10,8 @@ namespace NSJSBase void CreateDefaults() { CJSContext::Embed(); + CJSContext::Embed(); // CTextMeasurerEmbed::CreateObjectInContext("CreateNativeTextMeasurer", context); -// CMemoryStreamEmbed::CreateObjectInContext("CreateNativeMemoryStream", context); CJSContext::Embed(); } } diff --git a/DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h b/DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h index 25cd09b910..544d927f1f 100644 --- a/DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h +++ b/DesktopEditor/doctrenderer/embed/MemoryStreamEmbed.h @@ -29,7 +29,7 @@ public: JSSmart WriteString(JSSmart value); JSSmart WriteString2(JSSmart value); - static void CreateObjectInContext(const std::string& name, JSSmart context); + DECLARE_EMBED_METHODS }; #endif // _BUILD_NATIVE_MEMORYSTREAM_EMBED_H_ diff --git a/DesktopEditor/doctrenderer/embed/NativeControlEmbed.h b/DesktopEditor/doctrenderer/embed/NativeControlEmbed.h index 79d69798dc..a5c6dbe093 100644 --- a/DesktopEditor/doctrenderer/embed/NativeControlEmbed.h +++ b/DesktopEditor/doctrenderer/embed/NativeControlEmbed.h @@ -30,12 +30,12 @@ public: JSSmart CheckNextChange(); JSSmart GetCountChanges(); JSSmart GetChangesFile(JSSmart index); - JSSmart Save_AllocNative(JSSmart nLen); - JSSmart Save_ReAllocNative(JSSmart pos, JSSmart len); + /*[noexport]*/JSSmart Save_AllocNative(JSSmart nLen); + /*[noexport]*/JSSmart Save_ReAllocNative(JSSmart pos, JSSmart len); JSSmart Save_End(JSSmart pos, JSSmart len); JSSmart AddImageInChanges(JSSmart img); JSSmart ConsoleLog(JSSmart message); - JSSmart SaveChanges(JSSmart sParam, JSSmart nDeleteIndex, JSSmart nCount); + /*[noexport]*/JSSmart SaveChanges(JSSmart sParam, JSSmart nDeleteIndex, JSSmart nCount); JSSmart zipOpenFile(JSSmart name); JSSmart zipOpenFileBase64(JSSmart name); JSSmart zipGetFileAsString(JSSmart name); @@ -45,7 +45,6 @@ public: JSSmart GetImagesPath(); JSSmart GetImageOriginalSize(JSSmart sUrl); - static void CreateObjectInContext(const std::string& name, JSSmart context); static void CreateObjectBuilderInContext(const std::string& name, JSSmart context); }; diff --git a/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.cpp b/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.cpp index f3efaa5422..4f24eaf76b 100644 --- a/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.cpp +++ b/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.cpp @@ -1,4 +1,5 @@ #include "./TextMeasurerEmbed.h" +#include "./PointerEmbed.h" #include "./../../fontengine/TextShaper.h" #define RAW_POINTER(value) ((CPointerEmbedObject*)value->toObjectSmart()->getNative())->Data diff --git a/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.h b/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.h index ca5f0f97dd..5ac72fd208 100644 --- a/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.h +++ b/DesktopEditor/doctrenderer/embed/TextMeasurerEmbed.h @@ -2,7 +2,6 @@ #define _BUILD_NATIVE_TEXT_MEASURER_EMBED_H_ #include "../js_internal/js_base.h" -#include "./PointerEmbed.h" #if defined(__ANDROID__) || defined(_IOS) #define SUPPORT_HARFBUZZ_SHAPER diff --git a/DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStream.mm b/DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStream.mm deleted file mode 100644 index b3e45246cf..0000000000 --- a/DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStream.mm +++ /dev/null @@ -1,46 +0,0 @@ -#include "../MemoryStreamEmbed.h" -#include "../../js_internal/jsc/jsc_base.h" - -@protocol IJSCMemoryStream --(JSValue*) Copy : (JSValue*)value : (JSValue*)pos : (JSValue*)len; --(JSValue*) ClearNoAttack; --(JSValue*) WriteByte : (JSValue*)value; --(JSValue*) WriteBool : (JSValue*)value; --(JSValue*) WriteLong : (JSValue*)value; --(JSValue*) WriteDouble : (JSValue*)value; --(JSValue*) WriteDouble2 : (JSValue*)value; --(JSValue*) WriteStringA : (JSValue*)value; --(JSValue*) WriteString : (JSValue*)value; --(JSValue*) WriteString2 : (JSValue*)value; -@end - -@interface CJSCMemoryStream : NSObject -{ -@public - CMemoryStreamEmbed* m_internal; -} -@end - -@implementation CJSCMemoryStream - -EMBED_OBJECT_WRAPPER_METHODS(CMemoryStreamEmbed) - -FUNCTION_WRAPPER_JS_3(Copy, Copy) -FUNCTION_WRAPPER_JS(ClearNoAttack, ClearNoAttack) -FUNCTION_WRAPPER_JS_1(WriteByte, WriteByte) -FUNCTION_WRAPPER_JS_1(WriteBool, WriteBool) -FUNCTION_WRAPPER_JS_1(WriteLong, WriteLong) -FUNCTION_WRAPPER_JS_1(WriteDouble, WriteDouble) -FUNCTION_WRAPPER_JS_1(WriteDouble2, WriteDouble2) -FUNCTION_WRAPPER_JS_1(WriteStringA, WriteStringA) -FUNCTION_WRAPPER_JS_1(WriteString, WriteString) -FUNCTION_WRAPPER_JS_1(WriteString2, WriteString2) - -@end - -void CMemoryStreamEmbed::CreateObjectInContext(const std::string &name, JSSmart context) -{ - context->m_internal->context[[NSString stringWithAString:name]] = ^(){ - return [[CJSCMemoryStream alloc] init]; - }; -} diff --git a/DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStreamEmbed.mm b/DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStreamEmbed.mm new file mode 100644 index 0000000000..803ef27d3d --- /dev/null +++ b/DesktopEditor/doctrenderer/embed/jsc/jsc_MemoryStreamEmbed.mm @@ -0,0 +1,63 @@ +// THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT CHANGE IT! +// IF YOU NEED TO UPDATE THIS CODE, JUST RERUN PYTHON SCRIPT WITH "--internal" OPTION. + +#include "../MemoryStreamEmbed.h" +#include "../../js_internal/jsc/jsc_base.h" + +@protocol IJSCMemoryStreamEmbed +-(JSValue*) Copy : (JSValue*)stream : (JSValue*)pos : (JSValue*)len; +-(JSValue*) ClearNoAttack; +-(JSValue*) WriteByte : (JSValue*)value; +-(JSValue*) WriteBool : (JSValue*)value; +-(JSValue*) WriteLong : (JSValue*)value; +-(JSValue*) WriteDouble : (JSValue*)value; +-(JSValue*) WriteDouble2 : (JSValue*)value; +-(JSValue*) WriteStringA : (JSValue*)value; +-(JSValue*) WriteString : (JSValue*)value; +-(JSValue*) WriteString2 : (JSValue*)value; +@end + +@interface CJSCMemoryStreamEmbed : NSObject +{ +@public + CMemoryStreamEmbed* m_internal; +} +@end + +@implementation CJSCMemoryStreamEmbed +EMBED_OBJECT_WRAPPER_METHODS(CMemoryStreamEmbed); + +FUNCTION_WRAPPER_JS_3(Copy, Copy) +FUNCTION_WRAPPER_JS_0(ClearNoAttack, ClearNoAttack) +FUNCTION_WRAPPER_JS_1(WriteByte, WriteByte) +FUNCTION_WRAPPER_JS_1(WriteBool, WriteBool) +FUNCTION_WRAPPER_JS_1(WriteLong, WriteLong) +FUNCTION_WRAPPER_JS_1(WriteDouble, WriteDouble) +FUNCTION_WRAPPER_JS_1(WriteDouble2, WriteDouble2) +FUNCTION_WRAPPER_JS_1(WriteStringA, WriteStringA) +FUNCTION_WRAPPER_JS_1(WriteString, WriteString) +FUNCTION_WRAPPER_JS_1(WriteString2, WriteString2) +@end + +class CMemoryStreamEmbedAdapter : public CJSEmbedObjectAdapterJSC +{ +public: + virtual id getExportedObject(CJSEmbedObject* pNative) override + { + return [[CJSCMemoryStreamEmbed alloc] init:(CMemoryStreamEmbed*)pNative]; + } +}; + +CJSEmbedObjectAdapterBase* CMemoryStreamEmbed::getAdapter() +{ + if (m_pAdapter == nullptr) + m_pAdapter = new CMemoryStreamEmbedAdapter(); + return m_pAdapter; +} + +std::string CMemoryStreamEmbed::getName() { return "CMemoryStreamEmbed"; } + +CJSEmbedObject* CMemoryStreamEmbed::getCreator() +{ + return new CMemoryStreamEmbed(); +} diff --git a/DesktopEditor/doctrenderer/embed/jsc/jsc_NativeControl.mm b/DesktopEditor/doctrenderer/embed/jsc/jsc_NativeControl.mm index 9ee9ce0c32..df808c2954 100644 --- a/DesktopEditor/doctrenderer/embed/jsc/jsc_NativeControl.mm +++ b/DesktopEditor/doctrenderer/embed/jsc/jsc_NativeControl.mm @@ -71,12 +71,6 @@ FUNCTION_WRAPPER_JS_1(GetImageOriginalSize, GetImageOriginalSize); @end -void CNativeControlEmbed::CreateObjectInContext(const std::string &name, JSSmart context) -{ - context->m_internal->context[[NSString stringWithAString:name]] = ^(){ - return [[CJSCNativeControl alloc] init]; - }; -} void CNativeControlEmbed::CreateObjectBuilderInContext(const std::string &name, JSSmart context) { context->m_internal->context[[NSString stringWithAString:name]] = ^(){ diff --git a/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp b/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp deleted file mode 100644 index 610c4d34bc..0000000000 --- a/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStream.cpp +++ /dev/null @@ -1,58 +0,0 @@ -#include "../MemoryStreamEmbed.h" -#include "../../js_internal/v8/v8_base.h" - -namespace NSMemoryStream -{ -#define CURRENTWRAPPER CMemoryStreamEmbed - - FUNCTION_WRAPPER_V8_1(_ms_write_byte, WriteByte) - FUNCTION_WRAPPER_V8_1(_ms_write_bool, WriteBool) - FUNCTION_WRAPPER_V8_1(_ms_write_long, WriteLong) - FUNCTION_WRAPPER_V8_1(_ms_write_double, WriteDouble) - FUNCTION_WRAPPER_V8_1(_ms_write_double2, WriteDouble2) - FUNCTION_WRAPPER_V8_1(_ms_writestringA, WriteStringA) - FUNCTION_WRAPPER_V8_1(_ms_writestring1, WriteString) - FUNCTION_WRAPPER_V8_1(_ms_writestring2, WriteString2) - FUNCTION_WRAPPER_V8_3(_ms_copy, Copy) - FUNCTION_WRAPPER_V8(_ms_clearnoattack, ClearNoAttack) - - void _ms_pos(v8::Local name, const v8::PropertyCallbackInfo& args) - { - CMemoryStreamEmbed* _this = (CMemoryStreamEmbed*)unwrap_native(args.This()); - args.GetReturnValue().Set(v8::Integer::New(CV8Worker::GetCurrent(), _this->m_pInternal->GetSize())); - } - - v8::Handle CreateMemoryStreamTemplate(v8::Isolate* isolate) - { - v8::EscapableHandleScope handle_scope(isolate); - - v8::Local result = v8::ObjectTemplate::New(V8IsolateOneArg); - result->SetInternalFieldCount(1); - - // property - result->SetAccessor(CreateV8String(CV8Worker::GetCurrent(), "pos"), _ms_pos); - - NSV8Objects::Template_Set(result, "Copy", _ms_copy); - NSV8Objects::Template_Set(result, "ClearNoAttack", _ms_clearnoattack); - NSV8Objects::Template_Set(result, "WriteByte", _ms_write_byte); - NSV8Objects::Template_Set(result, "WriteBool", _ms_write_bool); - NSV8Objects::Template_Set(result, "WriteLong", _ms_write_long); - NSV8Objects::Template_Set(result, "WriteDouble", _ms_write_double); - NSV8Objects::Template_Set(result, "WriteDouble2", _ms_write_double2); - NSV8Objects::Template_Set(result, "WriteStringA", _ms_writestringA); - NSV8Objects::Template_Set(result, "WriteString", _ms_writestring1); - NSV8Objects::Template_Set(result, "WriteString2", _ms_writestring2); - - return handle_scope.Escape(result); - } - - void CreateNativeMemoryStream(const v8::FunctionCallbackInfo& args) - { - CreateNativeInternalField(new CMemoryStreamEmbed(), NSMemoryStream::CreateMemoryStreamTemplate, args); - } -} - -void CMemoryStreamEmbed::CreateObjectInContext(const std::string& name, JSSmart context) -{ - InsertToGlobal(name, context, NSMemoryStream::CreateNativeMemoryStream); -} diff --git a/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStreamEmbed.cpp b/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStreamEmbed.cpp new file mode 100644 index 0000000000..70e2d2f657 --- /dev/null +++ b/DesktopEditor/doctrenderer/embed/v8/v8_MemoryStreamEmbed.cpp @@ -0,0 +1,66 @@ +// THIS FILE WAS GENERATED AUTOMATICALLY. DO NOT CHANGE IT! +// IF YOU NEED TO UPDATE THIS CODE, JUST RERUN PYTHON SCRIPT WITH "--internal" OPTION. + +#include "../MemoryStreamEmbed.h" +#include "../../js_internal/v8/v8_base.h" + +namespace NSMemoryStreamEmbed +{ +#define CURRENTWRAPPER CMemoryStreamEmbed + + FUNCTION_WRAPPER_V8_3(_Copy, Copy) + FUNCTION_WRAPPER_V8_0(_ClearNoAttack, ClearNoAttack) + FUNCTION_WRAPPER_V8_1(_WriteByte, WriteByte) + FUNCTION_WRAPPER_V8_1(_WriteBool, WriteBool) + FUNCTION_WRAPPER_V8_1(_WriteLong, WriteLong) + FUNCTION_WRAPPER_V8_1(_WriteDouble, WriteDouble) + FUNCTION_WRAPPER_V8_1(_WriteDouble2, WriteDouble2) + FUNCTION_WRAPPER_V8_1(_WriteStringA, WriteStringA) + FUNCTION_WRAPPER_V8_1(_WriteString, WriteString) + FUNCTION_WRAPPER_V8_1(_WriteString2, WriteString2) + + v8::Handle CreateTemplate(v8::Isolate* isolate) + { + v8::EscapableHandleScope handle_scope(isolate); + v8::Local result = v8::ObjectTemplate::New(isolate); + result->SetInternalFieldCount(1); + + NSV8Objects::Template_Set(result, "Copy", _Copy); + NSV8Objects::Template_Set(result, "ClearNoAttack", _ClearNoAttack); + NSV8Objects::Template_Set(result, "WriteByte", _WriteByte); + NSV8Objects::Template_Set(result, "WriteBool", _WriteBool); + NSV8Objects::Template_Set(result, "WriteLong", _WriteLong); + NSV8Objects::Template_Set(result, "WriteDouble", _WriteDouble); + NSV8Objects::Template_Set(result, "WriteDouble2", _WriteDouble2); + NSV8Objects::Template_Set(result, "WriteStringA", _WriteStringA); + NSV8Objects::Template_Set(result, "WriteString", _WriteString); + NSV8Objects::Template_Set(result, "WriteString2", _WriteString2); + + return handle_scope.Escape(result); + } +} + +class CMemoryStreamEmbedAdapter : public CJSEmbedObjectAdapterV8Template +{ +public: + virtual v8::Local getTemplate(v8::Isolate* isolate) override + { + v8::EscapableHandleScope handle_scope(isolate); + v8::Local templ = NSMemoryStreamEmbed::CreateTemplate(isolate); + return handle_scope.Escape(templ); + } +}; + +CJSEmbedObjectAdapterBase* CMemoryStreamEmbed::getAdapter() +{ + if (m_pAdapter == nullptr) + m_pAdapter = new CMemoryStreamEmbedAdapter(); + return m_pAdapter; +} + +std::string CMemoryStreamEmbed::getName() { return "CMemoryStreamEmbed"; } + +CJSEmbedObject* CMemoryStreamEmbed::getCreator() +{ + return new CMemoryStreamEmbed(); +} diff --git a/DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp b/DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp index 9832b2b6ca..021d5e3305 100644 --- a/DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp +++ b/DesktopEditor/doctrenderer/embed/v8/v8_NativeControl.cpp @@ -32,43 +32,6 @@ namespace NSNativeControl FUNCTION_WRAPPER_V8_1(_GetImageOriginalSize, GetImageOriginalSize) FUNCTION_WRAPPER_V8(_GetImagesPath, GetImagesPath) - v8::Handle CreateNativeControlTemplate(v8::Isolate* isolate) - { - v8::EscapableHandleScope handle_scope(isolate); - - v8::Local result = v8::ObjectTemplate::New(V8IsolateOneArg); - result->SetInternalFieldCount(1); - - NSV8Objects::Template_Set(result, "SetFilePath", _SetFilePath); - NSV8Objects::Template_Set(result, "GetFilePath", _GetFilePath); - NSV8Objects::Template_Set(result, "SetFileId", _SetFileId); - NSV8Objects::Template_Set(result, "GetFileId", _GetFileId); - NSV8Objects::Template_Set(result, "GetFileBinary", _GetFileArrayBuffer); - NSV8Objects::Template_Set(result, "GetFontBinary", _GetFontArrayBuffer); - NSV8Objects::Template_Set(result, "GetFontsDirectory", _GetFontsDirectory); - NSV8Objects::Template_Set(result, "GetFileString", _GetFileString); - NSV8Objects::Template_Set(result, "GetEditorType", _GetEditorType); - NSV8Objects::Template_Set(result, "CheckNextChange", _CheckNextChange); - NSV8Objects::Template_Set(result, "GetCountChanges", _GetChangesCount); - NSV8Objects::Template_Set(result, "GetChangesFile", _GetChangesFile); - //NSV8Objects::Template_Set(result, "Save_AllocNative", _Save_AllocNative); - //NSV8Objects::Template_Set(result, "Save_ReAllocNative", _Save_ReAllocNative); - NSV8Objects::Template_Set(result, "Save_End", _Save_End); - NSV8Objects::Template_Set(result, "AddImageInChanges", _AddImageInChanges); - NSV8Objects::Template_Set(result, "ConsoleLog", _ConsoleLog); - NSV8Objects::Template_Set(result, "SaveChanges", _SaveChanges); - NSV8Objects::Template_Set(result, "ZipOpen", _zipOpenFile); - NSV8Objects::Template_Set(result, "ZipOpenBase64", _zipOpenFileBase64); - NSV8Objects::Template_Set(result, "ZipFileAsString", _zipGetFileAsString); - NSV8Objects::Template_Set(result, "ZipFileAsBinary", _zipGetFileAsBinary); - NSV8Objects::Template_Set(result, "ZipClose", _zipCloseFile); - NSV8Objects::Template_Set(result, "getImageUrl", _GetImageUrl); - NSV8Objects::Template_Set(result, "getImagesDirectory", _GetImagesPath); - NSV8Objects::Template_Set(result, "GetImageOriginalSize", _GetImageOriginalSize); - - return handle_scope.Escape(result); - } - // Без SaveChanges v8::Handle CreateNativeControlTemplateBuilder(v8::Isolate* isolate) { @@ -89,8 +52,6 @@ namespace NSNativeControl NSV8Objects::Template_Set(result, "CheckNextChange", _CheckNextChange); NSV8Objects::Template_Set(result, "GetCountChanges", _GetChangesCount); NSV8Objects::Template_Set(result, "GetChangesFile", _GetChangesFile); - //NSV8Objects::Template_Set(result, "Save_AllocNative", _Save_AllocNative); - //NSV8Objects::Template_Set(result, "Save_ReAllocNative", _Save_ReAllocNative); NSV8Objects::Template_Set(result, "Save_End", _Save_End); NSV8Objects::Template_Set(result, "AddImageInChanges", _AddImageInChanges); NSV8Objects::Template_Set(result, "ConsoleLog", _ConsoleLog); @@ -106,11 +67,6 @@ namespace NSNativeControl return handle_scope.Escape(result); } - void CreateNativeObject(const v8::FunctionCallbackInfo& args) - { - CreateNativeInternalField(new CNativeControlEmbed(), CreateNativeControlTemplate, args, NSJSBase::iadtSingletonNative); - } - // Без SaveChanges void CreateNativeObjectBuilder(const v8::FunctionCallbackInfo& args) { @@ -118,11 +74,6 @@ namespace NSNativeControl } } -void CNativeControlEmbed::CreateObjectInContext(const std::string& name, JSSmart context) -{ - InsertToGlobal(name, context, NSNativeControl::CreateNativeObject); -} - void CNativeControlEmbed::CreateObjectBuilderInContext(const std::string& name, JSSmart context) { InsertToGlobal(name, context, NSNativeControl::CreateNativeObjectBuilder);