From 4cf944eab8a7acd660fee5a6260f26707c38317f Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sat, 25 Aug 2018 19:17:24 +0200 Subject: [PATCH] Fix gl.isBuffer for buffers that are marked for deletion but still attached --- .../script/dom/webglrenderingcontext.rs | 2 +- .../oes-vertex-array-object.html.ini | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 tests/wpt/webgl/meta/conformance/extensions/oes-vertex-array-object.html.ini diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index df1b840fc46..bb4304e3276 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -2759,7 +2759,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 fn IsBuffer(&self, buffer: Option<&WebGLBuffer>) -> bool { buffer.map_or(false, |buf| { - self.validate_ownership(buf).is_ok() && buf.target().is_some() && !buf.is_marked_for_deletion() + self.validate_ownership(buf).is_ok() && buf.target().is_some() && !buf.is_deleted() }) } diff --git a/tests/wpt/webgl/meta/conformance/extensions/oes-vertex-array-object.html.ini b/tests/wpt/webgl/meta/conformance/extensions/oes-vertex-array-object.html.ini deleted file mode 100644 index 6afc852b104..00000000000 --- a/tests/wpt/webgl/meta/conformance/extensions/oes-vertex-array-object.html.ini +++ /dev/null @@ -1,25 +0,0 @@ -[oes-vertex-array-object.html] - [WebGL test #74: References from unbound VAOs keep Color buffer alive] - expected: FAIL - - [WebGL test #65: References from unbound VAOs keep Color buffer alive] - expected: FAIL - - [WebGL test #68: References from unbound VAOs keep Color buffer alive] - expected: FAIL - - [WebGL test #73: References from unbound VAOs keep Position buffer alive.] - expected: FAIL - - [WebGL test #71: References from unbound VAOs keep Color buffer alive] - expected: FAIL - - [WebGL test #70: References from unbound VAOs keep Position buffer alive.] - expected: FAIL - - [WebGL test #64: References from unbound VAOs keep Position buffer alive.] - expected: FAIL - - [WebGL test #67: References from unbound VAOs keep Position buffer alive.] - expected: FAIL -