diff -r 000000000000 -r 6474c204b198 content/canvas/src/WebGLQuery.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/canvas/src/WebGLQuery.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; 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/. */
+
+#ifndef WEBGLQUERY_H_
+#define WEBGLQUERY_H_
+
+#include "WebGLObjectModel.h"
+
+#include "nsWrapperCache.h"
+
+#include "mozilla/LinkedList.h"
+
+namespace mozilla {
+
+class WebGLQuery MOZ_FINAL
+    : public nsWrapperCache
+    , public WebGLRefCountedObject<WebGLQuery>
+    , public LinkedListElement<WebGLQuery>
+    , public WebGLContextBoundObject
+{
+// -----------------------------------------------------------------------------
+// PUBLIC
+public:
+
+    // -------------------------------------------------------------------------
+    // CONSTRUCTOR & DESTRUCTOR
+
+    WebGLQuery(WebGLContext *context);
+
+    ~WebGLQuery() {
+        DeleteOnce();
+    };
+
+
+    // -------------------------------------------------------------------------
+    // MEMBER FUNCTIONS
+
+    bool IsActive() const;
+
+    bool HasEverBeenActive()
+    {
+        return mType != 0;
+    }
+
+
+    // -------------------------------------------------------------------------
+    // IMPLEMENT WebGLRefCountedObject and WebGLContextBoundObject
+
+    void Delete();
+
+    WebGLContext* GetParentObject() const
+    {
+        return Context();
+    }
+
+
+    // -------------------------------------------------------------------------
+    // IMPLEMENT NS
+    virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
+
+    NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLQuery)
+    NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLQuery)
+
+
+// -----------------------------------------------------------------------------
+// PRIVATE
+private:
+
+    // -------------------------------------------------------------------------
+    // MEMBERS
+    GLuint mGLName;
+    GLenum mType;
+
+    // -------------------------------------------------------------------------
+    // FRIENDSHIPS
+    friend class WebGLContext;
+};
+
+} // namespace mozilla
+
+#endif