@nativescript/canvas 2.0.0-alpha.23 → 2.0.0-alpha.25

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface

@@ -10,6 +10,7 @@ import GLKit
 import OpenGLES
 import Swift
 import UIKit
+import WebKit
 import _Concurrency
 import _StringProcessing
 @objc(NSCCanvasListener) public protocol NSCCanvasListener {
@@ -75,6 +76,7 @@ import _StringProcessing
   @_Concurrency.MainActor(unsafe) public func render() -> Swift.Bool
   @objc @_Concurrency.MainActor(unsafe) public func context2DTest(_ context: Swift.Int64)
   @objc @_Concurrency.MainActor(unsafe) public func context2DTestToDataURL(_ context: Swift.Int64) -> Swift.String
+  @objc @_Concurrency.MainActor(unsafe) public var touchEventListener: ((Swift.String, UIKit.UIGestureRecognizer) -> Swift.Void)?
   @_Concurrency.MainActor(unsafe) @objc override dynamic public init(frame: CoreFoundation.CGRect)
   @objc @_Concurrency.MainActor(unsafe) public func setListener(_ listener: (any CanvasNative.NSCCanvasListener)?)
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func layoutSubviews()

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface

@@ -10,6 +10,7 @@ import GLKit
 import OpenGLES
 import Swift
 import UIKit
+import WebKit
 import _Concurrency
 import _StringProcessing
 @objc(NSCCanvasListener) public protocol NSCCanvasListener {
@@ -75,6 +76,7 @@ import _StringProcessing
   @_Concurrency.MainActor(unsafe) public func render() -> Swift.Bool
   @objc @_Concurrency.MainActor(unsafe) public func context2DTest(_ context: Swift.Int64)
   @objc @_Concurrency.MainActor(unsafe) public func context2DTestToDataURL(_ context: Swift.Int64) -> Swift.String
+  @objc @_Concurrency.MainActor(unsafe) public var touchEventListener: ((Swift.String, UIKit.UIGestureRecognizer) -> Swift.Void)?
   @_Concurrency.MainActor(unsafe) @objc override dynamic public init(frame: CoreFoundation.CGRect)
   @objc @_Concurrency.MainActor(unsafe) public func setListener(_ listener: (any CanvasNative.NSCCanvasListener)?)
   @_Concurrency.MainActor(unsafe) @objc override dynamic public func layoutSubviews()

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

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/CanvasNative-Swift.h</key>
 		<data>
-		nQtoIPuRAY9uRYYZCEaqMHer7F0=
+		jBOElM+jdlIX0KyletM2kVHDEyA=
 		</data>
 		<key>Headers/CanvasNative.h</key>
 		<data>
@@ -18,7 +18,7 @@
 		</data>
 		<key>Headers/canvas_native.h</key>
 		<data>
-		L8PTQjQNEaaDkctrsr3n+1X9SGM=
+		0JjcreRw0wOPRjXB8+82Lb40u0s=
 		</data>
 		<key>Info.plist</key>
 		<data>
@@ -26,19 +26,19 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		ePAowlczAp5HJpTw2x1X4+QPbXI=
+		3Kc4otquL0KPSV5dFXqL2IxOC34=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		nNOxlc4WyDn3qBIS0haTpXjmNw8=
+		RHn8aO+9BfgF2nhok70XTkh6yV8=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		r7arzWah724FL5A5bA8RvwuxXqU=
+		gw9C2PHsEzwxqSPCYQqiUPRuxGo=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		wlrtqLyuLVs3qeTlxhFuWJYFPkA=
+		8CpdKtWaXRIZ0Mt3B9N22LcdcCA=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<data>
@@ -46,19 +46,19 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		wlrtqLyuLVs3qeTlxhFuWJYFPkA=
+		8CpdKtWaXRIZ0Mt3B9N22LcdcCA=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		C7DBTWqlZA3pK0wqABMtp9M7RYs=
+		4stDgW5zGl0sCT6AtIibk5cZuG4=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		r7arzWah724FL5A5bA8RvwuxXqU=
+		gw9C2PHsEzwxqSPCYQqiUPRuxGo=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		FFguMsxD4NYYvIa8AnpLmRFtvsw=
+		LKgkDnlIui/KO7HrzvFsIOCGGOU=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
@@ -66,11 +66,11 @@
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		FFguMsxD4NYYvIa8AnpLmRFtvsw=
+		LKgkDnlIui/KO7HrzvFsIOCGGOU=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		9n4cAjTwJ58FCauLfS0DV6JwJdQ=
+		Vnye8Ktr8zC4WOc7PhaANB9z4Ek=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -87,7 +87,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			xwFUDtZ5319nV0wQyRtzw1LZyWudL6J9QLD6foTjLsU=
+			K0l9y/j8HRX0lG/sTxVBwtoZTXSR+GKUmOMTuO5rfYI=
 			</data>
 		</dict>
 		<key>Headers/CanvasNative.h</key>
@@ -108,35 +108,35 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			lhkoVR96jtofkMLed9weKeJwxTKgJuneTVRcscP33aM=
+			zWqFhnejCTn0DtFssxe5T9TrSIbwRJEpJPfV/T1dtK0=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			XXNQyzWBPNQc0LabYVFSq1+6FgiCA1PYg3CVpz1A/Ao=
+			c1Z8MNIbhelklIkhG59n31ahdFEVjSW9rF6Kj1XtKT4=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			MxYisuRzDnLJu8bdCdbZ+bLSCKuVjNrePs2w2NFQu8M=
+			Ug4eFaEMW/gKLMvWCht7Y6rzE5p21gBiD7ahdYuFwKs=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			i9e2tcx8M0/eA+88+O64ZYpGHYL/zuBPVrG4ceQY5H8=
+			ZBub4yj+4HOe9+wZz/hu40urzvQAbvP5q7S/peQLoYo=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			mU9wR9YI6z/UNBlZa45JU4RqDl1QKaUT7Tb5p61cE6w=
+			G8hvx62UwxyH3+RfdPMzA7CcH5+gJETa0eOp+HaboV4=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
@@ -150,28 +150,28 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			mU9wR9YI6z/UNBlZa45JU4RqDl1QKaUT7Tb5p61cE6w=
+			G8hvx62UwxyH3+RfdPMzA7CcH5+gJETa0eOp+HaboV4=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			Crvg6K57JW0JDRD652CUIK2/p5YIlD8xXVQrHb82jHA=
+			k3DzwzFOeqHIpIHBgLAo2XkLrwVZTd4lAMh/IELRLKg=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			i9e2tcx8M0/eA+88+O64ZYpGHYL/zuBPVrG4ceQY5H8=
+			ZBub4yj+4HOe9+wZz/hu40urzvQAbvP5q7S/peQLoYo=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			4ouJytdAzbFKEnd/Lvzzaznp6ecMfAOyLpDHj2ydA/0=
+			V8ldmwmeuG48TOf6ONRVDNKgln5igjJ4WEQzSgO76jY=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
@@ -185,14 +185,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			4ouJytdAzbFKEnd/Lvzzaznp6ecMfAOyLpDHj2ydA/0=
+			V8ldmwmeuG48TOf6ONRVDNKgln5igjJ4WEQzSgO76jY=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			xcHUbmIw4izou88kK/yKgfxaEf2rfhjQWFGq8a1YqLY=
+			DiYhme2U+0pQL+A91zGlJBaDmGtICkHvXN/K2+Cx/jI=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</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;