diff -r 000000000000 -r 6474c204b198 content/canvas/src/WebGLBuffer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/canvas/src/WebGLBuffer.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,84 @@
+/* -*- 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 "WebGLBuffer.h"
+
+#include "GLContext.h"
+#include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "WebGLContext.h"
+#include "WebGLElementArrayCache.h"
+
+using namespace mozilla;
+
+WebGLBuffer::WebGLBuffer(WebGLContext *context)
+    : WebGLContextBoundObject(context)
+    , mHasEverBeenBound(false)
+    , mByteLength(0)
+    , mTarget(LOCAL_GL_NONE)
+{
+    SetIsDOMBinding();
+    mContext->MakeContextCurrent();
+    mContext->gl->fGenBuffers(1, &mGLName);
+    mContext->mBuffers.insertBack(this);
+}
+
+WebGLBuffer::~WebGLBuffer() {
+    DeleteOnce();
+}
+
+void
+WebGLBuffer::Delete() {
+    mContext->MakeContextCurrent();
+    mContext->gl->fDeleteBuffers(1, &mGLName);
+    mByteLength = 0;
+    mCache = nullptr;
+    LinkedListElement<WebGLBuffer>::remove(); // remove from mContext->mBuffers
+}
+
+void
+WebGLBuffer::SetTarget(GLenum target) {
+    mTarget = target;
+    if (!mCache && mTarget == LOCAL_GL_ELEMENT_ARRAY_BUFFER)
+        mCache = new WebGLElementArrayCache;
+}
+
+bool
+WebGLBuffer::ElementArrayCacheBufferData(const void* ptr, size_t buffer_size_in_bytes) {
+    if (mTarget == LOCAL_GL_ELEMENT_ARRAY_BUFFER)
+        return mCache->BufferData(ptr, buffer_size_in_bytes);
+    return true;
+}
+
+void
+WebGLBuffer::ElementArrayCacheBufferSubData(size_t pos, const void* ptr, size_t update_size_in_bytes) {
+    if (mTarget == LOCAL_GL_ELEMENT_ARRAY_BUFFER)
+        mCache->BufferSubData(pos, ptr, update_size_in_bytes);
+}
+
+size_t
+WebGLBuffer::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
+{
+    size_t sizeOfCache = mCache ? mCache->SizeOfIncludingThis(aMallocSizeOf) : 0;
+    return aMallocSizeOf(this) + sizeOfCache;
+}
+
+bool
+WebGLBuffer::Validate(GLenum type, uint32_t max_allowed,
+                      size_t first, size_t count,
+                      uint32_t* out_upperBound)
+{
+    return mCache->Validate(type, max_allowed, first, count, out_upperBound);
+}
+
+
+JSObject*
+WebGLBuffer::WrapObject(JSContext *cx) {
+    return dom::WebGLBufferBinding::Wrap(cx, this);
+}
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLBuffer)
+
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(WebGLBuffer, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(WebGLBuffer, Release)