@@ -168,14 +168,15 @@ Context2d::Initialize(Napi::Env& env, Napi::Object& exports) {
168168
169169Context2d::Context2d (const Napi::CallbackInfo& info) : Napi::ObjectWrap<Context2d>(info), env(info.Env()) {
170170 InstanceData* data = env.GetInstanceData <InstanceData>();
171+ info.This ().As <Napi::Object>().TypeTag (&data->tags .Context2d );
171172
172173 if (!info[0 ].IsObject ()) {
173174 Napi::TypeError::New (env, " Canvas expected" ).ThrowAsJavaScriptException ();
174175 return ;
175176 }
176177
177178 Napi::Object obj = info[0 ].As <Napi::Object>();
178- if (!obj.InstanceOf ( data->CanvasCtor . Value ()). UnwrapOr ( false )) {
179+ if (!obj.CheckTypeTag (& data->tags . Canvas )) {
179180 if (!env.IsExceptionPending ()) {
180181 Napi::TypeError::New (env, " Canvas expected" ).ThrowAsJavaScriptException ();
181182 }
@@ -761,7 +762,7 @@ Context2d::PutImageData(const Napi::CallbackInfo& info) {
761762 }
762763 Napi::Object obj = info[0 ].As <Napi::Object>();
763764 InstanceData* data = env.GetInstanceData <InstanceData>();
764- if (!obj.InstanceOf ( data->ImageDataCtor . Value ()). UnwrapOr ( false )) {
765+ if (!obj.CheckTypeTag (& data->tags . ImageData )) {
765766 if (!env.IsExceptionPending ()) {
766767 Napi::TypeError::New (env, " ImageData expected" ).ThrowAsJavaScriptException ();
767768 }
@@ -1259,7 +1260,9 @@ Context2d::DrawImage(const Napi::CallbackInfo& info) {
12591260 Napi::Object obj = info[0 ].As <Napi::Object>();
12601261
12611262 // Image
1262- if (obj.InstanceOf (env.GetInstanceData <InstanceData>()->ImageCtor .Value ()).UnwrapOr (false )) {
1263+ InstanceData* data = env.GetInstanceData <InstanceData>();
1264+
1265+ if (obj.CheckTypeTag (&data->tags .Image )) {
12631266 Image *img = Image::Unwrap (obj);
12641267 if (!img->isComplete ()) {
12651268 Napi::Error::New (env, " Image given has not completed loading" ).ThrowAsJavaScriptException ();
@@ -1270,7 +1273,7 @@ Context2d::DrawImage(const Napi::CallbackInfo& info) {
12701273 surface = img->surface .surface ();
12711274
12721275 // Canvas
1273- } else if (obj.InstanceOf (env. GetInstanceData <InstanceData>()-> CanvasCtor . Value ()). UnwrapOr ( false )) {
1276+ } else if (obj.CheckTypeTag (&data-> tags . Canvas )) {
12741277 Canvas *canvas = Canvas::Unwrap (obj);
12751278 source_w = sw = canvas->getWidth ();
12761279 source_h = sh = canvas->getHeight ();
@@ -1903,9 +1906,9 @@ Context2d::SetFillStyle(const Napi::CallbackInfo& info, const Napi::Value& value
19031906 } else if (value.IsObject ()) {
19041907 InstanceData *data = env.GetInstanceData <InstanceData>();
19051908 Napi::Object obj = value.As <Napi::Object>();
1906- if (obj.InstanceOf ( data->CanvasGradientCtor . Value ()). UnwrapOr ( false )) {
1909+ if (obj.CheckTypeTag (& data->tags . Gradient )) {
19071910 state->fillGradient .Reset (obj);
1908- } else if (obj.InstanceOf ( data->CanvasPatternCtor . Value ()). UnwrapOr ( false )) {
1911+ } else if (obj.CheckTypeTag (& data->tags . Pattern )) {
19091912 state->fillPattern .Reset (obj);
19101913 }
19111914 }
@@ -1940,9 +1943,9 @@ Context2d::SetStrokeStyle(const Napi::CallbackInfo& info, const Napi::Value& val
19401943 } else if (value.IsObject ()) {
19411944 InstanceData *data = env.GetInstanceData <InstanceData>();
19421945 Napi::Object obj = value.As <Napi::Object>();
1943- if (obj.InstanceOf ( data->CanvasGradientCtor . Value ()). UnwrapOr ( false )) {
1946+ if (obj.CheckTypeTag (& data->tags . Gradient )) {
19441947 state->strokeGradient .Reset (obj);
1945- } else if (obj.InstanceOf ( data->CanvasPatternCtor . Value ()). UnwrapOr ( false )) {
1948+ } else if (obj.CheckTypeTag (& data->tags . Pattern )) {
19461949 state->strokePattern .Reset (obj);
19471950 }
19481951 }
0 commit comments