Moved the majority of WebGL functionality into WebGLRenderingContextBase

Source/bindings/v8/custom/V8WebGLRenderingContextBaseCustom.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "V8WebGLRenderingContext.h"
+#include "V8WebGLRenderingContextBase.h"
 
 #include "V8ANGLEInstancedArrays.h"
 #include "V8EXTFragDepth.h"
 #include "V8EXTTextureFilterAnisotropic.h"
 #include "V8HTMLCanvasElement.h"
 #include "V8HTMLImageElement.h"
 #include "V8HTMLVideoElement.h"
 #include "V8ImageData.h"
 #include "V8OESElementIndexUint.h"
 #include "V8OESStandardDerivatives.h"
@@ skipping 22 matching lines @@
 #include "bindings/v8/V8HiddenPropertyName.h"
 #include "bindings/v8/custom/V8ArrayBufferViewCustom.h"
 #include "bindings/v8/custom/V8Float32ArrayCustom.h"
 #include "bindings/v8/custom/V8Int16ArrayCustom.h"
 #include "bindings/v8/custom/V8Int32ArrayCustom.h"
 #include "bindings/v8/custom/V8Int8ArrayCustom.h"
 #include "bindings/v8/custom/V8Uint16ArrayCustom.h"
 #include "bindings/v8/custom/V8Uint32ArrayCustom.h"
 #include "bindings/v8/custom/V8Uint8ArrayCustom.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/html/canvas/WebGLRenderingContext.h"
+#include "core/html/canvas/WebGLRenderingContextBase.h"
 #include "core/platform/NotImplemented.h"
 #include "wtf/FastMalloc.h"
 #include <limits>
 
 namespace WebCore {
 
 // Allocates new storage via fastMalloc.
-// Returns NULL if array failed to convert for any reason.
+// Returns 0 if array failed to convert for any reason.
 static float* jsArrayToFloatArray(v8::Handle<v8::Array> array, uint32_t len)
 {
     // Convert the data element-by-element.
     if (len > std::numeric_limits<uint32_t>::max() / sizeof(float))
         return 0;
     float* data = static_cast<float*>(fastMalloc(len * sizeof(float)));
 
     for (uint32_t i = 0; i < len; i++) {
         v8::Local<v8::Value> val = array->Get(i);
         if (!val->IsNumber()) {
             fastFree(data);
             return 0;
         }
         data[i] = toFloat(val);
     }
     return data;
 }
 
 // Allocates new storage via fastMalloc.
-// Returns NULL if array failed to convert for any reason.
+// Returns 0 if array failed to convert for any reason.
 static int* jsArrayToIntArray(v8::Handle<v8::Array> array, uint32_t len)
 {
     // Convert the data element-by-element.
     if (len > std::numeric_limits<uint32_t>::max() / sizeof(int))
         return 0;
     int* data = static_cast<int*>(fastMalloc(len * sizeof(int)));
 
     for (uint32_t i = 0; i < len; i++) {
         v8::Local<v8::Value> val = array->Get(i);
         bool ok;
@@ skipping 145 matching lines @@
     kBuffer, kRenderbuffer, kTexture, kVertexAttrib
 };
 
 static void getObjectParameter(const v8::FunctionCallbackInfo<v8::Value>& args, ObjectType objectType)
 {
     if (args.Length() != 2) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     unsigned target = toInt32(args[0]);
     unsigned pname = toInt32(args[1]);
     WebGLGetInfo info;
     switch (objectType) {
     case kBuffer:
         info = context->getBufferParameter(target, pname);
         break;
     case kRenderbuffer:
         info = context->getRenderbufferParameter(target, pname);
         break;
@@ skipping 19 matching lines @@
         location = V8WebGLUniformLocation::toNative(value->ToObject());
         ok = true;
     }
     return location;
 }
 
 enum WhichProgramCall {
     kProgramParameter, kUniform
 };
 
-void V8WebGLRenderingContext::getAttachedShadersMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getAttachedShadersMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (args.Length() < 1) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     if (args.Length() > 0 && !isUndefinedOrNull(args[0]) && !V8WebGLProgram::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate()))) {
         throwTypeError(args.GetIsolate());
         return;
     }
     WebGLProgram* program = V8WebGLProgram::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate())) ? V8WebGLProgram::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0;
     Vector<RefPtr<WebGLShader> > shaders;
     bool succeed = context->getAttachedShaders(program, shaders);
     if (!succeed) {
         v8SetReturnValueNull(args);
         return;
     }
     v8::Local<v8::Array> array = v8::Array::New(shaders.size());
     for (size_t ii = 0; ii < shaders.size(); ++ii)
         array->Set(v8::Integer::New(ii, args.GetIsolate()), toV8(shaders[ii].get(), args.Holder(), args.GetIsolate()));
     v8SetReturnValue(args, array);
 }
 
-void V8WebGLRenderingContext::getBufferParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getBufferParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     getObjectParameter(args, kBuffer);
 }
 
-void V8WebGLRenderingContext::getExtensionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getExtensionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    WebGLRenderingContext* imp = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* imp = V8WebGLRenderingContextBase::toNative(args.Holder());
     if (args.Length() < 1) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, name, args[0]);
     RefPtr<WebGLExtension> extension(imp->getExtension(name));
     v8SetReturnValue(args, toV8Object(extension.get(), args.Holder(), args.GetIsolate()));
 }
 
-void V8WebGLRenderingContext::getFramebufferAttachmentParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getFramebufferAttachmentParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (args.Length() != 3) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     unsigned target = toInt32(args[0]);
     unsigned attachment = toInt32(args[1]);
     unsigned pname = toInt32(args[2]);
     WebGLGetInfo info = context->getFramebufferAttachmentParameter(target, attachment, pname);
     v8SetReturnValue(args, toV8Object(info, args.Holder(), args.GetIsolate()));
 }
 
-void V8WebGLRenderingContext::getParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (args.Length() != 1) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     unsigned pname = toInt32(args[0]);
     WebGLGetInfo info = context->getParameter(pname);
     v8SetReturnValue(args, toV8Object(info, args.Holder(), args.GetIsolate()));
 }
 
-void V8WebGLRenderingContext::getProgramParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getProgramParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (args.Length() != 2) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     if (args.Length() > 0 && !isUndefinedOrNull(args[0]) && !V8WebGLProgram::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate()))) {
         throwTypeError(args.GetIsolate());
         return;
     }
     WebGLProgram* program = V8WebGLProgram::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate())) ? V8WebGLProgram::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0;
     unsigned pname = toInt32(args[1]);
     WebGLGetInfo info = context->getProgramParameter(program, pname);
     v8SetReturnValue(args, toV8Object(info, args.Holder(), args.GetIsolate()));
 }
 
-void V8WebGLRenderingContext::getRenderbufferParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getRenderbufferParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     getObjectParameter(args, kRenderbuffer);
 }
 
-void V8WebGLRenderingContext::getShaderParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getShaderParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (args.Length() != 2) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     if (args.Length() > 0 && !isUndefinedOrNull(args[0]) && !V8WebGLShader::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate()))) {
         throwTypeError(args.GetIsolate());
         return;
     }
     WebGLShader* shader = V8WebGLShader::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate())) ? V8WebGLShader::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0;
     unsigned pname = toInt32(args[1]);
     WebGLGetInfo info = context->getShaderParameter(shader, pname);
     v8SetReturnValue(args, toV8Object(info, args.Holder(), args.GetIsolate()));
 }
 
-void V8WebGLRenderingContext::getSupportedExtensionsMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getSupportedExtensionsMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    WebGLRenderingContext* imp = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* imp = V8WebGLRenderingContextBase::toNative(args.Holder());
     if (imp->isContextLost()) {
         v8SetReturnValueNull(args);
         return;
     }
 
     Vector<String> value = imp->getSupportedExtensions();
     v8::Local<v8::Array> array = v8::Array::New(value.size());
     for (size_t ii = 0; ii < value.size(); ++ii)
         array->Set(v8::Integer::New(ii, args.GetIsolate()), v8String(value[ii], args.GetIsolate()));
     v8SetReturnValue(args, array);
 }
 
-void V8WebGLRenderingContext::getTexParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getTexParameterMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     getObjectParameter(args, kTexture);
 }
 
-void V8WebGLRenderingContext::getUniformMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getUniformMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (args.Length() != 2) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     if (args.Length() > 0 && !isUndefinedOrNull(args[0]) && !V8WebGLProgram::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate()))) {
         throwTypeError(args.GetIsolate());
         return;
     }
     WebGLProgram* program = V8WebGLProgram::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate())) ? V8WebGLProgram::toNative(v8::Handle<v8::Object>::Cast(args[0])) : 0;
 
     if (args.Length() > 1 && !isUndefinedOrNull(args[1]) && !V8WebGLUniformLocation::HasInstance(args[1], args.GetIsolate(), worldType(args.GetIsolate()))) {
         throwTypeError(args.GetIsolate());
         return;
     }
     bool ok = false;
     WebGLUniformLocation* location = toWebGLUniformLocation(args[1], ok, args.GetIsolate());
 
     WebGLGetInfo info = context->getUniform(program, location);
     v8SetReturnValue(args, toV8Object(info, args.Holder(), args.GetIsolate()));
 }
 
-void V8WebGLRenderingContext::getVertexAttribMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::getVertexAttribMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     getObjectParameter(args, kVertexAttrib);
 }
 
 enum FunctionToCall {
     kUniform1v, kUniform2v, kUniform3v, kUniform4v,
     kVertexAttrib1v, kVertexAttrib2v, kVertexAttrib3v, kVertexAttrib4v
 };
 
 bool isFunctionToCallForAttribute(FunctionToCall functionToCall)
@@ skipping 32 matching lines @@
 
     if (args.Length() != 2) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
     bool ok = false;
     int index = -1;
     WebGLUniformLocation* location = 0;
 
-    if (isFunctionToCallForAttribute(functionToCall))
+    if (isFunctionToCallForAttribute(functionToCall)) {
         index = toInt32(args[0]);
-    else {
+    } else {
         if (args.Length() > 0 && !isUndefinedOrNull(args[0]) && !V8WebGLUniformLocation::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate()))) {
             throwTypeError(args.GetIsolate());
             return;
         }
         location = toWebGLUniformLocation(args[0], ok, args.GetIsolate());
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
 
     if (V8Float32Array::HasInstance(args[1], args.GetIsolate(), worldType(args.GetIsolate()))) {
         Float32Array* array = V8Float32Array::toNative(args[1]->ToObject());
-        ASSERT(array != NULL);
+        ASSERT(array);
         switch (functionToCall) {
         case kUniform1v: context->uniform1fv(location, array); break;
         case kUniform2v: context->uniform2fv(location, array); break;
         case kUniform3v: context->uniform3fv(location, array); break;
         case kUniform4v: context->uniform4fv(location, array); break;
         case kVertexAttrib1v: context->vertexAttrib1fv(index, array); break;
         case kVertexAttrib2v: context->vertexAttrib2fv(index, array); break;
         case kVertexAttrib3v: context->vertexAttrib3fv(index, array); break;
         case kVertexAttrib4v: context->vertexAttrib4fv(index, array); break;
         default: ASSERT_NOT_REACHED(); break;
         }
         return;
     }
 
     if (args[1].IsEmpty() || !args[1]->IsArray()) {
         throwTypeError(args.GetIsolate());
         return;
     }
-    v8::Handle<v8::Array> array =
-      v8::Local<v8::Array>::Cast(args[1]);
+    v8::Handle<v8::Array> array = v8::Local<v8::Array>::Cast(args[1]);
     uint32_t len = array->Length();
     float* data = jsArrayToFloatArray(array, len);
     if (!data) {
         // FIXME: consider different / better exception type.
         setDOMException(SyntaxError, args.GetIsolate());
         return;
     }
     switch (functionToCall) {
     case kUniform1v: context->uniform1fv(location, data, len); break;
     case kUniform2v: context->uniform2fv(location, data, len); break;
@@ skipping 18 matching lines @@
     // * glUniform3iv(GLUniformLocation location, Array data);
     // * glUniform3iv(GLUniformLocation location, Int32Array data);
     // * glUniform4iv(GLUniformLocation location, Array data);
     // * glUniform4iv(GLUniformLocation location, Int32Array data);
 
     if (args.Length() != 2) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
     if (args.Length() > 0 && !isUndefinedOrNull(args[0]) && !V8WebGLUniformLocation::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate()))) {
         throwTypeError(args.GetIsolate());
         return;
     }
     bool ok = false;
     WebGLUniformLocation* location = toWebGLUniformLocation(args[0], ok, args.GetIsolate());
 
     if (V8Int32Array::HasInstance(args[1], args.GetIsolate(), worldType(args.GetIsolate()))) {
         Int32Array* array = V8Int32Array::toNative(args[1]->ToObject());
-        ASSERT(array != NULL);
+        ASSERT(array);
         switch (functionToCall) {
         case kUniform1v: context->uniform1iv(location, array); break;
         case kUniform2v: context->uniform2iv(location, array); break;
         case kUniform3v: context->uniform3iv(location, array); break;
         case kUniform4v: context->uniform4iv(location, array); break;
         default: ASSERT_NOT_REACHED(); break;
         }
         return;
     }
 
     if (args[1].IsEmpty() || !args[1]->IsArray()) {
         throwTypeError(args.GetIsolate());
         return;
     }
-    v8::Handle<v8::Array> array =
-      v8::Local<v8::Array>::Cast(args[1]);
+    v8::Handle<v8::Array> array = v8::Local<v8::Array>::Cast(args[1]);
     uint32_t len = array->Length();
     int* data = jsArrayToIntArray(array, len);
     if (!data) {
         // FIXME: consider different / better exception type.
         setDOMException(SyntaxError, args.GetIsolate());
         return;
     }
     switch (functionToCall) {
     case kUniform1v: context->uniform1iv(location, data, len); break;
     case kUniform2v: context->uniform2iv(location, data, len); break;
     case kUniform3v: context->uniform3iv(location, data, len); break;
     case kUniform4v: context->uniform4iv(location, data, len); break;
     default: ASSERT_NOT_REACHED(); break;
     }
     fastFree(data);
 }
 
-void V8WebGLRenderingContext::uniform1fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform1fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kUniform1v);
 }
 
-void V8WebGLRenderingContext::uniform1ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform1ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     uniformHelperi(args, kUniform1v);
 }
 
-void V8WebGLRenderingContext::uniform2fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform2fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kUniform2v);
 }
 
-void V8WebGLRenderingContext::uniform2ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform2ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     uniformHelperi(args, kUniform2v);
 }
 
-void V8WebGLRenderingContext::uniform3fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform3fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kUniform3v);
 }
 
-void V8WebGLRenderingContext::uniform3ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform3ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     uniformHelperi(args, kUniform3v);
 }
 
-void V8WebGLRenderingContext::uniform4fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform4fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kUniform4v);
 }
 
-void V8WebGLRenderingContext::uniform4ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniform4ivMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     uniformHelperi(args, kUniform4v);
 }
 
 static void uniformMatrixHelper(const v8::FunctionCallbackInfo<v8::Value>& args, int matrixSize)
 {
     // Forms:
     // * glUniformMatrix2fv(GLint location, GLboolean transpose, Array data);
     // * glUniformMatrix2fv(GLint location, GLboolean transpose, Float32Array data);
     // * glUniformMatrix3fv(GLint location, GLboolean transpose, Array data);
     // * glUniformMatrix3fv(GLint location, GLboolean transpose, Float32Array data);
     // * glUniformMatrix4fv(GLint location, GLboolean transpose, Array data);
     // * glUniformMatrix4fv(GLint location, GLboolean transpose, Float32Array data);
     //
     // FIXME: need to change to accept Float32Array as well.
     if (args.Length() != 3) {
         throwNotEnoughArgumentsError(args.GetIsolate());
         return;
     }
 
-    WebGLRenderingContext* context = V8WebGLRenderingContext::toNative(args.Holder());
+    WebGLRenderingContextBase* context = V8WebGLRenderingContextBase::toNative(args.Holder());
 
     if (args.Length() > 0 && !isUndefinedOrNull(args[0]) && !V8WebGLUniformLocation::HasInstance(args[0], args.GetIsolate(), worldType(args.GetIsolate()))) {
         throwTypeError(args.GetIsolate());
         return;
     }
     bool ok = false;
     WebGLUniformLocation* location = toWebGLUniformLocation(args[0], ok, args.GetIsolate());
 
     bool transpose = args[1]->BooleanValue();
     if (V8Float32Array::HasInstance(args[2], args.GetIsolate(), worldType(args.GetIsolate()))) {
         Float32Array* array = V8Float32Array::toNative(args[2]->ToObject());
-        ASSERT(array != NULL);
+        ASSERT(array);
         switch (matrixSize) {
         case 2: context->uniformMatrix2fv(location, transpose, array); break;
         case 3: context->uniformMatrix3fv(location, transpose, array); break;
         case 4: context->uniformMatrix4fv(location, transpose, array); break;
         default: ASSERT_NOT_REACHED(); break;
         }
         return;
     }
 
     if (args[2].IsEmpty() || !args[2]->IsArray()) {
         throwTypeError(args.GetIsolate());
         return;
     }
-    v8::Handle<v8::Array> array =
-      v8::Local<v8::Array>::Cast(args[2]);
+    v8::Handle<v8::Array> array = v8::Local<v8::Array>::Cast(args[2]);
     uint32_t len = array->Length();
     float* data = jsArrayToFloatArray(array, len);
     if (!data) {
         // FIXME: consider different / better exception type.
         setDOMException(SyntaxError, args.GetIsolate());
         return;
     }
     switch (matrixSize) {
     case 2: context->uniformMatrix2fv(location, transpose, data, len); break;
     case 3: context->uniformMatrix3fv(location, transpose, data, len); break;
     case 4: context->uniformMatrix4fv(location, transpose, data, len); break;
     default: ASSERT_NOT_REACHED(); break;
     }
     fastFree(data);
 }
 
-void V8WebGLRenderingContext::uniformMatrix2fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniformMatrix2fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     uniformMatrixHelper(args, 2);
 }
 
-void V8WebGLRenderingContext::uniformMatrix3fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniformMatrix3fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     uniformMatrixHelper(args, 3);
 }
 
-void V8WebGLRenderingContext::uniformMatrix4fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::uniformMatrix4fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     uniformMatrixHelper(args, 4);
 }
 
-void V8WebGLRenderingContext::vertexAttrib1fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::vertexAttrib1fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kVertexAttrib1v);
 }
 
-void V8WebGLRenderingContext::vertexAttrib2fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::vertexAttrib2fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kVertexAttrib2v);
 }
 
-void V8WebGLRenderingContext::vertexAttrib3fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::vertexAttrib3fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kVertexAttrib3v);
 }
 
-void V8WebGLRenderingContext::vertexAttrib4fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
+void V8WebGLRenderingContextBase::vertexAttrib4fvMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     vertexAttribAndUniformHelperf(args, kVertexAttrib4v);
 }
 
 } // namespace WebCore