@nativescript/canvas 2.0.0-beta.9 → 2.0.0-rc.0

package/platforms/ios/src/cpp/canvas2d/MatrixImpl.h

@@ -10,9 +10,9 @@
 
 class MatrixImpl: public ObjectWrapperImpl {
 public:
-    MatrixImpl(Matrix* matrix);
+    explicit MatrixImpl(Matrix* matrix);
     ~MatrixImpl(){
-        canvas_native_matrix_destroy(this->GetMatrix());
+        canvas_native_matrix_release(this->GetMatrix());
         this->matrix_ = nullptr;
     }
 
@@ -184,6 +184,33 @@ public:
                        v8::Local<v8::Value> value,
                        const v8::PropertyCallbackInfo<void> &info);
 
+
+    static void Translate(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void TranslateSelf(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void MultiplySelf(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void PremultiplySelf(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void ScaleNonUniform(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void ScaleNonUniformSelf(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void Rotate(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void RotateSelf(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void SkewX(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void SkewXSelf(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void SkewY(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void SkewYSelf(const v8::FunctionCallbackInfo<v8::Value> &args);
+
+    static void Clone(const v8::FunctionCallbackInfo<v8::Value> &args);
+
 private:
     Matrix* matrix_;
 };

package/platforms/ios/src/cpp/canvas2d/Path2D.cpp

@@ -75,8 +75,6 @@ void Path2D::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
     auto ret = args.This();
 
-    SetNativeType(ret, NativeType::Path2D);
-
     if (count > 0) {
         if (value->IsString()) {
             auto d = ConvertFromV8String(isolate, value);
@@ -87,6 +85,8 @@ void Path2D::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
             object->BindFinalizer(isolate, ret);
 
+            SetNativeType(object, NativeType::Path2D);
+
             args.GetReturnValue().Set(ret);
 
             return;
@@ -102,6 +102,8 @@ void Path2D::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
                 object->BindFinalizer(isolate, ret);
 
+                SetNativeType(object, NativeType::Path2D);
+
                 args.GetReturnValue().Set(ret);
                 return;
             }
@@ -109,11 +111,12 @@ void Path2D::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
     } else {
         auto path = new Path2D(canvas_native_path_create());
 
-
         ret->SetAlignedPointerInInternalField(0, path);
 
         path->BindFinalizer(isolate, ret);
 
+        SetNativeType(path, NativeType::Path2D);
+
         args.GetReturnValue().Set(ret);
         return;
 

package/platforms/ios/src/cpp/canvas2d/Path2D.h

@@ -11,10 +11,10 @@
 
 class Path2D : ObjectWrapperImpl {
 public:
-    Path2D(Path *path);
+    explicit Path2D(Path *path);
 
     ~Path2D() {
-        canvas_native_path_destroy(this->GetPath());
+        canvas_native_path_release(this->GetPath());
         this->path_ = nullptr;
     }
 
@@ -199,7 +199,7 @@ public:
                             double rotation,
                             double start_angle,
                             double end_angle,
-                            double anticlockwise) {
+                            bool anticlockwise) {
 
         canvas_native_path_ellipse(
                 receiver_obj,
@@ -222,7 +222,7 @@ public:
                             double rotation,
                             double start_angle,
                             double end_angle,
-                            double anticlockwise) {
+                            bool anticlockwise) {
         Path2D *ptr = GetPointer(receiver_obj);
         if (ptr == nullptr) {
             return;
@@ -362,9 +362,9 @@ public:
 
                 canvas_native_path_round_rect(
                         ptr->GetPath(),
-                        x, y,
-                        width,
-                        height, buf.data(),
+                        (float)x, (float)y,
+                        (float)width,
+                        (float)height, buf.data(),
                         buf.size());
 
             }

package/platforms/ios/src/cpp/canvas2d/TextMetricsImpl.h

@@ -10,10 +10,10 @@
 
 class TextMetricsImpl: public ObjectWrapperImpl {
 public:
-    TextMetricsImpl(TextMetrics* metrics);
-    
+    explicit TextMetricsImpl(TextMetrics* metrics);
+
     ~TextMetricsImpl(){
-        canvas_native_text_metrics_destroy(this->GetTextMetrics());
+        canvas_native_text_metrics_release(this->GetTextMetrics());
         this->metrics_ = nullptr;
     }
 

package/platforms/ios/src/cpp/webgl/WebGLActiveInfoImpl.h

@@ -25,7 +25,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLActiveInfoImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLActiveInfo);
+        SetNativeType( info, NativeType::WebGLActiveInfo);
         object->SetAlignedPointerInInternalField(0, info);
         info->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl/WebGLBuffer.h

@@ -35,7 +35,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLBuffer::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLBuffer);
+        SetNativeType( buffer, NativeType::WebGLBuffer);
         object->SetAlignedPointerInInternalField(0, buffer);
         buffer->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl/WebGLFramebuffer.h

@@ -35,7 +35,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLFramebuffer::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLFramebuffer);
+        SetNativeType( buffer, NativeType::WebGLFramebuffer);
         object->SetAlignedPointerInInternalField(0, buffer);
         buffer->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl/WebGLProgram.h

@@ -9,9 +9,9 @@
 
 class WebGLProgram:ObjectWrapperImpl  {
 public:
-    WebGLProgram(uint32_t program) : program_(program) {}
+    explicit WebGLProgram(uint32_t program) : program_(program) {}
 
-    uint32_t GetProgram() {
+    uint32_t GetProgram() const {
         return this->program_;
     }
 
@@ -39,7 +39,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLProgram::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLProgram);
+        SetNativeType( program, NativeType::WebGLProgram);
         object->SetAlignedPointerInInternalField(0, program);
         program->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl/WebGLRenderbuffer.h

@@ -8,7 +8,7 @@
 #include "ObjectWrapperImpl.h"
 class WebGLRenderbuffer: ObjectWrapperImpl {
 public:
-    WebGLRenderbuffer(uint32_t renderbuffer) : renderbuffer_(renderbuffer) {}
+    explicit WebGLRenderbuffer(uint32_t renderbuffer) : renderbuffer_(renderbuffer) {}
 
     static v8::Local<v8::FunctionTemplate> GetCtor(v8::Isolate *isolate) {
         auto cache = Caches::Get(isolate);
@@ -34,7 +34,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLRenderbuffer::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLRenderbuffer);
+        SetNativeType( buffer, NativeType::WebGLRenderbuffer);
         object->SetAlignedPointerInInternalField(0, buffer);
         buffer->BindFinalizer(isolate, object);
         return scope.Escape(object);
@@ -48,7 +48,7 @@ public:
         return static_cast<WebGLRenderbuffer *>(ptr);
     }
 
-    uint32_t GetRenderBuffer() {
+    uint32_t GetRenderBuffer() const {
         return this->renderbuffer_;
     }