Allowed GLES query target migration between binary occlusion types

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2012 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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
@@ skipping 4813 matching lines @@
   // if id does not have an object
   QueryTracker::Query* query = query_tracker_->GetQuery(id);
   if (!query) {
     query = query_tracker_->CreateQuery(id, target);
     if (!query) {
       SetGLError(GL_OUT_OF_MEMORY,
                  "glBeginQueryEXT",
                  "transfer buffer allocation failed");
       return;
     }
-  } else if (query->target() != target) {
+  } else if (!query->UpdateTarget(target)) {
     SetGLError(
         GL_INVALID_OPERATION, "glBeginQueryEXT", "target does not match");
     return;
   }
 
   current_queries_[target] = query;
 
   query->Begin(this);
   CheckGLError();
 }
@@ skipping 954 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu