diff -r 000000000000 -r 6474c204b198 content/canvas/src/WebGLExtensionVertexArray.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/canvas/src/WebGLExtensionVertexArray.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "WebGLContext.h"
+#include "WebGLBuffer.h"
+#include "WebGLVertexArray.h"
+#include "WebGLExtensions.h"
+#include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "GLContext.h"
+
+using namespace mozilla;
+
+WebGLExtensionVertexArray::WebGLExtensionVertexArray(WebGLContext* context)
+  : WebGLExtensionBase(context)
+{
+    MOZ_ASSERT(IsSupported(context), "should not construct WebGLExtensionVertexArray :"
+                                     "OES_vertex_array_object unsuported.");
+}
+
+WebGLExtensionVertexArray::~WebGLExtensionVertexArray()
+{
+}
+
+already_AddRefed<WebGLVertexArray> WebGLExtensionVertexArray::CreateVertexArrayOES()
+{
+    if (mIsLost) {
+        mContext->ErrorInvalidOperation("createVertexArrayOES: Extension is lost. Returning NULL.");
+        return nullptr;
+    }
+
+    return mContext->CreateVertexArray();
+}
+
+void WebGLExtensionVertexArray::DeleteVertexArrayOES(WebGLVertexArray* array)
+{
+    if (mIsLost)
+        return mContext->ErrorInvalidOperation("deleteVertexArrayOES: Extension is lost.");
+
+    mContext->DeleteVertexArray(array);
+}
+
+bool WebGLExtensionVertexArray::IsVertexArrayOES(WebGLVertexArray* array)
+{
+    if (mIsLost) {
+        mContext->ErrorInvalidOperation("isVertexArrayOES: Extension is lost. Returning false.");
+        return false;
+    }
+
+    return mContext->IsVertexArray(array);
+}
+
+void WebGLExtensionVertexArray::BindVertexArrayOES(WebGLVertexArray* array)
+{
+    if (mIsLost)
+        return mContext->ErrorInvalidOperation("bindVertexArrayOES: Extension is lost.");
+
+    mContext->BindVertexArray(array);
+}
+
+bool WebGLExtensionVertexArray::IsSupported(const WebGLContext* context)
+{
+    gl::GLContext* gl = context->GL();
+
+    return gl->IsSupported(gl::GLFeature::vertex_array_object);
+}
+
+IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionVertexArray)