Merge libGLESv2 and libEGL classes into libANGLE.

BUG=angle:733

Change-Id: Ic491c971411fe82c56cd97c5c8325ac14ec218df
Reviewed-on: https://chromium-review.googlesource.com/230830
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/Query.cpp b/src/libANGLE/Query.cpp
new file mode 100644
index 0000000..a402b73
--- /dev/null
+++ b/src/libANGLE/Query.cpp
@@ -0,0 +1,50 @@
+//
+// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// Query.cpp: Implements the gl::Query class
+
+#include "libANGLE/Query.h"
+#include "libANGLE/renderer/QueryImpl.h"
+
+namespace gl
+{
+Query::Query(rx::QueryImpl *impl, GLuint id)
+    : RefCountObject(id),
+      mQuery(impl)
+{
+}
+
+Query::~Query()
+{
+    SafeDelete(mQuery);
+}
+
+Error Query::begin()
+{
+    return mQuery->begin();
+}
+
+Error Query::end()
+{
+    return mQuery->end();
+}
+
+Error Query::getResult(GLuint *params)
+{
+    return mQuery->getResult(params);
+}
+
+Error Query::isResultAvailable(GLuint *available)
+{
+    return mQuery->isResultAvailable(available);
+}
+
+GLenum Query::getType() const
+{
+    return mQuery->getType();
+}
+
+}