Pass GLImplFactory to Query constructor.

src/libANGLE/Context.cpp

@@ -1355,7 +1355,7 @@ Query *Context::getQuery(QueryID handle, bool create, QueryType type)
     if (!query && create)
     {
         ASSERT(type != QueryType::InvalidEnum);
-        query = new Query(mImplementation->createQuery(type), handle);
+        query = new Query(mImplementation.get(), type, handle);
         query->addRef();
         mQueryMap.assign(handle, query);
     }

src/libANGLE/Query.cpp

@@ -7,11 +7,15 @@
 // Query.cpp: Implements the gl::Query class
 
 #include "libANGLE/Query.h"
+
+#include "libANGLE/renderer/GLImplFactory.h"
 #include "libANGLE/renderer/QueryImpl.h"
 
 namespace gl
 {
-Query::Query(rx::QueryImpl *impl, QueryID id) : RefCountObject(id), mQuery(impl), mLabel() {}
+Query::Query(rx::GLImplFactory *factory, QueryType type, QueryID id)
+    : RefCountObject(id), mQuery(factory->createQuery(type)), mLabel()
+{}
 
 Query::~Query()
 {

src/libANGLE/Query.h

@@ -20,8 +20,9 @@
 
 namespace rx
 {
+class GLImplFactory;
 class QueryImpl;
-}
+}  // namespace rx
 
 namespace gl
 {
@@ -29,7 +30,7 @@ namespace gl
 class Query final : public RefCountObject<QueryID>, public LabeledObject
 {
   public:
-    Query(rx::QueryImpl *impl, QueryID id);
+    Query(rx::GLImplFactory *factory, QueryType type, QueryID id);
     ~Query() override;
     void onDestroy(const Context *context) override;