| Index: third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.cpp b/third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.cpp
|
| index 1c3b496a4d1395b8fa227e401e8e1ed29a5daaa7..4988bfce36dc2d18de2491730be955f9fc5ba26d 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.cpp
|
| +++ b/third_party/WebKit/Source/modules/webgl/EXTDisjointTimerQuery.cpp
|
| @@ -68,7 +68,8 @@ void EXTDisjointTimerQuery::beginQueryEXT(GLenum target,
|
| if (scoped.isLost())
|
| return;
|
|
|
| - if (!query || query->isDeleted() || !query->validate(0, scoped.context())) {
|
| + DCHECK(query);
|
| + if (query->isDeleted() || !query->validate(0, scoped.context())) {
|
| scoped.context()->synthesizeGLError(GL_INVALID_OPERATION, "beginQueryEXT",
|
| "invalid query");
|
| return;
|
| @@ -125,7 +126,8 @@ void EXTDisjointTimerQuery::queryCounterEXT(WebGLTimerQueryEXT* query,
|
| if (scoped.isLost())
|
| return;
|
|
|
| - if (!query || query->isDeleted() || !query->validate(0, scoped.context())) {
|
| + DCHECK(query);
|
| + if (query->isDeleted() || !query->validate(0, scoped.context())) {
|
| scoped.context()->synthesizeGLError(GL_INVALID_OPERATION, "queryCounterEXT",
|
| "invalid query");
|
| return;
|
| @@ -188,7 +190,8 @@ ScriptValue EXTDisjointTimerQuery::getQueryObjectEXT(ScriptState* scriptState,
|
| if (scoped.isLost())
|
| return ScriptValue::createNull(scriptState);
|
|
|
| - if (!query || query->isDeleted() || !query->validate(0, scoped.context()) ||
|
| + DCHECK(query);
|
| + if (query->isDeleted() || !query->validate(0, scoped.context()) ||
|
| m_currentElapsedQuery == query) {
|
| scoped.context()->synthesizeGLError(GL_INVALID_OPERATION,
|
| "getQueryObjectEXT", "invalid query");
|
|
|