@nativescript/canvas 2.0.0-alpha.24 → 2.0.0-alpha.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas",
-  "version": "2.0.0-alpha.24",
+  "version": "2.0.0-alpha.26",
   "description": "DOM Canvas API for NativeScript",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/ios/CanvasNative.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>CanvasNative.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/platforms/ios/CanvasNative.xcframework/ios-arm64/CanvasNative.framework/Headers/canvas_native.h

@@ -89,6 +89,8 @@ typedef enum WebGLResultType {
 
 typedef struct ANGLE_instanced_arrays ANGLE_instanced_arrays;
 
+typedef struct CCow CCow;
+
 typedef struct CanvasRenderingContext2D CanvasRenderingContext2D;
 
 typedef struct ContextAttributes ContextAttributes;
@@ -1099,6 +1101,23 @@ const char *canvas_native_text_decoder_decode(const struct TextDecoder *decoder,
                                               const uint8_t *data,
                                               uintptr_t size);
 
+void canvas_native_ccow_destroy(struct CCow *cow);
+
+const uint8_t *canvas_native_ccow_get_bytes(const struct CCow *cow);
+
+uintptr_t canvas_native_ccow_get_length(const struct CCow *cow);
+
+struct CCow *canvas_native_text_decoder_decode_as_cow(const struct TextDecoder *decoder,
+                                                      const uint8_t *data,
+                                                      uintptr_t size);
+
+struct U8Buffer *canvas_native_text_decoder_decode_as_bytes(const struct TextDecoder *decoder,
+                                                            const uint8_t *data,
+                                                            uintptr_t size);
+
+const char *canvas_native_text_decoder_decode_c_string(const struct TextDecoder *decoder,
+                                                       const int8_t *data);
+
 const char *canvas_native_text_decoder_get_encoding(const struct TextDecoder *decoder);
 
 struct TextEncoder *canvas_native_text_encoder_create(const char *encoding);

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Headers/canvas_native.h

@@ -89,6 +89,8 @@ typedef enum WebGLResultType {
 
 typedef struct ANGLE_instanced_arrays ANGLE_instanced_arrays;
 
+typedef struct CCow CCow;
+
 typedef struct CanvasRenderingContext2D CanvasRenderingContext2D;
 
 typedef struct ContextAttributes ContextAttributes;
@@ -1099,6 +1101,23 @@ const char *canvas_native_text_decoder_decode(const struct TextDecoder *decoder,
                                               const uint8_t *data,
                                               uintptr_t size);
 
+void canvas_native_ccow_destroy(struct CCow *cow);
+
+const uint8_t *canvas_native_ccow_get_bytes(const struct CCow *cow);
+
+uintptr_t canvas_native_ccow_get_length(const struct CCow *cow);
+
+struct CCow *canvas_native_text_decoder_decode_as_cow(const struct TextDecoder *decoder,
+                                                      const uint8_t *data,
+                                                      uintptr_t size);
+
+struct U8Buffer *canvas_native_text_decoder_decode_as_bytes(const struct TextDecoder *decoder,
+                                                            const uint8_t *data,
+                                                            uintptr_t size);
+
+const char *canvas_native_text_decoder_decode_c_string(const struct TextDecoder *decoder,
+                                                       const int8_t *data);
+
 const char *canvas_native_text_decoder_get_encoding(const struct TextDecoder *decoder);
 
 struct TextEncoder *canvas_native_text_encoder_create(const char *encoding);

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources

@@ -18,7 +18,7 @@
 		</data>
 		<key>Headers/canvas_native.h</key>
 		<data>
-		L8PTQjQNEaaDkctrsr3n+1X9SGM=
+		0JjcreRw0wOPRjXB8+82Lb40u0s=
 		</data>
 		<key>Info.plist</key>
 		<data>
@@ -108,7 +108,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			lhkoVR96jtofkMLed9weKeJwxTKgJuneTVRcscP33aM=
+			zWqFhnejCTn0DtFssxe5T9TrSIbwRJEpJPfV/T1dtK0=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>

package/platforms/ios/src/cpp/CanvasJSIModule.cpp

@@ -193,13 +193,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                                   v8::Local<v8::Context> context = callback->GetCreationContextChecked();
                                   v8::Context::Scope context_scope(context);
 
-                                  auto ret = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                                          context).ToLocalChecked()->NewInstance(
-                                          context).ToLocalChecked();
-
-                                  SetNativeType(isolate, ret, NativeType::ImageBitmap);
-
-                                  ret->SetInternalField(0, cbData);
+                                  auto ret = ImageBitmapImpl::NewInstance(isolate, cbData);
 
                                   v8::Local<v8::Value> args[2];
 
@@ -304,7 +298,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                     auto store = arrayBuffer->GetBackingStore();
                     auto dataBuffer = (uint8_t *) store->Data();
                     v8::Global<v8::ArrayBuffer> ab(isolate, arrayBuffer);
-                    
+
                     std::thread thread(
                             [&dataBuffer, jsi_callback, &options, store, shared_asset, current_queue](
                                     v8::Global<v8::ArrayBuffer> ab, size_t size
@@ -325,7 +319,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
 
                                 auto main_task = [jsi_callback, current_queue, done]() {
 
-                                    
+
                                     v8::Isolate *isolate = jsi_callback->isolate_;
                                     v8::Locker locker(isolate);
                                     v8::Isolate::Scope isolate_scope(isolate);
@@ -336,13 +330,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                                     v8::Local<v8::Context> context = callback->GetCreationContextChecked();
                                     v8::Context::Scope context_scope(context);
 
-                                    auto ret = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                                            context).ToLocalChecked()->NewInstance(
-                                            context).ToLocalChecked();
-
-                                    SetNativeType(isolate, ret, NativeType::ImageBitmap);
-
-                                    ret->SetInternalField(0, cbData);
+                                    auto ret = ImageBitmapImpl::NewInstance(isolate, cbData);
 
                                     v8::Local<v8::Value> args[2];
 
@@ -358,7 +346,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
 
 
                                     callback->Call(context, context->Global(), 2, args);
-                                    
+
 
                                     delete jsi_callback;
                                     delete current_queue;
@@ -415,13 +403,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                                 v8::Local<v8::Context> context = callback->GetCreationContextChecked();
                                 v8::Context::Scope context_scope(context);
 
-                                auto ret = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                                        context).ToLocalChecked()->NewInstance(
-                                        context).ToLocalChecked();
-
-                                SetNativeType(isolate, ret, NativeType::ImageBitmap);
-
-                                ret->SetInternalField(0, cbData);
+                                 auto ret = ImageBitmapImpl::NewInstance(isolate, cbData);
 
                                 v8::Local<v8::Value> args[2];
 
@@ -489,13 +471,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                                   v8::Local<v8::Context> context = callback->GetCreationContextChecked();
                                   v8::Context::Scope context_scope(context);
 
-                                  auto ret = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                                          context).ToLocalChecked()->NewInstance(
-                                          context).ToLocalChecked();
-
-                                  SetNativeType(isolate, ret, NativeType::ImageBitmap);
-
-                                  ret->SetInternalField(0, cbData);
+                                  auto ret = ImageBitmapImpl::NewInstance(isolate, cbData);
 
                                   v8::Local<v8::Value> args[2];
 
@@ -749,13 +725,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
                                 v8::Local<v8::Context> context = callback->GetCreationContextChecked();
                                 v8::Context::Scope context_scope(context);
 
-                                auto ret = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                                        context).ToLocalChecked()->NewInstance(
-                                        context).ToLocalChecked();
-
-                                SetNativeType(isolate, ret, NativeType::ImageBitmap);
-
-                                ret->SetInternalField(0, cbData);
+                                 auto ret = ImageBitmapImpl::NewInstance(isolate, cbData);
 
                                 v8::Local<v8::Value> args[2];
 
@@ -821,12 +791,8 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
 
                 auto bitmap = new ImageBitmapImpl(ret);
                 auto data = v8::External::New(isolate, bitmap);
-                auto object = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                        context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-
-                object->SetInternalField(0, data);
 
-                SetNativeType(isolate, object, NativeType::ImageBitmap);
+                auto object = ImageBitmapImpl::NewInstance(isolate, data);
 
                 retArgs[1] = object;
             }
@@ -845,12 +811,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
 
                 auto bitmap = new ImageBitmapImpl(ret);
                 auto data = v8::External::New(isolate, bitmap);
-                auto object = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                        context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-
-                object->SetInternalField(0, data);
-
-                SetNativeType(isolate, object, NativeType::ImageBitmap);
+                auto object = ImageBitmapImpl::NewInstance(isolate, data);
 
                 retArgs[1] = object;
 
@@ -892,12 +853,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
 
                 auto bitmap = new ImageBitmapImpl(ret);
                 auto data = v8::External::New(isolate, bitmap);
-                auto object = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                        context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-
-                object->SetInternalField(0, data);
-
-                SetNativeType(isolate, object, NativeType::ImageBitmap);
+                auto object = ImageBitmapImpl::NewInstance(isolate, data);
 
                 retArgs[1] = object;
             }
@@ -920,12 +876,7 @@ void CanvasJSIModule::CreateImageBitmap(const v8::FunctionCallbackInfo<v8::Value
 
                 auto bitmap = new ImageBitmapImpl(ret);
                 auto data = v8::External::New(isolate, bitmap);
-                auto object = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
-                        context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-
-                object->SetInternalField(0, data);
-
-                SetNativeType(isolate, object, NativeType::ImageBitmap);
+                auto object = ImageBitmapImpl::NewInstance(isolate, data);
 
                 retArgs[1] = object;
 
@@ -1130,7 +1081,7 @@ void CanvasJSIModule::ReadFile(const v8::FunctionCallbackInfo<v8::Value> &args)
 
 
                 auto buf = (void*)canvas_native_u8_buffer_get_bytes_mut(vec);
-                
+
                 auto size = (size_t)canvas_native_u8_buffer_get_length(vec);
 
                 auto store = v8::ArrayBuffer::NewBackingStore(buf, size,

package/platforms/ios/src/cpp/ImageBitmapImpl.h

@@ -20,12 +20,24 @@ struct Options {
 
 class ImageBitmapImpl {
 public:
-    ImageBitmapImpl(ImageAsset* asset);
+    ImageBitmapImpl(ImageAsset *asset);
+
     ~ImageBitmapImpl();
 
+
+    static v8::Local<v8::Object> NewInstance(v8::Isolate *isolate, v8::Local<v8::External> asset) {
+        auto context = isolate->GetCurrentContext();
+        v8::EscapableHandleScope scope(isolate);
+        auto object = ImageBitmapImpl::GetCtor(isolate)->GetFunction(
+                context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
+        SetNativeType(isolate, object, NativeType::ImageBitmap);
+        object->SetInternalField(0, asset);
+        return scope.Escape(object);
+    }
+
     static Options HandleOptions(v8::Isolate *isolate, const v8::Local<v8::Value> &options);
 
-    ImageAsset* GetImageAsset();
+    ImageAsset *GetImageAsset();
 
     static void Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolate);
 
@@ -42,6 +54,6 @@ public:
     static void Close(const v8::FunctionCallbackInfo<v8::Value> &args);
 
 private:
-    ImageAsset* bitmap_;
+    ImageAsset *bitmap_;
     bool closed_ = false;
 };

package/platforms/ios/src/cpp/OneByteStringResource.cpp

@@ -9,9 +9,32 @@ OneByteStringResource::OneByteStringResource(char *string) : string_(string),
 
 }
 
+OneByteStringResource::OneByteStringResource(U8Buffer *buffer) : buffer_(buffer) {
+    string_ = (char *) canvas_native_u8_buffer_get_bytes(buffer);
+    length_ = canvas_native_u8_buffer_get_length(buffer);
+    usingBuffer_ = true;
+}
+
+OneByteStringResource::OneByteStringResource(CCow *cow) : cow_(cow) {
+    string_ = (char *) canvas_native_ccow_get_bytes(cow);
+    length_ = canvas_native_ccow_get_length(cow);
+    usingCow_ = true;
+}
+
 OneByteStringResource::~OneByteStringResource() {
-    canvas_native_string_destroy((char *) this->string_);
-    this->string_ = nullptr;
+    if (usingBuffer_) {
+        canvas_native_u8_buffer_destroy(buffer_);
+        this->string_ = nullptr;
+        this->length_ = 0;
+    }else if(usingCow_){
+        canvas_native_ccow_destroy(cow_);
+        this->string_ = nullptr;
+        this->length_ = 0;
+    } else {
+        canvas_native_string_destroy((char *) this->string_);
+        this->string_ = nullptr;
+        this->length_ = 0;
+    }
 }
 
 const char *OneByteStringResource::data() const {
@@ -23,3 +46,4 @@ size_t OneByteStringResource::length() const {
 }
 
 
+

package/platforms/ios/src/cpp/OneByteStringResource.h

@@ -3,19 +3,30 @@
 //
 
 #pragma once
+
 #include "Common.h"
 
 class OneByteStringResource : public v8::String::ExternalOneByteStringResource {
 public:
-    OneByteStringResource(char* string);
+    OneByteStringResource(char *string);
+
+    OneByteStringResource(U8Buffer *buffer);
     
+    OneByteStringResource(CCow *cow);
+
     ~OneByteStringResource();
 
-    const char* data() const override;
+    const char *data() const override;
+
     size_t length() const override;
 
 private:
-    const char* string_;
+    const char *string_;
     size_t length_;
+    U8Buffer *buffer_ = nullptr;
+    CCow *cow_ = nullptr;
+    // todo enum
+    bool usingBuffer_ = false;
+    bool usingCow_ = false;
 };
 

package/platforms/ios/src/cpp/TextDecoderImpl.cpp

@@ -109,7 +109,6 @@ void TextDecoderImpl::Decode(const v8::FunctionCallbackInfo<v8::Value> &args) {
         return;
     }
     auto isolate = args.GetIsolate();
-    auto context = isolate->GetCurrentContext();
 
     if (args.Length() == 1) {
         auto value = args[0];
@@ -146,13 +145,13 @@ void TextDecoderImpl::Decode(const v8::FunctionCallbackInfo<v8::Value> &args) {
         if (buf->IsArrayBufferView()) {
 
             auto buffer = buf.As<v8::ArrayBufferView>();
-            
+
 
             auto store = buffer->Buffer()->GetBackingStore();
             auto buffer_data = static_cast<uint8_t *>(store->Data()) + buffer->ByteOffset();
-            
+
             auto len = buffer->ByteLength();
-            
+
 //            v8::Local<v8::Value> size;
 //
 //            buf->Get(context, ConvertToV8String(isolate, "BYTES_PER_ELEMENT")).ToLocal(&size);
@@ -162,16 +161,16 @@ void TextDecoderImpl::Decode(const v8::FunctionCallbackInfo<v8::Value> &args) {
 //            if(!size.IsEmpty()){
 //                len =  buffer->Length() * (size_t)size->NumberValue(context).FromMaybe(0);
 //            }
-            
+
           //  auto len = buffer->ByteLength();
-            
-            auto decoded = canvas_native_text_decoder_decode(
+
+            auto decoded = canvas_native_text_decoder_decode_as_cow(
                     ptr->GetTextDecoder(),
                                                              buffer_data, len);
-        
+
 
             // args.GetReturnValue().Set(ConvertToV8String(isolate, decoded.c_str()));
-            auto returnValue = new OneByteStringResource((char*) decoded);
+            auto returnValue = new OneByteStringResource(decoded);
             auto ret = v8::String::NewExternalOneByte(isolate, returnValue);
             args.GetReturnValue().Set(ret.ToLocalChecked());
             return;