Removed logic assuming ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE query types were inte…

Source/core/html/canvas/WebGL2RenderingContextBase.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/html/canvas/WebGL2RenderingContextBase.h"
 
 #include "bindings/core/v8/WebGLAny.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 1062 matching lines @@
 void WebGL2RenderingContextBase::beginQuery(GLenum target, WebGLQuery* query)
 {
     bool deleted;
     if (!checkObjectToBeBound("beginQuery", query, deleted))
         return;
     if (deleted) {
         synthesizeGLError(GL_INVALID_OPERATION, "beginQuery", "attempted to begin a deleted query object");
         return;
     }
 
-    if (!query->isCompatibleTarget(target)) {
+    if (query->getTarget() && query->getTarget() != target) {
         synthesizeGLError(GL_INVALID_OPERATION, "beginQuery", "query type does not match target");
         return;
     }
 
     switch (target) {
     case GL_ANY_SAMPLES_PASSED:
     case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
         {
             if (m_currentBooleanOcclusionQuery) {
                 synthesizeGLError(GL_INVALID_OPERATION, "beginQuery", "a query is already active for target");
                 return;
             }
             m_currentBooleanOcclusionQuery = query;
         }
         break;
     case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
         {
             if (m_currentTransformFeedbackPrimitivesWrittenQuery) {
                 synthesizeGLError(GL_INVALID_OPERATION, "beginQuery", "a query is already active for target");
                 return;
             }
             m_currentTransformFeedbackPrimitivesWrittenQuery = query;
         }
         break;
     default:
         synthesizeGLError(GL_INVALID_ENUM, "beginQuery", "invalid target");
         return;
     }
 
-    query->setTarget(target);
+    if (!query->getTarget())
+        query->setTarget(target);
 
     webContext()->beginQueryEXT(target, query->object());
 }
 
 void WebGL2RenderingContextBase::endQuery(GLenum target)
 {
     if (isContextLost())
         return;
 
     switch (target) {
@@ skipping 1099 matching lines @@
 GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat()
 {
     if (m_readFramebufferBinding && m_readFramebufferBinding->object())
         return m_readFramebufferBinding->colorBufferFormat();
     if (m_requestedAttributes.alpha())
         return GL_RGBA;
     return GL_RGB;
 }
 
 } // namespace blink