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

package/platforms/ios/src/cpp/webgl2/WebGL2RenderingContext.cpp

@@ -4,12 +4,12 @@
 
 #include "WebGL2RenderingContext.h"
 
-WebGL2RenderingContext::WebGL2RenderingContext(WebGLState* state) : WebGLRenderingContext(
+WebGL2RenderingContext::WebGL2RenderingContext(WebGLState *state) : WebGLRenderingContext(
         state, WebGLRenderingVersion::V2) {
 }
 
 
-WebGL2RenderingContext::WebGL2RenderingContext(WebGLState* state,
+WebGL2RenderingContext::WebGL2RenderingContext(WebGLState *state,
                                                WebGLRenderingVersion version)
         : WebGLRenderingContext(state, version) {
 }
@@ -61,7 +61,7 @@ void WebGL2RenderingContext::BeginQuery(const v8::FunctionCallbackInfo<v8::Value
     auto value = args[1];
     auto type = GetNativeType(isolate, value);
     if (type == NativeType::WebGLQuery) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
         auto query = WebGLQuery::GetPointer(value.As<v8::Object>());
 
         if (query != nullptr) {
@@ -87,7 +87,7 @@ WebGL2RenderingContext::BeginTransformFeedback(const v8::FunctionCallbackInfo<v8
     auto value = args[0];
     if (value->IsNumber()) {
         canvas_native_webgl2_begin_transform_feedback(
-                (uint32_t) args[0]->NumberValue(context).ToChecked(),
+                args[0]->Uint32Value(context).ToChecked(),
                 ptr->GetState()
         );
     }
@@ -106,8 +106,8 @@ void WebGL2RenderingContext::BindBufferBase(const v8::FunctionCallbackInfo<v8::V
     auto type = GetNativeType(isolate, bufferValue);
 
     if (type == NativeType::WebGLBuffer) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto index = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto index = args[1]->Uint32Value(context).ToChecked();
 
         auto buffer = WebGLBuffer::GetPointer(bufferValue.As<v8::Object>());
 
@@ -132,8 +132,8 @@ void WebGL2RenderingContext::BindBufferRange(const v8::FunctionCallbackInfo<v8::
     auto bufferValue = args[2];
     auto type = GetNativeType(isolate, bufferValue);
     if (args.Length() > 4 && type == NativeType::WebGLBuffer) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto index = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto index = args[1]->Uint32Value(context).ToChecked();
         auto offset = args[3]->NumberValue(context).ToChecked();
         auto size = args[4]->NumberValue(context).ToChecked();
         auto buffer = WebGLBuffer::GetPointer(bufferValue.As<v8::Object>());
@@ -160,7 +160,7 @@ void WebGL2RenderingContext::BindSampler(const v8::FunctionCallbackInfo<v8::Valu
     auto samplerValue = args[1];
     auto type = GetNativeType(isolate, samplerValue);
     if (type == NativeType::WebGLSampler) {
-        auto unit = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto unit = args[0]->Uint32Value(context).ToChecked();
         auto sampler = WebGLSampler::GetPointer(samplerValue.As<v8::Object>());
 
         canvas_native_webgl2_bind_sampler(
@@ -185,7 +185,7 @@ WebGL2RenderingContext::BindTransformFeedback(const v8::FunctionCallbackInfo<v8:
     auto type = GetNativeType(isolate, transformFeedbackValue);
 
     if (type == NativeType::WebGLTransformFeedback) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
         auto transformFeedback = WebGLTransformFeedback::GetPointer(
                 transformFeedbackValue.As<v8::Object>());
 
@@ -237,20 +237,20 @@ void WebGL2RenderingContext::BlitFramebuffer(const v8::FunctionCallbackInfo<v8::
     auto context = isolate->GetCurrentContext();
 
     if (args.Length() > 9) {
-        auto srcX0 = (int32_t) args[0]->NumberValue(context).ToChecked();
-        auto srcY0 = (int32_t) args[1]->NumberValue(context).ToChecked();
+        auto srcX0 = args[0]->Int32Value(context).ToChecked();
+        auto srcY0 = args[1]->Int32Value(context).ToChecked();
 
-        auto srcX1 = (int32_t) args[2]->NumberValue(context).ToChecked();
-        auto srcY1 = (int32_t) args[3]->NumberValue(context).ToChecked();
+        auto srcX1 = args[2]->Int32Value(context).ToChecked();
+        auto srcY1 = args[3]->Int32Value(context).ToChecked();
 
-        auto dstX0 = (int32_t) args[4]->NumberValue(context).ToChecked();
-        auto dstY0 = (int32_t) args[5]->NumberValue(context).ToChecked();
+        auto dstX0 = args[4]->Int32Value(context).ToChecked();
+        auto dstY0 = args[5]->Int32Value(context).ToChecked();
 
-        auto dstX1 = (int32_t) args[6]->NumberValue(context).ToChecked();
-        auto dstY1 = (int32_t) args[7]->NumberValue(context).ToChecked();
+        auto dstX1 = args[6]->Int32Value(context).ToChecked();
+        auto dstY1 = args[7]->Int32Value(context).ToChecked();
 
-        auto mask = (uint32_t) args[8]->NumberValue(context).ToChecked();
-        auto filter = (uint32_t) args[9]->NumberValue(context).ToChecked();
+        auto mask = args[8]->Uint32Value(context).ToChecked();
+        auto filter = args[9]->Uint32Value(context).ToChecked();
         canvas_native_webgl2_blit_framebuffer(
                 srcX0,
                 srcY0,
@@ -276,56 +276,46 @@ void WebGL2RenderingContext::ClearBufferfv(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto bufferValue = args[0];
-    auto type = GetNativeType(isolate, bufferValue);
     auto values = args[2];
-    if (args.Length() > 2 && type == NativeType::WebGLBuffer &&
-        args[1]->IsObject()) {
-        auto drawbuffer = (int32_t) args[1]->NumberValue(context).ToChecked();
-        auto buffer = WebGLBuffer::GetPointer(bufferValue.As<v8::Object>());
-        if (values->IsArray()) {
-            auto array = values.As<v8::Array>();
-            auto len = array->Length();
-            std::vector<float> buf;
-            buf.reserve(len);
-            for (int j = 0; j < len; ++j) {
-                auto item = array->Get(
-                        context, j).ToLocalChecked();
-                if (!item->IsNumber()) {
-                    buf.push_back(
-                            std::nanf(""));
-                } else {
-                    buf.push_back(
-                            static_cast<float>(item->NumberValue(context).ToChecked())
-                    );
-                }
-            }
-
-            canvas_native_webgl2_clear_bufferfv(
-                    buffer->GetBuffer(),
-                    drawbuffer,
-                                                buf.data(),
-                                                buf.size(),
-                    ptr->GetState()
+    auto buffer = args[0]->Uint32Value(context).ToChecked();
+    auto drawbuffer = args[1]->Int32Value(context).ToChecked();
+    if (values->IsArray()) {
+        auto array = values.As<v8::Array>();
+        auto len = array->Length();
+        std::vector<float> buf;
+        buf.reserve(len);
+        for (int j = 0; j < len; ++j) {
+            auto item = array->Get(
+                    context, j).ToLocalChecked();
+            buf.push_back(
+                    static_cast<float>(item->NumberValue(context).ToChecked())
             );
+        }
 
-        } else if (values->IsFloat32Array()) {
-            auto buf = values.As<v8::Float32Array>();
-            auto array = buf->Buffer();
-            auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<float *>((void*) data_ptr);
+        canvas_native_webgl2_clear_bufferfv(
+                buffer,
+                drawbuffer,
+                buf.data(),
+                buf.size(),
+                ptr->GetState()
+        );
 
+    } else if (values->IsFloat32Array()) {
+        auto buf = values.As<v8::Float32Array>();
+        auto array = buf->Buffer();
+        auto offset = buf->ByteOffset();
+        auto size = buf->Length();
+        auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+        auto data = static_cast<float *>((void *) data_ptr);
 
-            canvas_native_webgl2_clear_bufferfv(
-                    buffer->GetBuffer(),
-                    drawbuffer,
-                    data,
-                    size,
-                    ptr->GetState()
-            );
-        }
+
+        canvas_native_webgl2_clear_bufferfv(
+                buffer,
+                drawbuffer,
+                data,
+                size,
+                ptr->GetState()
+        );
     }
 }
 
@@ -338,55 +328,49 @@ void WebGL2RenderingContext::ClearBufferiv(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto bufferValue = args[0];
-    auto type = GetNativeType(isolate, bufferValue);
     auto values = args[2];
-    if (args.Length() > 2 && type == NativeType::WebGLBuffer &&
-        args[1]->IsObject()) {
-        auto drawbuffer = (int32_t) args[1]->NumberValue(context).ToChecked();
-        auto buffer = WebGLBuffer::GetPointer(bufferValue.As<v8::Object>());
-        if (values->IsArray()) {
-            auto array = values.As<v8::Array>();
-            auto len = array->Length();
-            std::vector<int32_t> buf;
-            buf.reserve(len);
-            for (int j = 0; j < len; ++j) {
-                auto item = array->Get(
-                        context, j).ToLocalChecked();
-                buf.push_back(
-                        static_cast<int32_t>(item->NumberValue(context).ToChecked())
-                );
-            }
 
-
-            canvas_native_webgl2_clear_bufferiv(
-                    buffer->GetBuffer(),
-                    drawbuffer,
-                                                buf.data(),
-                                                buf.size(),
-                    ptr->GetState()
+    auto buffer = args[0]->Uint32Value(context).ToChecked();
+    auto drawbuffer = args[1]->Int32Value(context).ToChecked();
+    if (values->IsArray()) {
+        auto array = values.As<v8::Array>();
+        auto len = array->Length();
+        std::vector<int32_t> buf;
+        buf.reserve(len);
+        for (int j = 0; j < len; ++j) {
+            auto item = array->Get(
+                    context, j).ToLocalChecked();
+            buf.push_back(
+                    item->Int32Value(context).ToChecked()
             );
+        }
 
-        } else if (values->IsInt32Array()) {
-            auto buf = values.As<v8::Int32Array>();
 
-            auto array = buf->Buffer();
-            auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<int32_t *>((void*) data_ptr);
+        canvas_native_webgl2_clear_bufferiv(
+                buffer,
+                drawbuffer,
+                buf.data(),
+                buf.size(),
+                ptr->GetState()
+        );
 
+    } else if (values->IsInt32Array()) {
+        auto buf = values.As<v8::Int32Array>();
 
+        auto array = buf->Buffer();
+        auto offset = buf->ByteOffset();
+        auto size = buf->Length();
+        auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+        auto data = static_cast<int32_t *>((void *) data_ptr);
 
 
-            canvas_native_webgl2_clear_bufferiv(
-                    buffer->GetBuffer(),
-                    drawbuffer,
-                    data,
-                                                size,
-                    ptr->GetState()
-            );
-        }
+        canvas_native_webgl2_clear_bufferiv(
+                buffer,
+                drawbuffer,
+                data,
+                size,
+                ptr->GetState()
+        );
     }
 }
 
@@ -399,23 +383,17 @@ void WebGL2RenderingContext::ClearBufferfi(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto bufferValue = args[0];
-    auto type = GetNativeType(isolate, bufferValue);
-    if (args.Length() > 3 && type == NativeType::WebGLBuffer) {
-        auto buffer = WebGLBuffer::GetPointer(bufferValue.As<v8::Object>());
-        if (buffer != nullptr) {
-            auto drawbuffer = (int32_t) args[1]->NumberValue(context).ToChecked();
-            auto depth = args[2]->NumberValue(context).ToChecked();
-            auto stencil = (int32_t) args[3]->NumberValue(context).ToChecked();
-            canvas_native_webgl2_clear_bufferfi(
-                    buffer->GetBuffer(),
-                    drawbuffer,
-                    static_cast<float>(depth),
-                    stencil,
-                    ptr->GetState()
-            );
-        }
-    }
+    auto buffer = args[0]->Uint32Value(context).ToChecked();
+    auto drawbuffer = args[1]->Int32Value(context).ToChecked();
+    auto depth = args[2]->NumberValue(context).ToChecked();
+    auto stencil = args[3]->Int32Value(context).ToChecked();
+    canvas_native_webgl2_clear_bufferfi(
+            buffer,
+            drawbuffer,
+            static_cast<float>(depth),
+            stencil,
+            ptr->GetState()
+    );
 }
 
 void WebGL2RenderingContext::ClearBufferuiv(const v8::FunctionCallbackInfo<v8::Value> &args) {
@@ -427,52 +405,48 @@ void WebGL2RenderingContext::ClearBufferuiv(const v8::FunctionCallbackInfo<v8::V
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto bufferValue = args[0];
-    auto type = GetNativeType(isolate, bufferValue);
-    auto values = args[2];
-    if (args.Length() > 2 && type == NativeType::WebGLBuffer &&
-        args[1]->IsObject()) {
-        auto drawbuffer = (int32_t) args[1]->NumberValue(context).ToChecked();
-        auto buffer = WebGLBuffer::GetPointer(bufferValue.As<v8::Object>());
-        if (values->IsArray()) {
-            auto array = values.As<v8::Array>();
-            auto len = array->Length();
-            std::vector<uint32_t> buf;
-            buf.reserve(len);
-            for (int j = 0; j < len; ++j) {
-                auto item = array->Get(
-                        context, j).ToLocalChecked();
-                buf.push_back(
-                        static_cast<uint32_t>(item->NumberValue(context).ToChecked())
-                );
-            }
 
+    auto values = args[2];
 
-            canvas_native_webgl2_clear_bufferuiv(
-                    buffer->GetBuffer(),
-                    drawbuffer,
-                                                 buf.data(),
-                                                 buf.size(),
-                    ptr->GetState()
+    auto buffer = args[0]->Uint32Value(context).ToChecked();
+    auto drawbuffer = args[1]->Int32Value(context).ToChecked();
+    if (values->IsArray()) {
+        auto array = values.As<v8::Array>();
+        auto len = array->Length();
+        std::vector<uint32_t> buf;
+        buf.reserve(len);
+        for (int j = 0; j < len; ++j) {
+            auto item = array->Get(
+                    context, j).ToLocalChecked();
+            buf.push_back(
+                    item->Uint32Value(context).ToChecked()
             );
+        }
 
-        } else if (values->IsUint32Array()) {
-            auto buf = values.As<v8::Uint32Array>();
-            auto array = buf->Buffer();
-            auto offset = buf->ByteOffset();
-            auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint32_t *>((void*) data_ptr);
 
+        canvas_native_webgl2_clear_bufferuiv(
+                buffer,
+                drawbuffer,
+                buf.data(),
+                buf.size(),
+                ptr->GetState()
+        );
+
+    } else if (values->IsUint32Array()) {
+        auto buf = values.As<v8::Uint32Array>();
+        auto array = buf->Buffer();
+        auto offset = buf->ByteOffset();
+        auto size = buf->Length();
+        auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+        auto data = static_cast<uint32_t *>((void *) data_ptr);
 
 
-            canvas_native_webgl2_clear_bufferuiv(
-                    buffer->GetBuffer(),
-                    drawbuffer,
-                    data, size,
-                    ptr->GetState()
-            );
-        }
+        canvas_native_webgl2_clear_bufferuiv(
+                buffer,
+                drawbuffer,
+                data, size,
+                ptr->GetState()
+        );
     }
 }
 
@@ -490,7 +464,7 @@ void WebGL2RenderingContext::ClientWaitSync(const v8::FunctionCallbackInfo<v8::V
     if (args.Length() > 2 && type == NativeType::WebGLSync) {
         auto sync = WebGLSyncImpl::GetPointer(syncValue.As<v8::Object>());
         if (sync != nullptr) {
-            auto flags = (uint32_t) args[1]->NumberValue(context).ToChecked();
+            auto flags = args[1]->Uint32Value(context).ToChecked();
             auto timeout = args[2]->NumberValue(context).ToChecked();
             auto ret = canvas_native_webgl2_client_wait_sync(
                     sync->GetSync(),
@@ -499,7 +473,7 @@ void WebGL2RenderingContext::ClientWaitSync(const v8::FunctionCallbackInfo<v8::V
                     ptr->GetState()
             );
 
-            args.GetReturnValue().Set((int32_t) ret);
+            args.GetReturnValue().Set(ret);
             return;
         }
     }
@@ -518,15 +492,15 @@ WebGL2RenderingContext::CompressedTexSubImage3D(const v8::FunctionCallbackInfo<v
     auto context = isolate->GetCurrentContext();
 
     if (args.Length() > 8) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto level = (int32_t) args[1]->NumberValue(context).ToChecked();
-        auto xoffset = (int32_t) args[2]->NumberValue(context).ToChecked();
-        auto yoffset = (int32_t) args[3]->NumberValue(context).ToChecked();
-        auto zoffset = (int32_t) args[4]->NumberValue(context).ToChecked();
-        auto width = (int32_t) args[5]->NumberValue(context).ToChecked();
-        auto height = (int32_t) args[6]->NumberValue(context).ToChecked();
-        auto depth = (int32_t) args[7]->NumberValue(context).ToChecked();
-        auto format = (uint32_t) args[8]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto level = args[1]->Int32Value(context).ToChecked();
+        auto xoffset = args[2]->Int32Value(context).ToChecked();
+        auto yoffset = args[3]->Int32Value(context).ToChecked();
+        auto zoffset = args[4]->Int32Value(context).ToChecked();
+        auto width = args[5]->Int32Value(context).ToChecked();
+        auto height = args[6]->Int32Value(context).ToChecked();
+        auto depth = args[7]->Int32Value(context).ToChecked();
+        auto format = args[8]->Uint32Value(context).ToChecked();
 
         auto imageSizeOrBufValue = args[0];
         if (args[9]->IsObject()) {
@@ -535,8 +509,8 @@ WebGL2RenderingContext::CompressedTexSubImage3D(const v8::FunctionCallbackInfo<v
                 auto array = buf->Buffer();
                 auto offset = buf->ByteOffset();
                 auto size = buf->ByteLength();
-                auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-                auto data = static_cast<uint8_t *>((void*) data_ptr);
+                auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+                auto data = static_cast<uint8_t *>((void *) data_ptr);
 
                 size_t srcOffset = 0;
                 if (args[10]->IsNumber()) {
@@ -567,10 +541,10 @@ WebGL2RenderingContext::CompressedTexSubImage3D(const v8::FunctionCallbackInfo<v
                 );
             }
         } else {
-            auto imageSizeOrBuf = (int32_t) imageSizeOrBufValue->NumberValue(context).ToChecked();
+            auto imageSizeOrBuf = imageSizeOrBufValue->Int32Value(context).ToChecked();
             auto offset = 0;
             if (args[10]->IsNumber()) {
-                offset = (int32_t) args[10]->NumberValue(context).ToChecked();
+                offset = args[10]->Int32Value(context).ToChecked();
             }
             canvas_native_webgl2_compressed_tex_sub_image3d_none(
                     target,
@@ -600,8 +574,8 @@ void WebGL2RenderingContext::CopyBufferSubData(const v8::FunctionCallbackInfo<v8
     auto context = isolate->GetCurrentContext();
 
     if (args.Length() > 4) {
-        auto readTarget = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto writeTarget = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto readTarget = args[0]->Uint32Value(context).ToChecked();
+        auto writeTarget = args[1]->Uint32Value(context).ToChecked();
         auto readOffset = args[2]->NumberValue(context).ToChecked();
         auto writeOffset = args[3]->NumberValue(context).ToChecked();
         auto size = args[4]->NumberValue(context).ToChecked();
@@ -626,15 +600,15 @@ void WebGL2RenderingContext::CopyTexSubImage3D(const v8::FunctionCallbackInfo<v8
     auto context = isolate->GetCurrentContext();
 
     if (args.Length() > 8) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto level = (int32_t) args[1]->NumberValue(context).ToChecked();
-        auto xoffset = (int32_t) args[2]->NumberValue(context).ToChecked();
-        auto yoffset = (int32_t) args[3]->NumberValue(context).ToChecked();
-        auto zoffset = (int32_t) args[4]->NumberValue(context).ToChecked();
-        auto x = (int32_t) args[5]->NumberValue(context).ToChecked();
-        auto y = (int32_t) args[6]->NumberValue(context).ToChecked();
-        auto width = (int32_t) args[7]->NumberValue(context).ToChecked();
-        auto height = (int32_t) args[8]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto level = args[1]->Int32Value(context).ToChecked();
+        auto xoffset = args[2]->Int32Value(context).ToChecked();
+        auto yoffset = args[3]->Int32Value(context).ToChecked();
+        auto zoffset = args[4]->Int32Value(context).ToChecked();
+        auto x = args[5]->Int32Value(context).ToChecked();
+        auto y = args[6]->Int32Value(context).ToChecked();
+        auto width = args[7]->Int32Value(context).ToChecked();
+        auto height = args[8]->Int32Value(context).ToChecked();
         canvas_native_webgl2_copy_tex_sub_image3d(
                 target,
                 level,
@@ -845,10 +819,10 @@ void WebGL2RenderingContext::DrawArraysInstanced(const v8::FunctionCallbackInfo<
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto mode = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto first = (int32_t) args[1]->NumberValue(context).ToChecked();
-    auto count_ = (int32_t) args[2]->NumberValue(context).ToChecked();
-    auto instanceCount = (int32_t) args[3]->NumberValue(context).ToChecked();
+    auto mode = args[0]->Uint32Value(context).ToChecked();
+    auto first = args[1]->Int32Value(context).ToChecked();
+    auto count_ = args[2]->Int32Value(context).ToChecked();
+    auto instanceCount = args[3]->Int32Value(context).ToChecked();
     canvas_native_webgl2_draw_arrays_instanced(
             mode,
             first,
@@ -878,12 +852,11 @@ void WebGL2RenderingContext::DrawBuffers(const v8::FunctionCallbackInfo<v8::Valu
         for (int j = 0; j < len; ++j) {
             auto item = array->Get(
                     context, j).ToLocalChecked();
-            buf.emplace_back(
-                    (uint32_t) item->NumberValue(context).ToChecked());
+            buf.emplace_back(item->Uint32Value(context).ToChecked());
         }
 
         canvas_native_webgl2_draw_buffers(
-                                          buf.data(), buf.size(),
+                buf.data(), buf.size(),
                 ptr->GetState());
     }
 }
@@ -898,11 +871,11 @@ WebGL2RenderingContext::DrawElementsInstanced(const v8::FunctionCallbackInfo<v8:
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto mode = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto count_ = (int32_t) args[1]->NumberValue(context).ToChecked();
-    auto type = (uint32_t) args[2]->NumberValue(context).ToChecked();
+    auto mode = args[0]->Uint32Value(context).ToChecked();
+    auto count_ = args[1]->Int32Value(context).ToChecked();
+    auto type = args[2]->Uint32Value(context).ToChecked();
     auto offset = args[3]->NumberValue(context).ToChecked();
-    auto instanceCount = (int32_t) args[4]->NumberValue(context).ToChecked();
+    auto instanceCount = args[4]->Int32Value(context).ToChecked();
     canvas_native_webgl2_draw_elements_instanced(
             mode,
             count_,
@@ -924,11 +897,11 @@ void WebGL2RenderingContext::DrawRangeElements(const v8::FunctionCallbackInfo<v8
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto mode = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto start = (uint32_t) args[1]->NumberValue(context).ToChecked();
-    auto end = (uint32_t) args[2]->NumberValue(context).ToChecked();
-    auto count_ = (int32_t) args[3]->NumberValue(context).ToChecked();
-    auto type = (uint32_t) args[4]->NumberValue(context).ToChecked();
+    auto mode = args[0]->Uint32Value(context).ToChecked();
+    auto start = args[1]->Uint32Value(context).ToChecked();
+    auto end = args[2]->Uint32Value(context).ToChecked();
+    auto count_ = args[3]->Int32Value(context).ToChecked();
+    auto type = args[4]->Uint32Value(context).ToChecked();
     auto offset = args[5]->NumberValue(context).ToChecked();
     canvas_native_webgl2_draw_range_elements(
             mode,
@@ -953,7 +926,7 @@ void WebGL2RenderingContext::EndQuery(const v8::FunctionCallbackInfo<v8::Value>
     auto context = isolate->GetCurrentContext();
 
     if (args[0]->IsNumber()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
         canvas_native_webgl2_end_query(target,
                                        ptr->GetState());
     }
@@ -982,8 +955,8 @@ void WebGL2RenderingContext::FenceSync(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto condition = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto flags = (uint32_t) args[1]->NumberValue(context).ToChecked();
+    auto condition = args[0]->Uint32Value(context).ToChecked();
+    auto flags = args[1]->Uint32Value(context).ToChecked();
     auto sync = canvas_native_webgl2_fence_sync(
             condition,
             flags,
@@ -1009,11 +982,11 @@ WebGL2RenderingContext::FramebufferTextureLayer(const v8::FunctionCallbackInfo<v
     auto textureValue = args[2];
     auto type = GetNativeType(isolate, textureValue);
     if (type == NativeType::WebGLTexture) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto attachment = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto attachment = args[1]->Uint32Value(context).ToChecked();
         auto texture = WebGLTexture::GetPointer(textureValue.As<v8::Object>());
-        auto level = (int32_t) args[3]->NumberValue(context).ToChecked();
-        auto layer = (int32_t) args[4]->NumberValue(context).ToChecked();
+        auto level = args[3]->Int32Value(context).ToChecked();
+        auto layer = args[4]->Int32Value(context).ToChecked();
         if (texture != nullptr) {
             canvas_native_webgl2_framebuffer_texture_layer(
                     target,
@@ -1044,13 +1017,13 @@ WebGL2RenderingContext::GetActiveUniformBlockName(const v8::FunctionCallbackInfo
     if (type == NativeType::WebGLProgram) {
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
         if (program != nullptr) {
-            auto uniformBlockIndex = (uint32_t) args[1]->NumberValue(context).ToChecked();
+            auto uniformBlockIndex = args[1]->Uint32Value(context).ToChecked();
             auto name = canvas_native_webgl2_get_active_uniform_block_name(
                     program->GetProgram(),
                     uniformBlockIndex,
                     ptr->GetState()
             );
-            args.GetReturnValue().Set(ConvertToV8OneByteString(isolate, (char*)name));
+            args.GetReturnValue().Set(ConvertToV8OneByteString(isolate, (char *) name));
             return;
         }
 
@@ -1077,8 +1050,8 @@ void WebGL2RenderingContext::GetActiveUniformBlockParameter(
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
 
         if (program != nullptr) {
-            auto uniformBlockIndex = (uint32_t) args[1]->NumberValue(context).ToChecked();
-            auto pname = (uint32_t) args[2]->NumberValue(context).ToChecked();
+            auto uniformBlockIndex = args[1]->Uint32Value(context).ToChecked();
+            auto pname = args[2]->Uint32Value(context).ToChecked();
             auto ret = canvas_native_webgl2_get_active_uniform_block_parameter(
                     program->GetProgram(),
                     uniformBlockIndex,
@@ -1098,7 +1071,7 @@ void WebGL2RenderingContext::GetActiveUniformBlockParameter(
                     auto value = canvas_native_webgl_result_get_u32_array(
                             ret);
 
-                    auto buf = (uint8_t*)canvas_native_u32_buffer_get_bytes(value);
+                    auto buf = (uint8_t *) canvas_native_u32_buffer_get_bytes(value);
                     auto size = canvas_native_u32_buffer_get_length(value);
                     auto bytes_size = size * sizeof(uint32_t);
 
@@ -1106,7 +1079,8 @@ void WebGL2RenderingContext::GetActiveUniformBlockParameter(
                                                                   [](void *data, size_t length,
                                                                      void *deleter_data) {
                                                                       if (deleter_data != nullptr) {
-                                                                          canvas_native_u32_buffer_destroy((U32Buffer *) deleter_data);
+                                                                          canvas_native_u32_buffer_destroy(
+                                                                                  (U32Buffer *) deleter_data);
                                                                       }
                                                                   },
                                                                   value);
@@ -1150,7 +1124,7 @@ void WebGL2RenderingContext::GetActiveUniforms(const v8::FunctionCallbackInfo<v8
 
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
         auto uniformIndicesObject = args[1];
-        auto pname = (uint32_t) args[2]->NumberValue(context).ToChecked();
+        auto pname = args[2]->Uint32Value(context).ToChecked();
 
         if (uniformIndicesObject->IsArray()) {
             auto uniformIndices = uniformIndicesObject.As<v8::Array>();
@@ -1158,14 +1132,14 @@ void WebGL2RenderingContext::GetActiveUniforms(const v8::FunctionCallbackInfo<v8
             std::vector<uint32_t> buf;
             buf.reserve(size);
             for (int j = 0; j < size; j++) {
-                auto item = (uint32_t) uniformIndices->Get(
-                        context, j).ToLocalChecked()->NumberValue(context).ToChecked();
+                auto item = uniformIndices->Get(
+                        context, j).ToLocalChecked()->Uint32Value(context).ToChecked();
                 buf.emplace_back(item);
             }
 
             auto ret = canvas_native_webgl2_get_active_uniforms(
                     program->GetProgram(),
-                                                                buf.data(), buf.size(),
+                    buf.data(), buf.size(),
                     pname,
                     ptr->GetState()
             );
@@ -1186,7 +1160,7 @@ void WebGL2RenderingContext::GetActiveUniforms(const v8::FunctionCallbackInfo<v8
                         auto item = buffer[j];
                         array->Set(
                                 context, j,
-                                v8::Number::New(isolate, (double) item));
+                                v8::Integer::NewFromUnsigned(isolate, item));
                     }
                     args.GetReturnValue().Set(array);
                     canvas_native_u32_buffer_destroy(value);
@@ -1208,8 +1182,7 @@ void WebGL2RenderingContext::GetActiveUniforms(const v8::FunctionCallbackInfo<v8
                         auto item = buffer[j];
                         array->Set(
                                 context, j,
-                                v8::Number::New(isolate,
-                                                (double) item));
+                                v8::Integer::New(isolate, item));
                     }
                     args.GetReturnValue().Set(array);
                     canvas_native_i32_buffer_destroy(value);
@@ -1260,7 +1233,7 @@ void WebGL2RenderingContext::GetBufferSubData(const v8::FunctionCallbackInfo<v8:
 
     auto dstDataObject = args[2];
     if (dstDataObject->IsArrayBufferView()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
         auto srcByteOffset = args[1]->NumberValue(context).ToChecked();
 
         auto array = dstDataObject.As<v8::ArrayBufferView>();
@@ -1271,7 +1244,6 @@ void WebGL2RenderingContext::GetBufferSubData(const v8::FunctionCallbackInfo<v8:
         auto data = reinterpret_cast<uint8_t *>(buf->GetBackingStore()->Data()) + offset;
 
 
-
         auto BYTES_PER_ELEMENT = (ssize_t) array->Get(
                 context,
                 ConvertToV8String(isolate, "BYTES_PER_ELEMENT")).ToLocalChecked()->NumberValue(
@@ -1345,8 +1317,8 @@ void WebGL2RenderingContext::GetIndexedParameter(const v8::FunctionCallbackInfo<
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto index = (uint32_t) args[1]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    auto index = args[1]->Uint32Value(context).ToChecked();
     auto ret = canvas_native_webgl2_get_indexed_parameter(
             target,
             index,
@@ -1390,9 +1362,9 @@ void WebGL2RenderingContext::GetInternalformatParameter(
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto internalformat = (uint32_t) args[1]->NumberValue(context).ToChecked();
-    auto pname = (uint32_t) args[2]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    auto internalformat = args[1]->Uint32Value(context).ToChecked();
+    auto pname = args[2]->Uint32Value(context).ToChecked();
     switch (internalformat) {
         case GL_RGB:
         case GL_RGBA:
@@ -1461,7 +1433,7 @@ void WebGL2RenderingContext::GetInternalformatParameter(
     if (pname == GL_SAMPLES) {
         auto value = canvas_native_webgl_result_get_i32_array(ret);
 
-        auto buf = (uint8_t*)canvas_native_i32_buffer_get_bytes(value);
+        auto buf = (uint8_t *) canvas_native_i32_buffer_get_bytes(value);
         auto size = canvas_native_i32_buffer_get_length(value);
         auto bytes_size = size * sizeof(int32_t);
 
@@ -1469,7 +1441,8 @@ void WebGL2RenderingContext::GetInternalformatParameter(
                                                       [](void *data, size_t length,
                                                          void *deleter_data) {
                                                           if (deleter_data != nullptr) {
-                                                              canvas_native_i32_buffer_destroy((I32Buffer *) deleter_data);
+                                                              canvas_native_i32_buffer_destroy(
+                                                                      (I32Buffer *) deleter_data);
                                                           }
                                                       },
                                                       value);
@@ -1495,7 +1468,7 @@ void WebGL2RenderingContext::GetParameter(const v8::FunctionCallbackInfo<v8::Val
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto pname = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto pname = args[0]->Uint32Value(context).ToChecked();
     auto result = canvas_native_webgl2_get_parameter(
             pname,
             ptr->GetState());
@@ -1510,7 +1483,7 @@ void WebGL2RenderingContext::GetParameter(const v8::FunctionCallbackInfo<v8::Val
             return;
         default: {
             auto ret = ptr->GetParameterInternal(
-                    isolate, pname,result);
+                    isolate, pname, result);
 
             canvas_native_webgl_WebGLResult_destroy(result);
 
@@ -1535,7 +1508,7 @@ void WebGL2RenderingContext::GetQueryParameter(const v8::FunctionCallbackInfo<v8
     if (type == NativeType::WebGLQuery) {
         auto query = WebGLQuery::GetPointer(queryValue.As<v8::Object>());
         if (query != nullptr) {
-            auto pname = (uint32_t) args[1]->NumberValue(context).ToChecked();
+            auto pname = args[1]->Uint32Value(context).ToChecked();
 
 
             auto ret = canvas_native_webgl2_get_query_parameter(
@@ -1549,7 +1522,7 @@ void WebGL2RenderingContext::GetQueryParameter(const v8::FunctionCallbackInfo<v8
                 return;
             } else if (pname ==
                        GL_QUERY_RESULT_AVAILABLE) {
-                args.GetReturnValue().Set((int32_t) canvas_native_webgl_result_get_u32(
+                args.GetReturnValue().Set(canvas_native_webgl_result_get_u32(
                         ret));
                 canvas_native_webgl_WebGLResult_destroy(ret);
                 return;
@@ -1573,8 +1546,8 @@ void WebGL2RenderingContext::GetQuery(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto pname = (uint32_t) args[1]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    auto pname = args[1]->Uint32Value(context).ToChecked();
     auto ret = canvas_native_webgl2_get_query(
             target,
             pname,
@@ -1604,7 +1577,7 @@ void WebGL2RenderingContext::GetSamplerParameter(const v8::FunctionCallbackInfo<
     if (type == NativeType::WebGLSampler) {
         auto sampler = WebGLSampler::GetPointer(samplerValue.As<v8::Object>());
         if (sampler != nullptr) {
-            auto pname = (uint32_t) args[1]->NumberValue(context).ToChecked();
+            auto pname = args[1]->Uint32Value(context).ToChecked();
             auto ret = canvas_native_webgl2_get_sampler_parameter(
                     sampler->GetSampler(),
                     pname,
@@ -1653,7 +1626,7 @@ void WebGL2RenderingContext::GetSyncParameter(const v8::FunctionCallbackInfo<v8:
     auto syncValue = args[0];
     auto sync = WebGLSyncImpl::GetPointer(syncValue.As<v8::Object>());
     if (sync != nullptr) {
-        auto pname = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto pname = args[1]->Uint32Value(context).ToChecked();
         auto ret = canvas_native_webgl2_get_sync_parameter(
                 sync->GetSync(),
                 pname,
@@ -1693,7 +1666,7 @@ void WebGL2RenderingContext::GetTransformFeedbackVarying(
     auto type = GetNativeType(isolate, programValue);
     if (type == NativeType::WebGLProgram) {
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
-        auto index = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto index = args[1]->Uint32Value(context).ToChecked();
         if (program != nullptr) {
             auto ret = canvas_native_webgl2_get_transform_feedback_varying(
                     program->GetProgram(),
@@ -1776,7 +1749,7 @@ void WebGL2RenderingContext::GetUniformIndices(const v8::FunctionCallbackInfo<v8
             }
 
 
-            const char* cStrings[store.size()];
+            const char *cStrings[store.size()];
             for (size_t i = 0; i < store.size(); ++i) {
                 cStrings[i] = store[i].c_str();
             }
@@ -1796,8 +1769,7 @@ void WebGL2RenderingContext::GetUniformIndices(const v8::FunctionCallbackInfo<v8
                 auto item = buf[j];
                 result->Set(context,
                             j,
-                            v8::Number::New(isolate,
-                                            (int32_t) item));
+                            v8::Integer::NewFromUnsigned(isolate, item));
             }
 
             args.GetReturnValue().Set(result);
@@ -1820,7 +1792,7 @@ WebGL2RenderingContext::InvalidateFramebuffer(const v8::FunctionCallbackInfo<v8:
     auto context = isolate->GetCurrentContext();
 
     auto attachments = args[1];
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
 
     if (attachments->IsArray()) {
         auto array = attachments.As<v8::Array>();
@@ -1828,8 +1800,8 @@ WebGL2RenderingContext::InvalidateFramebuffer(const v8::FunctionCallbackInfo<v8:
         std::vector<uint32_t> buf;
         buf.reserve(len);
         for (int j = 0; j < len; ++j) {
-            auto item = (uint32_t) array->Get(
-                    context, j).ToLocalChecked()->NumberValue(context).ToChecked();
+            auto item = array->Get(
+                    context, j).ToLocalChecked()->Uint32Value(context).ToChecked();
             buf.push_back(item);
         }
 
@@ -1851,19 +1823,19 @@ WebGL2RenderingContext::InvalidateSubFramebuffer(const v8::FunctionCallbackInfo<
 
     auto attachments = args[1];
     if (attachments->IsArray()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto x = (int32_t) args[2]->NumberValue(context).ToChecked();
-        auto y = (int32_t) args[3]->NumberValue(context).ToChecked();
-        auto width = (int32_t) args[4]->NumberValue(context).ToChecked();
-        auto height = (int32_t) args[5]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto x = args[2]->Int32Value(context).ToChecked();
+        auto y = args[3]->Int32Value(context).ToChecked();
+        auto width = args[4]->Int32Value(context).ToChecked();
+        auto height = args[5]->Int32Value(context).ToChecked();
 
         auto array = attachments.As<v8::Array>();
         auto len = array->Length();
         std::vector<uint32_t> buf;
         buf.reserve(len);
         for (int j = 0; j < len; ++j) {
-            auto item = (uint32_t) array->Get(
-                    context, j).ToLocalChecked()->NumberValue(context).ToChecked();
+            auto item = array->Get(
+                    context, j).ToLocalChecked()->Uint32Value(context).ToChecked();
             buf.push_back(item);
         }
 
@@ -2022,7 +1994,7 @@ void WebGL2RenderingContext::ReadBuffer(const v8::FunctionCallbackInfo<v8::Value
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto src = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto src = args[0]->Uint32Value(context).ToChecked();
     canvas_native_webgl2_read_buffer(
             src,
             ptr->GetState()
@@ -2039,11 +2011,11 @@ void WebGL2RenderingContext::RenderbufferStorageMultisample(
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto samples = (int32_t) args[1]->NumberValue(context).ToChecked();
-    auto internalFormat = (uint32_t) args[2]->NumberValue(context).ToChecked();
-    auto width = (int32_t) args[3]->NumberValue(context).ToChecked();
-    auto height = (int32_t) args[4]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    auto samples = args[1]->Int32Value(context).ToChecked();
+    auto internalFormat = args[2]->Uint32Value(context).ToChecked();
+    auto width = args[3]->Int32Value(context).ToChecked();
+    auto height = args[4]->Int32Value(context).ToChecked();
     canvas_native_webgl2_renderbuffer_storage_multisample(
             target,
             samples,
@@ -2078,7 +2050,7 @@ void WebGL2RenderingContext::SamplerParameterf(const v8::FunctionCallbackInfo<v8
     auto type = GetNativeType(isolate, samplerValue);
     if (type == NativeType::WebGLSampler) {
         auto sampler = WebGLSampler::GetPointer(samplerValue.As<v8::Object>());
-        auto pname = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto pname = args[1]->Uint32Value(context).ToChecked();
         auto param = args[2]->NumberValue(context).ToChecked();
         if (sampler != nullptr) {
             canvas_native_webgl2_sampler_parameterf(
@@ -2104,8 +2076,8 @@ void WebGL2RenderingContext::SamplerParameteri(const v8::FunctionCallbackInfo<v8
     auto type = GetNativeType(isolate, samplerValue);
     if (type == NativeType::WebGLSampler) {
         auto sampler = WebGLSampler::GetPointer(samplerValue.As<v8::Object>());
-        auto pname = (uint32_t) args[1]->NumberValue(context).ToChecked();
-        auto param = (int32_t) args[2]->NumberValue(context).ToChecked();
+        auto pname = args[1]->Uint32Value(context).ToChecked();
+        auto param = args[2]->Int32Value(context).ToChecked();
         if (sampler != nullptr) {
             canvas_native_webgl2_sampler_parameteri(
                     sampler->GetSampler(),
@@ -2130,23 +2102,23 @@ void WebGL2RenderingContext::TexImage3D(const v8::FunctionCallbackInfo<v8::Value
 
 
     if (count == 10) {
-        auto target = (int32_t) args[0]->NumberValue(
+        auto target = args[0]->Int32Value(
                 context).ToChecked();
-        auto level = (int32_t) args[1]->NumberValue(
+        auto level = args[1]->Int32Value(
                 context).ToChecked();
-        auto internalformat = (int32_t) args[2]->NumberValue(
+        auto internalformat = args[2]->Int32Value(
                 context).ToChecked();
-        auto width = (int32_t) args[3]->NumberValue(
+        auto width = args[3]->Int32Value(
                 context).ToChecked();
-        auto height = (int32_t) args[4]->NumberValue(
+        auto height = args[4]->Int32Value(
                 context).ToChecked();
-        auto depth = (int32_t) args[5]->NumberValue(
+        auto depth = args[5]->Int32Value(
                 context).ToChecked();
-        auto border = (int32_t) args[6]->NumberValue(
+        auto border = args[6]->Int32Value(
                 context).ToChecked();
-        auto format = (int32_t) args[7]->NumberValue(
+        auto format = args[7]->Int32Value(
                 context).ToChecked();
-        auto type = (uint32_t) args[8]->NumberValue(
+        auto type = args[8]->Uint32Value(
                 context).ToChecked();
 
         auto imageOrPixelsOrOffset = args[9];
@@ -2177,8 +2149,8 @@ void WebGL2RenderingContext::TexImage3D(const v8::FunctionCallbackInfo<v8::Value
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->ByteLength();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint8_t *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
             canvas_native_webgl2_tex_image3d(
@@ -2250,23 +2222,23 @@ void WebGL2RenderingContext::TexImage3D(const v8::FunctionCallbackInfo<v8::Value
         }
     } else if (args.Length() > 10) {
 
-        auto target = (int32_t) args[0]->NumberValue(
+        auto target = args[0]->Int32Value(
                 context).ToChecked();
-        auto level = (int32_t) args[1]->NumberValue(
+        auto level = args[1]->Int32Value(
                 context).ToChecked();
-        auto internalformat = (int32_t) args[2]->NumberValue(
+        auto internalformat = args[2]->Int32Value(
                 context).ToChecked();
-        auto width = (int32_t) args[3]->NumberValue(
+        auto width = args[3]->Int32Value(
                 context).ToChecked();
-        auto height = (int32_t) args[4]->NumberValue(
+        auto height = args[4]->Int32Value(
                 context).ToChecked();
-        auto depth = (int32_t) args[5]->NumberValue(
+        auto depth = args[5]->Int32Value(
                 context).ToChecked();
-        auto border = (int32_t) args[6]->NumberValue(
+        auto border = args[6]->Int32Value(
                 context).ToChecked();
-        auto format = (int32_t) args[7]->NumberValue(
+        auto format = args[7]->Int32Value(
                 context).ToChecked();
-        auto type = (uint32_t) args[8]->NumberValue(
+        auto type = args[8]->Uint32Value(
                 context).ToChecked();
 
         auto imageOrPixelsOrOffset = args[9];
@@ -2283,8 +2255,8 @@ void WebGL2RenderingContext::TexImage3D(const v8::FunctionCallbackInfo<v8::Value
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->ByteLength();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint8_t *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint8_t *>((void *) data_ptr);
 
             srcOffsetValue =
                     srcOffsetValue * size;
@@ -2322,15 +2294,15 @@ void WebGL2RenderingContext::TexStorage2D(const v8::FunctionCallbackInfo<v8::Val
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto levels = (int32_t) args[1]->NumberValue(
+    auto levels = args[1]->Int32Value(
             context).ToChecked();
-    auto internalFormat = (uint32_t) args[2]->NumberValue(
+    auto internalFormat = args[2]->Uint32Value(
             context).ToChecked();
-    auto width = (int32_t) args[3]->NumberValue(
+    auto width = args[3]->Int32Value(
             context).ToChecked();
-    auto height = (int32_t) args[4]->NumberValue(
+    auto height = args[4]->Int32Value(
             context).ToChecked();
     canvas_native_webgl2_tex_storage2d(
             target,
@@ -2351,17 +2323,17 @@ void WebGL2RenderingContext::TexStorage3D(const v8::FunctionCallbackInfo<v8::Val
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto levels = (int32_t) args[1]->NumberValue(
+    auto levels = args[1]->Int32Value(
             context).ToChecked();
-    auto internalFormat = (uint32_t) args[2]->NumberValue(
+    auto internalFormat = args[2]->Uint32Value(
             context).ToChecked();
-    auto width = (int32_t) args[3]->NumberValue(
+    auto width = args[3]->Int32Value(
             context).ToChecked();
-    auto height = (int32_t) args[4]->NumberValue(
+    auto height = args[4]->Int32Value(
             context).ToChecked();
-    auto depth = (int32_t) args[5]->NumberValue(
+    auto depth = args[5]->Int32Value(
             context).ToChecked();
     canvas_native_webgl2_tex_storage3d(
             target,
@@ -2385,25 +2357,25 @@ void WebGL2RenderingContext::TexSubImage3D(const v8::FunctionCallbackInfo<v8::Va
 
     auto count = args.Length();
     if (count == 11) {
-        auto target = (uint32_t) args[0]->NumberValue(
+        auto target = args[0]->Uint32Value(
                 context).ToChecked();
-        auto level = (int32_t) args[1]->NumberValue(
+        auto level = args[1]->Int32Value(
                 context).ToChecked();
-        auto xoffset = (int32_t) args[2]->NumberValue(
+        auto xoffset = args[2]->Int32Value(
                 context).ToChecked();
-        auto yoffset = (int32_t) args[3]->NumberValue(
+        auto yoffset = args[3]->Int32Value(
                 context).ToChecked();
-        auto zoffset = (int32_t) args[4]->NumberValue(
+        auto zoffset = args[4]->Int32Value(
                 context).ToChecked();
-        auto width = (int32_t) args[5]->NumberValue(
+        auto width = args[5]->Int32Value(
                 context).ToChecked();
-        auto height = (int32_t) args[6]->NumberValue(
+        auto height = args[6]->Int32Value(
                 context).ToChecked();
-        auto depth = (int32_t) args[7]->NumberValue(
+        auto depth = args[7]->Int32Value(
                 context).ToChecked();
-        auto format = (uint32_t) args[8]->NumberValue(
+        auto format = args[8]->Uint32Value(
                 context).ToChecked();
-        auto type = (int32_t) args[9]->NumberValue(
+        auto type = args[9]->Uint32Value(
                 context).ToChecked();
 
         if (args[10]->IsNumber()) {
@@ -2434,9 +2406,8 @@ void WebGL2RenderingContext::TexSubImage3D(const v8::FunctionCallbackInfo<v8::Va
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->ByteLength();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint8_t *>((void*) data_ptr);
-
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
             canvas_native_webgl2_tex_sub_image3d(
@@ -2482,25 +2453,25 @@ void WebGL2RenderingContext::TexSubImage3D(const v8::FunctionCallbackInfo<v8::Va
         }
 
     } else if (count > 11) {
-        auto target = (uint32_t) args[0]->NumberValue(
+        auto target = args[0]->Uint32Value(
                 context).ToChecked();
-        auto level = (int32_t) args[1]->NumberValue(
+        auto level = args[1]->Int32Value(
                 context).ToChecked();
-        auto xoffset = (int32_t) args[2]->NumberValue(
+        auto xoffset = args[2]->Int32Value(
                 context).ToChecked();
-        auto yoffset = (int32_t) args[3]->NumberValue(
+        auto yoffset = args[3]->Int32Value(
                 context).ToChecked();
-        auto zoffset = (int32_t) args[4]->NumberValue(
+        auto zoffset = args[4]->Int32Value(
                 context).ToChecked();
-        auto width = (int32_t) args[5]->NumberValue(
+        auto width = args[5]->Int32Value(
                 context).ToChecked();
-        auto height = (int32_t) args[6]->NumberValue(
+        auto height = args[6]->Int32Value(
                 context).ToChecked();
-        auto depth = (int32_t) args[7]->NumberValue(
+        auto depth = args[7]->Int32Value(
                 context).ToChecked();
-        auto format = (uint32_t) args[8]->NumberValue(
+        auto format = args[8]->Uint32Value(
                 context).ToChecked();
-        auto type = (uint32_t) args[9]->NumberValue(
+        auto type = args[9]->Uint32Value(
                 context).ToChecked();
 
         size_t srcOffsetValue = 0;
@@ -2519,8 +2490,8 @@ void WebGL2RenderingContext::TexSubImage3D(const v8::FunctionCallbackInfo<v8::Va
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->ByteLength();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint8_t *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint8_t *>((void *) data_ptr);
 
 
             srcOffsetValue =
@@ -2564,7 +2535,7 @@ WebGL2RenderingContext::TransformFeedbackVaryings(const v8::FunctionCallbackInfo
     if (type == NativeType::WebGLProgram) {
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
         auto varyingsObject = args[1];
-        auto bufferMode = (uint32_t) args[2]->NumberValue(
+        auto bufferMode = args[2]->Uint32Value(
                 context).ToChecked();
 
         if (program != nullptr &&
@@ -2584,10 +2555,10 @@ WebGL2RenderingContext::TransformFeedbackVaryings(const v8::FunctionCallbackInfo
             }
 
 
-                const char* cStrings[store.size()];
-                for (size_t i = 0; i < store.size(); ++i) {
-                    cStrings[i] = store[i].c_str();
-                }
+            const char *cStrings[store.size()];
+            for (size_t i = 0; i < store.size(); ++i) {
+                cStrings[i] = store[i].c_str();
+            }
 
             canvas_native_webgl2_transform_feedback_varyings(
                     program->GetProgram(),
@@ -2616,7 +2587,7 @@ void WebGL2RenderingContext::Uniform1ui(const v8::FunctionCallbackInfo<v8::Value
     if (type == NativeType::WebGLUniformLocation) {
 
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
-        auto v0 = (uint32_t) v0Value->NumberValue(
+        auto v0 = v0Value->Uint32Value(
                 context).ToChecked();
 
         if (location != nullptr) {
@@ -2645,9 +2616,9 @@ void WebGL2RenderingContext::Uniform2ui(const v8::FunctionCallbackInfo<v8::Value
     if (type == NativeType::WebGLUniformLocation) {
 
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
-        auto v0 = (uint32_t) args[1]->NumberValue(
+        auto v0 = args[1]->Uint32Value(
                 context).ToChecked();
-        auto v1 = (uint32_t) args[2]->NumberValue(
+        auto v1 = args[2]->Uint32Value(
                 context).ToChecked();
 
         if (location != nullptr) {
@@ -2677,13 +2648,13 @@ void WebGL2RenderingContext::Uniform3ui(const v8::FunctionCallbackInfo<v8::Value
     if (type == NativeType::WebGLUniformLocation) {
 
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
-        auto v0 = (uint32_t) args[1]->NumberValue(
+        auto v0 = args[1]->Uint32Value(
                 context).ToChecked();
 
-        auto v1 = (uint32_t) args[2]->NumberValue(
+        auto v1 = args[2]->Uint32Value(
                 context).ToChecked();
 
-        auto v2 = (uint32_t) args[3]->NumberValue(
+        auto v2 = args[3]->Uint32Value(
                 context).ToChecked();
 
         if (location != nullptr) {
@@ -2714,15 +2685,15 @@ void WebGL2RenderingContext::Uniform4ui(const v8::FunctionCallbackInfo<v8::Value
     if (type == NativeType::WebGLUniformLocation) {
 
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
-        auto v0 = (uint32_t) args[1]->NumberValue(
+        auto v0 = args[1]->Uint32Value(
                 context).ToChecked();
 
-        auto v1 = (uint32_t) args[2]->NumberValue(
+        auto v1 = args[2]->Uint32Value(
                 context).ToChecked();
 
-        auto v2 = (uint32_t) args[3]->NumberValue(
+        auto v2 = args[3]->Uint32Value(
                 context).ToChecked();
-        auto v3 = (uint32_t) args[4]->NumberValue(
+        auto v3 = args[4]->Uint32Value(
                 context).ToChecked();
 
 
@@ -2758,13 +2729,13 @@ void WebGL2RenderingContext::Uniform1uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
         auto dataValue = args[1];
         if (location != nullptr &&
-                dataValue->IsUint32Array()) {
+            dataValue->IsUint32Array()) {
             auto buf = dataValue.As<v8::Uint32Array>();
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint32_t *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint32_t *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform1uiv(
@@ -2778,9 +2749,9 @@ void WebGL2RenderingContext::Uniform1uiv(const v8::FunctionCallbackInfo<v8::Valu
             auto len = array->Length();
             buf.reserve(len);
             for (int i = 0; i < len; i++) {
-                auto item = (uint32_t) array->Get(
+                auto item = array->Get(
                         context,
-                        i).ToLocalChecked()->NumberValue(
+                        i).ToLocalChecked()->Uint32Value(
                         context).ToChecked();
                 buf.push_back(item);
             }
@@ -2815,14 +2786,13 @@ void WebGL2RenderingContext::Uniform2uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
         auto dataValue = args[1];
         if (location != nullptr &&
-                dataValue->IsUint32Array()) {
+            dataValue->IsUint32Array()) {
             auto buf = dataValue.As<v8::Uint32Array>();
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint32_t *>((void*) data_ptr);
-
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint32_t *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform2uiv(
@@ -2836,9 +2806,9 @@ void WebGL2RenderingContext::Uniform2uiv(const v8::FunctionCallbackInfo<v8::Valu
             auto len = array->Length();
             buf.reserve(len);
             for (int i = 0; i < len; i++) {
-                auto item = (uint32_t) array->Get(
+                auto item = array->Get(
                         context,
-                        i).ToLocalChecked()->NumberValue(
+                        i).ToLocalChecked()->Uint32Value(
                         context).ToChecked();
                 buf.push_back(item);
             }
@@ -2872,14 +2842,14 @@ void WebGL2RenderingContext::Uniform3uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
         auto dataValue = args[1];
         if (location != nullptr &&
-                dataValue->IsUint32Array()) {
+            dataValue->IsUint32Array()) {
             auto buf = dataValue.As<v8::Uint32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint32_t *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint32_t *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform3uiv(
@@ -2893,9 +2863,9 @@ void WebGL2RenderingContext::Uniform3uiv(const v8::FunctionCallbackInfo<v8::Valu
             auto len = array->Length();
             buf.reserve(len);
             for (int i = 0; i < len; i++) {
-                auto item = (uint32_t) array->Get(
+                auto item = array->Get(
                         context,
-                        i).ToLocalChecked()->NumberValue(
+                        i).ToLocalChecked()->Uint32Value(
                         context).ToChecked();
                 buf.push_back(item);
             }
@@ -2929,14 +2899,14 @@ void WebGL2RenderingContext::Uniform4uiv(const v8::FunctionCallbackInfo<v8::Valu
         auto location = WebGLUniformLocation::GetPointer(locationValue.As<v8::Object>());
         auto dataValue = args[1];
         if (location != nullptr &&
-                dataValue->IsUint32Array()) {
+            dataValue->IsUint32Array()) {
             auto buf = dataValue.As<v8::Uint32Array>();
 
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<uint32_t *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<uint32_t *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform4uiv(
@@ -2950,9 +2920,9 @@ void WebGL2RenderingContext::Uniform4uiv(const v8::FunctionCallbackInfo<v8::Valu
             auto len = array->Length();
             buf.reserve(len);
             for (int i = 0; i < len; i++) {
-                auto item = (uint32_t) array->Get(
+                auto item = array->Get(
                         context,
-                        i).ToLocalChecked()->NumberValue(
+                        i).ToLocalChecked()->Uint32Value(
                         context).ToChecked();
                 buf.push_back(item);
             }
@@ -2983,16 +2953,16 @@ void WebGL2RenderingContext::UniformBlockBinding(const v8::FunctionCallbackInfo<
     if (type == NativeType::WebGLProgram) {
 
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
-        auto uniformBlockIndex = args[1]->NumberValue(
+        auto uniformBlockIndex = args[1]->Uint32Value(
                 context).ToChecked();
-        auto uniformBlockBinding = args[2]->NumberValue(
+        auto uniformBlockBinding = args[2]->Uint32Value(
                 context).ToChecked();
 
         if (program != nullptr) {
             canvas_native_webgl2_uniform_block_binding(
                     program->GetProgram(),
-                    (uint32_t) uniformBlockIndex,
-                    (uint32_t) uniformBlockBinding,
+                    uniformBlockIndex,
+                    uniformBlockBinding,
                     ptr->GetState()
             );
         }
@@ -3023,8 +2993,8 @@ void WebGL2RenderingContext::UniformMatrix2x3fv(const v8::FunctionCallbackInfo<v
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<float *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<float *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform_matrix2x3fv(
@@ -3080,8 +3050,8 @@ void WebGL2RenderingContext::UniformMatrix2x4fv(const v8::FunctionCallbackInfo<v
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<float *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<float *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform_matrix2x4fv(
@@ -3103,7 +3073,6 @@ void WebGL2RenderingContext::UniformMatrix2x4fv(const v8::FunctionCallbackInfo<v
             }
 
 
-
             canvas_native_webgl2_uniform_matrix2x4fv(
                     location->GetUniformLocation(),
                     transpose,
@@ -3139,8 +3108,8 @@ void WebGL2RenderingContext::UniformMatrix3x2fv(const v8::FunctionCallbackInfo<v
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<float *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<float *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform_matrix3x2fv(
@@ -3162,7 +3131,6 @@ void WebGL2RenderingContext::UniformMatrix3x2fv(const v8::FunctionCallbackInfo<v
             }
 
 
-
             canvas_native_webgl2_uniform_matrix3x2fv(
                     location->GetUniformLocation(),
                     transpose,
@@ -3196,8 +3164,8 @@ void WebGL2RenderingContext::UniformMatrix3x4fv(const v8::FunctionCallbackInfo<v
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<float *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<float *>((void *) data_ptr);
 
 
             canvas_native_webgl2_uniform_matrix3x4fv(
@@ -3219,7 +3187,6 @@ void WebGL2RenderingContext::UniformMatrix3x4fv(const v8::FunctionCallbackInfo<v
             }
 
 
-
             canvas_native_webgl2_uniform_matrix3x4fv(
                     location->GetUniformLocation(),
                     transpose,
@@ -3254,8 +3221,8 @@ void WebGL2RenderingContext::UniformMatrix4x2fv(const v8::FunctionCallbackInfo<v
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<float *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<float *>((void *) data_ptr);
 
             canvas_native_webgl2_uniform_matrix4x2fv(
                     location->GetUniformLocation(),
@@ -3276,7 +3243,6 @@ void WebGL2RenderingContext::UniformMatrix4x2fv(const v8::FunctionCallbackInfo<v
             }
 
 
-
             canvas_native_webgl2_uniform_matrix4x2fv(
                     location->GetUniformLocation(),
                     transpose,
@@ -3310,8 +3276,8 @@ void WebGL2RenderingContext::UniformMatrix4x3fv(const v8::FunctionCallbackInfo<v
             auto array = buf->Buffer();
             auto offset = buf->ByteOffset();
             auto size = buf->Length();
-            auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-            auto data = static_cast<float *>((void*) data_ptr);
+            auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+            auto data = static_cast<float *>((void *) data_ptr);
 
             canvas_native_webgl2_uniform_matrix4x3fv(
                     location->GetUniformLocation(),
@@ -3353,13 +3319,13 @@ void WebGL2RenderingContext::VertexAttribDivisor(const v8::FunctionCallbackInfo<
     auto context = isolate->GetCurrentContext();
 
 
-    auto index = args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
-    auto divisor = args[1]->NumberValue(
+    auto divisor = args[1]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl2_vertex_attrib_divisor(
-            (uint32_t) index,
-            (uint32_t) divisor,
+            index,
+            divisor,
             ptr->GetState()
     );
 
@@ -3375,22 +3341,22 @@ void WebGL2RenderingContext::VertexAttribI4i(const v8::FunctionCallbackInfo<v8::
     auto context = isolate->GetCurrentContext();
 
 
-    auto index = args[0]->NumberValue(
+    auto index = args[0]->Int32Value(
             context).ToChecked();
-    auto v0 = args[1]->NumberValue(
+    auto v0 = args[1]->Int32Value(
             context).ToChecked();
-    auto v1 = args[2]->NumberValue(
+    auto v1 = args[2]->Int32Value(
             context).ToChecked();
-    auto v2 = args[3]->NumberValue(
+    auto v2 = args[3]->Int32Value(
             context).ToChecked();
-    auto v3 = args[4]->NumberValue(
+    auto v3 = args[4]->Int32Value(
             context).ToChecked();
     canvas_native_webgl2_vertex_attrib_i4i(
-            (uint32_t) index,
-            (int32_t) v0,
-            (int32_t) v1,
-            (int32_t) v2,
-            (int32_t) v3,
+            index,
+            v0,
+            v1,
+            v2,
+            v3,
             ptr->GetState()
     );
 
@@ -3406,7 +3372,7 @@ void WebGL2RenderingContext::VertexAttribI4iv(const v8::FunctionCallbackInfo<v8:
     auto context = isolate->GetCurrentContext();
 
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
     auto value = args[1];
     if (value->IsInt32Array()) {
@@ -3415,8 +3381,8 @@ void WebGL2RenderingContext::VertexAttribI4iv(const v8::FunctionCallbackInfo<v8:
         auto array = buf->Buffer();
         auto offset = buf->ByteOffset();
         auto size = buf->Length();
-        auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-        auto data = static_cast<int32_t *>((void*) data_ptr);
+        auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+        auto data = static_cast<int32_t *>((void *) data_ptr);
 
 
         canvas_native_webgl2_vertex_attrib_i4iv(
@@ -3430,9 +3396,9 @@ void WebGL2RenderingContext::VertexAttribI4iv(const v8::FunctionCallbackInfo<v8:
         std::vector<int32_t> buf;
         buf.reserve(len);
         for (int i = 0; i < len; i++) {
-            auto item = (int32_t) array->Get(
+            auto item = array->Get(
                     context,
-                    i).ToLocalChecked()->NumberValue(
+                    i).ToLocalChecked()->Int32Value(
                     context).ToChecked();
             buf.push_back(item);
         }
@@ -3457,15 +3423,15 @@ void WebGL2RenderingContext::VertexAttribI4ui(const v8::FunctionCallbackInfo<v8:
     auto context = isolate->GetCurrentContext();
 
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
-    auto v0 = (uint32_t) args[1]->NumberValue(
+    auto v0 = args[1]->Uint32Value(
             context).ToChecked();
-    auto v1 = (uint32_t) args[2]->NumberValue(
+    auto v1 = args[2]->Uint32Value(
             context).ToChecked();
-    auto v2 = (uint32_t) args[3]->NumberValue(
+    auto v2 = args[3]->Uint32Value(
             context).ToChecked();
-    auto v3 = (uint32_t) args[4]->NumberValue(
+    auto v3 = args[4]->Uint32Value(
             context).ToChecked();
 
     canvas_native_webgl2_vertex_attrib_i4ui(
@@ -3488,7 +3454,7 @@ void WebGL2RenderingContext::VertexAttribI4uiv(const v8::FunctionCallbackInfo<v8
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
     auto value = args[1];
     if (value->IsUint32Array()) {
@@ -3496,8 +3462,8 @@ void WebGL2RenderingContext::VertexAttribI4uiv(const v8::FunctionCallbackInfo<v8
         auto array = buf->Buffer();
         auto offset = buf->ByteOffset();
         auto size = buf->Length();
-        auto data_ptr = static_cast<uint8_t*>(array->GetBackingStore()->Data()) + offset;
-        auto data = static_cast<uint32_t *>((void*) data_ptr);
+        auto data_ptr = static_cast<uint8_t *>(array->GetBackingStore()->Data()) + offset;
+        auto data = static_cast<uint32_t *>((void *) data_ptr);
 
 
         canvas_native_webgl2_vertex_attrib_i4uiv(
@@ -3511,9 +3477,9 @@ void WebGL2RenderingContext::VertexAttribI4uiv(const v8::FunctionCallbackInfo<v8
         std::vector<uint32_t> buf;
         buf.reserve(len);
         for (int i = 0; i < len; i++) {
-            auto item = (uint32_t) array->Get(
+            auto item = array->Get(
                     context,
-                    i).ToLocalChecked()->NumberValue(
+                    i).ToLocalChecked()->Uint32Value(
                     context).ToChecked();
             buf.push_back(item);
         }
@@ -3532,392 +3498,431 @@ void WebGL2RenderingContext::SetConstants(v8::Isolate *isolate,
                                           const v8::Local<v8::ObjectTemplate> &tmpl) {
     /* Getting GL parameter information */
 
-    tmpl->Set(isolate, "READ_BUFFER", v8::Uint32::New(isolate, 0x0C02));
-
-    tmpl->Set(isolate, "UNPACK_ROW_LENGTH", v8::Uint32::New(isolate, 0x0CF2));
+    tmpl->Set(isolate, "READ_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x0C02));
 
-    tmpl->Set(isolate, "UNPACK_SKIP_ROWS", v8::Uint32::New(isolate, 0x0CF3));
+    tmpl->Set(isolate, "UNPACK_ROW_LENGTH", v8::Integer::NewFromUnsigned(isolate, 0x0CF2));
 
-    tmpl->Set(isolate, "UNPACK_SKIP_PIXELS", v8::Uint32::New(isolate, 0x0CF4));
+    tmpl->Set(isolate, "UNPACK_SKIP_ROWS", v8::Integer::NewFromUnsigned(isolate, 0x0CF3));
 
-    tmpl->Set(isolate, "PACK_ROW_LENGTH", v8::Uint32::New(isolate, 0x0D02));
+    tmpl->Set(isolate, "UNPACK_SKIP_PIXELS", v8::Integer::NewFromUnsigned(isolate, 0x0CF4));
 
-    tmpl->Set(isolate, "PACK_SKIP_ROWS", v8::Uint32::New(isolate, 0x0D03));
+    tmpl->Set(isolate, "PACK_ROW_LENGTH", v8::Integer::NewFromUnsigned(isolate, 0x0D02));
 
-    tmpl->Set(isolate, "PACK_SKIP_PIXELS", v8::Uint32::New(isolate, 0x0D04));
+    tmpl->Set(isolate, "PACK_SKIP_ROWS", v8::Integer::NewFromUnsigned(isolate, 0x0D03));
 
-    tmpl->Set(isolate, "TEXTURE_BINDING_3D", v8::Uint32::New(isolate, 0x806A));
+    tmpl->Set(isolate, "PACK_SKIP_PIXELS", v8::Integer::NewFromUnsigned(isolate, 0x0D04));
 
-    tmpl->Set(isolate, "UNPACK_SKIP_IMAGES", v8::Uint32::New(isolate, 0x806D));
+    tmpl->Set(isolate, "TEXTURE_BINDING_3D", v8::Integer::NewFromUnsigned(isolate, 0x806A));
 
-    tmpl->Set(isolate, "UNPACK_IMAGE_HEIGHT", v8::Uint32::New(isolate, 0x806E));
+    tmpl->Set(isolate, "UNPACK_SKIP_IMAGES", v8::Integer::NewFromUnsigned(isolate, 0x806D));
 
-    tmpl->Set(isolate, "MAX_3D_TEXTURE_SIZE", v8::Uint32::New(isolate, 0x8073));
+    tmpl->Set(isolate, "UNPACK_IMAGE_HEIGHT", v8::Integer::NewFromUnsigned(isolate, 0x806E));
 
-    tmpl->Set(isolate, "MAX_ELEMENTS_VERTICES", v8::Uint32::New(isolate, 0x80E8));
+    tmpl->Set(isolate, "MAX_3D_TEXTURE_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8073));
 
-    tmpl->Set(isolate, "MAX_ELEMENTS_INDICES", v8::Uint32::New(isolate, 0x80E9));
+    tmpl->Set(isolate, "MAX_ELEMENTS_VERTICES", v8::Integer::NewFromUnsigned(isolate, 0x80E8));
 
-    tmpl->Set(isolate, "MAX_TEXTURE_LOD_BIAS", v8::Uint32::New(isolate, 0x84FD));
+    tmpl->Set(isolate, "MAX_ELEMENTS_INDICES", v8::Integer::NewFromUnsigned(isolate, 0x80E9));
 
-    tmpl->Set(isolate, "MAX_FRAGMENT_UNIFORM_COMPONENTS", v8::Uint32::New(isolate, 0x8B49));
+    tmpl->Set(isolate, "MAX_TEXTURE_LOD_BIAS", v8::Integer::NewFromUnsigned(isolate, 0x84FD));
 
-    tmpl->Set(isolate, "MAX_VERTEX_UNIFORM_COMPONENTS", v8::Uint32::New(isolate, 0x8B4A));
+    tmpl->Set(isolate, "MAX_FRAGMENT_UNIFORM_COMPONENTS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8B49));
 
-    tmpl->Set(isolate, "MAX_ARRAY_TEXTURE_LAYERS", v8::Uint32::New(isolate, 0x88FF));
+    tmpl->Set(isolate, "MAX_VERTEX_UNIFORM_COMPONENTS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8B4A));
 
-    tmpl->Set(isolate, "MIN_PROGRAM_TEXEL_OFFSET", v8::Uint32::New(isolate, 0x8904));
+    tmpl->Set(isolate, "MAX_ARRAY_TEXTURE_LAYERS", v8::Integer::NewFromUnsigned(isolate, 0x88FF));
 
-    tmpl->Set(isolate, "MAX_PROGRAM_TEXEL_OFFSET", v8::Uint32::New(isolate, 0x8905));
+    tmpl->Set(isolate, "MIN_PROGRAM_TEXEL_OFFSET", v8::Integer::NewFromUnsigned(isolate, 0x8904));
 
-    tmpl->Set(isolate, "MAX_VARYING_COMPONENTS", v8::Uint32::New(isolate, 0x8B4B));
+    tmpl->Set(isolate, "MAX_PROGRAM_TEXEL_OFFSET", v8::Integer::NewFromUnsigned(isolate, 0x8905));
 
-    tmpl->Set(isolate, "FRAGMENT_SHADER_DERIVATIVE_HINT", v8::Uint32::New(isolate, 0x8B8B));
+    tmpl->Set(isolate, "MAX_VARYING_COMPONENTS", v8::Integer::NewFromUnsigned(isolate, 0x8B4B));
 
-    tmpl->Set(isolate, "RASTERIZER_DISCARD", v8::Uint32::New(isolate, 0x8C89));
+    tmpl->Set(isolate, "FRAGMENT_SHADER_DERIVATIVE_HINT",
+              v8::Integer::NewFromUnsigned(isolate, 0x8B8B));
 
-    tmpl->Set(isolate, "VERTEX_ARRAY_BINDING", v8::Uint32::New(isolate, 0x85B5));
-    tmpl->Set(isolate, "MAX_VERTEX_OUTPUT_COMPONENTS", v8::Uint32::New(isolate, 0x9122));
-    tmpl->Set(isolate, "MAX_FRAGMENT_INPUT_COMPONENTS", v8::Uint32::New(isolate, 0x9125));
-    tmpl->Set(isolate, "MAX_SERVER_WAIT_TIMEOUT", v8::Uint32::New(isolate, 0x9111));
-    tmpl->Set(isolate, "MAX_ELEMENT_INDEX", v8::Uint32::New(isolate, 0x8D6B));
+    tmpl->Set(isolate, "RASTERIZER_DISCARD", v8::Integer::NewFromUnsigned(isolate, 0x8C89));
 
-    tmpl->Set(isolate, "RED", v8::Uint32::New(isolate, 0x1903));
-    tmpl->Set(isolate, "RGB8", v8::Uint32::New(isolate, 0x8051));
-    tmpl->Set(isolate, "RGBA8", v8::Uint32::New(isolate, 0x8058));
-    tmpl->Set(isolate, "RGB10_A2", v8::Uint32::New(isolate, 0x8059));
-    tmpl->Set(isolate, "TEXTURE_3D", v8::Uint32::New(isolate, 0x806F));
+    tmpl->Set(isolate, "VERTEX_ARRAY_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x85B5));
+    tmpl->Set(isolate, "MAX_VERTEX_OUTPUT_COMPONENTS",
+              v8::Integer::NewFromUnsigned(isolate, 0x9122));
+    tmpl->Set(isolate, "MAX_FRAGMENT_INPUT_COMPONENTS",
+              v8::Integer::NewFromUnsigned(isolate, 0x9125));
+    tmpl->Set(isolate, "MAX_SERVER_WAIT_TIMEOUT", v8::Integer::NewFromUnsigned(isolate, 0x9111));
+    tmpl->Set(isolate, "MAX_ELEMENT_INDEX", v8::Integer::NewFromUnsigned(isolate, 0x8D6B));
 
-    tmpl->Set(isolate, "TEXTURE_WRAP_R", v8::Uint32::New(isolate, 0x8072));
-    tmpl->Set(isolate, "TEXTURE_MIN_LOD", v8::Uint32::New(isolate, 0x813A));
-    tmpl->Set(isolate, "TEXTURE_MAX_LOD", v8::Uint32::New(isolate, 0x813B));
-    tmpl->Set(isolate, "TEXTURE_BASE_LEVEL", v8::Uint32::New(isolate, 0x813C));
-    tmpl->Set(isolate, "TEXTURE_MAX_LEVEL", v8::Uint32::New(isolate, 0x813D));
+    tmpl->Set(isolate, "RED", v8::Integer::NewFromUnsigned(isolate, 0x1903));
+    tmpl->Set(isolate, "RGB8", v8::Integer::NewFromUnsigned(isolate, 0x8051));
+    tmpl->Set(isolate, "RGBA8", v8::Integer::NewFromUnsigned(isolate, 0x8058));
+    tmpl->Set(isolate, "RGB10_A2", v8::Integer::NewFromUnsigned(isolate, 0x8059));
+    tmpl->Set(isolate, "TEXTURE_3D", v8::Integer::NewFromUnsigned(isolate, 0x806F));
 
+    tmpl->Set(isolate, "TEXTURE_WRAP_R", v8::Integer::NewFromUnsigned(isolate, 0x8072));
+    tmpl->Set(isolate, "TEXTURE_MIN_LOD", v8::Integer::NewFromUnsigned(isolate, 0x813A));
+    tmpl->Set(isolate, "TEXTURE_MAX_LOD", v8::Integer::NewFromUnsigned(isolate, 0x813B));
+    tmpl->Set(isolate, "TEXTURE_BASE_LEVEL", v8::Integer::NewFromUnsigned(isolate, 0x813C));
+    tmpl->Set(isolate, "TEXTURE_MAX_LEVEL", v8::Integer::NewFromUnsigned(isolate, 0x813D));
 
-    tmpl->Set(isolate, "TEXTURE_COMPARE_MODE", v8::Uint32::New(isolate, 0x884C));
-    tmpl->Set(isolate, "TEXTURE_COMPARE_FUNC", v8::Uint32::New(isolate, 0x884D));
-    tmpl->Set(isolate, "SRGB", v8::Uint32::New(isolate, 0x8C40));
-    tmpl->Set(isolate, "SRGB8", v8::Uint32::New(isolate, 0x8C41));
-    tmpl->Set(isolate, "SRGB8_ALPHA8", v8::Uint32::New(isolate, 0x8C43));
 
-    tmpl->Set(isolate, "COMPARE_REF_TO_TEXTURE", v8::Uint32::New(isolate, 0x884E));
-    tmpl->Set(isolate, "RGBA32F", v8::Uint32::New(isolate, 0x8814));
-    tmpl->Set(isolate, "RGB32F", v8::Uint32::New(isolate, 0x8815));
-    tmpl->Set(isolate, "RGBA16F", v8::Uint32::New(isolate, 0x881A));
-    tmpl->Set(isolate, "RGB16F", v8::Uint32::New(isolate, 0x881B));
+    tmpl->Set(isolate, "TEXTURE_COMPARE_MODE", v8::Integer::NewFromUnsigned(isolate, 0x884C));
+    tmpl->Set(isolate, "TEXTURE_COMPARE_FUNC", v8::Integer::NewFromUnsigned(isolate, 0x884D));
+    tmpl->Set(isolate, "SRGB", v8::Integer::NewFromUnsigned(isolate, 0x8C40));
+    tmpl->Set(isolate, "SRGB8", v8::Integer::NewFromUnsigned(isolate, 0x8C41));
+    tmpl->Set(isolate, "SRGB8_ALPHA8", v8::Integer::NewFromUnsigned(isolate, 0x8C43));
 
-    tmpl->Set(isolate, "TEXTURE_2D_ARRAY", v8::Uint32::New(isolate, 0x8C1A));
-    tmpl->Set(isolate, "TEXTURE_BINDING_2D_ARRAY", v8::Uint32::New(isolate, 0x8C1D));
-    tmpl->Set(isolate, "R11F_G11F_B10F", v8::Uint32::New(isolate, 0x8C3A));
-    tmpl->Set(isolate, "RGB9_E5", v8::Uint32::New(isolate, 0x8C3D));
-    tmpl->Set(isolate, "RGBA32UI", v8::Uint32::New(isolate, 0x8D70));
+    tmpl->Set(isolate, "COMPARE_REF_TO_TEXTURE", v8::Integer::NewFromUnsigned(isolate, 0x884E));
+    tmpl->Set(isolate, "RGBA32F", v8::Integer::NewFromUnsigned(isolate, 0x8814));
+    tmpl->Set(isolate, "RGB32F", v8::Integer::NewFromUnsigned(isolate, 0x8815));
+    tmpl->Set(isolate, "RGBA16F", v8::Integer::NewFromUnsigned(isolate, 0x881A));
+    tmpl->Set(isolate, "RGB16F", v8::Integer::NewFromUnsigned(isolate, 0x881B));
 
+    tmpl->Set(isolate, "TEXTURE_2D_ARRAY", v8::Integer::NewFromUnsigned(isolate, 0x8C1A));
+    tmpl->Set(isolate, "TEXTURE_BINDING_2D_ARRAY", v8::Integer::NewFromUnsigned(isolate, 0x8C1D));
+    tmpl->Set(isolate, "R11F_G11F_B10F", v8::Integer::NewFromUnsigned(isolate, 0x8C3A));
+    tmpl->Set(isolate, "RGB9_E5", v8::Integer::NewFromUnsigned(isolate, 0x8C3D));
+    tmpl->Set(isolate, "RGBA32UI", v8::Integer::NewFromUnsigned(isolate, 0x8D70));
 
-    tmpl->Set(isolate, "RGB32UI", v8::Uint32::New(isolate, 0x8D71));
-    tmpl->Set(isolate, "RGBA16UI", v8::Uint32::New(isolate, 0x8D76));
-    tmpl->Set(isolate, "RGB16UI", v8::Uint32::New(isolate, 0x8D77));
-    tmpl->Set(isolate, "RGBA8UI", v8::Uint32::New(isolate, 0x8D7C));
-    tmpl->Set(isolate, "RGB8UI", v8::Uint32::New(isolate, 0x8D7D));
 
+    tmpl->Set(isolate, "RGB32UI", v8::Integer::NewFromUnsigned(isolate, 0x8D71));
+    tmpl->Set(isolate, "RGBA16UI", v8::Integer::NewFromUnsigned(isolate, 0x8D76));
+    tmpl->Set(isolate, "RGB16UI", v8::Integer::NewFromUnsigned(isolate, 0x8D77));
+    tmpl->Set(isolate, "RGBA8UI", v8::Integer::NewFromUnsigned(isolate, 0x8D7C));
+    tmpl->Set(isolate, "RGB8UI", v8::Integer::NewFromUnsigned(isolate, 0x8D7D));
 
-    tmpl->Set(isolate, "RGBA32I", v8::Uint32::New(isolate, 0x8D82));
-    tmpl->Set(isolate, "RGB32I", v8::Uint32::New(isolate, 0x8D83));
-    tmpl->Set(isolate, "RGBA16I", v8::Uint32::New(isolate, 0x8D88));
-    tmpl->Set(isolate, "RGB16I", v8::Uint32::New(isolate, 0x8D89));
-    tmpl->Set(isolate, "RGBA8I", v8::Uint32::New(isolate, 0x8D8E));
 
+    tmpl->Set(isolate, "RGBA32I", v8::Integer::NewFromUnsigned(isolate, 0x8D82));
+    tmpl->Set(isolate, "RGB32I", v8::Integer::NewFromUnsigned(isolate, 0x8D83));
+    tmpl->Set(isolate, "RGBA16I", v8::Integer::NewFromUnsigned(isolate, 0x8D88));
+    tmpl->Set(isolate, "RGB16I", v8::Integer::NewFromUnsigned(isolate, 0x8D89));
+    tmpl->Set(isolate, "RGBA8I", v8::Integer::NewFromUnsigned(isolate, 0x8D8E));
 
-    tmpl->Set(isolate, "RGB8I", v8::Uint32::New(isolate, 0x8D8F));
-    tmpl->Set(isolate, "RED_INTEGER", v8::Uint32::New(isolate, 0x8D94));
-    tmpl->Set(isolate, "RGB_INTEGER", v8::Uint32::New(isolate, 0x8D98));
-    tmpl->Set(isolate, "RGBA_INTEGER", v8::Uint32::New(isolate, 0x8D99));
-    tmpl->Set(isolate, "R8", v8::Uint32::New(isolate, 0x8229));
 
+    tmpl->Set(isolate, "RGB8I", v8::Integer::NewFromUnsigned(isolate, 0x8D8F));
+    tmpl->Set(isolate, "RED_INTEGER", v8::Integer::NewFromUnsigned(isolate, 0x8D94));
+    tmpl->Set(isolate, "RGB_INTEGER", v8::Integer::NewFromUnsigned(isolate, 0x8D98));
+    tmpl->Set(isolate, "RGBA_INTEGER", v8::Integer::NewFromUnsigned(isolate, 0x8D99));
+    tmpl->Set(isolate, "R8", v8::Integer::NewFromUnsigned(isolate, 0x8229));
 
-    tmpl->Set(isolate, "RG8", v8::Uint32::New(isolate, 0x822B));
-    tmpl->Set(isolate, "R16F", v8::Uint32::New(isolate, 0x822D));
-    tmpl->Set(isolate, "R32F", v8::Uint32::New(isolate, 0x822E));
-    tmpl->Set(isolate, "RG16F", v8::Uint32::New(isolate, 0x822F));
-    tmpl->Set(isolate, "RG32F", v8::Uint32::New(isolate, 0x8230));
 
+    tmpl->Set(isolate, "RG8", v8::Integer::NewFromUnsigned(isolate, 0x822B));
+    tmpl->Set(isolate, "R16F", v8::Integer::NewFromUnsigned(isolate, 0x822D));
+    tmpl->Set(isolate, "R32F", v8::Integer::NewFromUnsigned(isolate, 0x822E));
+    tmpl->Set(isolate, "RG16F", v8::Integer::NewFromUnsigned(isolate, 0x822F));
+    tmpl->Set(isolate, "RG32F", v8::Integer::NewFromUnsigned(isolate, 0x8230));
 
-    tmpl->Set(isolate, "R8I", v8::Uint32::New(isolate, 0x8231));
-    tmpl->Set(isolate, "R8UI", v8::Uint32::New(isolate, 0x8232));
-    tmpl->Set(isolate, "R16I", v8::Uint32::New(isolate, 0x8233));
-    tmpl->Set(isolate, "R16UI", v8::Uint32::New(isolate, 0x8234));
-    tmpl->Set(isolate, "R32I", v8::Uint32::New(isolate, 0x8235));
 
+    tmpl->Set(isolate, "R8I", v8::Integer::NewFromUnsigned(isolate, 0x8231));
+    tmpl->Set(isolate, "R8UI", v8::Integer::NewFromUnsigned(isolate, 0x8232));
+    tmpl->Set(isolate, "R16I", v8::Integer::NewFromUnsigned(isolate, 0x8233));
+    tmpl->Set(isolate, "R16UI", v8::Integer::NewFromUnsigned(isolate, 0x8234));
+    tmpl->Set(isolate, "R32I", v8::Integer::NewFromUnsigned(isolate, 0x8235));
 
-    tmpl->Set(isolate, "R32UI", v8::Uint32::New(isolate, 0x8236));
-    tmpl->Set(isolate, "RG8I", v8::Uint32::New(isolate, 0x8237));
-    tmpl->Set(isolate, "RG8UI", v8::Uint32::New(isolate, 0x8238));
-    tmpl->Set(isolate, "RG16I", v8::Uint32::New(isolate, 0x8239));
-    tmpl->Set(isolate, "RG16UI", v8::Uint32::New(isolate, 0x823A));
 
-    tmpl->Set(isolate, "RG32I", v8::Uint32::New(isolate, 0x823B));
-    tmpl->Set(isolate, "RG32UI", v8::Uint32::New(isolate, 0x823C));
-    tmpl->Set(isolate, "R8_SNORM", v8::Uint32::New(isolate, 0x8F94));
-    tmpl->Set(isolate, "RG8_SNORM", v8::Uint32::New(isolate, 0x8F95));
-    tmpl->Set(isolate, "RGB8_SNORM", v8::Uint32::New(isolate, 0x8F96));
+    tmpl->Set(isolate, "R32UI", v8::Integer::NewFromUnsigned(isolate, 0x8236));
+    tmpl->Set(isolate, "RG8I", v8::Integer::NewFromUnsigned(isolate, 0x8237));
+    tmpl->Set(isolate, "RG8UI", v8::Integer::NewFromUnsigned(isolate, 0x8238));
+    tmpl->Set(isolate, "RG16I", v8::Integer::NewFromUnsigned(isolate, 0x8239));
+    tmpl->Set(isolate, "RG16UI", v8::Integer::NewFromUnsigned(isolate, 0x823A));
 
+    tmpl->Set(isolate, "RG32I", v8::Integer::NewFromUnsigned(isolate, 0x823B));
+    tmpl->Set(isolate, "RG32UI", v8::Integer::NewFromUnsigned(isolate, 0x823C));
+    tmpl->Set(isolate, "R8_SNORM", v8::Integer::NewFromUnsigned(isolate, 0x8F94));
+    tmpl->Set(isolate, "RG8_SNORM", v8::Integer::NewFromUnsigned(isolate, 0x8F95));
+    tmpl->Set(isolate, "RGB8_SNORM", v8::Integer::NewFromUnsigned(isolate, 0x8F96));
 
-    tmpl->Set(isolate, "RGBA8_SNORM", v8::Uint32::New(isolate, 0x8F97));
-    tmpl->Set(isolate, "RGB10_A2UI", v8::Uint32::New(isolate, 0x906F));
-    tmpl->Set(isolate, "TEXTURE_IMMUTABLE_FORMAT", v8::Uint32::New(isolate, 0x912F));
-    tmpl->Set(isolate, "TEXTURE_IMMUTABLE_LEVELS", v8::Uint32::New(isolate, 0x82DF));
-    tmpl->Set(isolate, "UNSIGNED_INT_2_10_10_10_REV", v8::Uint32::New(isolate, 0x8368));
 
-
-    tmpl->Set(isolate, "UNSIGNED_INT_10F_11F_11F_REV", v8::Uint32::New(isolate, 0x8C3B));
-    tmpl->Set(isolate, "UNSIGNED_INT_5_9_9_9_REV", v8::Uint32::New(isolate, 0x8C3E));
-    tmpl->Set(isolate, "FLOAT_32_UNSIGNED_INT_24_8_REV", v8::Uint32::New(isolate, 0x8DAD));
-    tmpl->Set(isolate, "UNSIGNED_INT_24_8", v8::Uint32::New(isolate, 0x84FA));
-    tmpl->Set(isolate, "HALF_FLOAT", v8::Uint32::New(isolate, 0x140B));
-
-
-    tmpl->Set(isolate, "RG", v8::Uint32::New(isolate, 0x8227));
-    tmpl->Set(isolate, "RG_INTEGER", v8::Uint32::New(isolate, 0x8228));
-    tmpl->Set(isolate, "INT_2_10_10_10_REV", v8::Uint32::New(isolate, 0x8D9F));
-    tmpl->Set(isolate, "QUERY_RESULT_AVAILABLE", v8::Uint32::New(isolate, 0x8865));
-    tmpl->Set(isolate, "QUERY_RESULT", v8::Uint32::New(isolate, 0x8866));
-
-
-    tmpl->Set(isolate, "CURRENT_QUERY", v8::Uint32::New(isolate, 0x8867));
-    tmpl->Set(isolate, "ANY_SAMPLES_PASSED", v8::Uint32::New(isolate, 0x8C2F));
-    tmpl->Set(isolate, "ANY_SAMPLES_PASSED_CONSERVATIVE", v8::Uint32::New(isolate, 0x8D6A));
-    tmpl->Set(isolate, "MAX_DRAW_BUFFERS", v8::Uint32::New(isolate, 0x8824));
-
-    tmpl->Set(isolate, "DRAW_BUFFER0", v8::Uint32::New(isolate, 0x8825));
-    tmpl->Set(isolate, "DRAW_BUFFER1", v8::Uint32::New(isolate, 0x8826));
-    tmpl->Set(isolate, "DRAW_BUFFER2", v8::Uint32::New(isolate, 0x8827));
-    tmpl->Set(isolate, "DRAW_BUFFER3", v8::Uint32::New(isolate, 0x8828));
-    tmpl->Set(isolate, "DRAW_BUFFER4", v8::Uint32::New(isolate, 0x8829));
-    tmpl->Set(isolate, "DRAW_BUFFER5", v8::Uint32::New(isolate, 0x882A));
-    tmpl->Set(isolate, "DRAW_BUFFER6", v8::Uint32::New(isolate, 0x882B));
-    tmpl->Set(isolate, "DRAW_BUFFER7", v8::Uint32::New(isolate, 0x882C));
-    tmpl->Set(isolate, "DRAW_BUFFER8", v8::Uint32::New(isolate, 0x882D));
-    tmpl->Set(isolate, "DRAW_BUFFER9", v8::Uint32::New(isolate, 0x882E));
-    tmpl->Set(isolate, "DRAW_BUFFER10", v8::Uint32::New(isolate, 0x882F));
+    tmpl->Set(isolate, "RGBA8_SNORM", v8::Integer::NewFromUnsigned(isolate, 0x8F97));
+    tmpl->Set(isolate, "RGB10_A2UI", v8::Integer::NewFromUnsigned(isolate, 0x906F));
+    tmpl->Set(isolate, "TEXTURE_IMMUTABLE_FORMAT", v8::Integer::NewFromUnsigned(isolate, 0x912F));
+    tmpl->Set(isolate, "TEXTURE_IMMUTABLE_LEVELS", v8::Integer::NewFromUnsigned(isolate, 0x82DF));
+    tmpl->Set(isolate, "UNSIGNED_INT_2_10_10_10_REV",
+              v8::Integer::NewFromUnsigned(isolate, 0x8368));
+
+
+    tmpl->Set(isolate, "UNSIGNED_INT_10F_11F_11F_REV",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C3B));
+    tmpl->Set(isolate, "UNSIGNED_INT_5_9_9_9_REV", v8::Integer::NewFromUnsigned(isolate, 0x8C3E));
+    tmpl->Set(isolate, "FLOAT_32_UNSIGNED_INT_24_8_REV",
+              v8::Integer::NewFromUnsigned(isolate, 0x8DAD));
+    tmpl->Set(isolate, "UNSIGNED_INT_24_8", v8::Integer::NewFromUnsigned(isolate, 0x84FA));
+    tmpl->Set(isolate, "HALF_FLOAT", v8::Integer::NewFromUnsigned(isolate, 0x140B));
+
+
+    tmpl->Set(isolate, "RG", v8::Integer::NewFromUnsigned(isolate, 0x8227));
+    tmpl->Set(isolate, "RG_INTEGER", v8::Integer::NewFromUnsigned(isolate, 0x8228));
+    tmpl->Set(isolate, "INT_2_10_10_10_REV", v8::Integer::NewFromUnsigned(isolate, 0x8D9F));
+    tmpl->Set(isolate, "QUERY_RESULT_AVAILABLE", v8::Integer::NewFromUnsigned(isolate, 0x8865));
+    tmpl->Set(isolate, "QUERY_RESULT", v8::Integer::NewFromUnsigned(isolate, 0x8866));
+
+
+    tmpl->Set(isolate, "CURRENT_QUERY", v8::Integer::NewFromUnsigned(isolate, 0x8867));
+    tmpl->Set(isolate, "ANY_SAMPLES_PASSED", v8::Integer::NewFromUnsigned(isolate, 0x8C2F));
+    tmpl->Set(isolate, "ANY_SAMPLES_PASSED_CONSERVATIVE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8D6A));
+    tmpl->Set(isolate, "MAX_DRAW_BUFFERS", v8::Integer::NewFromUnsigned(isolate, 0x8824));
+
+    tmpl->Set(isolate, "DRAW_BUFFER0", v8::Integer::NewFromUnsigned(isolate, 0x8825));
+    tmpl->Set(isolate, "DRAW_BUFFER1", v8::Integer::NewFromUnsigned(isolate, 0x8826));
+    tmpl->Set(isolate, "DRAW_BUFFER2", v8::Integer::NewFromUnsigned(isolate, 0x8827));
+    tmpl->Set(isolate, "DRAW_BUFFER3", v8::Integer::NewFromUnsigned(isolate, 0x8828));
+    tmpl->Set(isolate, "DRAW_BUFFER4", v8::Integer::NewFromUnsigned(isolate, 0x8829));
+    tmpl->Set(isolate, "DRAW_BUFFER5", v8::Integer::NewFromUnsigned(isolate, 0x882A));
+    tmpl->Set(isolate, "DRAW_BUFFER6", v8::Integer::NewFromUnsigned(isolate, 0x882B));
+    tmpl->Set(isolate, "DRAW_BUFFER7", v8::Integer::NewFromUnsigned(isolate, 0x882C));
+    tmpl->Set(isolate, "DRAW_BUFFER8", v8::Integer::NewFromUnsigned(isolate, 0x882D));
+    tmpl->Set(isolate, "DRAW_BUFFER9", v8::Integer::NewFromUnsigned(isolate, 0x882E));
+    tmpl->Set(isolate, "DRAW_BUFFER10", v8::Integer::NewFromUnsigned(isolate, 0x882F));
 
     /* Getting GL parameter information */
 
     /* Textures */
 
-    tmpl->Set(isolate, "DRAW_BUFFER11", v8::Uint32::New(isolate, 0x8830));
-    tmpl->Set(isolate, "DRAW_BUFFER12", v8::Uint32::New(isolate, 0x8831));
-    tmpl->Set(isolate, "DRAW_BUFFER13", v8::Uint32::New(isolate, 0x8832));
-    tmpl->Set(isolate, "DRAW_BUFFER14", v8::Uint32::New(isolate, 0x8833));
-    tmpl->Set(isolate, "DRAW_BUFFER15", v8::Uint32::New(isolate, 0x8834));
-
-    tmpl->Set(isolate, "MAX_COLOR_ATTACHMENTS", v8::Uint32::New(isolate, 0x8CDF));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT1", v8::Uint32::New(isolate, 0x8CE1));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT2", v8::Uint32::New(isolate, 0x8CE2));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT3", v8::Uint32::New(isolate, 0x8CE3));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT4", v8::Uint32::New(isolate, 0x8CE4));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT5", v8::Uint32::New(isolate, 0x8CE5));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT6", v8::Uint32::New(isolate, 0x8CE6));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT7", v8::Uint32::New(isolate, 0x8CE7));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT8", v8::Uint32::New(isolate, 0x8CE8));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT9", v8::Uint32::New(isolate, 0x8CE9));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT10", v8::Uint32::New(isolate, 0x8CEA));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT11", v8::Uint32::New(isolate, 0x8CEB));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT12", v8::Uint32::New(isolate, 0x8CEC));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT13", v8::Uint32::New(isolate, 0x8CED));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT14", v8::Uint32::New(isolate, 0x8CEE));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT15", v8::Uint32::New(isolate, 0x8CEF));
-
-    tmpl->Set(isolate, "SAMPLER_3D", v8::Uint32::New(isolate, 0x8B5F));
-    tmpl->Set(isolate, "SAMPLER_2D_SHADOW", v8::Uint32::New(isolate, 0x8B62));
-    tmpl->Set(isolate, "SAMPLER_2D_ARRAY", v8::Uint32::New(isolate, 0x8DC1));
-    tmpl->Set(isolate, "SAMPLER_2D_ARRAY_SHADOW", v8::Uint32::New(isolate, 0x8DC4));
-    tmpl->Set(isolate, "SAMPLER_CUBE_SHADOW", v8::Uint32::New(isolate, 0x8DC5));
-
-    tmpl->Set(isolate, "INT_SAMPLER_2D", v8::Uint32::New(isolate, 0x8DCA));
-    tmpl->Set(isolate, "INT_SAMPLER_3D", v8::Uint32::New(isolate, 0x8DCB));
-    tmpl->Set(isolate, "INT_SAMPLER_CUBE", v8::Uint32::New(isolate, 0x8DCC));
-    tmpl->Set(isolate, "INT_SAMPLER_2D_ARRAY", v8::Uint32::New(isolate, 0x8DCF));
-    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_2D", v8::Uint32::New(isolate, 0x8DD2));
-
-    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_3D", v8::Uint32::New(isolate, 0x8DD3));
-    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_CUBE", v8::Uint32::New(isolate, 0x8DD4));
-    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_2D_ARRAY", v8::Uint32::New(isolate, 0x8DD7));
-    tmpl->Set(isolate, "MAX_SAMPLES", v8::Uint32::New(isolate, 0x8D57));
-    tmpl->Set(isolate, "SAMPLER_BINDING", v8::Uint32::New(isolate, 0x8919));
-
-    tmpl->Set(isolate, "PIXEL_PACK_BUFFER", v8::Uint32::New(isolate, 0x88EB));
-    tmpl->Set(isolate, "PIXEL_UNPACK_BUFFER", v8::Uint32::New(isolate, 0x88EC));
-    tmpl->Set(isolate, "PIXEL_PACK_BUFFER_BINDING", v8::Uint32::New(isolate, 0x88ED));
-    tmpl->Set(isolate, "PIXEL_UNPACK_BUFFER_BINDING", v8::Uint32::New(isolate, 0x88EF));
-    tmpl->Set(isolate, "COPY_READ_BUFFER", v8::Uint32::New(isolate, 0x8F36));
-
-    tmpl->Set(isolate, "COPY_WRITE_BUFFER", v8::Uint32::New(isolate, 0x8F37));
-    tmpl->Set(isolate, "COPY_READ_BUFFER_BINDING", v8::Uint32::New(isolate, 0x8F36));
-    tmpl->Set(isolate, "COPY_WRITE_BUFFER_BINDING", v8::Uint32::New(isolate, 0x8F37));
-    tmpl->Set(isolate, "FLOAT_MAT2x3", v8::Uint32::New(isolate, 0x8B65));
-    tmpl->Set(isolate, "FLOAT_MAT2x4", v8::Uint32::New(isolate, 0x8B66));
-
-    tmpl->Set(isolate, "FLOAT_MAT3x2", v8::Uint32::New(isolate, 0x8B67));
-    tmpl->Set(isolate, "FLOAT_MAT3x4", v8::Uint32::New(isolate, 0x8B68));
-    tmpl->Set(isolate, "FLOAT_MAT4x2", v8::Uint32::New(isolate, 0x8B69));
-    tmpl->Set(isolate, "FLOAT_MAT4x3", v8::Uint32::New(isolate, 0x8B6A));
-    tmpl->Set(isolate, "UNSIGNED_INT_VEC2", v8::Uint32::New(isolate, 0x8DC6));
-
-    tmpl->Set(isolate, "UNSIGNED_INT_VEC3", v8::Uint32::New(isolate, 0x8DC7));
-    tmpl->Set(isolate, "UNSIGNED_INT_VEC4", v8::Uint32::New(isolate, 0x8DC8));
-    tmpl->Set(isolate, "UNSIGNED_NORMALIZED", v8::Uint32::New(isolate, 0x8C17));
-    tmpl->Set(isolate, "SIGNED_NORMALIZED", v8::Uint32::New(isolate, 0x8F9C));
+    tmpl->Set(isolate, "DRAW_BUFFER11", v8::Integer::NewFromUnsigned(isolate, 0x8830));
+    tmpl->Set(isolate, "DRAW_BUFFER12", v8::Integer::NewFromUnsigned(isolate, 0x8831));
+    tmpl->Set(isolate, "DRAW_BUFFER13", v8::Integer::NewFromUnsigned(isolate, 0x8832));
+    tmpl->Set(isolate, "DRAW_BUFFER14", v8::Integer::NewFromUnsigned(isolate, 0x8833));
+    tmpl->Set(isolate, "DRAW_BUFFER15", v8::Integer::NewFromUnsigned(isolate, 0x8834));
+
+    tmpl->Set(isolate, "MAX_COLOR_ATTACHMENTS", v8::Integer::NewFromUnsigned(isolate, 0x8CDF));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT1", v8::Integer::NewFromUnsigned(isolate, 0x8CE1));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT2", v8::Integer::NewFromUnsigned(isolate, 0x8CE2));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT3", v8::Integer::NewFromUnsigned(isolate, 0x8CE3));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT4", v8::Integer::NewFromUnsigned(isolate, 0x8CE4));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT5", v8::Integer::NewFromUnsigned(isolate, 0x8CE5));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT6", v8::Integer::NewFromUnsigned(isolate, 0x8CE6));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT7", v8::Integer::NewFromUnsigned(isolate, 0x8CE7));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT8", v8::Integer::NewFromUnsigned(isolate, 0x8CE8));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT9", v8::Integer::NewFromUnsigned(isolate, 0x8CE9));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT10", v8::Integer::NewFromUnsigned(isolate, 0x8CEA));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT11", v8::Integer::NewFromUnsigned(isolate, 0x8CEB));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT12", v8::Integer::NewFromUnsigned(isolate, 0x8CEC));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT13", v8::Integer::NewFromUnsigned(isolate, 0x8CED));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT14", v8::Integer::NewFromUnsigned(isolate, 0x8CEE));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT15", v8::Integer::NewFromUnsigned(isolate, 0x8CEF));
+
+    tmpl->Set(isolate, "SAMPLER_3D", v8::Integer::NewFromUnsigned(isolate, 0x8B5F));
+    tmpl->Set(isolate, "SAMPLER_2D_SHADOW", v8::Integer::NewFromUnsigned(isolate, 0x8B62));
+    tmpl->Set(isolate, "SAMPLER_2D_ARRAY", v8::Integer::NewFromUnsigned(isolate, 0x8DC1));
+    tmpl->Set(isolate, "SAMPLER_2D_ARRAY_SHADOW", v8::Integer::NewFromUnsigned(isolate, 0x8DC4));
+    tmpl->Set(isolate, "SAMPLER_CUBE_SHADOW", v8::Integer::NewFromUnsigned(isolate, 0x8DC5));
+
+    tmpl->Set(isolate, "INT_SAMPLER_2D", v8::Integer::NewFromUnsigned(isolate, 0x8DCA));
+    tmpl->Set(isolate, "INT_SAMPLER_3D", v8::Integer::NewFromUnsigned(isolate, 0x8DCB));
+    tmpl->Set(isolate, "INT_SAMPLER_CUBE", v8::Integer::NewFromUnsigned(isolate, 0x8DCC));
+    tmpl->Set(isolate, "INT_SAMPLER_2D_ARRAY", v8::Integer::NewFromUnsigned(isolate, 0x8DCF));
+    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_2D", v8::Integer::NewFromUnsigned(isolate, 0x8DD2));
+
+    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_3D", v8::Integer::NewFromUnsigned(isolate, 0x8DD3));
+    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_CUBE", v8::Integer::NewFromUnsigned(isolate, 0x8DD4));
+    tmpl->Set(isolate, "UNSIGNED_INT_SAMPLER_2D_ARRAY",
+              v8::Integer::NewFromUnsigned(isolate, 0x8DD7));
+    tmpl->Set(isolate, "MAX_SAMPLES", v8::Integer::NewFromUnsigned(isolate, 0x8D57));
+    tmpl->Set(isolate, "SAMPLER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8919));
+
+    tmpl->Set(isolate, "PIXEL_PACK_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x88EB));
+    tmpl->Set(isolate, "PIXEL_UNPACK_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x88EC));
+    tmpl->Set(isolate, "PIXEL_PACK_BUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x88ED));
+    tmpl->Set(isolate, "PIXEL_UNPACK_BUFFER_BINDING",
+              v8::Integer::NewFromUnsigned(isolate, 0x88EF));
+    tmpl->Set(isolate, "COPY_READ_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8F36));
+
+    tmpl->Set(isolate, "COPY_WRITE_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8F37));
+    tmpl->Set(isolate, "COPY_READ_BUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8F36));
+    tmpl->Set(isolate, "COPY_WRITE_BUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8F37));
+    tmpl->Set(isolate, "FLOAT_MAT2x3", v8::Integer::NewFromUnsigned(isolate, 0x8B65));
+    tmpl->Set(isolate, "FLOAT_MAT2x4", v8::Integer::NewFromUnsigned(isolate, 0x8B66));
+
+    tmpl->Set(isolate, "FLOAT_MAT3x2", v8::Integer::NewFromUnsigned(isolate, 0x8B67));
+    tmpl->Set(isolate, "FLOAT_MAT3x4", v8::Integer::NewFromUnsigned(isolate, 0x8B68));
+    tmpl->Set(isolate, "FLOAT_MAT4x2", v8::Integer::NewFromUnsigned(isolate, 0x8B69));
+    tmpl->Set(isolate, "FLOAT_MAT4x3", v8::Integer::NewFromUnsigned(isolate, 0x8B6A));
+    tmpl->Set(isolate, "UNSIGNED_INT_VEC2", v8::Integer::NewFromUnsigned(isolate, 0x8DC6));
+
+    tmpl->Set(isolate, "UNSIGNED_INT_VEC3", v8::Integer::NewFromUnsigned(isolate, 0x8DC7));
+    tmpl->Set(isolate, "UNSIGNED_INT_VEC4", v8::Integer::NewFromUnsigned(isolate, 0x8DC8));
+    tmpl->Set(isolate, "UNSIGNED_NORMALIZED", v8::Integer::NewFromUnsigned(isolate, 0x8C17));
+    tmpl->Set(isolate, "SIGNED_NORMALIZED", v8::Integer::NewFromUnsigned(isolate, 0x8F9C));
 
     /* Vertex attributes */
 
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_INTEGER", v8::Uint32::New(isolate, 0x88FD));
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_DIVISOR", v8::Uint32::New(isolate, 0x88FE));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_MODE", v8::Uint32::New(isolate, 0x8C7F));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_INTEGER",
+              v8::Integer::NewFromUnsigned(isolate, 0x88FD));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_DIVISOR",
+              v8::Integer::NewFromUnsigned(isolate, 0x88FE));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_MODE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C7F));
     tmpl->Set(isolate, "MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS",
-              v8::Uint32::New(isolate, 0x8C80));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_VARYINGS", v8::Uint32::New(isolate, 0x8C83));
-
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_START", v8::Uint32::New(isolate, 0x8C84));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_SIZE", v8::Uint32::New(isolate, 0x8C85));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN", v8::Uint32::New(isolate, 0x8C88));
+              v8::Integer::NewFromUnsigned(isolate, 0x8C80));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_VARYINGS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C83));
+
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_START",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C84));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_SIZE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C85));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C88));
     tmpl->Set(isolate, "MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS",
-              v8::Uint32::New(isolate, 0x8C8A));
+              v8::Integer::NewFromUnsigned(isolate, 0x8C8A));
 
     /* Textures */
 
     /* Pixel types */
 
-    tmpl->Set(isolate, "MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", v8::Uint32::New(isolate, 0x8C8B));
-    tmpl->Set(isolate, "INTERLEAVED_ATTRIBS", v8::Uint32::New(isolate, 0x8C8C));
-    tmpl->Set(isolate, "SEPARATE_ATTRIBS", v8::Uint32::New(isolate, 0x8C8D));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER", v8::Uint32::New(isolate, 0x8C8E));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_BINDING", v8::Uint32::New(isolate, 0x8C8F));
+    tmpl->Set(isolate, "MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C8B));
+    tmpl->Set(isolate, "INTERLEAVED_ATTRIBS", v8::Integer::NewFromUnsigned(isolate, 0x8C8C));
+    tmpl->Set(isolate, "SEPARATE_ATTRIBS", v8::Integer::NewFromUnsigned(isolate, 0x8C8D));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8C8E));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BUFFER_BINDING",
+              v8::Integer::NewFromUnsigned(isolate, 0x8C8F));
 
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK", v8::Uint32::New(isolate, 0x8E22));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_PAUSED", v8::Uint32::New(isolate, 0x8E23));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_ACTIVE", v8::Uint32::New(isolate, 0x8E24));
-    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BINDING", v8::Uint32::New(isolate, 0x8E25));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK", v8::Integer::NewFromUnsigned(isolate, 0x8E22));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_PAUSED", v8::Integer::NewFromUnsigned(isolate, 0x8E23));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_ACTIVE", v8::Integer::NewFromUnsigned(isolate, 0x8E24));
+    tmpl->Set(isolate, "TRANSFORM_FEEDBACK_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8E25));
 
     /* Pixel types */
 
     /* Queries */
 
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING", v8::Uint32::New(isolate, 0x8210));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE", v8::Uint32::New(isolate, 0x8211));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_RED_SIZE", v8::Uint32::New(isolate, 0x8212));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_GREEN_SIZE", v8::Uint32::New(isolate, 0x8213));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_BLUE_SIZE", v8::Uint32::New(isolate, 0x8214));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING",
+              v8::Integer::NewFromUnsigned(isolate, 0x8210));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8211));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_RED_SIZE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8212));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_GREEN_SIZE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8213));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_BLUE_SIZE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8214));
 
     /* Queries */
 
     /* Draw buffers */
 
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE", v8::Uint32::New(isolate, 0x8215));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE", v8::Uint32::New(isolate, 0x8216));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE", v8::Uint32::New(isolate, 0x8217));
-    tmpl->Set(isolate, "FRAMEBUFFER_DEFAULT", v8::Uint32::New(isolate, 0x8218));
-    tmpl->Set(isolate, "DEPTH_STENCIL_ATTACHMENT", v8::Uint32::New(isolate, 0x821A));
-
-    tmpl->Set(isolate, "DEPTH_STENCIL", v8::Uint32::New(isolate, 0x84F9));
-    tmpl->Set(isolate, "DEPTH24_STENCIL8", v8::Uint32::New(isolate, 0x88F0));
-    tmpl->Set(isolate, "DRAW_FRAMEBUFFER_BINDING", v8::Uint32::New(isolate, 0x8CA6));
-    tmpl->Set(isolate, "READ_FRAMEBUFFER", v8::Uint32::New(isolate, 0x8CA8));
-    tmpl->Set(isolate, "DRAW_FRAMEBUFFER", v8::Uint32::New(isolate, 0x8CA9));
-
-    tmpl->Set(isolate, "READ_FRAMEBUFFER_BINDING", v8::Uint32::New(isolate, 0x8CAA));
-    tmpl->Set(isolate, "RENDERBUFFER_SAMPLES", v8::Uint32::New(isolate, 0x8CAB));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER", v8::Uint32::New(isolate, 0x8CD4));
-    tmpl->Set(isolate, "FRAMEBUFFER_INCOMPLETE_MULTISAMPLE", v8::Uint32::New(isolate, 0x8D56));
-    tmpl->Set(isolate, "UNIFORM_BUFFER", v8::Uint32::New(isolate, 0x8A11));
-
-    tmpl->Set(isolate, "UNIFORM_BUFFER_BINDING", v8::Uint32::New(isolate, 0x8A28));
-    tmpl->Set(isolate, "UNIFORM_BUFFER_START", v8::Uint32::New(isolate, 0x8A29));
-    tmpl->Set(isolate, "UNIFORM_BUFFER_SIZE", v8::Uint32::New(isolate, 0x8A2A));
-    tmpl->Set(isolate, "MAX_VERTEX_UNIFORM_BLOCKS", v8::Uint32::New(isolate, 0x8A2B));
-    tmpl->Set(isolate, "MAX_FRAGMENT_UNIFORM_BLOCKS", v8::Uint32::New(isolate, 0x8A2D));
-
-    tmpl->Set(isolate, "MAX_COMBINED_UNIFORM_BLOCKS", v8::Uint32::New(isolate, 0x8A2E));
-    tmpl->Set(isolate, "MAX_UNIFORM_BUFFER_BINDINGS", v8::Uint32::New(isolate, 0x8A2F));
-    tmpl->Set(isolate, "MAX_UNIFORM_BLOCK_SIZE", v8::Uint32::New(isolate, 0x8A30));
-    tmpl->Set(isolate, "MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS", v8::Uint32::New(isolate, 0x8A31));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8215));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8216));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8217));
+    tmpl->Set(isolate, "FRAMEBUFFER_DEFAULT", v8::Integer::NewFromUnsigned(isolate, 0x8218));
+    tmpl->Set(isolate, "DEPTH_STENCIL_ATTACHMENT", v8::Integer::NewFromUnsigned(isolate, 0x821A));
+
+    tmpl->Set(isolate, "DEPTH_STENCIL", v8::Integer::NewFromUnsigned(isolate, 0x84F9));
+    tmpl->Set(isolate, "DEPTH24_STENCIL8", v8::Integer::NewFromUnsigned(isolate, 0x88F0));
+    tmpl->Set(isolate, "DRAW_FRAMEBUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8CA6));
+    tmpl->Set(isolate, "READ_FRAMEBUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8CA8));
+    tmpl->Set(isolate, "DRAW_FRAMEBUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8CA9));
+
+    tmpl->Set(isolate, "READ_FRAMEBUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8CAA));
+    tmpl->Set(isolate, "RENDERBUFFER_SAMPLES", v8::Integer::NewFromUnsigned(isolate, 0x8CAB));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER",
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD4));
+    tmpl->Set(isolate, "FRAMEBUFFER_INCOMPLETE_MULTISAMPLE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8D56));
+    tmpl->Set(isolate, "UNIFORM_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8A11));
+
+    tmpl->Set(isolate, "UNIFORM_BUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8A28));
+    tmpl->Set(isolate, "UNIFORM_BUFFER_START", v8::Integer::NewFromUnsigned(isolate, 0x8A29));
+    tmpl->Set(isolate, "UNIFORM_BUFFER_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8A2A));
+    tmpl->Set(isolate, "MAX_VERTEX_UNIFORM_BLOCKS", v8::Integer::NewFromUnsigned(isolate, 0x8A2B));
+    tmpl->Set(isolate, "MAX_FRAGMENT_UNIFORM_BLOCKS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8A2D));
+
+    tmpl->Set(isolate, "MAX_COMBINED_UNIFORM_BLOCKS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8A2E));
+    tmpl->Set(isolate, "MAX_UNIFORM_BUFFER_BINDINGS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8A2F));
+    tmpl->Set(isolate, "MAX_UNIFORM_BLOCK_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8A30));
+    tmpl->Set(isolate, "MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8A31));
     tmpl->Set(isolate, "MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS",
-              v8::Uint32::New(isolate, 0x8A33));
+              v8::Integer::NewFromUnsigned(isolate, 0x8A33));
 
-    tmpl->Set(isolate, "UNIFORM_BUFFER_OFFSET_ALIGNMENT", v8::Uint32::New(isolate, 0x8A34));
-    tmpl->Set(isolate, "ACTIVE_UNIFORM_BLOCKS", v8::Uint32::New(isolate, 0x8A36));
-    tmpl->Set(isolate, "UNIFORM_TYPE", v8::Uint32::New(isolate, 0x8A37));
-    tmpl->Set(isolate, "UNIFORM_SIZE", v8::Uint32::New(isolate, 0x8A38));
-    tmpl->Set(isolate, "UNIFORM_BLOCK_INDEX", v8::Uint32::New(isolate, 0x8A3A));
+    tmpl->Set(isolate, "UNIFORM_BUFFER_OFFSET_ALIGNMENT",
+              v8::Integer::NewFromUnsigned(isolate, 0x8A34));
+    tmpl->Set(isolate, "ACTIVE_UNIFORM_BLOCKS", v8::Integer::NewFromUnsigned(isolate, 0x8A36));
+    tmpl->Set(isolate, "UNIFORM_TYPE", v8::Integer::NewFromUnsigned(isolate, 0x8A37));
+    tmpl->Set(isolate, "UNIFORM_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8A38));
+    tmpl->Set(isolate, "UNIFORM_BLOCK_INDEX", v8::Integer::NewFromUnsigned(isolate, 0x8A3A));
 
-    tmpl->Set(isolate, "UNIFORM_OFFSET", v8::Uint32::New(isolate, 0x8A3B));
-    tmpl->Set(isolate, "UNIFORM_ARRAY_STRIDE", v8::Uint32::New(isolate, 0x8A3C));
-    tmpl->Set(isolate, "UNIFORM_MATRIX_STRIDE", v8::Uint32::New(isolate, 0x8A3D));
+    tmpl->Set(isolate, "UNIFORM_OFFSET", v8::Integer::NewFromUnsigned(isolate, 0x8A3B));
+    tmpl->Set(isolate, "UNIFORM_ARRAY_STRIDE", v8::Integer::NewFromUnsigned(isolate, 0x8A3C));
+    tmpl->Set(isolate, "UNIFORM_MATRIX_STRIDE", v8::Integer::NewFromUnsigned(isolate, 0x8A3D));
 
     /* Draw buffers */
 
     /* Samplers */
 
-    tmpl->Set(isolate, "UNIFORM_IS_ROW_MAJOR", v8::Uint32::New(isolate, 0x8A3E));
-    tmpl->Set(isolate, "UNIFORM_BLOCK_BINDING", v8::Uint32::New(isolate, 0x8A3F));
-    tmpl->Set(isolate, "UNIFORM_BLOCK_DATA_SIZE", v8::Uint32::New(isolate, 0x8A40));
-    tmpl->Set(isolate, "UNIFORM_BLOCK_ACTIVE_UNIFORMS", v8::Uint32::New(isolate, 0x8A42));
-    tmpl->Set(isolate, "UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES", v8::Uint32::New(isolate, 0x8A43));
+    tmpl->Set(isolate, "UNIFORM_IS_ROW_MAJOR", v8::Integer::NewFromUnsigned(isolate, 0x8A3E));
+    tmpl->Set(isolate, "UNIFORM_BLOCK_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8A3F));
+    tmpl->Set(isolate, "UNIFORM_BLOCK_DATA_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8A40));
+    tmpl->Set(isolate, "UNIFORM_BLOCK_ACTIVE_UNIFORMS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8A42));
+    tmpl->Set(isolate, "UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES",
+              v8::Integer::NewFromUnsigned(isolate, 0x8A43));
 
     tmpl->Set(isolate, "UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER",
-              v8::Uint32::New(isolate, 0x8A44));
+              v8::Integer::NewFromUnsigned(isolate, 0x8A44));
     tmpl->Set(isolate, "UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER",
-              v8::Uint32::New(isolate, 0x8A46));
-    tmpl->Set(isolate, "OBJECT_TYPE", v8::Uint32::New(isolate, 0x9112));
-    tmpl->Set(isolate, "SYNC_CONDITION", v8::Uint32::New(isolate, 0x9113));
-    tmpl->Set(isolate, "SYNC_STATUS", v8::Uint32::New(isolate, 0x9114));
+              v8::Integer::NewFromUnsigned(isolate, 0x8A46));
+    tmpl->Set(isolate, "OBJECT_TYPE", v8::Integer::NewFromUnsigned(isolate, 0x9112));
+    tmpl->Set(isolate, "SYNC_CONDITION", v8::Integer::NewFromUnsigned(isolate, 0x9113));
+    tmpl->Set(isolate, "SYNC_STATUS", v8::Integer::NewFromUnsigned(isolate, 0x9114));
 
-    tmpl->Set(isolate, "SYNC_FLAGS", v8::Uint32::New(isolate, 0x9115));
-    tmpl->Set(isolate, "SYNC_FENCE", v8::Uint32::New(isolate, 0x9116));
-    tmpl->Set(isolate, "SYNC_GPU_COMMANDS_COMPLETE", v8::Uint32::New(isolate, 0x9117));
-    tmpl->Set(isolate, "UNSIGNALED", v8::Uint32::New(isolate, 0x9118));
-    tmpl->Set(isolate, "SIGNALED", v8::Uint32::New(isolate, 0x9119));
+    tmpl->Set(isolate, "SYNC_FLAGS", v8::Integer::NewFromUnsigned(isolate, 0x9115));
+    tmpl->Set(isolate, "SYNC_FENCE", v8::Integer::NewFromUnsigned(isolate, 0x9116));
+    tmpl->Set(isolate, "SYNC_GPU_COMMANDS_COMPLETE", v8::Integer::NewFromUnsigned(isolate, 0x9117));
+    tmpl->Set(isolate, "UNSIGNALED", v8::Integer::NewFromUnsigned(isolate, 0x9118));
+    tmpl->Set(isolate, "SIGNALED", v8::Integer::NewFromUnsigned(isolate, 0x9119));
 
     /* Samplers */
 
     /* Buffers */
 
-    tmpl->Set(isolate, "ALREADY_SIGNALED", v8::Uint32::New(isolate, 0x911A));
-    tmpl->Set(isolate, "TIMEOUT_EXPIRED", v8::Uint32::New(isolate, 0x911B));
-    tmpl->Set(isolate, "CONDITION_SATISFIED", v8::Uint32::New(isolate, 0x911C));
-    tmpl->Set(isolate, "WAIT_FAILED", v8::Uint32::New(isolate, 0x911D));
-    tmpl->Set(isolate, "SYNC_FLUSH_COMMANDS_BIT", v8::Uint32::New(isolate, 0x00000001));
+    tmpl->Set(isolate, "ALREADY_SIGNALED", v8::Integer::NewFromUnsigned(isolate, 0x911A));
+    tmpl->Set(isolate, "TIMEOUT_EXPIRED", v8::Integer::NewFromUnsigned(isolate, 0x911B));
+    tmpl->Set(isolate, "CONDITION_SATISFIED", v8::Integer::NewFromUnsigned(isolate, 0x911C));
+    tmpl->Set(isolate, "WAIT_FAILED", v8::Integer::NewFromUnsigned(isolate, 0x911D));
+    tmpl->Set(isolate, "SYNC_FLUSH_COMMANDS_BIT",
+              v8::Integer::NewFromUnsigned(isolate, 0x00000001));
 
-    tmpl->Set(isolate, "COLOR", v8::Uint32::New(isolate, 0x1800));
-    tmpl->Set(isolate, "DEPTH", v8::Uint32::New(isolate, 0x1801));
-    tmpl->Set(isolate, "STENCIL", v8::Uint32::New(isolate, 0x1802));
+    tmpl->Set(isolate, "COLOR", v8::Integer::NewFromUnsigned(isolate, 0x1800));
+    tmpl->Set(isolate, "DEPTH", v8::Integer::NewFromUnsigned(isolate, 0x1801));
+    tmpl->Set(isolate, "STENCIL", v8::Integer::NewFromUnsigned(isolate, 0x1802));
 
     /* Buffers */
 
     /* Data types */
 
-    tmpl->Set(isolate, "MIN", v8::Uint32::New(isolate, 0x8007));
-    tmpl->Set(isolate, "MAX", v8::Uint32::New(isolate, 0x8008));
-    tmpl->Set(isolate, "DEPTH_COMPONENT24", v8::Uint32::New(isolate, 0x81A6));
-    tmpl->Set(isolate, "STREAM_READ", v8::Uint32::New(isolate, 0x88E1));
-    tmpl->Set(isolate, "STREAM_COPY", v8::Uint32::New(isolate, 0x88E2));
+    tmpl->Set(isolate, "MIN", v8::Integer::NewFromUnsigned(isolate, 0x8007));
+    tmpl->Set(isolate, "MAX", v8::Integer::NewFromUnsigned(isolate, 0x8008));
+    tmpl->Set(isolate, "DEPTH_COMPONENT24", v8::Integer::NewFromUnsigned(isolate, 0x81A6));
+    tmpl->Set(isolate, "STREAM_READ", v8::Integer::NewFromUnsigned(isolate, 0x88E1));
+    tmpl->Set(isolate, "STREAM_COPY", v8::Integer::NewFromUnsigned(isolate, 0x88E2));
 
-    tmpl->Set(isolate, "STATIC_READ", v8::Uint32::New(isolate, 0x88E5));
-    tmpl->Set(isolate, "STATIC_COPY", v8::Uint32::New(isolate, 0x88E6));
-    tmpl->Set(isolate, "DYNAMIC_READ", v8::Uint32::New(isolate, 0x88E9));
-    tmpl->Set(isolate, "DYNAMIC_COPY", v8::Uint32::New(isolate, 0x88EA));
-    tmpl->Set(isolate, "DEPTH_COMPONENT32F", v8::Uint32::New(isolate, 0x8CAC));
-    tmpl->Set(isolate, "DEPTH32F_STENCIL8", v8::Uint32::New(isolate, 0x8CAD));
+    tmpl->Set(isolate, "STATIC_READ", v8::Integer::NewFromUnsigned(isolate, 0x88E5));
+    tmpl->Set(isolate, "STATIC_COPY", v8::Integer::NewFromUnsigned(isolate, 0x88E6));
+    tmpl->Set(isolate, "DYNAMIC_READ", v8::Integer::NewFromUnsigned(isolate, 0x88E9));
+    tmpl->Set(isolate, "DYNAMIC_COPY", v8::Integer::NewFromUnsigned(isolate, 0x88EA));
+    tmpl->Set(isolate, "DEPTH_COMPONENT32F", v8::Integer::NewFromUnsigned(isolate, 0x8CAC));
+    tmpl->Set(isolate, "DEPTH32F_STENCIL8", v8::Integer::NewFromUnsigned(isolate, 0x8CAD));
 
     /* Data types */
 
-    tmpl->Set(isolate, "INVALID_INDEX", v8::Number::New(isolate, (double) 0xFFFFFFFF));
+    tmpl->Set(isolate, "INVALID_INDEX", v8::Integer::NewFromUnsigned(isolate, 0xFFFFFFFF));
     tmpl->Set(isolate, "TIMEOUT_IGNORED", v8::Int32::New(isolate, -1));
 
     /* Vertex attributes */
 
     /* Transform feedback */
 
-    tmpl->Set(isolate, "MAX_CLIENT_WAIT_TIMEOUT_WEBGL", v8::Uint32::New(isolate, 0x9247));
+    tmpl->Set(isolate, "MAX_CLIENT_WAIT_TIMEOUT_WEBGL",
+              v8::Integer::NewFromUnsigned(isolate, 0x9247));
 
     /* Transform feedback */