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

package/platforms/ios/src/cpp/webgl/WebGLRenderingContext.cpp

@@ -122,12 +122,12 @@ v8::Local<v8::Value> WebGLRenderingContext::GetParameterInternal(v8::Isolate *is
                 value == 0) {
                 return scope.Escape(v8::Null(isolate));
             }
-            return scope.Escape(v8::Number::New(isolate, (double) value));
+            return scope.Escape(v8::Integer::New(isolate, value));
         }
         case (uint32_t) GLConstants::UNPACK_COLORSPACE_CONVERSION_WEBGL:
-            return scope.Escape(v8::Number::New(isolate,
-                                                (double) canvas_native_webgl_state_get_unpack_colorspace_conversion_webgl(
-                                                        this->GetState())));
+            return scope.Escape(v8::Integer::New(isolate,
+                                                 canvas_native_webgl_state_get_unpack_colorspace_conversion_webgl(
+                                                         this->GetState())));
         case GL_ALIASED_LINE_WIDTH_RANGE:
         case GL_ALIASED_POINT_SIZE_RANGE:
         case GL_BLEND_COLOR:
@@ -307,7 +307,7 @@ void WebGLRenderingContext::ActiveTexture(const v8::FunctionCallbackInfo<v8::Val
 
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
-    auto texture = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto texture = args[0]->Uint32Value(context).ToChecked();
     canvas_native_webgl_active_texture(texture,
                                        ptr->GetState());
 }
@@ -322,32 +322,33 @@ void WebGLRenderingContext::AttachShader(const v8::FunctionCallbackInfo<v8::Valu
 
     auto programValue = args[0];
     auto shaderValue = args[1];
-    if (programValue->IsObject() && shaderValue->IsObject()) {
-        WebGLProgram *program = nullptr;
-        WebGLShader *shader = nullptr;
-        if (GetNativeType(isolate, programValue.As<v8::Object>()) == NativeType::WebGLProgram) {
-            program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
-        }
 
-        if (GetNativeType(isolate, shaderValue.As<v8::Object>()) == NativeType::WebGLShader) {
-            shader = WebGLShader::GetPointer(shaderValue.As<v8::Object>());
-        }
+    auto programType = GetNativeType(isolate, programValue);
+    auto shaderType = GetNativeType(isolate, shaderValue);
 
-        if (program == nullptr) {
-            return;
-        }
+    WebGLProgram *program = nullptr;
+    WebGLShader *shader = nullptr;
+    if (programType == NativeType::WebGLProgram) {
+        program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
+    }
 
-        if (shader == nullptr) {
-            return;
-        }
+    if (shaderType == NativeType::WebGLShader) {
+        shader = WebGLShader::GetPointer(shaderValue.As<v8::Object>());
+    }
 
-        canvas_native_webgl_attach_shader(
-                program->GetProgram(),
-                shader->GetShader(),
-                ptr->GetState()
-        );
+    if (program == nullptr) {
+        return;
+    }
 
+    if (shader == nullptr) {
+        return;
     }
+
+    canvas_native_webgl_attach_shader(
+            program->GetProgram(),
+            shader->GetShader(),
+            ptr->GetState()
+    );
 }
 
 void WebGLRenderingContext::BindAttribLocation(const v8::FunctionCallbackInfo<v8::Value> &args) {
@@ -361,11 +362,10 @@ void WebGLRenderingContext::BindAttribLocation(const v8::FunctionCallbackInfo<v8
 
     auto programValue = args[0];
     auto type = GetNativeType(isolate, programValue);
-    if (type == NativeType::WebGLProgram && args[1]->IsNumber() &&
-        args[2]->IsString()) {
+    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();
         auto name = ConvertFromV8String(isolate, args[2]);
         canvas_native_webgl_bind_attrib_location(
                 program->GetProgram(),
@@ -386,31 +386,29 @@ void WebGLRenderingContext::BindBuffer(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    if (args[0]->IsNumber()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        if (!args[1]->IsNull() &&
-            args[1]->IsObject()) {
-            auto type = GetNativeType(isolate, args[1].As<v8::Object>());
-            if (type == NativeType::WebGLBuffer) {
-                auto buffer = WebGLBuffer::GetPointer(args[1].As<v8::Object>());
-                if (buffer ==
-                    nullptr) { return; }
-                canvas_native_webgl_bind_buffer(
-                        target,
-                        buffer->GetBuffer(),
-                        ptr->GetState()
-                );
-            }
-
-        } else {
-            // unbind
-            // check for null or undefined ?
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    if (!args[1]->IsNull() &&
+        args[1]->IsObject()) {
+        auto type = GetNativeType(isolate, args[1].As<v8::Object>());
+        if (type == NativeType::WebGLBuffer) {
+            auto buffer = WebGLBuffer::GetPointer(args[1].As<v8::Object>());
+            if (buffer ==
+                nullptr) { return; }
             canvas_native_webgl_bind_buffer(
                     target,
-                    0,
+                    buffer->GetBuffer(),
                     ptr->GetState()
             );
         }
+
+    } else {
+        // unbind
+        // check for null or undefined ?
+        canvas_native_webgl_bind_buffer(
+                target,
+                0,
+                ptr->GetState()
+        );
     }
 }
 
@@ -424,9 +422,9 @@ void WebGLRenderingContext::BindFramebuffer(const v8::FunctionCallbackInfo<v8::V
     auto context = isolate->GetCurrentContext();
 
     if (args[0]->IsNumber()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
         if (args[1]->IsObject()) {
-            auto type = GetNativeType(isolate, args[1].As<v8::Object>());
+            auto type = GetNativeType(isolate, args[1]);
             if (type == NativeType::WebGLFramebuffer) {
                 auto framebuffer = WebGLFramebuffer::GetPointer(args[1].As<v8::Object>());
                 canvas_native_webgl_bind_frame_buffer(
@@ -456,28 +454,26 @@ void WebGLRenderingContext::BindRenderbuffer(const v8::FunctionCallbackInfo<v8::
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    if (args[0]->IsNumber()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        if (args[1]->IsObject()) {
-            auto type = GetNativeType(isolate, args[1].As<v8::Object>());
-            if (type == NativeType::WebGLRenderbuffer) {
-                auto renderbuffer = WebGLRenderbuffer::GetPointer(args[1].As<v8::Object>());
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    if (args[1]->IsObject()) {
+        auto type = GetNativeType(isolate, args[1].As<v8::Object>());
+        if (type == NativeType::WebGLRenderbuffer) {
+            auto renderbuffer = WebGLRenderbuffer::GetPointer(args[1].As<v8::Object>());
 
-                if (renderbuffer ==
-                    nullptr) { return; }
-                canvas_native_webgl_bind_render_buffer(
-                        target,
-                        renderbuffer->GetRenderBuffer(),
-                        ptr->GetState()
-                );
-            }
-        } else {
+            if (renderbuffer ==
+                nullptr) { return; }
             canvas_native_webgl_bind_render_buffer(
                     target,
-                    0,
+                    renderbuffer->GetRenderBuffer(),
                     ptr->GetState()
             );
         }
+    } else {
+        canvas_native_webgl_bind_render_buffer(
+                target,
+                0,
+                ptr->GetState()
+        );
     }
 }
 
@@ -490,25 +486,23 @@ void WebGLRenderingContext::BindTexture(const v8::FunctionCallbackInfo<v8::Value
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    if (args[0]->IsNumber()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        if (args[1]->IsObject()) {
-            auto type = GetNativeType(isolate, args[1].As<v8::Object>());
-            if (type == NativeType::WebGLTexture) {
-                auto texture = WebGLTexture::GetPointer(args[1].As<v8::Object>());
-                canvas_native_webgl_bind_texture(
-                        target,
-                        texture->GetTexture(),
-                        ptr->GetState()
-                );
-            }
-        } else {
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    if (args[1]->IsObject()) {
+        auto type = GetNativeType(isolate, args[1].As<v8::Object>());
+        if (type == NativeType::WebGLTexture) {
+            auto texture = WebGLTexture::GetPointer(args[1].As<v8::Object>());
             canvas_native_webgl_bind_texture(
                     target,
-                    0,
+                    texture->GetTexture(),
                     ptr->GetState()
             );
         }
+    } else {
+        canvas_native_webgl_bind_texture(
+                target,
+                0,
+                ptr->GetState()
+        );
     }
 }
 
@@ -544,8 +538,8 @@ void WebGLRenderingContext::BlendEquationSeparate(const v8::FunctionCallbackInfo
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto modeRGB = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto modeAlpha = (uint32_t) args[1]->NumberValue(context).ToChecked();
+    auto modeRGB = args[0]->Uint32Value(context).ToChecked();
+    auto modeAlpha = args[1]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_blend_equation_separate(
             modeRGB,
@@ -563,7 +557,7 @@ void WebGLRenderingContext::BlendEquation(const v8::FunctionCallbackInfo<v8::Val
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto mode = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto mode = args[0]->Uint32Value(context).ToChecked();
     canvas_native_webgl_blend_equation(
             mode,
             ptr->GetState()
@@ -579,10 +573,10 @@ void WebGLRenderingContext::BlendFuncSeparate(const v8::FunctionCallbackInfo<v8:
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto srcRGB = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto dstRGB = (uint32_t) args[1]->NumberValue(context).ToChecked();
-    auto srcAlpha = (uint32_t) args[2]->NumberValue(context).ToChecked();
-    auto dstAlpha = (uint32_t) args[3]->NumberValue(context).ToChecked();
+    auto srcRGB = args[0]->Uint32Value(context).ToChecked();
+    auto dstRGB = args[1]->Uint32Value(context).ToChecked();
+    auto srcAlpha = args[2]->Uint32Value(context).ToChecked();
+    auto dstAlpha = args[3]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_blend_func_separate(
             srcRGB,
@@ -602,8 +596,8 @@ void WebGLRenderingContext::BlendFunc(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto sfactor = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto dfactor = (uint32_t) args[1]->NumberValue(context).ToChecked();
+    auto sfactor = args[0]->Uint32Value(context).ToChecked();
+    auto dfactor = args[1]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_blend_func(
             sfactor,
@@ -624,8 +618,8 @@ void WebGLRenderingContext::BufferData(const v8::FunctionCallbackInfo<v8::Value>
     auto count = args.Length();
 
     if (count == 2) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto usage = (uint32_t) args[1]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto usage = args[1]->Uint32Value(context).ToChecked();
 
         canvas_native_webgl_buffer_data_none(
                 target,
@@ -634,9 +628,9 @@ void WebGLRenderingContext::BufferData(const v8::FunctionCallbackInfo<v8::Value>
                 ptr->GetState()
         );
     } else if (count == 3) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
 
-        auto usage = (uint32_t) args[2]->NumberValue(context).ToChecked();
+        auto usage = args[2]->Uint32Value(context).ToChecked();
 
         if (args[1]->IsObject()) {
 
@@ -730,7 +724,7 @@ void WebGLRenderingContext::BufferSubData(const v8::FunctionCallbackInfo<v8::Val
     auto count = args.Length();
 
     if (count == 2) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
         auto offset = args[1]->NumberValue(context).ToChecked();
 
         canvas_native_webgl_buffer_sub_data_none(
@@ -739,7 +733,7 @@ void WebGLRenderingContext::BufferSubData(const v8::FunctionCallbackInfo<v8::Val
                 ptr->GetState()
         );
     } else if (count == 3) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
         auto offset = args[1]->NumberValue(context).ToChecked();
 
         if (args[2]->IsObject()) {
@@ -793,14 +787,14 @@ WebGLRenderingContext::CheckFramebufferStatus(const v8::FunctionCallbackInfo<v8:
     auto count = args.Length();
 
     if (args[0]->IsNumber()) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
 
         auto ret = canvas_native_webgl_check_frame_buffer_status(
                 target,
                 ptr->GetState()
         );
 
-        args.GetReturnValue().Set((int32_t) ret);
+        args.GetReturnValue().Set(ret);
         return;
     }
 
@@ -856,7 +850,7 @@ void WebGLRenderingContext::ClearStencil(const v8::FunctionCallbackInfo<v8::Valu
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto stencil = (int32_t) args[0]->NumberValue(context).ToChecked();
+    auto stencil = args[0]->Int32Value(context).ToChecked();
     canvas_native_webgl_clear_stencil(
             stencil,
             ptr->GetState()
@@ -872,7 +866,7 @@ void WebGLRenderingContext::Clear(const v8::FunctionCallbackInfo<v8::Value> &arg
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto mask = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto mask = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_clear(
             mask,
@@ -938,12 +932,12 @@ void WebGLRenderingContext::CompressedTexImage2D(const v8::FunctionCallbackInfo<
     auto count = args.Length();
 
     if (count == 6) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto level = (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 border = (int32_t) args[5]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto level = 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();
+        auto border = args[5]->Int32Value(context).ToChecked();
 
         canvas_native_webgl_compressed_tex_image2d_none(
                 target,
@@ -955,12 +949,12 @@ void WebGLRenderingContext::CompressedTexImage2D(const v8::FunctionCallbackInfo<
                 ptr->GetState()
         );
     } else if (count > 6) {
-        auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-        auto level = (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 border = (int32_t) args[5]->NumberValue(context).ToChecked();
+        auto target = args[0]->Uint32Value(context).ToChecked();
+        auto level = 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();
+        auto border = args[5]->Int32Value(context).ToChecked();
         auto pixels = args[6];
         if (pixels->IsObject()) {
             if (pixels->IsArrayBufferView()) {
@@ -1015,13 +1009,13 @@ WebGLRenderingContext::CompressedTexSubImage2D(const v8::FunctionCallbackInfo<v8
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    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 width = (int32_t) args[4]->NumberValue(context).ToChecked();
-    auto height = (int32_t) args[5]->NumberValue(context).ToChecked();
-    auto format = (uint32_t) args[6]->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 width = args[4]->Int32Value(context).ToChecked();
+    auto height = args[5]->Int32Value(context).ToChecked();
+    auto format = args[6]->Uint32Value(context).ToChecked();
     if (args[7]->IsObject()) {
         auto pixels = args[7];
         if (pixels->IsArrayBufferView()) {
@@ -1076,14 +1070,14 @@ void WebGLRenderingContext::CopyTexImage2D(const v8::FunctionCallbackInfo<v8::Va
     auto count = args.Length();
 
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto level = (int32_t) args[1]->NumberValue(context).ToChecked();
-    auto internalformat = (uint32_t) args[2]->NumberValue(context).ToChecked();
-    auto x = (int32_t) args[3]->NumberValue(context).ToChecked();
-    auto y = (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 border = (int32_t) args[7]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    auto level = args[1]->Int32Value(context).ToChecked();
+    auto internalformat = args[2]->Uint32Value(context).ToChecked();
+    auto x = args[3]->Int32Value(context).ToChecked();
+    auto y = args[4]->Int32Value(context).ToChecked();
+    auto width = args[5]->Int32Value(context).ToChecked();
+    auto height = args[6]->Int32Value(context).ToChecked();
+    auto border = args[7]->Int32Value(context).ToChecked();
 
     canvas_native_webgl_copy_tex_image2d(
             target,
@@ -1111,14 +1105,14 @@ void WebGLRenderingContext::CopyTexSubImage2D(const v8::FunctionCallbackInfo<v8:
     auto count = args.Length();
 
 
-    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 x = (int32_t) args[4]->NumberValue(context).ToChecked();
-    auto y = (int32_t) args[5]->NumberValue(context).ToChecked();
-    auto width = (int32_t) args[6]->NumberValue(context).ToChecked();
-    auto height = (int32_t) args[7]->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 x = args[4]->Int32Value(context).ToChecked();
+    auto y = args[5]->Int32Value(context).ToChecked();
+    auto width = args[6]->Int32Value(context).ToChecked();
+    auto height = args[7]->Int32Value(context).ToChecked();
 
     canvas_native_webgl_copy_tex_sub_image2d(
             target,
@@ -1243,7 +1237,7 @@ void WebGLRenderingContext::CreateShader(const v8::FunctionCallbackInfo<v8::Valu
         return;
     }
 
-    auto type = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto type = args[0]->Uint32Value(context).ToChecked();
     auto shader = canvas_native_webgl_create_shader(
             type, ptr->GetState());
     if (shader != 0) {
@@ -1290,7 +1284,7 @@ void WebGLRenderingContext::CullFace(const v8::FunctionCallbackInfo<v8::Value> &
     auto context = isolate->GetCurrentContext();
 
 
-    auto mode = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto mode = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_cull_face(
             mode,
@@ -1454,7 +1448,7 @@ void WebGLRenderingContext::DepthFunc(const v8::FunctionCallbackInfo<v8::Value>
 
     auto value = args[0];
 
-    auto func = (uint32_t) value->NumberValue(context).ToChecked();
+    auto func = value->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_depth_func(
             func,
@@ -1470,9 +1464,7 @@ void WebGLRenderingContext::DepthMask(const v8::FunctionCallbackInfo<v8::Value>
 
     auto isolate = args.GetIsolate();
 
-    auto value = args[0];
-
-    auto mask = value->BooleanValue(isolate);
+    auto mask = args[0]->BooleanValue(isolate);
 
     canvas_native_webgl_depth_mask(
             mask,
@@ -1543,7 +1535,7 @@ WebGLRenderingContext::DisableVertexAttribArray(const v8::FunctionCallbackInfo<v
     auto context = isolate->GetCurrentContext();
 
 
-    auto index = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto index = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_disable_vertex_attrib_array(
             index,
@@ -1560,7 +1552,7 @@ void WebGLRenderingContext::Disable(const v8::FunctionCallbackInfo<v8::Value> &a
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto cap = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto cap = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_disable(
             cap,
@@ -1577,9 +1569,9 @@ void WebGLRenderingContext::DrawArrays(const v8::FunctionCallbackInfo<v8::Value>
     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 mode = args[0]->Uint32Value(context).ToChecked();
+    auto first = args[1]->Int32Value(context).ToChecked();
+    auto count = args[2]->Int32Value(context).ToChecked();
 
     canvas_native_webgl_draw_arrays(
             mode,
@@ -1600,9 +1592,9 @@ void WebGLRenderingContext::DrawElements(const v8::FunctionCallbackInfo<v8::Valu
     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]->Int32Value(context).ToChecked();
     auto offset = args[3]->NumberValue(context).ToChecked();
 
     canvas_native_webgl_draw_elements(
@@ -1625,7 +1617,7 @@ WebGLRenderingContext::EnableVertexAttribArray(const v8::FunctionCallbackInfo<v8
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto index = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto index = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_enable_vertex_attrib_array(
             index,
@@ -1642,7 +1634,7 @@ void WebGLRenderingContext::Enable(const v8::FunctionCallbackInfo<v8::Value> &ar
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto cap = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto cap = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_enable(
             cap,
@@ -1682,9 +1674,9 @@ WebGLRenderingContext::FramebufferRenderbuffer(const v8::FunctionCallbackInfo<v8
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto attachment = (uint32_t) args[1]->NumberValue(context).ToChecked();
-    auto renderbuffertarget = (uint32_t) args[2]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    auto attachment = args[1]->Uint32Value(context).ToChecked();
+    auto renderbuffertarget = args[2]->Uint32Value(context).ToChecked();
     auto renderbufferValue = args[3];
     auto type = GetNativeType(isolate, renderbufferValue);
     if (type == NativeType::WebGLRenderbuffer) {
@@ -1710,10 +1702,10 @@ void WebGLRenderingContext::FramebufferTexture2D(const v8::FunctionCallbackInfo<
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
-    auto attachment = (uint32_t) args[1]->NumberValue(context).ToChecked();
-    auto textarget = (uint32_t) args[2]->NumberValue(context).ToChecked();
-    auto level = (int32_t) args[4]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
+    auto attachment = args[1]->Uint32Value(context).ToChecked();
+    auto textarget = args[2]->Uint32Value(context).ToChecked();
+    auto level = args[4]->Int32Value(context).ToChecked();
     auto textureValue = args[3];
     auto type = GetNativeType(isolate, textureValue);
     if (type == NativeType::WebGLTexture) {
@@ -1740,7 +1732,7 @@ void WebGLRenderingContext::FrontFace(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto mode = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto mode = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_front_face(
             mode,
@@ -1757,7 +1749,7 @@ void WebGLRenderingContext::GenerateMipmap(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(context).ToChecked();
+    auto target = args[0]->Uint32Value(context).ToChecked();
 
     canvas_native_webgl_generate_mipmap(
             target,
@@ -1777,7 +1769,7 @@ void WebGLRenderingContext::GetActiveAttrib(const v8::FunctionCallbackInfo<v8::V
     auto programValue = args[0];
     auto type = GetNativeType(isolate, programValue);
     if (type == NativeType::WebGLProgram) {
-        auto index = (int32_t) args[1]->NumberValue(context).ToChecked();
+        auto index = args[1]->Int32Value(context).ToChecked();
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
         if (program != nullptr) {
             auto info = canvas_native_webgl_get_active_attrib(
@@ -1808,7 +1800,7 @@ void WebGLRenderingContext::GetActiveUniform(const v8::FunctionCallbackInfo<v8::
     auto programValue = args[0];
     auto type = GetNativeType(isolate, programValue);
     if (type == NativeType::WebGLProgram) {
-        auto index = (int32_t) args[1]->NumberValue(
+        auto index = args[1]->Int32Value(
                 context).ToChecked();
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
         if (program != nullptr) {
@@ -1906,9 +1898,9 @@ void WebGLRenderingContext::GetBufferParameter(const v8::FunctionCallbackInfo<v8
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
 
     auto param = canvas_native_webgl_get_buffer_parameter(
@@ -2014,7 +2006,7 @@ void WebGLRenderingContext::GetError(const v8::FunctionCallbackInfo<v8::Value> &
     auto ret = canvas_native_webgl_get_error(
             ptr->GetState());
 
-    args.GetReturnValue().Set((int32_t) ret);
+    args.GetReturnValue().Set(ret);
 
 }
 
@@ -2265,11 +2257,11 @@ void WebGLRenderingContext::GetFramebufferAttachmentParameter(
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto attachment = (uint32_t) args[1]->NumberValue(
+    auto attachment = args[1]->Uint32Value(
             context).ToChecked();
-    auto pname = (uint32_t) args[2]->NumberValue(
+    auto pname = args[2]->Uint32Value(
             context).ToChecked();
     auto ret = canvas_native_webgl_get_framebuffer_attachment_parameter(
             target,
@@ -2327,7 +2319,7 @@ void WebGLRenderingContext::GetParameter(const v8::FunctionCallbackInfo<v8::Valu
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto pname = (uint32_t) args[0]->NumberValue(
+    auto pname = args[0]->Uint32Value(
             context).ToChecked();
     auto result = canvas_native_webgl_get_parameter(
             pname,
@@ -2386,7 +2378,7 @@ void WebGLRenderingContext::GetProgramParameter(const v8::FunctionCallbackInfo<v
 
     auto programValue = args[0];
     auto type = GetNativeType(isolate, programValue);
-    auto pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
     if (type == NativeType::WebGLProgram) {
         auto program = WebGLProgram::GetPointer(programValue.As<v8::Object>());
@@ -2439,9 +2431,9 @@ WebGLRenderingContext::GetRenderbufferParameter(const v8::FunctionCallbackInfo<v
     auto context = isolate->GetCurrentContext();
 
     if (args.Length() > 1) {
-        auto target = (uint32_t) args[0]->NumberValue(
+        auto target = args[0]->Uint32Value(
                 context).ToChecked();
-        auto pname = (uint32_t) args[1]->NumberValue(
+        auto pname = args[1]->Uint32Value(
                 context).ToChecked();
         auto ret = canvas_native_webgl_get_renderbuffer_parameter(
                 target,
@@ -2502,7 +2494,7 @@ void WebGLRenderingContext::GetShaderParameter(const v8::FunctionCallbackInfo<v8
 
     auto value = args[0];
     auto type = GetNativeType(isolate, value);
-    auto pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
     if (type == NativeType::WebGLShader) {
         auto shader = WebGLShader::GetPointer(value.As<v8::Object>());
@@ -2556,9 +2548,9 @@ WebGLRenderingContext::GetShaderPrecisionFormat(const v8::FunctionCallbackInfo<v
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto shaderType = (uint32_t) args[0]->NumberValue(
+    auto shaderType = args[0]->Uint32Value(
             context).ToChecked();
-    auto precisionType = (uint32_t) args[1]->NumberValue(
+    auto precisionType = args[1]->Uint32Value(
             context).ToChecked();
     auto ret = canvas_native_webgl_get_shader_precision_format(
             shaderType,
@@ -2665,9 +2657,9 @@ WebGLRenderingContext::GetTexParameter(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
     auto ret = canvas_native_webgl_get_tex_parameter(
             target,
@@ -2918,9 +2910,9 @@ WebGLRenderingContext::GetVertexAttribOffset(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 pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
     auto ret = canvas_native_webgl_get_vertex_attrib_offset(
             index,
@@ -2941,9 +2933,9 @@ WebGLRenderingContext::GetVertexAttrib(const v8::FunctionCallbackInfo<v8::Value>
     auto context = isolate->GetCurrentContext();
 
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
-    auto pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
     auto ret = canvas_native_webgl_get_vertex_attrib(
             index,
@@ -3006,9 +2998,9 @@ WebGLRenderingContext::Hint(const v8::FunctionCallbackInfo<v8::Value> &args) {
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto mode = (uint32_t) args[1]->NumberValue(
+    auto mode = args[1]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl_hint(target,
                              mode,
@@ -3067,7 +3059,7 @@ WebGLRenderingContext::IsEnabled(const v8::FunctionCallbackInfo<v8::Value> &args
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto cap = (uint32_t) args[0]->NumberValue(
+    auto cap = args[0]->Uint32Value(
             context).ToChecked();
     auto ret = canvas_native_webgl_is_enabled(
             cap, ptr->GetState());
@@ -3259,7 +3251,7 @@ WebGLRenderingContext::PixelStorei(const v8::FunctionCallbackInfo<v8::Value> &ar
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto pname = (uint32_t) args[0]->NumberValue(
+    auto pname = args[0]->Uint32Value(
             context).ToChecked();
     if (args[1]->IsBoolean()) {
         auto param = args[1]->BooleanValue(isolate);
@@ -3269,7 +3261,7 @@ WebGLRenderingContext::PixelStorei(const v8::FunctionCallbackInfo<v8::Value> &ar
                 ptr->GetState()
         );
     } else {
-        auto param = (int32_t) args[1]->NumberValue(
+        auto param = args[1]->Int32Value(
                 context).ToChecked();
         canvas_native_webgl_pixel_storei(
                 pname,
@@ -3312,17 +3304,17 @@ WebGLRenderingContext::ReadPixels(const v8::FunctionCallbackInfo<v8::Value> &arg
     auto context = isolate->GetCurrentContext();
 
 
-    auto x = (int32_t) args[0]->NumberValue(
+    auto x = args[0]->Int32Value(
             context).ToChecked();
-    auto y = (int32_t) args[1]->NumberValue(
+    auto y = args[1]->Int32Value(
             context).ToChecked();
-    auto width = (int32_t) args[2]->NumberValue(
+    auto width = args[2]->Int32Value(
             context).ToChecked();
-    auto height = (int32_t) args[3]->NumberValue(
+    auto height = args[3]->Int32Value(
             context).ToChecked();
-    auto format = (uint32_t) args[4]->NumberValue(
+    auto format = args[4]->Uint32Value(
             context).ToChecked();
-    auto type = (uint32_t) args[5]->NumberValue(
+    auto type = args[5]->Uint32Value(
             context).ToChecked();
 
     auto pixels = args[6];
@@ -3380,13 +3372,13 @@ WebGLRenderingContext::RenderbufferStorage(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto internalFormat = (uint32_t) args[1]->NumberValue(
+    auto internalFormat = args[1]->Uint32Value(
             context).ToChecked();
-    auto width = (int32_t) args[2]->NumberValue(
+    auto width = args[2]->Int32Value(
             context).ToChecked();
-    auto height = (int32_t) args[3]->NumberValue(
+    auto height = args[3]->Int32Value(
             context).ToChecked();
     canvas_native_webgl_renderbuffer_storage(
             target,
@@ -3429,13 +3421,13 @@ WebGLRenderingContext::Scissor(const v8::FunctionCallbackInfo<v8::Value> &args)
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto x = (int32_t) args[0]->NumberValue(
+    auto x = args[0]->Int32Value(
             context).ToChecked();
-    auto y = (int32_t) args[1]->NumberValue(
+    auto y = args[1]->Int32Value(
             context).ToChecked();
-    auto width = (int32_t) args[2]->NumberValue(
+    auto width = args[2]->Int32Value(
             context).ToChecked();
-    auto height = (int32_t) args[3]->NumberValue(
+    auto height = args[3]->Int32Value(
             context).ToChecked();
     canvas_native_webgl_scissor(
             x,
@@ -3459,7 +3451,7 @@ WebGLRenderingContext::ShaderSource(const v8::FunctionCallbackInfo<v8::Value> &a
     auto value = args[0];
     auto type = GetNativeType(isolate, value);
     auto sourceValue = args[1];
-    if (type == NativeType::WebGLShader && sourceValue->IsString()) {
+    if (type == NativeType::WebGLShader) {
         auto shader = WebGLShader::GetPointer(value.As<v8::Object>());
         auto source = ConvertFromV8String(isolate, sourceValue);
         if (shader != nullptr) {
@@ -3482,13 +3474,13 @@ WebGLRenderingContext::StencilFuncSeparate(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto face = (uint32_t) args[0]->NumberValue(
+    auto face = args[0]->Uint32Value(
             context).ToChecked();
-    auto func = (uint32_t) args[1]->NumberValue(
+    auto func = args[1]->Uint32Value(
             context).ToChecked();
-    auto ref = (int32_t) args[2]->NumberValue(
+    auto ref = args[2]->Int32Value(
             context).ToChecked();
-    auto mask = (uint32_t) args[3]->NumberValue(
+    auto mask = args[3]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl_stencil_func_separate(
             face,
@@ -3510,11 +3502,11 @@ WebGLRenderingContext::StencilFunc(const v8::FunctionCallbackInfo<v8::Value> &ar
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto func = (uint32_t) args[0]->NumberValue(
+    auto func = args[0]->Uint32Value(
             context).ToChecked();
-    auto ref = (int32_t) args[1]->NumberValue(
+    auto ref = args[1]->Int32Value(
             context).ToChecked();
-    auto mask = (uint32_t) args[2]->NumberValue(
+    auto mask = args[2]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl_stencil_func(
             func,
@@ -3535,9 +3527,9 @@ WebGLRenderingContext::StencilMaskSeparate(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto face = (uint32_t) args[0]->NumberValue(
+    auto face = args[0]->Uint32Value(
             context).ToChecked();
-    auto mask = (uint32_t) args[1]->NumberValue(
+    auto mask = args[1]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl_stencil_mask_separate(
             face,
@@ -3557,7 +3549,7 @@ WebGLRenderingContext::StencilMask(const v8::FunctionCallbackInfo<v8::Value> &ar
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto mask = (uint32_t) args[0]->NumberValue(
+    auto mask = args[0]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl_stencil_mask(
             mask,
@@ -3577,13 +3569,13 @@ WebGLRenderingContext::StencilOpSeparate(const v8::FunctionCallbackInfo<v8::Valu
     auto context = isolate->GetCurrentContext();
 
 
-    auto face = (uint32_t) args[0]->NumberValue(
+    auto face = args[0]->Uint32Value(
             context).ToChecked();
-    auto fail = (uint32_t) args[1]->NumberValue(
+    auto fail = args[1]->Uint32Value(
             context).ToChecked();
-    auto zfail = (uint32_t) args[2]->NumberValue(
+    auto zfail = args[2]->Uint32Value(
             context).ToChecked();
-    auto zpass = (uint32_t) args[3]->NumberValue(
+    auto zpass = args[3]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl_stencil_op_separate(
             face,
@@ -3605,11 +3597,11 @@ WebGLRenderingContext::StencilOp(const v8::FunctionCallbackInfo<v8::Value> &args
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto fail = (uint32_t) args[0]->NumberValue(
+    auto fail = args[0]->Uint32Value(
             context).ToChecked();
-    auto zfail = (uint32_t) args[1]->NumberValue(
+    auto zfail = args[1]->Uint32Value(
             context).ToChecked();
-    auto zpass = (uint32_t) args[2]->NumberValue(
+    auto zpass = args[2]->Uint32Value(
             context).ToChecked();
     canvas_native_webgl_stencil_op(
             fail,
@@ -3636,15 +3628,15 @@ WebGLRenderingContext::TexImage2D(const v8::FunctionCallbackInfo<v8::Value> &arg
     // TODO tidy
 
     if (count == 5) {
-        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 format = (int32_t) args[3]->NumberValue(
+        auto format = args[3]->Int32Value(
                 context).ToChecked();
-        auto type = (int32_t) args[4]->NumberValue(
+        auto type = args[4]->Int32Value(
                 context).ToChecked();
 
         canvas_native_webgl_tex_image2d_image_none(
@@ -3657,15 +3649,15 @@ WebGLRenderingContext::TexImage2D(const v8::FunctionCallbackInfo<v8::Value> &arg
         );
 
     } else if (count == 6) {
-        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 format = (int32_t) args[3]->NumberValue(
+        auto format = args[3]->Int32Value(
                 context).ToChecked();
-        auto type = (int32_t) args[4]->NumberValue(
+        auto type = args[4]->Int32Value(
                 context).ToChecked();
 
         auto pixels = args[5];
@@ -3746,21 +3738,21 @@ WebGLRenderingContext::TexImage2D(const v8::FunctionCallbackInfo<v8::Value> &arg
                 break;
         }
     } else if (count == 8) {
-        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 border = (int32_t) args[5]->NumberValue(
+        auto border = args[5]->Int32Value(
                 context).ToChecked();
-        auto format = (int32_t) args[6]->NumberValue(
+        auto format = args[6]->Int32Value(
                 context).ToChecked();
-        auto type = (int32_t) args[7]->NumberValue(
+        auto type = args[7]->Int32Value(
                 context).ToChecked();
         canvas_native_webgl_tex_image2d_none(
                 target,
@@ -3774,21 +3766,21 @@ WebGLRenderingContext::TexImage2D(const v8::FunctionCallbackInfo<v8::Value> &arg
                 ptr->GetState()
         );
     } else if (count == 9) {
-        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 border = (int32_t) args[5]->NumberValue(
+        auto border = args[5]->Int32Value(
                 context).ToChecked();
-        auto format = (int32_t) args[6]->NumberValue(
+        auto format = args[6]->Int32Value(
                 context).ToChecked();
-        auto type = (int32_t) args[7]->NumberValue(
+        auto type = args[7]->Int32Value(
                 context).ToChecked();
 
 
@@ -3863,9 +3855,9 @@ WebGLRenderingContext::TexParameterf(const v8::FunctionCallbackInfo<v8::Value> &
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target =  args[0]->Uint32Value(
             context).ToChecked();
-    auto pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
     auto param = args[2]->NumberValue(
             context).ToChecked();
@@ -3888,11 +3880,11 @@ WebGLRenderingContext::TexParameteri(const v8::FunctionCallbackInfo<v8::Value> &
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto target = (uint32_t) args[0]->NumberValue(
+    auto target = args[0]->Uint32Value(
             context).ToChecked();
-    auto pname = (uint32_t) args[1]->NumberValue(
+    auto pname = args[1]->Uint32Value(
             context).ToChecked();
-    auto param = (int32_t) args[2]->NumberValue(
+    auto param = args[2]->Int32Value(
             context).ToChecked();
     canvas_native_webgl_tex_parameteri(
             target,
@@ -3915,17 +3907,17 @@ WebGLRenderingContext::TexSubImage2D(const v8::FunctionCallbackInfo<v8::Value> &
 
     auto count = args.Length();
     if (count == 7) {
-        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 format = (uint32_t) args[4]->NumberValue(
+        auto format = args[4]->Uint32Value(
                 context).ToChecked();
-        auto type = (int32_t) args[5]->NumberValue(
+        auto type = args[5]->Int32Value(
                 context).ToChecked();
 
 
@@ -4006,21 +3998,21 @@ WebGLRenderingContext::TexSubImage2D(const v8::FunctionCallbackInfo<v8::Value> &
         }
 
     } else if (count == 9) {
-        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 width = (int32_t) args[4]->NumberValue(
+        auto width = args[4]->Int32Value(
                 context).ToChecked();
-        auto height = (int32_t) args[5]->NumberValue(
+        auto height = args[5]->Int32Value(
                 context).ToChecked();
-        auto format = (uint32_t) args[6]->NumberValue(
+        auto format = args[6]->Uint32Value(
                 context).ToChecked();
-        auto type = (int32_t) args[7]->NumberValue(
+        auto type = args[7]->Int32Value(
                 context).ToChecked();
 
         auto pixels = args[8];
@@ -4083,7 +4075,7 @@ WebGLRenderingContext::VertexAttrib1f(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index =  args[0]->Uint32Value(
             context).ToChecked();
     auto v0 = static_cast<float>(args[1]->NumberValue(
             context).ToChecked());
@@ -4102,7 +4094,7 @@ WebGLRenderingContext::VertexAttrib2f(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
     auto v0 = static_cast<float>(args[1]->NumberValue(
             context).ToChecked());
@@ -4124,7 +4116,7 @@ WebGLRenderingContext::VertexAttrib3f(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
     auto v0 = static_cast<float>(args[1]->NumberValue(
             context).ToChecked());
@@ -4148,7 +4140,7 @@ WebGLRenderingContext::VertexAttrib4f(const v8::FunctionCallbackInfo<v8::Value>
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
     auto v0 = static_cast<float>(args[1]->NumberValue(
             context).ToChecked());
@@ -4174,7 +4166,7 @@ WebGLRenderingContext::VertexAttrib1fv(const v8::FunctionCallbackInfo<v8::Value>
     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];
@@ -4204,7 +4196,7 @@ WebGLRenderingContext::VertexAttrib2fv(const v8::FunctionCallbackInfo<v8::Value>
     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];
@@ -4234,7 +4226,7 @@ WebGLRenderingContext::VertexAttrib3fv(const v8::FunctionCallbackInfo<v8::Value>
     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];
@@ -4264,7 +4256,7 @@ WebGLRenderingContext::VertexAttrib4fv(const v8::FunctionCallbackInfo<v8::Value>
     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];
@@ -4294,14 +4286,14 @@ WebGLRenderingContext::VertexAttribPointer(const v8::FunctionCallbackInfo<v8::Va
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto index = (uint32_t) args[0]->NumberValue(
+    auto index = args[0]->Uint32Value(
             context).ToChecked();
-    auto size = (int32_t) args[1]->NumberValue(
+    auto size = args[1]->Int32Value(
             context).ToChecked();
-    auto type = (uint32_t) args[2]->NumberValue(
+    auto type = args[2]->Uint32Value(
             context).ToChecked();
     auto normalized = args[3]->BooleanValue(isolate);
-    auto stride = (int32_t) args[4]->NumberValue(
+    auto stride = args[4]->Int32Value(
             context).ToChecked();
     auto offset = static_cast<ssize_t>(args[5]->NumberValue(
             context).ToChecked());
@@ -4662,12 +4654,12 @@ WebGLRenderingContext::Uniform1i(const v8::FunctionCallbackInfo<v8::Value> &args
 
     auto value = args[0];
     auto location = WebGLUniformLocation::GetPointer(value.As<v8::Object>());
-    auto v0 = args[1]->NumberValue(
+    auto v0 = args[1]->Int32Value(
             context).ToChecked();
     if (location != nullptr) {
         canvas_native_webgl_uniform1i(
                 location->GetUniformLocation(),
-                static_cast<int32_t>(v0),
+                v0,
                 ptr->GetState()
         );
     }
@@ -4685,15 +4677,15 @@ WebGLRenderingContext::Uniform2i(const v8::FunctionCallbackInfo<v8::Value> &args
 
     auto value = args[0];
     auto location = WebGLUniformLocation::GetPointer(value.As<v8::Object>());
-    auto v0 = args[1]->NumberValue(
+    auto v0 = args[1]->Int32Value(
             context).ToChecked();
-    auto v1 = args[2]->NumberValue(
+    auto v1 = args[2]->Int32Value(
             context).ToChecked();
     if (location != nullptr) {
         canvas_native_webgl_uniform2i(
                 location->GetUniformLocation(),
-                static_cast<int32_t>(v0),
-                static_cast<int32_t>(v1),
+                v0,
+                v1,
                 ptr->GetState()
         );
     }
@@ -4711,18 +4703,18 @@ WebGLRenderingContext::Uniform3i(const v8::FunctionCallbackInfo<v8::Value> &args
 
     auto value = args[0];
     auto location = WebGLUniformLocation::GetPointer(value.As<v8::Object>());
-    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();
     if (location != nullptr) {
         canvas_native_webgl_uniform3i(
                 location->GetUniformLocation(),
-                static_cast<int32_t>(v0),
-                static_cast<int32_t>(v1),
-                static_cast<int32_t>(v2),
+                v0,
+                v1,
+                v2,
                 ptr->GetState()
         );
     }
@@ -4740,21 +4732,21 @@ WebGLRenderingContext::Uniform4i(const v8::FunctionCallbackInfo<v8::Value> &args
 
     auto value = args[0];
     auto location = WebGLUniformLocation::GetPointer(value.As<v8::Object>());
-    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();
     if (location != nullptr) {
         canvas_native_webgl_uniform4i(
                 location->GetUniformLocation(),
-                static_cast<int32_t>(v0),
-                static_cast<int32_t>(v1),
-                static_cast<int32_t>(v2),
-                static_cast<int32_t>(v3),
+                v0,
+                v1,
+                v2,
+                v3,
                 ptr->GetState()
         );
     }
@@ -5223,13 +5215,13 @@ WebGLRenderingContext::Viewport(const v8::FunctionCallbackInfo<v8::Value> &args)
     auto isolate = args.GetIsolate();
     auto context = isolate->GetCurrentContext();
 
-    auto x = (int32_t) args[0]->NumberValue(
+    auto x = args[0]->Int32Value(
             context).ToChecked();
-    auto y = (int32_t) args[1]->NumberValue(
+    auto y = args[1]->Int32Value(
             context).ToChecked();
-    auto width = (int32_t) args[2]->NumberValue(
+    auto width = args[2]->Int32Value(
             context).ToChecked();
-    auto height = (int32_t) args[3]->NumberValue(
+    auto height = args[3]->Int32Value(
             context).ToChecked();
     canvas_native_webgl_viewport(x, y,
                                  width,
@@ -5272,446 +5264,473 @@ WebGLRenderingContext::__ToDataURL(const v8::FunctionCallbackInfo<v8::Value> &ar
 
 void WebGLRenderingContext::SetConstants(v8::Isolate *isolate,
                                          const v8::Local<v8::ObjectTemplate> &tmpl) {
-    tmpl->Set(isolate, "DEPTH_BUFFER_BIT", v8::Uint32::New(isolate, 0x00000100));
+    tmpl->Set(isolate, "DEPTH_BUFFER_BIT", v8::Integer::NewFromUnsigned(isolate, 0x00000100));
 
-    tmpl->Set(isolate, "STENCIL_BUFFER_BIT", v8::Uint32::New(isolate, 0x00000400));
+    tmpl->Set(isolate, "STENCIL_BUFFER_BIT", v8::Integer::NewFromUnsigned(isolate, 0x00000400));
 
-    tmpl->Set(isolate, "COLOR_BUFFER_BIT", v8::Uint32::New(isolate, 0x00004000));
+    tmpl->Set(isolate, "COLOR_BUFFER_BIT", v8::Integer::NewFromUnsigned(isolate, 0x00004000));
 
-    tmpl->Set(isolate, "POINTS", v8::Uint32::New(isolate, 0x0000));
+    tmpl->Set(isolate, "POINTS", v8::Integer::NewFromUnsigned(isolate, 0x0000));
 
-    tmpl->Set(isolate, "LINES", v8::Uint32::New(isolate, 0x0001));
+    tmpl->Set(isolate, "LINES", v8::Integer::NewFromUnsigned(isolate, 0x0001));
 
-    tmpl->Set(isolate, "LINE_LOOP", v8::Uint32::New(isolate, 0x0002));
+    tmpl->Set(isolate, "LINE_LOOP", v8::Integer::NewFromUnsigned(isolate, 0x0002));
 
-    tmpl->Set(isolate, "LINE_STRIP", v8::Uint32::New(isolate, 0x0003));
+    tmpl->Set(isolate, "LINE_STRIP", v8::Integer::NewFromUnsigned(isolate, 0x0003));
 
-    tmpl->Set(isolate, "TRIANGLES", v8::Uint32::New(isolate, 0x0004));
+    tmpl->Set(isolate, "TRIANGLES", v8::Integer::NewFromUnsigned(isolate, 0x0004));
 
-    tmpl->Set(isolate, "TRIANGLE_STRIP", v8::Uint32::New(isolate, 0x0005));
+    tmpl->Set(isolate, "TRIANGLE_STRIP", v8::Integer::NewFromUnsigned(isolate, 0x0005));
 
-    tmpl->Set(isolate, "TRIANGLE_FAN", v8::Uint32::New(isolate, 0x0006));
+    tmpl->Set(isolate, "TRIANGLE_FAN", v8::Integer::NewFromUnsigned(isolate, 0x0006));
 
-    tmpl->Set(isolate, "ZERO", v8::Uint32::New(isolate, 0));
+    tmpl->Set(isolate, "ZERO", v8::Integer::NewFromUnsigned(isolate, 0));
 
-    tmpl->Set(isolate, "ONE", v8::Uint32::New(isolate, 1));
+    tmpl->Set(isolate, "ONE", v8::Integer::NewFromUnsigned(isolate, 1));
 
-    tmpl->Set(isolate, "SRC_COLOR", v8::Uint32::New(isolate, 0x0300));
+    tmpl->Set(isolate, "SRC_COLOR", v8::Integer::NewFromUnsigned(isolate, 0x0300));
 
-    tmpl->Set(isolate, "ONE_MINUS_SRC_COLOR", v8::Uint32::New(isolate, 0x0301));
+    tmpl->Set(isolate, "ONE_MINUS_SRC_COLOR", v8::Integer::NewFromUnsigned(isolate, 0x0301));
 
-    tmpl->Set(isolate, "SRC_ALPHA", v8::Uint32::New(isolate, 0x0302));
+    tmpl->Set(isolate, "SRC_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x0302));
 
-    tmpl->Set(isolate, "ONE_MINUS_SRC_ALPHA", v8::Uint32::New(isolate, 0x0303));
+    tmpl->Set(isolate, "ONE_MINUS_SRC_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x0303));
 
-    tmpl->Set(isolate, "DST_ALPHA", v8::Uint32::New(isolate, 0x0304));
+    tmpl->Set(isolate, "DST_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x0304));
 
-    tmpl->Set(isolate, "ONE_MINUS_DST_ALPHA", v8::Uint32::New(isolate, 0x0305));
+    tmpl->Set(isolate, "ONE_MINUS_DST_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x0305));
 
-    tmpl->Set(isolate, "DST_COLOR", v8::Uint32::New(isolate, 0x0306));
+    tmpl->Set(isolate, "DST_COLOR", v8::Integer::NewFromUnsigned(isolate, 0x0306));
 
-    tmpl->Set(isolate, "ONE_MINUS_DST_COLOR", v8::Uint32::New(isolate, 0x0307));
+    tmpl->Set(isolate, "ONE_MINUS_DST_COLOR", v8::Integer::NewFromUnsigned(isolate, 0x0307));
 
-    tmpl->Set(isolate, "SRC_ALPHA_SATURATE", v8::Uint32::New(isolate, 0x0308));
+    tmpl->Set(isolate, "SRC_ALPHA_SATURATE", v8::Integer::NewFromUnsigned(isolate, 0x0308));
 
 
-    tmpl->Set(isolate, "CONSTANT_COLOR", v8::Uint32::New(isolate, 0x8001));
-    tmpl->Set(isolate, "ONE_MINUS_CONSTANT_COLOR", v8::Uint32::New(isolate, 0x8002));
-    tmpl->Set(isolate, "CONSTANT_ALPHA", v8::Uint32::New(isolate, 0x8003));
-    tmpl->Set(isolate, "ONE_MINUS_CONSTANT_ALPHA", v8::Uint32::New(isolate, 0x8004));
+    tmpl->Set(isolate, "CONSTANT_COLOR", v8::Integer::NewFromUnsigned(isolate, 0x8001));
+    tmpl->Set(isolate, "ONE_MINUS_CONSTANT_COLOR", v8::Integer::NewFromUnsigned(isolate, 0x8002));
+    tmpl->Set(isolate, "CONSTANT_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x8003));
+    tmpl->Set(isolate, "ONE_MINUS_CONSTANT_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x8004));
 
 
     /* Blending equations */
 
-    tmpl->Set(isolate, "FUNC_ADD", v8::Uint32::New(isolate, 0x8006));
-    tmpl->Set(isolate, "FUNC_SUBTRACT", v8::Uint32::New(isolate, 0x800A));
-    tmpl->Set(isolate, "FUNC_REVERSE_SUBTRACT", v8::Uint32::New(isolate, 0x800B));
-    tmpl->Set(isolate, "BLEND_EQUATION", v8::Uint32::New(isolate, 0x8009));
-    tmpl->Set(isolate, "BLEND_EQUATION_RGB", v8::Uint32::New(isolate, 0x8009));
-    tmpl->Set(isolate, "BLEND_EQUATION_ALPHA", v8::Uint32::New(isolate, 0x883D));
-
-
-    tmpl->Set(isolate, "BLEND_DST_RGB", v8::Uint32::New(isolate, 0x80C8));
-    tmpl->Set(isolate, "BLEND_SRC_RGB", v8::Uint32::New(isolate, 0x80C9));
-    tmpl->Set(isolate, "BLEND_DST_ALPHA", v8::Uint32::New(isolate, 0x80CA));
-
-
-    tmpl->Set(isolate, "BLEND_SRC_ALPHA", v8::Uint32::New(isolate, 0x80CB));
-    tmpl->Set(isolate, "BLEND_COLOR", v8::Uint32::New(isolate, 0x8005));
-    tmpl->Set(isolate, "ARRAY_BUFFER_BINDING", v8::Uint32::New(isolate, 0x8894));
-
-
-    tmpl->Set(isolate, "ELEMENT_ARRAY_BUFFER_BINDING", v8::Uint32::New(isolate, 0x8895));
-    tmpl->Set(isolate, "LINE_WIDTH", v8::Uint32::New(isolate, 0x0B21));
-    tmpl->Set(isolate, "ALIASED_POINT_SIZE_RANGE", v8::Uint32::New(isolate, 0x846D));
-
-    tmpl->Set(isolate, "ALIASED_LINE_WIDTH_RANGE", v8::Uint32::New(isolate, 0x846E));
-    tmpl->Set(isolate, "CULL_FACE_MODE", v8::Uint32::New(isolate, 0x0B45));
-    tmpl->Set(isolate, "FRONT_FACE", v8::Uint32::New(isolate, 0x0B46));
-
-    tmpl->Set(isolate, "DEPTH_RANGE", v8::Uint32::New(isolate, 0x0B70));
-    tmpl->Set(isolate, "DEPTH_WRITEMASK", v8::Uint32::New(isolate, 0x0B72));
-    tmpl->Set(isolate, "DEPTH_CLEAR_VALUE", v8::Uint32::New(isolate, 0x0B73));
-
-    tmpl->Set(isolate, "DEPTH_FUNC", v8::Uint32::New(isolate, 0x0B74));
-    tmpl->Set(isolate, "STENCIL_CLEAR_VALUE", v8::Uint32::New(isolate, 0x0B91));
-    tmpl->Set(isolate, "STENCIL_FUNC", v8::Uint32::New(isolate, 0x0B92));
-
-    tmpl->Set(isolate, "STENCIL_FAIL", v8::Uint32::New(isolate, 0x0B94));
-    tmpl->Set(isolate, "STENCIL_PASS_DEPTH_FAIL", v8::Uint32::New(isolate, 0x0B95));
-    tmpl->Set(isolate, "STENCIL_PASS_DEPTH_PASS", v8::Uint32::New(isolate, 0x0B96));
-
-    tmpl->Set(isolate, "STENCIL_REF", v8::Uint32::New(isolate, 0x0B97));
-    tmpl->Set(isolate, "STENCIL_VALUE_MASK", v8::Uint32::New(isolate, 0x0B93));
-    tmpl->Set(isolate, "STENCIL_WRITEMASK", v8::Uint32::New(isolate, 0x0B98));
-
-    tmpl->Set(isolate, "STENCIL_BACK_FUNC", v8::Uint32::New(isolate, 0x8800));
-    tmpl->Set(isolate, "STENCIL_BACK_FAIL", v8::Uint32::New(isolate, 0x8801));
-    tmpl->Set(isolate, "STENCIL_BACK_PASS_DEPTH_FAIL", v8::Uint32::New(isolate, 0x8802));
-
-    tmpl->Set(isolate, "STENCIL_BACK_PASS_DEPTH_PASS", v8::Uint32::New(isolate, 0x8803));
-    tmpl->Set(isolate, "STENCIL_BACK_REF", v8::Uint32::New(isolate, 0x8CA3));
-    tmpl->Set(isolate, "STENCIL_BACK_VALUE_MASK", v8::Uint32::New(isolate, 0x8CA4));
-    tmpl->Set(isolate, "STENCIL_BACK_WRITEMASK", v8::Uint32::New(isolate, 0x8CA5));
-
-    tmpl->Set(isolate, "VIEWPORT", v8::Uint32::New(isolate, 0x0BA2));
-    tmpl->Set(isolate, "SCISSOR_BOX", v8::Uint32::New(isolate, 0x0C10));
-    tmpl->Set(isolate, "COLOR_CLEAR_VALUE", v8::Uint32::New(isolate, 0x0C22));
-    tmpl->Set(isolate, "COLOR_WRITEMASK", v8::Uint32::New(isolate, 0x0C23));
-
-    tmpl->Set(isolate, "UNPACK_ALIGNMENT", v8::Uint32::New(isolate, 0x0CF5));
-    tmpl->Set(isolate, "PACK_ALIGNMENT", v8::Uint32::New(isolate, 0x0D05));
-    tmpl->Set(isolate, "MAX_TEXTURE_SIZE", v8::Uint32::New(isolate, 0x0D33));
-
-
-    tmpl->Set(isolate, "MAX_VIEWPORT_DIMS", v8::Uint32::New(isolate, 0x0D3A));
-    tmpl->Set(isolate, "SUBPIXEL_BITS", v8::Uint32::New(isolate, 0x0D50));
-
-    tmpl->Set(isolate, "RED_BITS", v8::Uint32::New(isolate, 0x0D52));
-    tmpl->Set(isolate, "GREEN_BITS", v8::Uint32::New(isolate, 0x0D53));
-    tmpl->Set(isolate, "BLUE_BITS", v8::Uint32::New(isolate, 0x0D54));
-    tmpl->Set(isolate, "ALPHA_BITS", v8::Uint32::New(isolate, 0x0D55));
-
-    tmpl->Set(isolate, "STENCIL_BITS", v8::Uint32::New(isolate, 0x0D57));
-    tmpl->Set(isolate, "POLYGON_OFFSET_UNITS", v8::Uint32::New(isolate, 0x2A00));
-    tmpl->Set(isolate, "POLYGON_OFFSET_FACTOR", v8::Uint32::New(isolate, 0x8038));
-
-    tmpl->Set(isolate, "TEXTURE_BINDING_2D", v8::Uint32::New(isolate, 0x8069));
-    tmpl->Set(isolate, "SAMPLE_BUFFERS", v8::Uint32::New(isolate, 0x80A8));
-    tmpl->Set(isolate, "SAMPLES", v8::Uint32::New(isolate, 0x80A9));
-    tmpl->Set(isolate, "SAMPLE_COVERAGE_VALUE", v8::Uint32::New(isolate, 0x80AA));
-
-    tmpl->Set(isolate, "SAMPLE_COVERAGE_INVERT", v8::Uint32::New(isolate, 0x80AB));
-    tmpl->Set(isolate, "COMPRESSED_TEXTURE_FORMATS", v8::Uint32::New(isolate, 0x86A3));
-    tmpl->Set(isolate, "VENDOR", v8::Uint32::New(isolate, 0x1F00));
-    tmpl->Set(isolate, "RENDERER", v8::Uint32::New(isolate, 0x1F01));
-
-    tmpl->Set(isolate, "VERSION", v8::Uint32::New(isolate, 0x1F02));
-    tmpl->Set(isolate, "IMPLEMENTATION_COLOR_READ_TYPE", v8::Uint32::New(isolate, 0x8B9A));
-    tmpl->Set(isolate, "IMPLEMENTATION_COLOR_READ_FORMAT", v8::Uint32::New(isolate, 0x8B9B));
-    tmpl->Set(isolate, "BROWSER_DEFAULT_WEBGL", v8::Uint32::New(isolate, 0x9244));
-
-    tmpl->Set(isolate, "STATIC_DRAW", v8::Uint32::New(isolate, 0x88E4));
-    tmpl->Set(isolate, "STREAM_DRAW", v8::Uint32::New(isolate, 0x88E0));
-    tmpl->Set(isolate, "DYNAMIC_DRAW", v8::Uint32::New(isolate, 0x88E8));
-    tmpl->Set(isolate, "ARRAY_BUFFER", v8::Uint32::New(isolate, 0x8892));
-
-    tmpl->Set(isolate, "ELEMENT_ARRAY_BUFFER", v8::Uint32::New(isolate, 0x8893));
-    tmpl->Set(isolate, "BUFFER_SIZE", v8::Uint32::New(isolate, 0x8764));
-    tmpl->Set(isolate, "BUFFER_USAGE", v8::Uint32::New(isolate, 0x8765));
-    tmpl->Set(isolate, "CURRENT_VERTEX_ATTRIB", v8::Uint32::New(isolate, 0x8626));
-
-
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_ENABLED", v8::Uint32::New(isolate, 0x8622));
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_SIZE", v8::Uint32::New(isolate, 0x8623));
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_STRIDE", v8::Uint32::New(isolate, 0x8624));
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_TYPE", v8::Uint32::New(isolate, 0x8625));
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_NORMALIZED", v8::Uint32::New(isolate, 0x886A));
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_POINTER", v8::Uint32::New(isolate, 0x8645));
-    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", v8::Uint32::New(isolate, 0x889F));
-
-    tmpl->Set(isolate, "CULL_FACE", v8::Uint32::New(isolate, 0x0B44));
-    tmpl->Set(isolate, "FRONT", v8::Uint32::New(isolate, 0x0404));
-    tmpl->Set(isolate, "BACK", v8::Uint32::New(isolate, 0x0405));
-    tmpl->Set(isolate, "FRONT_AND_BACK", v8::Uint32::New(isolate, 0x0408));
+    tmpl->Set(isolate, "FUNC_ADD", v8::Integer::NewFromUnsigned(isolate, 0x8006));
+    tmpl->Set(isolate, "FUNC_SUBTRACT", v8::Integer::NewFromUnsigned(isolate, 0x800A));
+    tmpl->Set(isolate, "FUNC_REVERSE_SUBTRACT", v8::Integer::NewFromUnsigned(isolate, 0x800B));
+    tmpl->Set(isolate, "BLEND_EQUATION", v8::Integer::NewFromUnsigned(isolate, 0x8009));
+    tmpl->Set(isolate, "BLEND_EQUATION_RGB", v8::Integer::NewFromUnsigned(isolate, 0x8009));
+    tmpl->Set(isolate, "BLEND_EQUATION_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x883D));
 
-    tmpl->Set(isolate, "BLEND", v8::Uint32::New(isolate, 0x0BE2));
-    tmpl->Set(isolate, "DEPTH_TEST", v8::Uint32::New(isolate, 0x0B71));
-    tmpl->Set(isolate, "DITHER", v8::Uint32::New(isolate, 0x0BD0));
-    tmpl->Set(isolate, "POLYGON_OFFSET_FILL", v8::Uint32::New(isolate, 0x8037));
 
-    tmpl->Set(isolate, "SAMPLE_ALPHA_TO_COVERAGE", v8::Uint32::New(isolate, 0x809E));
-    tmpl->Set(isolate, "SAMPLE_COVERAGE", v8::Uint32::New(isolate, 0x80A0));
-    tmpl->Set(isolate, "SCISSOR_TEST", v8::Uint32::New(isolate, 0x0C11));
-    tmpl->Set(isolate, "STENCIL_TEST", v8::Uint32::New(isolate, 0x0B90));
+    tmpl->Set(isolate, "BLEND_DST_RGB", v8::Integer::NewFromUnsigned(isolate, 0x80C8));
+    tmpl->Set(isolate, "BLEND_SRC_RGB", v8::Integer::NewFromUnsigned(isolate, 0x80C9));
+    tmpl->Set(isolate, "BLEND_DST_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x80CA));
+
+
+    tmpl->Set(isolate, "BLEND_SRC_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x80CB));
+    tmpl->Set(isolate, "BLEND_COLOR", v8::Integer::NewFromUnsigned(isolate, 0x8005));
+    tmpl->Set(isolate, "ARRAY_BUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8894));
+
+
+    tmpl->Set(isolate, "ELEMENT_ARRAY_BUFFER_BINDING",
+              v8::Integer::NewFromUnsigned(isolate, 0x8895));
+    tmpl->Set(isolate, "LINE_WIDTH", v8::Integer::NewFromUnsigned(isolate, 0x0B21));
+    tmpl->Set(isolate, "ALIASED_POINT_SIZE_RANGE", v8::Integer::NewFromUnsigned(isolate, 0x846D));
+
+    tmpl->Set(isolate, "ALIASED_LINE_WIDTH_RANGE", v8::Integer::NewFromUnsigned(isolate, 0x846E));
+    tmpl->Set(isolate, "CULL_FACE_MODE", v8::Integer::NewFromUnsigned(isolate, 0x0B45));
+    tmpl->Set(isolate, "FRONT_FACE", v8::Integer::NewFromUnsigned(isolate, 0x0B46));
+
+    tmpl->Set(isolate, "DEPTH_RANGE", v8::Integer::NewFromUnsigned(isolate, 0x0B70));
+    tmpl->Set(isolate, "DEPTH_WRITEMASK", v8::Integer::NewFromUnsigned(isolate, 0x0B72));
+    tmpl->Set(isolate, "DEPTH_CLEAR_VALUE", v8::Integer::NewFromUnsigned(isolate, 0x0B73));
+
+    tmpl->Set(isolate, "DEPTH_FUNC", v8::Integer::NewFromUnsigned(isolate, 0x0B74));
+    tmpl->Set(isolate, "STENCIL_CLEAR_VALUE", v8::Integer::NewFromUnsigned(isolate, 0x0B91));
+    tmpl->Set(isolate, "STENCIL_FUNC", v8::Integer::NewFromUnsigned(isolate, 0x0B92));
+
+    tmpl->Set(isolate, "STENCIL_FAIL", v8::Integer::NewFromUnsigned(isolate, 0x0B94));
+    tmpl->Set(isolate, "STENCIL_PASS_DEPTH_FAIL", v8::Integer::NewFromUnsigned(isolate, 0x0B95));
+    tmpl->Set(isolate, "STENCIL_PASS_DEPTH_PASS", v8::Integer::NewFromUnsigned(isolate, 0x0B96));
+
+    tmpl->Set(isolate, "STENCIL_REF", v8::Integer::NewFromUnsigned(isolate, 0x0B97));
+    tmpl->Set(isolate, "STENCIL_VALUE_MASK", v8::Integer::NewFromUnsigned(isolate, 0x0B93));
+    tmpl->Set(isolate, "STENCIL_WRITEMASK", v8::Integer::NewFromUnsigned(isolate, 0x0B98));
+
+    tmpl->Set(isolate, "STENCIL_BACK_FUNC", v8::Integer::NewFromUnsigned(isolate, 0x8800));
+    tmpl->Set(isolate, "STENCIL_BACK_FAIL", v8::Integer::NewFromUnsigned(isolate, 0x8801));
+    tmpl->Set(isolate, "STENCIL_BACK_PASS_DEPTH_FAIL",
+              v8::Integer::NewFromUnsigned(isolate, 0x8802));
+
+    tmpl->Set(isolate, "STENCIL_BACK_PASS_DEPTH_PASS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8803));
+    tmpl->Set(isolate, "STENCIL_BACK_REF", v8::Integer::NewFromUnsigned(isolate, 0x8CA3));
+    tmpl->Set(isolate, "STENCIL_BACK_VALUE_MASK", v8::Integer::NewFromUnsigned(isolate, 0x8CA4));
+    tmpl->Set(isolate, "STENCIL_BACK_WRITEMASK", v8::Integer::NewFromUnsigned(isolate, 0x8CA5));
+
+    tmpl->Set(isolate, "VIEWPORT", v8::Integer::NewFromUnsigned(isolate, 0x0BA2));
+    tmpl->Set(isolate, "SCISSOR_BOX", v8::Integer::NewFromUnsigned(isolate, 0x0C10));
+    tmpl->Set(isolate, "COLOR_CLEAR_VALUE", v8::Integer::NewFromUnsigned(isolate, 0x0C22));
+    tmpl->Set(isolate, "COLOR_WRITEMASK", v8::Integer::NewFromUnsigned(isolate, 0x0C23));
+
+    tmpl->Set(isolate, "UNPACK_ALIGNMENT", v8::Integer::NewFromUnsigned(isolate, 0x0CF5));
+    tmpl->Set(isolate, "PACK_ALIGNMENT", v8::Integer::NewFromUnsigned(isolate, 0x0D05));
+    tmpl->Set(isolate, "MAX_TEXTURE_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x0D33));
+
+
+    tmpl->Set(isolate, "MAX_VIEWPORT_DIMS", v8::Integer::NewFromUnsigned(isolate, 0x0D3A));
+    tmpl->Set(isolate, "SUBPIXEL_BITS", v8::Integer::NewFromUnsigned(isolate, 0x0D50));
+
+    tmpl->Set(isolate, "RED_BITS", v8::Integer::NewFromUnsigned(isolate, 0x0D52));
+    tmpl->Set(isolate, "GREEN_BITS", v8::Integer::NewFromUnsigned(isolate, 0x0D53));
+    tmpl->Set(isolate, "BLUE_BITS", v8::Integer::NewFromUnsigned(isolate, 0x0D54));
+    tmpl->Set(isolate, "ALPHA_BITS", v8::Integer::NewFromUnsigned(isolate, 0x0D55));
+
+    tmpl->Set(isolate, "STENCIL_BITS", v8::Integer::NewFromUnsigned(isolate, 0x0D57));
+    tmpl->Set(isolate, "POLYGON_OFFSET_UNITS", v8::Integer::NewFromUnsigned(isolate, 0x2A00));
+    tmpl->Set(isolate, "POLYGON_OFFSET_FACTOR", v8::Integer::NewFromUnsigned(isolate, 0x8038));
+
+    tmpl->Set(isolate, "TEXTURE_BINDING_2D", v8::Integer::NewFromUnsigned(isolate, 0x8069));
+    tmpl->Set(isolate, "SAMPLE_BUFFERS", v8::Integer::NewFromUnsigned(isolate, 0x80A8));
+    tmpl->Set(isolate, "SAMPLES", v8::Integer::NewFromUnsigned(isolate, 0x80A9));
+    tmpl->Set(isolate, "SAMPLE_COVERAGE_VALUE", v8::Integer::NewFromUnsigned(isolate, 0x80AA));
+
+    tmpl->Set(isolate, "SAMPLE_COVERAGE_INVERT", v8::Integer::NewFromUnsigned(isolate, 0x80AB));
+    tmpl->Set(isolate, "COMPRESSED_TEXTURE_FORMATS", v8::Integer::NewFromUnsigned(isolate, 0x86A3));
+    tmpl->Set(isolate, "VENDOR", v8::Integer::NewFromUnsigned(isolate, 0x1F00));
+    tmpl->Set(isolate, "RENDERER", v8::Integer::NewFromUnsigned(isolate, 0x1F01));
+
+    tmpl->Set(isolate, "VERSION", v8::Integer::NewFromUnsigned(isolate, 0x1F02));
+    tmpl->Set(isolate, "IMPLEMENTATION_COLOR_READ_TYPE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8B9A));
+    tmpl->Set(isolate, "IMPLEMENTATION_COLOR_READ_FORMAT",
+              v8::Integer::NewFromUnsigned(isolate, 0x8B9B));
+    tmpl->Set(isolate, "BROWSER_DEFAULT_WEBGL", v8::Integer::NewFromUnsigned(isolate, 0x9244));
+
+    tmpl->Set(isolate, "STATIC_DRAW", v8::Integer::NewFromUnsigned(isolate, 0x88E4));
+    tmpl->Set(isolate, "STREAM_DRAW", v8::Integer::NewFromUnsigned(isolate, 0x88E0));
+    tmpl->Set(isolate, "DYNAMIC_DRAW", v8::Integer::NewFromUnsigned(isolate, 0x88E8));
+    tmpl->Set(isolate, "ARRAY_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8892));
+
+    tmpl->Set(isolate, "ELEMENT_ARRAY_BUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8893));
+    tmpl->Set(isolate, "BUFFER_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8764));
+    tmpl->Set(isolate, "BUFFER_USAGE", v8::Integer::NewFromUnsigned(isolate, 0x8765));
+    tmpl->Set(isolate, "CURRENT_VERTEX_ATTRIB", v8::Integer::NewFromUnsigned(isolate, 0x8626));
+
+
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_ENABLED",
+              v8::Integer::NewFromUnsigned(isolate, 0x8622));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8623));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_STRIDE", v8::Integer::NewFromUnsigned(isolate, 0x8624));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_TYPE", v8::Integer::NewFromUnsigned(isolate, 0x8625));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_NORMALIZED",
+              v8::Integer::NewFromUnsigned(isolate, 0x886A));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_POINTER",
+              v8::Integer::NewFromUnsigned(isolate, 0x8645));
+    tmpl->Set(isolate, "VERTEX_ATTRIB_ARRAY_BUFFER_BINDING",
+              v8::Integer::NewFromUnsigned(isolate, 0x889F));
+
+    tmpl->Set(isolate, "CULL_FACE", v8::Integer::NewFromUnsigned(isolate, 0x0B44));
+    tmpl->Set(isolate, "FRONT", v8::Integer::NewFromUnsigned(isolate, 0x0404));
+    tmpl->Set(isolate, "BACK", v8::Integer::NewFromUnsigned(isolate, 0x0405));
+    tmpl->Set(isolate, "FRONT_AND_BACK", v8::Integer::NewFromUnsigned(isolate, 0x0408));
+
+    tmpl->Set(isolate, "BLEND", v8::Integer::NewFromUnsigned(isolate, 0x0BE2));
+    tmpl->Set(isolate, "DEPTH_TEST", v8::Integer::NewFromUnsigned(isolate, 0x0B71));
+    tmpl->Set(isolate, "DITHER", v8::Integer::NewFromUnsigned(isolate, 0x0BD0));
+    tmpl->Set(isolate, "POLYGON_OFFSET_FILL", v8::Integer::NewFromUnsigned(isolate, 0x8037));
+
+    tmpl->Set(isolate, "SAMPLE_ALPHA_TO_COVERAGE", v8::Integer::NewFromUnsigned(isolate, 0x809E));
+    tmpl->Set(isolate, "SAMPLE_COVERAGE", v8::Integer::NewFromUnsigned(isolate, 0x80A0));
+    tmpl->Set(isolate, "SCISSOR_TEST", v8::Integer::NewFromUnsigned(isolate, 0x0C11));
+    tmpl->Set(isolate, "STENCIL_TEST", v8::Integer::NewFromUnsigned(isolate, 0x0B90));
 
 
     /* Errors */
 
-    tmpl->Set(isolate, "NO_ERROR", v8::Uint32::New(isolate, 0));
-    tmpl->Set(isolate, "INVALID_ENUM", v8::Uint32::New(isolate, 0x0500));
-    tmpl->Set(isolate, "INVALID_VALUE", v8::Uint32::New(isolate, 0x0501));
-    tmpl->Set(isolate, "INVALID_OPERATION", v8::Uint32::New(isolate, 0x0502));
+    tmpl->Set(isolate, "NO_ERROR", v8::Integer::NewFromUnsigned(isolate, 0));
+    tmpl->Set(isolate, "INVALID_ENUM", v8::Integer::NewFromUnsigned(isolate, 0x0500));
+    tmpl->Set(isolate, "INVALID_VALUE", v8::Integer::NewFromUnsigned(isolate, 0x0501));
+    tmpl->Set(isolate, "INVALID_OPERATION", v8::Integer::NewFromUnsigned(isolate, 0x0502));
 
-    tmpl->Set(isolate, "OUT_OF_MEMORY", v8::Uint32::New(isolate, 0x0505));
-    tmpl->Set(isolate, "CONTEXT_LOST_WEBGL", v8::Uint32::New(isolate, 0x9242));
-    tmpl->Set(isolate, "CW", v8::Uint32::New(isolate, 0x0900));
-    tmpl->Set(isolate, "CCW", v8::Uint32::New(isolate, 0x0901));
+    tmpl->Set(isolate, "OUT_OF_MEMORY", v8::Integer::NewFromUnsigned(isolate, 0x0505));
+    tmpl->Set(isolate, "CONTEXT_LOST_WEBGL", v8::Integer::NewFromUnsigned(isolate, 0x9242));
+    tmpl->Set(isolate, "CW", v8::Integer::NewFromUnsigned(isolate, 0x0900));
+    tmpl->Set(isolate, "CCW", v8::Integer::NewFromUnsigned(isolate, 0x0901));
 
-    tmpl->Set(isolate, "DONT_CARE", v8::Uint32::New(isolate, 0x1100));
-    tmpl->Set(isolate, "FASTEST", v8::Uint32::New(isolate, 0x1101));
-    tmpl->Set(isolate, "NICEST", v8::Uint32::New(isolate, 0x1102));
-    tmpl->Set(isolate, "GENERATE_MIPMAP_HINT", v8::Uint32::New(isolate, 0x8192));
+    tmpl->Set(isolate, "DONT_CARE", v8::Integer::NewFromUnsigned(isolate, 0x1100));
+    tmpl->Set(isolate, "FASTEST", v8::Integer::NewFromUnsigned(isolate, 0x1101));
+    tmpl->Set(isolate, "NICEST", v8::Integer::NewFromUnsigned(isolate, 0x1102));
+    tmpl->Set(isolate, "GENERATE_MIPMAP_HINT", v8::Integer::NewFromUnsigned(isolate, 0x8192));
 
-    tmpl->Set(isolate, "BYTE", v8::Uint32::New(isolate, 0x1400));
-    tmpl->Set(isolate, "UNSIGNED_BYTE", v8::Uint32::New(isolate, 0x1401));
-    tmpl->Set(isolate, "SHORT", v8::Uint32::New(isolate, 0x1402));
-    tmpl->Set(isolate, "UNSIGNED_SHORT", v8::Uint32::New(isolate, 0x1403));
+    tmpl->Set(isolate, "BYTE", v8::Integer::NewFromUnsigned(isolate, 0x1400));
+    tmpl->Set(isolate, "UNSIGNED_BYTE", v8::Integer::NewFromUnsigned(isolate, 0x1401));
+    tmpl->Set(isolate, "SHORT", v8::Integer::NewFromUnsigned(isolate, 0x1402));
+    tmpl->Set(isolate, "UNSIGNED_SHORT", v8::Integer::NewFromUnsigned(isolate, 0x1403));
 
-    tmpl->Set(isolate, "BYTE", v8::Uint32::New(isolate, 0x1400));
-    tmpl->Set(isolate, "UNSIGNED_BYTE", v8::Uint32::New(isolate, 0x1401));
-    tmpl->Set(isolate, "SHORT", v8::Uint32::New(isolate, 0x1402));
-    tmpl->Set(isolate, "UNSIGNED_SHORT", v8::Uint32::New(isolate, 0x1403));
+    tmpl->Set(isolate, "BYTE", v8::Integer::NewFromUnsigned(isolate, 0x1400));
+    tmpl->Set(isolate, "UNSIGNED_BYTE", v8::Integer::NewFromUnsigned(isolate, 0x1401));
+    tmpl->Set(isolate, "SHORT", v8::Integer::NewFromUnsigned(isolate, 0x1402));
+    tmpl->Set(isolate, "UNSIGNED_SHORT", v8::Integer::NewFromUnsigned(isolate, 0x1403));
 
-    tmpl->Set(isolate, "INT", v8::Uint32::New(isolate, 0x1404));
-    tmpl->Set(isolate, "UNSIGNED_INT", v8::Uint32::New(isolate, 0x1405));
-    tmpl->Set(isolate, "FLOAT", v8::Uint32::New(isolate, 0x1406));
-    tmpl->Set(isolate, "DEPTH_COMPONENT", v8::Uint32::New(isolate, 0x1902));
+    tmpl->Set(isolate, "INT", v8::Integer::NewFromUnsigned(isolate, 0x1404));
+    tmpl->Set(isolate, "UNSIGNED_INT", v8::Integer::NewFromUnsigned(isolate, 0x1405));
+    tmpl->Set(isolate, "FLOAT", v8::Integer::NewFromUnsigned(isolate, 0x1406));
+    tmpl->Set(isolate, "DEPTH_COMPONENT", v8::Integer::NewFromUnsigned(isolate, 0x1902));
 
-    tmpl->Set(isolate, "ALPHA", v8::Uint32::New(isolate, 0x1906));
-    tmpl->Set(isolate, "RGB", v8::Uint32::New(isolate, 0x1907));
+    tmpl->Set(isolate, "ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x1906));
+    tmpl->Set(isolate, "RGB", v8::Integer::NewFromUnsigned(isolate, 0x1907));
 
     /* Clearing buffers */
 
-    tmpl->Set(isolate, "RGBA", v8::Uint32::New(isolate, 0x1908));
-    tmpl->Set(isolate, "LUMINANCE", v8::Uint32::New(isolate, 0x1909));
-    tmpl->Set(isolate, "LUMINANCE_ALPHA", v8::Uint32::New(isolate, 0x190A));
+    tmpl->Set(isolate, "RGBA", v8::Integer::NewFromUnsigned(isolate, 0x1908));
+    tmpl->Set(isolate, "LUMINANCE", v8::Integer::NewFromUnsigned(isolate, 0x1909));
+    tmpl->Set(isolate, "LUMINANCE_ALPHA", v8::Integer::NewFromUnsigned(isolate, 0x190A));
 
     /* Clearing buffers */
 
     /* Rendering primitives */
 
-    tmpl->Set(isolate, "UNSIGNED_SHORT_4_4_4_4", v8::Uint32::New(isolate, 0x8033));
-    tmpl->Set(isolate, "UNSIGNED_SHORT_5_5_5_1", v8::Uint32::New(isolate, 0x8034));
-    tmpl->Set(isolate, "UNSIGNED_SHORT_5_6_5", v8::Uint32::New(isolate, 0x8363));
-    tmpl->Set(isolate, "FRAGMENT_SHADER", v8::Uint32::New(isolate, 0x8B30));
-    tmpl->Set(isolate, "VERTEX_SHADER", v8::Uint32::New(isolate, 0x8B31));
-    tmpl->Set(isolate, "COMPILE_STATUS", v8::Uint32::New(isolate, 0x8B81));
-    tmpl->Set(isolate, "DELETE_STATUS", v8::Uint32::New(isolate, 0x8B80));
+    tmpl->Set(isolate, "UNSIGNED_SHORT_4_4_4_4", v8::Integer::NewFromUnsigned(isolate, 0x8033));
+    tmpl->Set(isolate, "UNSIGNED_SHORT_5_5_5_1", v8::Integer::NewFromUnsigned(isolate, 0x8034));
+    tmpl->Set(isolate, "UNSIGNED_SHORT_5_6_5", v8::Integer::NewFromUnsigned(isolate, 0x8363));
+    tmpl->Set(isolate, "FRAGMENT_SHADER", v8::Integer::NewFromUnsigned(isolate, 0x8B30));
+    tmpl->Set(isolate, "VERTEX_SHADER", v8::Integer::NewFromUnsigned(isolate, 0x8B31));
+    tmpl->Set(isolate, "COMPILE_STATUS", v8::Integer::NewFromUnsigned(isolate, 0x8B81));
+    tmpl->Set(isolate, "DELETE_STATUS", v8::Integer::NewFromUnsigned(isolate, 0x8B80));
 
     /* Rendering primitives */
 
     /* Blending modes */
 
-    tmpl->Set(isolate, "LINK_STATUS", v8::Uint32::New(isolate, 0x8B82));
-    tmpl->Set(isolate, "VALIDATE_STATUS", v8::Uint32::New(isolate, 0x8B83));
-    tmpl->Set(isolate, "ATTACHED_SHADERS", v8::Uint32::New(isolate, 0x8B85));
-    tmpl->Set(isolate, "ACTIVE_ATTRIBUTES", v8::Uint32::New(isolate, 0x8B89));
-    tmpl->Set(isolate, "ACTIVE_UNIFORMS", v8::Uint32::New(isolate, 0x8B86));
-    tmpl->Set(isolate, "MAX_VERTEX_ATTRIBS", v8::Uint32::New(isolate, 0x8869));
-    tmpl->Set(isolate, "MAX_VERTEX_UNIFORM_VECTORS", v8::Uint32::New(isolate, 0x8DFB));
-    tmpl->Set(isolate, "MAX_VARYING_VECTORS", v8::Uint32::New(isolate, 0x8DFC));
-    tmpl->Set(isolate, "MAX_COMBINED_TEXTURE_IMAGE_UNITS", v8::Uint32::New(isolate, 0x8B4D));
-    tmpl->Set(isolate, "MAX_VERTEX_TEXTURE_IMAGE_UNITS", v8::Uint32::New(isolate, 0x8B4C));
-    tmpl->Set(isolate, "MAX_TEXTURE_IMAGE_UNITS", v8::Uint32::New(isolate, 0x8872));
-    tmpl->Set(isolate, "MAX_FRAGMENT_UNIFORM_VECTORS", v8::Uint32::New(isolate, 0x8DFD));
-    tmpl->Set(isolate, "SHADER_TYPE", v8::Uint32::New(isolate, 0x8B4F));
-    tmpl->Set(isolate, "SHADING_LANGUAGE_VERSION", v8::Uint32::New(isolate, 0x8B8C));
-    tmpl->Set(isolate, "CURRENT_PROGRAM", v8::Uint32::New(isolate, 0x8B8D));
+    tmpl->Set(isolate, "LINK_STATUS", v8::Integer::NewFromUnsigned(isolate, 0x8B82));
+    tmpl->Set(isolate, "VALIDATE_STATUS", v8::Integer::NewFromUnsigned(isolate, 0x8B83));
+    tmpl->Set(isolate, "ATTACHED_SHADERS", v8::Integer::NewFromUnsigned(isolate, 0x8B85));
+    tmpl->Set(isolate, "ACTIVE_ATTRIBUTES", v8::Integer::NewFromUnsigned(isolate, 0x8B89));
+    tmpl->Set(isolate, "ACTIVE_UNIFORMS", v8::Integer::NewFromUnsigned(isolate, 0x8B86));
+    tmpl->Set(isolate, "MAX_VERTEX_ATTRIBS", v8::Integer::NewFromUnsigned(isolate, 0x8869));
+    tmpl->Set(isolate, "MAX_VERTEX_UNIFORM_VECTORS", v8::Integer::NewFromUnsigned(isolate, 0x8DFB));
+    tmpl->Set(isolate, "MAX_VARYING_VECTORS", v8::Integer::NewFromUnsigned(isolate, 0x8DFC));
+    tmpl->Set(isolate, "MAX_COMBINED_TEXTURE_IMAGE_UNITS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8B4D));
+    tmpl->Set(isolate, "MAX_VERTEX_TEXTURE_IMAGE_UNITS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8B4C));
+    tmpl->Set(isolate, "MAX_TEXTURE_IMAGE_UNITS", v8::Integer::NewFromUnsigned(isolate, 0x8872));
+    tmpl->Set(isolate, "MAX_FRAGMENT_UNIFORM_VECTORS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8DFD));
+    tmpl->Set(isolate, "SHADER_TYPE", v8::Integer::NewFromUnsigned(isolate, 0x8B4F));
+    tmpl->Set(isolate, "SHADING_LANGUAGE_VERSION", v8::Integer::NewFromUnsigned(isolate, 0x8B8C));
+    tmpl->Set(isolate, "CURRENT_PROGRAM", v8::Integer::NewFromUnsigned(isolate, 0x8B8D));
 
     /* Blending modes */
 
-    tmpl->Set(isolate, "NEVER", v8::Uint32::New(isolate, 0x0200));
-    tmpl->Set(isolate, "LESS", v8::Uint32::New(isolate, 0x0201));
-    tmpl->Set(isolate, "EQUAL", v8::Uint32::New(isolate, 0x0202));
+    tmpl->Set(isolate, "NEVER", v8::Integer::NewFromUnsigned(isolate, 0x0200));
+    tmpl->Set(isolate, "LESS", v8::Integer::NewFromUnsigned(isolate, 0x0201));
+    tmpl->Set(isolate, "EQUAL", v8::Integer::NewFromUnsigned(isolate, 0x0202));
 
     /* Blending equations */
 
     /* Getting GL parameter information */
 
-    tmpl->Set(isolate, "LEQUAL", v8::Uint32::New(isolate, 0x0203));
-    tmpl->Set(isolate, "GREATER", v8::Uint32::New(isolate, 0x0204));
-    tmpl->Set(isolate, "NOTEQUAL", v8::Uint32::New(isolate, 0x0205));
-    tmpl->Set(isolate, "GEQUAL", v8::Uint32::New(isolate, 0x0206));
-    tmpl->Set(isolate, "ALWAYS", v8::Uint32::New(isolate, 0x0207));
-    tmpl->Set(isolate, "KEEP", v8::Uint32::New(isolate, 0x1E00));
-    tmpl->Set(isolate, "REPLACE", v8::Uint32::New(isolate, 0x1E01));
-    tmpl->Set(isolate, "INCR", v8::Uint32::New(isolate, 0x1E02));
-    tmpl->Set(isolate, "DECR", v8::Uint32::New(isolate, 0x1E03));
-    tmpl->Set(isolate, "INVERT", v8::Uint32::New(isolate, 0x150A));
-    tmpl->Set(isolate, "INCR_WRAP", v8::Uint32::New(isolate, 0x8507));
-    tmpl->Set(isolate, "DECR_WRAP", v8::Uint32::New(isolate, 0x8508));
-    tmpl->Set(isolate, "NEAREST", v8::Uint32::New(isolate, 0x2600));
-    tmpl->Set(isolate, "LINEAR", v8::Uint32::New(isolate, 0x2601));
-    tmpl->Set(isolate, "NEAREST_MIPMAP_NEAREST", v8::Uint32::New(isolate, 0x2700));
-    tmpl->Set(isolate, "LINEAR_MIPMAP_NEAREST", v8::Uint32::New(isolate, 0x2701));
-    tmpl->Set(isolate, "NEAREST_MIPMAP_LINEAR", v8::Uint32::New(isolate, 0x2702));
-    tmpl->Set(isolate, "LINEAR_MIPMAP_LINEAR", v8::Uint32::New(isolate, 0x2703));
-    tmpl->Set(isolate, "TEXTURE_MAG_FILTER", v8::Uint32::New(isolate, 0x2800));
-    tmpl->Set(isolate, "TEXTURE_MIN_FILTER", v8::Uint32::New(isolate, 0x2801));
-    tmpl->Set(isolate, "TEXTURE_WRAP_S", v8::Uint32::New(isolate, 0x2802));
-    tmpl->Set(isolate, "TEXTURE_WRAP_T", v8::Uint32::New(isolate, 0x2803));
-    tmpl->Set(isolate, "TEXTURE_2D", v8::Uint32::New(isolate, 0x0DE1));
-    tmpl->Set(isolate, "TEXTURE", v8::Uint32::New(isolate, 0x1702));
-    tmpl->Set(isolate, "TEXTURE_CUBE_MAP", v8::Uint32::New(isolate, 0x8513));
-    tmpl->Set(isolate, "TEXTURE_BINDING_CUBE_MAP", v8::Uint32::New(isolate, 0x8514));
-    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_POSITIVE_X", v8::Uint32::New(isolate, 0x8515));
-    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_NEGATIVE_X", v8::Uint32::New(isolate, 0x8516));
-    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_POSITIVE_Y", v8::Uint32::New(isolate, 0x8517));
-    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_NEGATIVE_Y", v8::Uint32::New(isolate, 0x8518));
-    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_POSITIVE_Z", v8::Uint32::New(isolate, 0x8519));
-    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_NEGATIVE_Z", v8::Uint32::New(isolate, 0x851A));
-    tmpl->Set(isolate, "MAX_CUBE_MAP_TEXTURE_SIZE", v8::Uint32::New(isolate, 0x851C));
-    tmpl->Set(isolate, "TEXTURE0", v8::Uint32::New(isolate, 0x84C0));
-    tmpl->Set(isolate, "TEXTURE1", v8::Uint32::New(isolate, 0x84C1));
-    tmpl->Set(isolate, "TEXTURE2", v8::Uint32::New(isolate, 0x84C2));
-    tmpl->Set(isolate, "TEXTURE3", v8::Uint32::New(isolate, 0x84C3));
-    tmpl->Set(isolate, "TEXTURE4", v8::Uint32::New(isolate, 0x84C4));
-    tmpl->Set(isolate, "TEXTURE5", v8::Uint32::New(isolate, 0x84C5));
-    tmpl->Set(isolate, "TEXTURE6", v8::Uint32::New(isolate, 0x84C6));
-    tmpl->Set(isolate, "TEXTURE7", v8::Uint32::New(isolate, 0x84C7));
-    tmpl->Set(isolate, "TEXTURE8", v8::Uint32::New(isolate, 0x84C8));
-    tmpl->Set(isolate, "TEXTURE9", v8::Uint32::New(isolate, 0x84C9));
-    tmpl->Set(isolate, "TEXTURE10", v8::Uint32::New(isolate, 0x84CA));
-    tmpl->Set(isolate, "TEXTURE11", v8::Uint32::New(isolate, 0x84CB));
-    tmpl->Set(isolate, "TEXTURE12", v8::Uint32::New(isolate, 0x84CC));
-    tmpl->Set(isolate, "TEXTURE13", v8::Uint32::New(isolate, 0x84CD));
-    tmpl->Set(isolate, "TEXTURE14", v8::Uint32::New(isolate, 0x84CE));
-    tmpl->Set(isolate, "TEXTURE15", v8::Uint32::New(isolate, 0x84CF));
-    tmpl->Set(isolate, "TEXTURE16", v8::Uint32::New(isolate, 0x84D0));
-    tmpl->Set(isolate, "TEXTURE17", v8::Uint32::New(isolate, 0x84D1));
-    tmpl->Set(isolate, "TEXTURE18", v8::Uint32::New(isolate, 0x84D2));
-    tmpl->Set(isolate, "TEXTURE19", v8::Uint32::New(isolate, 0x84D3));
-    tmpl->Set(isolate, "TEXTURE20", v8::Uint32::New(isolate, 0x84D4));
-    tmpl->Set(isolate, "TEXTURE21", v8::Uint32::New(isolate, 0x84D5));
-    tmpl->Set(isolate, "TEXTURE22", v8::Uint32::New(isolate, 0x84D6));
-    tmpl->Set(isolate, "TEXTURE23", v8::Uint32::New(isolate, 0x84D7));
-    tmpl->Set(isolate, "TEXTURE24", v8::Uint32::New(isolate, 0x84D8));
-    tmpl->Set(isolate, "TEXTURE25", v8::Uint32::New(isolate, 0x84D9));
-    tmpl->Set(isolate, "TEXTURE26", v8::Uint32::New(isolate, 0x84DA));
-    tmpl->Set(isolate, "TEXTURE27", v8::Uint32::New(isolate, 0x84DB));
-    tmpl->Set(isolate, "TEXTURE28", v8::Uint32::New(isolate, 0x84DC));
-    tmpl->Set(isolate, "TEXTURE29", v8::Uint32::New(isolate, 0x84DD));
+    tmpl->Set(isolate, "LEQUAL", v8::Integer::NewFromUnsigned(isolate, 0x0203));
+    tmpl->Set(isolate, "GREATER", v8::Integer::NewFromUnsigned(isolate, 0x0204));
+    tmpl->Set(isolate, "NOTEQUAL", v8::Integer::NewFromUnsigned(isolate, 0x0205));
+    tmpl->Set(isolate, "GEQUAL", v8::Integer::NewFromUnsigned(isolate, 0x0206));
+    tmpl->Set(isolate, "ALWAYS", v8::Integer::NewFromUnsigned(isolate, 0x0207));
+    tmpl->Set(isolate, "KEEP", v8::Integer::NewFromUnsigned(isolate, 0x1E00));
+    tmpl->Set(isolate, "REPLACE", v8::Integer::NewFromUnsigned(isolate, 0x1E01));
+    tmpl->Set(isolate, "INCR", v8::Integer::NewFromUnsigned(isolate, 0x1E02));
+    tmpl->Set(isolate, "DECR", v8::Integer::NewFromUnsigned(isolate, 0x1E03));
+    tmpl->Set(isolate, "INVERT", v8::Integer::NewFromUnsigned(isolate, 0x150A));
+    tmpl->Set(isolate, "INCR_WRAP", v8::Integer::NewFromUnsigned(isolate, 0x8507));
+    tmpl->Set(isolate, "DECR_WRAP", v8::Integer::NewFromUnsigned(isolate, 0x8508));
+    tmpl->Set(isolate, "NEAREST", v8::Integer::NewFromUnsigned(isolate, 0x2600));
+    tmpl->Set(isolate, "LINEAR", v8::Integer::NewFromUnsigned(isolate, 0x2601));
+    tmpl->Set(isolate, "NEAREST_MIPMAP_NEAREST", v8::Integer::NewFromUnsigned(isolate, 0x2700));
+    tmpl->Set(isolate, "LINEAR_MIPMAP_NEAREST", v8::Integer::NewFromUnsigned(isolate, 0x2701));
+    tmpl->Set(isolate, "NEAREST_MIPMAP_LINEAR", v8::Integer::NewFromUnsigned(isolate, 0x2702));
+    tmpl->Set(isolate, "LINEAR_MIPMAP_LINEAR", v8::Integer::NewFromUnsigned(isolate, 0x2703));
+    tmpl->Set(isolate, "TEXTURE_MAG_FILTER", v8::Integer::NewFromUnsigned(isolate, 0x2800));
+    tmpl->Set(isolate, "TEXTURE_MIN_FILTER", v8::Integer::NewFromUnsigned(isolate, 0x2801));
+    tmpl->Set(isolate, "TEXTURE_WRAP_S", v8::Integer::NewFromUnsigned(isolate, 0x2802));
+    tmpl->Set(isolate, "TEXTURE_WRAP_T", v8::Integer::NewFromUnsigned(isolate, 0x2803));
+    tmpl->Set(isolate, "TEXTURE_2D", v8::Integer::NewFromUnsigned(isolate, 0x0DE1));
+    tmpl->Set(isolate, "TEXTURE", v8::Integer::NewFromUnsigned(isolate, 0x1702));
+    tmpl->Set(isolate, "TEXTURE_CUBE_MAP", v8::Integer::NewFromUnsigned(isolate, 0x8513));
+    tmpl->Set(isolate, "TEXTURE_BINDING_CUBE_MAP", v8::Integer::NewFromUnsigned(isolate, 0x8514));
+    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_POSITIVE_X",
+              v8::Integer::NewFromUnsigned(isolate, 0x8515));
+    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_NEGATIVE_X",
+              v8::Integer::NewFromUnsigned(isolate, 0x8516));
+    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_POSITIVE_Y",
+              v8::Integer::NewFromUnsigned(isolate, 0x8517));
+    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_NEGATIVE_Y",
+              v8::Integer::NewFromUnsigned(isolate, 0x8518));
+    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_POSITIVE_Z",
+              v8::Integer::NewFromUnsigned(isolate, 0x8519));
+    tmpl->Set(isolate, "TEXTURE_CUBE_MAP_NEGATIVE_Z",
+              v8::Integer::NewFromUnsigned(isolate, 0x851A));
+    tmpl->Set(isolate, "MAX_CUBE_MAP_TEXTURE_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x851C));
+    tmpl->Set(isolate, "TEXTURE0", v8::Integer::NewFromUnsigned(isolate, 0x84C0));
+    tmpl->Set(isolate, "TEXTURE1", v8::Integer::NewFromUnsigned(isolate, 0x84C1));
+    tmpl->Set(isolate, "TEXTURE2", v8::Integer::NewFromUnsigned(isolate, 0x84C2));
+    tmpl->Set(isolate, "TEXTURE3", v8::Integer::NewFromUnsigned(isolate, 0x84C3));
+    tmpl->Set(isolate, "TEXTURE4", v8::Integer::NewFromUnsigned(isolate, 0x84C4));
+    tmpl->Set(isolate, "TEXTURE5", v8::Integer::NewFromUnsigned(isolate, 0x84C5));
+    tmpl->Set(isolate, "TEXTURE6", v8::Integer::NewFromUnsigned(isolate, 0x84C6));
+    tmpl->Set(isolate, "TEXTURE7", v8::Integer::NewFromUnsigned(isolate, 0x84C7));
+    tmpl->Set(isolate, "TEXTURE8", v8::Integer::NewFromUnsigned(isolate, 0x84C8));
+    tmpl->Set(isolate, "TEXTURE9", v8::Integer::NewFromUnsigned(isolate, 0x84C9));
+    tmpl->Set(isolate, "TEXTURE10", v8::Integer::NewFromUnsigned(isolate, 0x84CA));
+    tmpl->Set(isolate, "TEXTURE11", v8::Integer::NewFromUnsigned(isolate, 0x84CB));
+    tmpl->Set(isolate, "TEXTURE12", v8::Integer::NewFromUnsigned(isolate, 0x84CC));
+    tmpl->Set(isolate, "TEXTURE13", v8::Integer::NewFromUnsigned(isolate, 0x84CD));
+    tmpl->Set(isolate, "TEXTURE14", v8::Integer::NewFromUnsigned(isolate, 0x84CE));
+    tmpl->Set(isolate, "TEXTURE15", v8::Integer::NewFromUnsigned(isolate, 0x84CF));
+    tmpl->Set(isolate, "TEXTURE16", v8::Integer::NewFromUnsigned(isolate, 0x84D0));
+    tmpl->Set(isolate, "TEXTURE17", v8::Integer::NewFromUnsigned(isolate, 0x84D1));
+    tmpl->Set(isolate, "TEXTURE18", v8::Integer::NewFromUnsigned(isolate, 0x84D2));
+    tmpl->Set(isolate, "TEXTURE19", v8::Integer::NewFromUnsigned(isolate, 0x84D3));
+    tmpl->Set(isolate, "TEXTURE20", v8::Integer::NewFromUnsigned(isolate, 0x84D4));
+    tmpl->Set(isolate, "TEXTURE21", v8::Integer::NewFromUnsigned(isolate, 0x84D5));
+    tmpl->Set(isolate, "TEXTURE22", v8::Integer::NewFromUnsigned(isolate, 0x84D6));
+    tmpl->Set(isolate, "TEXTURE23", v8::Integer::NewFromUnsigned(isolate, 0x84D7));
+    tmpl->Set(isolate, "TEXTURE24", v8::Integer::NewFromUnsigned(isolate, 0x84D8));
+    tmpl->Set(isolate, "TEXTURE25", v8::Integer::NewFromUnsigned(isolate, 0x84D9));
+    tmpl->Set(isolate, "TEXTURE26", v8::Integer::NewFromUnsigned(isolate, 0x84DA));
+    tmpl->Set(isolate, "TEXTURE27", v8::Integer::NewFromUnsigned(isolate, 0x84DB));
+    tmpl->Set(isolate, "TEXTURE28", v8::Integer::NewFromUnsigned(isolate, 0x84DC));
+    tmpl->Set(isolate, "TEXTURE29", v8::Integer::NewFromUnsigned(isolate, 0x84DD));
 
     /* Getting GL parameter information */
 
     /* Buffers */
 
-    tmpl->Set(isolate, "TEXTURE30", v8::Uint32::New(isolate, 0x84DE));
-    tmpl->Set(isolate, "TEXTURE31", v8::Uint32::New(isolate, 0x84DF));
-    tmpl->Set(isolate, "ACTIVE_TEXTURE", v8::Uint32::New(isolate, 0x84E0));
-    tmpl->Set(isolate, "REPEAT", v8::Uint32::New(isolate, 0x2901));
-    tmpl->Set(isolate, "CLAMP_TO_EDGE", v8::Uint32::New(isolate, 0x812F));
-    tmpl->Set(isolate, "MIRRORED_REPEAT", v8::Uint32::New(isolate, 0x8370));
-    tmpl->Set(isolate, "FLOAT_VEC2", v8::Uint32::New(isolate, 0x8B50));
+    tmpl->Set(isolate, "TEXTURE30", v8::Integer::NewFromUnsigned(isolate, 0x84DE));
+    tmpl->Set(isolate, "TEXTURE31", v8::Integer::NewFromUnsigned(isolate, 0x84DF));
+    tmpl->Set(isolate, "ACTIVE_TEXTURE", v8::Integer::NewFromUnsigned(isolate, 0x84E0));
+    tmpl->Set(isolate, "REPEAT", v8::Integer::NewFromUnsigned(isolate, 0x2901));
+    tmpl->Set(isolate, "CLAMP_TO_EDGE", v8::Integer::NewFromUnsigned(isolate, 0x812F));
+    tmpl->Set(isolate, "MIRRORED_REPEAT", v8::Integer::NewFromUnsigned(isolate, 0x8370));
+    tmpl->Set(isolate, "FLOAT_VEC2", v8::Integer::NewFromUnsigned(isolate, 0x8B50));
 
     /* Buffers */
 
     /* Vertex attributes */
 
-    tmpl->Set(isolate, "FLOAT_VEC3", v8::Uint32::New(isolate, 0x8B51));
-    tmpl->Set(isolate, "FLOAT_VEC4", v8::Uint32::New(isolate, 0x8B52));
-    tmpl->Set(isolate, "INT_VEC2", v8::Uint32::New(isolate, 0x8B53));
-    tmpl->Set(isolate, "INT_VEC3", v8::Uint32::New(isolate, 0x8B54));
-    tmpl->Set(isolate, "INT_VEC4", v8::Uint32::New(isolate, 0x8B55));
-    tmpl->Set(isolate, "BOOL", v8::Uint32::New(isolate, 0x8B56));
-    tmpl->Set(isolate, "BOOL_VEC2", v8::Uint32::New(isolate, 0x8B57));
-    tmpl->Set(isolate, "BOOL_VEC3", v8::Uint32::New(isolate, 0x8B58));
+    tmpl->Set(isolate, "FLOAT_VEC3", v8::Integer::NewFromUnsigned(isolate, 0x8B51));
+    tmpl->Set(isolate, "FLOAT_VEC4", v8::Integer::NewFromUnsigned(isolate, 0x8B52));
+    tmpl->Set(isolate, "INT_VEC2", v8::Integer::NewFromUnsigned(isolate, 0x8B53));
+    tmpl->Set(isolate, "INT_VEC3", v8::Integer::NewFromUnsigned(isolate, 0x8B54));
+    tmpl->Set(isolate, "INT_VEC4", v8::Integer::NewFromUnsigned(isolate, 0x8B55));
+    tmpl->Set(isolate, "BOOL", v8::Integer::NewFromUnsigned(isolate, 0x8B56));
+    tmpl->Set(isolate, "BOOL_VEC2", v8::Integer::NewFromUnsigned(isolate, 0x8B57));
+    tmpl->Set(isolate, "BOOL_VEC3", v8::Integer::NewFromUnsigned(isolate, 0x8B58));
 
     /* Vertex attributes */
 
     /* Culling */
 
-    tmpl->Set(isolate, "BOOL_VEC4", v8::Uint32::New(isolate, 0x8B59));
-    tmpl->Set(isolate, "FLOAT_MAT2", v8::Uint32::New(isolate, 0x8B5A));
-    tmpl->Set(isolate, "FLOAT_MAT3", v8::Uint32::New(isolate, 0x8B5B));
-    tmpl->Set(isolate, "FLOAT_MAT4", v8::Uint32::New(isolate, 0x8B5C));
+    tmpl->Set(isolate, "BOOL_VEC4", v8::Integer::NewFromUnsigned(isolate, 0x8B59));
+    tmpl->Set(isolate, "FLOAT_MAT2", v8::Integer::NewFromUnsigned(isolate, 0x8B5A));
+    tmpl->Set(isolate, "FLOAT_MAT3", v8::Integer::NewFromUnsigned(isolate, 0x8B5B));
+    tmpl->Set(isolate, "FLOAT_MAT4", v8::Integer::NewFromUnsigned(isolate, 0x8B5C));
 
     /* Culling */
 
     /* Enabling and disabling */
 
-    tmpl->Set(isolate, "SAMPLER_2D", v8::Uint32::New(isolate, 0x8B5E));
-    tmpl->Set(isolate, "SAMPLER_CUBE", v8::Uint32::New(isolate, 0x8B60));
-    tmpl->Set(isolate, "LOW_FLOAT", v8::Uint32::New(isolate, 0x8DF0));
-    tmpl->Set(isolate, "MEDIUM_FLOAT", v8::Uint32::New(isolate, 0x8DF1));
-    tmpl->Set(isolate, "HIGH_FLOAT", v8::Uint32::New(isolate, 0x8DF2));
-    tmpl->Set(isolate, "LOW_INT", v8::Uint32::New(isolate, 0x8DF3));
-    tmpl->Set(isolate, "MEDIUM_INT", v8::Uint32::New(isolate, 0x8DF4));
-    tmpl->Set(isolate, "HIGH_INT", v8::Uint32::New(isolate, 0x8DF5));
+    tmpl->Set(isolate, "SAMPLER_2D", v8::Integer::NewFromUnsigned(isolate, 0x8B5E));
+    tmpl->Set(isolate, "SAMPLER_CUBE", v8::Integer::NewFromUnsigned(isolate, 0x8B60));
+    tmpl->Set(isolate, "LOW_FLOAT", v8::Integer::NewFromUnsigned(isolate, 0x8DF0));
+    tmpl->Set(isolate, "MEDIUM_FLOAT", v8::Integer::NewFromUnsigned(isolate, 0x8DF1));
+    tmpl->Set(isolate, "HIGH_FLOAT", v8::Integer::NewFromUnsigned(isolate, 0x8DF2));
+    tmpl->Set(isolate, "LOW_INT", v8::Integer::NewFromUnsigned(isolate, 0x8DF3));
+    tmpl->Set(isolate, "MEDIUM_INT", v8::Integer::NewFromUnsigned(isolate, 0x8DF4));
+    tmpl->Set(isolate, "HIGH_INT", v8::Integer::NewFromUnsigned(isolate, 0x8DF5));
 
     /* Enabling and disabling */
 
-    tmpl->Set(isolate, "FRAMEBUFFER", v8::Uint32::New(isolate, 0x8D40));
-    tmpl->Set(isolate, "RENDERBUFFER", v8::Uint32::New(isolate, 0x8D41));
-    tmpl->Set(isolate, "RGBA4", v8::Uint32::New(isolate, 0x8056));
-    tmpl->Set(isolate, "RGB5_A1", v8::Uint32::New(isolate, 0x8057));
-    tmpl->Set(isolate, "RGB565", v8::Uint32::New(isolate, 0x8D62));
-    tmpl->Set(isolate, "DEPTH_COMPONENT16", v8::Uint32::New(isolate, 0x81A5));
-    tmpl->Set(isolate, "STENCIL_INDEX8", v8::Uint32::New(isolate, 0x8D48));
+    tmpl->Set(isolate, "FRAMEBUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8D40));
+    tmpl->Set(isolate, "RENDERBUFFER", v8::Integer::NewFromUnsigned(isolate, 0x8D41));
+    tmpl->Set(isolate, "RGBA4", v8::Integer::NewFromUnsigned(isolate, 0x8056));
+    tmpl->Set(isolate, "RGB5_A1", v8::Integer::NewFromUnsigned(isolate, 0x8057));
+    tmpl->Set(isolate, "RGB565", v8::Integer::NewFromUnsigned(isolate, 0x8D62));
+    tmpl->Set(isolate, "DEPTH_COMPONENT16", v8::Integer::NewFromUnsigned(isolate, 0x81A5));
+    tmpl->Set(isolate, "STENCIL_INDEX8", v8::Integer::NewFromUnsigned(isolate, 0x8D48));
 
     /* Errors */
 
     /* Front face directions */
 
-    tmpl->Set(isolate, "DEPTH_STENCIL", v8::Uint32::New(isolate, 0x84F9));
-    tmpl->Set(isolate, "RENDERBUFFER_WIDTH", v8::Uint32::New(isolate, 0x8D42));
+    tmpl->Set(isolate, "DEPTH_STENCIL", v8::Integer::NewFromUnsigned(isolate, 0x84F9));
+    tmpl->Set(isolate, "RENDERBUFFER_WIDTH", v8::Integer::NewFromUnsigned(isolate, 0x8D42));
 
     /* Front face directions */
 
     /* Hints */
 
-    tmpl->Set(isolate, "RENDERBUFFER_HEIGHT", v8::Uint32::New(isolate, 0x8D43));
-    tmpl->Set(isolate, "RENDERBUFFER_INTERNAL_FORMAT", v8::Uint32::New(isolate, 0x8D44));
-    tmpl->Set(isolate, "RENDERBUFFER_RED_SIZE", v8::Uint32::New(isolate, 0x8D50));
-    tmpl->Set(isolate, "RENDERBUFFER_GREEN_SIZE", v8::Uint32::New(isolate, 0x8D51));
+    tmpl->Set(isolate, "RENDERBUFFER_HEIGHT", v8::Integer::NewFromUnsigned(isolate, 0x8D43));
+    tmpl->Set(isolate, "RENDERBUFFER_INTERNAL_FORMAT",
+              v8::Integer::NewFromUnsigned(isolate, 0x8D44));
+    tmpl->Set(isolate, "RENDERBUFFER_RED_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8D50));
+    tmpl->Set(isolate, "RENDERBUFFER_GREEN_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8D51));
 
     /* Hints */
 
     /* Data types */
 
-    tmpl->Set(isolate, "RENDERBUFFER_BLUE_SIZE", v8::Uint32::New(isolate, 0x8D52));
-    tmpl->Set(isolate, "RENDERBUFFER_ALPHA_SIZE", v8::Uint32::New(isolate, 0x8D53));
-    tmpl->Set(isolate, "RENDERBUFFER_DEPTH_SIZE", v8::Uint32::New(isolate, 0x8D54));
-    tmpl->Set(isolate, "RENDERBUFFER_STENCIL_SIZE", v8::Uint32::New(isolate, 0x8D55));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE", v8::Uint32::New(isolate, 0x8CD0));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_OBJECT_NAME", v8::Uint32::New(isolate, 0x8CD1));
-    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL", v8::Uint32::New(isolate, 0x8CD2));
+    tmpl->Set(isolate, "RENDERBUFFER_BLUE_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8D52));
+    tmpl->Set(isolate, "RENDERBUFFER_ALPHA_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8D53));
+    tmpl->Set(isolate, "RENDERBUFFER_DEPTH_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8D54));
+    tmpl->Set(isolate, "RENDERBUFFER_STENCIL_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x8D55));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE",
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD0));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_OBJECT_NAME",
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD1));
+    tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL",
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD2));
 
     /* Data types */
 
     /* Pixel formats */
 
     tmpl->Set(isolate, "FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE",
-              v8::Uint32::New(isolate, 0x8CD3));
-    tmpl->Set(isolate, "COLOR_ATTACHMENT0", v8::Uint32::New(isolate, 0x8CE0));
-    tmpl->Set(isolate, "DEPTH_ATTACHMENT", v8::Uint32::New(isolate, 0x8D00));
-    tmpl->Set(isolate, "STENCIL_ATTACHMENT", v8::Uint32::New(isolate, 0x8D20));
-    tmpl->Set(isolate, "DEPTH_STENCIL_ATTACHMENT", v8::Uint32::New(isolate, 0x821A));
-    tmpl->Set(isolate, "NONE", v8::Uint32::New(isolate, 0));
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD3));
+    tmpl->Set(isolate, "COLOR_ATTACHMENT0", v8::Integer::NewFromUnsigned(isolate, 0x8CE0));
+    tmpl->Set(isolate, "DEPTH_ATTACHMENT", v8::Integer::NewFromUnsigned(isolate, 0x8D00));
+    tmpl->Set(isolate, "STENCIL_ATTACHMENT", v8::Integer::NewFromUnsigned(isolate, 0x8D20));
+    tmpl->Set(isolate, "DEPTH_STENCIL_ATTACHMENT", v8::Integer::NewFromUnsigned(isolate, 0x821A));
+    tmpl->Set(isolate, "NONE", v8::Integer::NewFromUnsigned(isolate, 0));
 
     /* Pixel formats */
 
     /* Pixel types */
 
-    tmpl->Set(isolate, "FRAMEBUFFER_COMPLETE", v8::Uint32::New(isolate, 0x8CD5));
-    tmpl->Set(isolate, "FRAMEBUFFER_INCOMPLETE_ATTACHMENT", v8::Uint32::New(isolate, 0x8CD6));
+    tmpl->Set(isolate, "FRAMEBUFFER_COMPLETE", v8::Integer::NewFromUnsigned(isolate, 0x8CD5));
+    tmpl->Set(isolate, "FRAMEBUFFER_INCOMPLETE_ATTACHMENT",
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD6));
     tmpl->Set(isolate, "FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT",
-              v8::Uint32::New(isolate, 0x8CD7));
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD7));
 
     /* Pixel types */
 
     /* Shaders */
 
-    tmpl->Set(isolate, "FRAMEBUFFER_INCOMPLETE_DIMENSIONS", v8::Uint32::New(isolate, 0x8CD9));
-    tmpl->Set(isolate, "FRAMEBUFFER_UNSUPPORTED", v8::Uint32::New(isolate, 0x8CDD));
-    tmpl->Set(isolate, "FRAMEBUFFER_BINDING", v8::Uint32::New(isolate, 0x8CA6));
-    tmpl->Set(isolate, "RENDERBUFFER_BINDING", v8::Uint32::New(isolate, 0x8CA7));
-    tmpl->Set(isolate, "MAX_RENDERBUFFER_SIZE", v8::Uint32::New(isolate, 0x84E8));
-    tmpl->Set(isolate, "INVALID_FRAMEBUFFER_OPERATION", v8::Uint32::New(isolate, 0x0506));
-    tmpl->Set(isolate, "UNPACK_FLIP_Y_WEBGL", v8::Uint32::New(isolate, 0x9240));
-    tmpl->Set(isolate, "UNPACK_PREMULTIPLY_ALPHA_WEBGL", v8::Uint32::New(isolate, 0x9241));
-    tmpl->Set(isolate, "UNPACK_COLORSPACE_CONVERSION_WEBGL", v8::Uint32::New(isolate, 0x9243));
+    tmpl->Set(isolate, "FRAMEBUFFER_INCOMPLETE_DIMENSIONS",
+              v8::Integer::NewFromUnsigned(isolate, 0x8CD9));
+    tmpl->Set(isolate, "FRAMEBUFFER_UNSUPPORTED", v8::Integer::NewFromUnsigned(isolate, 0x8CDD));
+    tmpl->Set(isolate, "FRAMEBUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8CA6));
+    tmpl->Set(isolate, "RENDERBUFFER_BINDING", v8::Integer::NewFromUnsigned(isolate, 0x8CA7));
+    tmpl->Set(isolate, "MAX_RENDERBUFFER_SIZE", v8::Integer::NewFromUnsigned(isolate, 0x84E8));
+    tmpl->Set(isolate, "INVALID_FRAMEBUFFER_OPERATION",
+              v8::Integer::NewFromUnsigned(isolate, 0x0506));
+    tmpl->Set(isolate, "UNPACK_FLIP_Y_WEBGL", v8::Integer::NewFromUnsigned(isolate, 0x9240));
+    tmpl->Set(isolate, "UNPACK_PREMULTIPLY_ALPHA_WEBGL",
+              v8::Integer::NewFromUnsigned(isolate, 0x9241));
+    tmpl->Set(isolate, "UNPACK_COLORSPACE_CONVERSION_WEBGL",
+              v8::Integer::NewFromUnsigned(isolate, 0x9243));
 }
 
 void WebGLRenderingContext::SetProps(v8::Isolate *isolate,