Implement EXT_disjoint_timer_query_webgl2

third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.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 "modules/webgl/EXTDisjointTimerQuery.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
 #include "modules/webgl/WebGLTimerQueryEXT.h"
@@ skipping 64 matching lines @@
   }
 
   if (target != GL_TIME_ELAPSED_EXT) {
     scoped.context()->synthesizeGLError(GL_INVALID_ENUM, "beginQueryEXT",
                                         "invalid target");
     return;
   }
 
   if (m_currentElapsedQuery) {
     scoped.context()->synthesizeGLError(GL_INVALID_OPERATION, "beginQueryEXT",
-                                        "no current query");
+                                        "a query is already active for target");
     return;
   }
 
   if (query->hasTarget() && query->target() != target) {
     scoped.context()->synthesizeGLError(GL_INVALID_OPERATION, "beginQueryEXT",
                                         "target does not match query");
     return;
   }
 
   scoped.context()->contextGL()->BeginQueryEXT(target, query->object());
@@ skipping 53 matching lines @@
   query->resetCachedResult();
 }
 
 ScriptValue EXTDisjointTimerQuery::getQueryEXT(ScriptState* scriptState,
                                                GLenum target,
                                                GLenum pname) {
   WebGLExtensionScopedContext scoped(this);
   if (scoped.isLost())
     return ScriptValue::createNull(scriptState);
 
-  if (target == GL_TIMESTAMP_EXT || target == GL_TIME_ELAPSED_EXT) {
-    switch (pname) {
-      case GL_CURRENT_QUERY_EXT:
-        if (GL_TIME_ELAPSED_EXT == target && m_currentElapsedQuery.get())
-          return WebGLAny(scriptState, m_currentElapsedQuery.get());
-        return ScriptValue::createNull(scriptState);
-      case GL_QUERY_COUNTER_BITS_EXT: {
-        GLint value = 0;
-        scoped.context()->contextGL()->GetQueryivEXT(target, pname, &value);
-        return WebGLAny(scriptState, value);
-      }
-      default:
-        break;
+  if (pname == GL_QUERY_COUNTER_BITS_EXT) {
+    if (target == GL_TIMESTAMP_EXT || target == GL_TIME_ELAPSED_EXT) {
+      GLint value = 0;
+      scoped.context()->contextGL()->GetQueryivEXT(target, pname, &value);
+      return WebGLAny(scriptState, value);
     }
+    scoped.context()->synthesizeGLError(GL_INVALID_ENUM, "getQuery",
+                                        "invalid target/pname combination");
+    return ScriptValue::createNull(scriptState);
   }
 
-  scoped.context()->synthesizeGLError(GL_INVALID_ENUM, "getQueryEXT",
-                                      "invalid target or pname");
+  if (target == GL_TIME_ELAPSED_EXT && pname == GL_CURRENT_QUERY) {
+    return m_currentElapsedQuery ? WebGLAny(scriptState, m_currentElapsedQuery)
+                                 : ScriptValue::createNull(scriptState);
+  }
+
+  if (target == GL_TIMESTAMP_EXT && pname == GL_CURRENT_QUERY) {
+    return ScriptValue::createNull(scriptState);
+  }
+
+  scoped.context()->synthesizeGLError(GL_INVALID_ENUM, "getQuery",
+                                      "invalid target/pname combination");
   return ScriptValue::createNull(scriptState);
 }
 
 ScriptValue EXTDisjointTimerQuery::getQueryObjectEXT(ScriptState* scriptState,
                                                      WebGLTimerQueryEXT* query,
                                                      GLenum pname) {
   WebGLExtensionScopedContext scoped(this);
   if (scoped.isLost())
     return ScriptValue::createNull(scriptState);
 
@@ skipping 27 matching lines @@
   WebGLExtension::trace(visitor);
 }
 
 EXTDisjointTimerQuery::EXTDisjointTimerQuery(WebGLRenderingContextBase* context)
     : WebGLExtension(context) {
   context->extensionsUtil()->ensureExtensionEnabled(
       "GL_EXT_disjoint_timer_query");
 }
 
 }  // namespace blink