Allowed GLES query target migration between binary occlusion types

gpu/command_buffer/client/query_tracker.cc

Index: gpu/command_buffer/client/query_tracker.cc
diff --git a/gpu/command_buffer/client/query_tracker.cc b/gpu/command_buffer/client/query_tracker.cc
index ddb559a2a3ce87f2f0c93c29515eaa75866e6644..30b252322e3d5cc57123db0ecd8dd6be91e01d5d 100644
--- a/gpu/command_buffer/client/query_tracker.cc
+++ b/gpu/command_buffer/client/query_tracker.cc
@@ -206,6 +206,23 @@ uint32 QueryTracker::Query::GetResult() const {
   return result_;
 }
 
+bool QueryTracker::Query::UpdateTarget(GLenum target) {
+  switch (target_) {
+    // The boolean occlusion targets are interchangable.
+    case GL_ANY_SAMPLES_PASSED:
+    case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+      if (target == GL_ANY_SAMPLES_PASSED ||
+          target == GL_ANY_SAMPLES_PASSED_CONSERVATIVE) {
+        target_ = target;
+        return true;
+      };
+      return false;
+    // Otherwise target is finalized the first time beginQuery() is called.
+    default:
+      return target_ == target;
+  }
+}
+
 QueryTracker::QueryTracker(MappedMemoryManager* manager)
     : query_sync_manager_(manager) {
 }