@nativescript/canvas 2.0.0-beta.11 → 2.0.0-beta.13

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

@@ -7,7 +7,6 @@
 #include <memory>
 #include "Common.h"
 #include "OneByteStringResource.h"
-#include "PerIsolateData.h"
 #include "v8-fast-api-calls.h"
 //#ifdef __APPLE__
 //#ifdef __OBJC__
@@ -176,7 +175,7 @@ static void SetPrivateValue(v8::Isolate *isolate, const v8::Local<v8::Object> &o
                             const v8::Local<v8::String> &propName,
                             const v8::Local<v8::Value> &value) {
     v8::Local<v8::Context> context;
-    obj->GetCreationContext().ToLocal(&context);
+    auto succcess = obj->GetCreationContext().ToLocal(&context);
     v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, propName);
     obj->SetPrivate(context, privateKey, value);
 }
@@ -185,7 +184,7 @@ static v8::Local<v8::Value>
 GetPrivateValue(v8::Isolate *isolate, const v8::Local<v8::Object> &obj,
                 const v8::Local<v8::String> &propName) {
     v8::Local<v8::Context> context;
-    obj->GetCreationContext().ToLocal(&context);
+    auto succcess = obj->GetCreationContext().ToLocal(&context);
     v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, propName);
 
     v8::Maybe<bool> hasPrivate = obj->HasPrivate(context, privateKey);
@@ -196,7 +195,7 @@ GetPrivateValue(v8::Isolate *isolate, const v8::Local<v8::Object> &obj,
 
     v8::Local<v8::Value> result;
 
-    obj->GetPrivate(context, privateKey).ToLocal(&result);
+    succcess = obj->GetPrivate(context, privateKey).ToLocal(&result);
 
     return result;
 }

package/platforms/ios/src/cpp/ImageAssetImpl.cpp

@@ -28,7 +28,7 @@ void ImageAssetImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isola
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "ImageAsset"), func);
+    canvasModule->Set(context, ConvertToV8String(isolate, "ImageAsset"), func).IsJust();
 }
 
 ImageAssetImpl *ImageAssetImpl::GetPointer(const v8::Local<v8::Object> &object) {
@@ -66,9 +66,9 @@ v8::Local<v8::FunctionTemplate> ImageAssetImpl::GetCtor(v8::Isolate *isolate) {
             ConvertToV8String(isolate, "__addr"),
             GetAddr);
 
-    tmpl->Set(
-            ConvertToV8String(isolate, "scale"),
-            v8::FunctionTemplate::New(isolate, &Scale));
+//    tmpl->Set(
+//            ConvertToV8String(isolate, "scale"),
+//            v8::FunctionTemplate::New(isolate, &Scale));
 
     tmpl->Set(
             ConvertToV8String(isolate, "fromUrlSync"),
@@ -97,14 +97,14 @@ v8::Local<v8::FunctionTemplate> ImageAssetImpl::GetCtor(v8::Isolate *isolate) {
             v8::FunctionTemplate::New(isolate, &FromBytesCb));
 
 
-    tmpl->Set(
+ /*   tmpl->Set(
             ConvertToV8String(isolate, "saveSync"),
             v8::FunctionTemplate::New(isolate, &SaveSync));
 
     tmpl->Set(
             ConvertToV8String(isolate, "saveCb"),
             v8::FunctionTemplate::New(isolate, &SaveCb));
-
+*/
 
     cache->ImageAssetTmpl =
             std::make_unique<v8::Persistent<v8::FunctionTemplate>>(isolate, ctorTmpl);
@@ -182,26 +182,6 @@ ImageAssetImpl::GetError(v8::Local<v8::String> name,
     info.GetReturnValue().SetEmptyString();
 }
 
-void ImageAssetImpl::Scale(const v8::FunctionCallbackInfo<v8::Value> &args) {
-    ImageAssetImpl *ptr = GetPointer(args.This());
-    if (ptr == nullptr) {
-        args.GetReturnValue().SetUndefined();
-        return;
-    }
-    auto isolate = args.GetIsolate();
-    auto context = isolate->GetCurrentContext();
-
-    if (args.Length() > 1) {
-        auto x = args[0]->Uint32Value(context).ToChecked();
-        auto y = args[1]->Uint32Value(context).ToChecked();
-        if (x > 0 && y > 0) {
-            canvas_native_image_asset_scale(
-                    ptr->GetImageAsset(), x,
-                    y);
-        }
-    }
-}
-
 void ImageAssetImpl::FromUrlSync(const v8::FunctionCallbackInfo<v8::Value> &args) {
     ImageAssetImpl *ptr = GetPointer(args.This());
     if (ptr == nullptr) {
@@ -671,7 +651,7 @@ void ImageAssetImpl::FromBytesCb(const v8::FunctionCallbackInfo<v8::Value> &args
 #endif
 
 }
-
+/*
 void ImageAssetImpl::SaveSync(const v8::FunctionCallbackInfo<v8::Value> &args) {
     ImageAssetImpl *ptr = GetPointer(args.This());
     if (ptr == nullptr) {
@@ -814,6 +794,7 @@ void ImageAssetImpl::SaveCb(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
 
 }
+*/
 
 ImageAsset *ImageAssetImpl::GetImageAsset() {
     return this->asset_;

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

@@ -43,7 +43,7 @@ public:
     static void GetError(v8::Local<v8::String> name,
                           const v8::PropertyCallbackInfo<v8::Value> &info);
 
-    static void Scale(const v8::FunctionCallbackInfo<v8::Value> &args);
+//    static void Scale(const v8::FunctionCallbackInfo<v8::Value> &args);
 
     static void FromUrlSync(const v8::FunctionCallbackInfo<v8::Value> &args);
 
@@ -57,9 +57,9 @@ public:
 
     static void FromBytesCb(const v8::FunctionCallbackInfo<v8::Value> &args);
 
-    static void SaveSync(const v8::FunctionCallbackInfo<v8::Value> &args);
+   /* static void SaveSync(const v8::FunctionCallbackInfo<v8::Value> &args);
 
-    static void SaveCb(const v8::FunctionCallbackInfo<v8::Value> &args);
+    static void SaveCb(const v8::FunctionCallbackInfo<v8::Value> &args);*/
 
 
 private:

package/platforms/ios/src/cpp/URLImpl.cpp

@@ -141,6 +141,14 @@ void URLImpl::GetHash(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_hash(ptr->GetURL());
+    
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -170,6 +178,12 @@ void URLImpl::GetHost(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_host(ptr->GetURL());
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -199,6 +213,10 @@ void URLImpl::GetHostName(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_host_name(ptr->GetURL());
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -228,6 +246,14 @@ void URLImpl::GetHref(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_href(ptr->GetURL());
+    
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -256,6 +282,14 @@ void URLImpl::GetOrigin(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_origin(ptr->GetURL());
+    
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -271,6 +305,13 @@ void URLImpl::GetPassword(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_password(ptr->GetURL());
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -299,6 +340,12 @@ void URLImpl::GetPathName(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_pathname(ptr->GetURL());
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -327,6 +374,13 @@ void URLImpl::GetPort(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_port(ptr->GetURL());
+    
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -355,6 +409,13 @@ void URLImpl::GetProtocol(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_protocol(ptr->GetURL());
+    
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -384,6 +445,12 @@ void URLImpl::GetSearch(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_search(ptr->GetURL());
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 
@@ -413,6 +480,12 @@ void URLImpl::GetUserName(v8::Local<v8::String> property,
     auto isolate = info.GetIsolate();
 
     auto value = canvas_url_username(ptr->GetURL());
+    
+    if (value == nullptr) {
+        info.GetReturnValue().SetEmptyString();
+        return;
+    }
+    
     info.GetReturnValue().Set(ConvertToV8String(isolate, value));
     canvas_native_string_destroy((char *) value);
 

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

@@ -5,6 +5,7 @@
 #include "CanvasRenderingContext2DImpl.h"
 #include "Caches.h"
 #include "OneByteStringResource.h"
+#include "WebGLRenderingContextBase.h"
 
 v8::CFunction CanvasRenderingContext2DImpl::fast_start_raf_(
         v8::CFunction::Make(CanvasRenderingContext2DImpl::__FastStartRaf));
@@ -254,7 +255,7 @@ void CanvasRenderingContext2DImpl::Init(v8::Local<v8::Object> canvasModule, v8::
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "CanvasRenderingContext2D"), func);
+    canvasModule->Set(context, ConvertToV8String(isolate, "CanvasRenderingContext2D"), func).FromJust();
 }
 
 CanvasRenderingContext2DImpl *
@@ -1380,7 +1381,7 @@ void CanvasRenderingContext2DImpl::GetLineDash(v8::Local<v8::String> property,
     auto ret = v8::Array::New(isolate, (int) size);
     for (int i = 0; i < size; i++) {
         auto item = buf[i];
-        ret->Set(context, i, v8::Number::New(isolate, (double) item));
+        ret->Set(context, i, v8::Number::New(isolate, (double) item)).FromJust();
     }
 
 }
@@ -1943,7 +1944,7 @@ CanvasRenderingContext2DImpl::DrawAtlas(const v8::FunctionCallbackInfo<v8::Value
         int32_t mode = 4;
 
         if (blendValue->IsInt32()) {
-            blendValue->Int32Value(context).To(&mode);
+            auto val = blendValue->Int32Value(context).To(&mode);
         }
 
         if (colorsValue->IsArray()) {
@@ -2081,6 +2082,17 @@ CanvasRenderingContext2DImpl::DrawImage(const v8::FunctionCallbackInfo<v8::Value
                 }
             }
                 break;
+            case NativeType::WebGLRenderingContextBase: {
+                auto gl = WebGLRenderingContextBase::GetPointer(image);
+                if (gl != nullptr) {
+                    canvas_native_context_draw_image_dx_dy_webgl(
+                            ptr->GetContext(),
+                            gl->GetState(),
+                            dx, dy
+                    );
+                }
+            }
+                break;
             default:
                 break;
         }
@@ -2131,6 +2143,17 @@ CanvasRenderingContext2DImpl::DrawImage(const v8::FunctionCallbackInfo<v8::Value
                 }
             }
                 break;
+            case NativeType::WebGLRenderingContextBase: {
+                auto gl = WebGLRenderingContextBase::GetPointer(image);
+                if (gl != nullptr) {
+                    canvas_native_context_draw_image_dx_dy_dw_dh_webgl(
+                            ptr->GetContext(),
+                            gl->GetState(),
+                            dx, dy, dWidth, dHeight
+                    );
+                }
+            }
+                break;
             default:
                 break;
         }
@@ -2189,6 +2212,20 @@ CanvasRenderingContext2DImpl::DrawImage(const v8::FunctionCallbackInfo<v8::Value
                 }
             }
                 break;
+            case NativeType::WebGLRenderingContextBase: {
+                auto gl = WebGLRenderingContextBase::GetPointer(image);
+                if (gl != nullptr) {
+                    canvas_native_context_draw_image_webgl(
+                            ptr->GetContext(),
+                            gl->GetState(),
+                            sx,
+                            sy, sWidth, sHeight,
+                            dx,
+                            dy, dWidth, dHeight
+                    );
+                }
+            }
+                break;
             default:
                 break;
         }
@@ -2402,7 +2439,7 @@ CanvasRenderingContext2DImpl::GetLineDash(const v8::FunctionCallbackInfo<v8::Val
     for (int i = 0; i < size; ++i) {
         array->Set(context, i,
                    v8::Number::New(isolate,
-                                   (double) buf[i]));
+                                   (double) buf[i])).FromJust();
     }
 
     args.GetReturnValue().Set(array);