From a02a6de88e5346273914c84e3987b017b3a1badd Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Wed, 12 Sep 2018 11:22:00 +0200
Subject: [PATCH] Update WebGL tests

This brings in https://github.com/KhronosGroup/WebGL/pull/2708.
---
 tests/wpt/webgl/meta/MANIFEST.json                            | 4 ++--
 .../meta/conformance/rendering/framebuffer-switch.html.ini    | 3 ---
 .../conformance/rendering/framebuffer-texture-switch.html.ini | 3 ---
 .../webgl/tests/conformance/rendering/framebuffer-switch.html | 1 +
 .../conformance/rendering/framebuffer-texture-switch.html     | 1 +
 5 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
 delete mode 100644 tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini

diff --git a/tests/wpt/webgl/meta/MANIFEST.json b/tests/wpt/webgl/meta/MANIFEST.json
index ee13046d7f2..3799e3b2fc5 100644
--- a/tests/wpt/webgl/meta/MANIFEST.json
+++ b/tests/wpt/webgl/meta/MANIFEST.json
@@ -36364,7 +36364,7 @@
    "testharness"
   ],
   "conformance/rendering/framebuffer-switch.html": [
-   "943f571b3b15f9794e2a9e3f89fcdadf1d49b6dd",
+   "fc8c3dc5dac8a2ece2b286325bf8f1b227f3aee6",
    "testharness"
   ],
   "conformance/rendering/framebuffer-texture-clear.html": [
@@ -36372,7 +36372,7 @@
    "testharness"
   ],
   "conformance/rendering/framebuffer-texture-switch.html": [
-   "5b677f79ad9378638624dab7c001f8381eed5e87",
+   "04d03a0bc2e2f834762f0bb47e484a38323213f8",
    "testharness"
   ],
   "conformance/rendering/gl-clear.html": [
diff --git a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
deleted file mode 100644
index e6657730f7f..00000000000
--- a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-switch.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[framebuffer-switch.html]
-  bug: https://github.com/servo/servo/issues/8984
-  expected: ERROR
diff --git a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini b/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
deleted file mode 100644
index 53a1115bd9e..00000000000
--- a/tests/wpt/webgl/meta/conformance/rendering/framebuffer-texture-switch.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[framebuffer-texture-switch.html]
-  bug: https://github.com/servo/servo/issues/8984
-  expected: ERROR
diff --git a/tests/wpt/webgl/tests/conformance/rendering/framebuffer-switch.html b/tests/wpt/webgl/tests/conformance/rendering/framebuffer-switch.html
index 943f571b3b1..fc8c3dc5dac 100644
--- a/tests/wpt/webgl/tests/conformance/rendering/framebuffer-switch.html
+++ b/tests/wpt/webgl/tests/conformance/rendering/framebuffer-switch.html
@@ -44,6 +44,7 @@
 "use strict";
 description("Test framebuffer switching. The test switches between two framebuffers, copying rendering results from one to the other.");
 var wtu = WebGLTestUtils;
+var canvas = document.getElementById("canvas");
 
 var gl = wtu.create3DContext("canvas");
 var program = wtu.setupTexturedQuad(gl);
diff --git a/tests/wpt/webgl/tests/conformance/rendering/framebuffer-texture-switch.html b/tests/wpt/webgl/tests/conformance/rendering/framebuffer-texture-switch.html
index 5b677f79ad9..04d03a0bc2e 100644
--- a/tests/wpt/webgl/tests/conformance/rendering/framebuffer-texture-switch.html
+++ b/tests/wpt/webgl/tests/conformance/rendering/framebuffer-texture-switch.html
@@ -44,6 +44,7 @@
 "use strict";
 description("Test framebuffer texture attachment switching. The test uses one framebuffer object and switches its color attachment.");
 var wtu = WebGLTestUtils;
+var canvas = document.getElementById("canvas");
 
 var gl = wtu.create3DContext("canvas");
 var program = wtu.setupTexturedQuad(gl);