| Index: Source/core/html/canvas/WebGLQuery.cpp
|
| diff --git a/Source/core/html/canvas/WebGLQuery.cpp b/Source/core/html/canvas/WebGLQuery.cpp
|
| index 9fff37db0c1d4c06643f2a4151486c5b8a0e0f73..6f43f5859dcc1a0086f1e5f826ff63c70ce1053d 100644
|
| --- a/Source/core/html/canvas/WebGLQuery.cpp
|
| +++ b/Source/core/html/canvas/WebGLQuery.cpp
|
| @@ -37,26 +37,10 @@ WebGLQuery::WebGLQuery(WebGL2RenderingContextBase* ctx)
|
| void WebGLQuery::setTarget(GLenum target)
|
| {
|
| ASSERT(object());
|
| - ASSERT(isCompatibleTarget(target));
|
| + ASSERT(!m_target);
|
| m_target = target;
|
| }
|
|
|
| -bool WebGLQuery::isCompatibleTarget(GLenum target)
|
| -{
|
| - if (!m_target)
|
| - return true;
|
| -
|
| - switch (target) {
|
| - // The SAMPLES_PASSED targets are interchangable.
|
| - case GL_ANY_SAMPLES_PASSED:
|
| - case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
|
| - return m_target == GL_ANY_SAMPLES_PASSED || m_target == GL_ANY_SAMPLES_PASSED_CONSERVATIVE;
|
| - // Otherwise target is finalized the first time beginQuery() is called.
|
| - default:
|
| - return m_target == target;
|
| - }
|
| -}
|
| -
|
| void WebGLQuery::deleteObjectImpl(WebGraphicsContext3D* context3d)
|
| {
|
| context3d->deleteQueryEXT(m_object);
|
|
|