Fixed WebglRenderingContextBase toImageData

third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-webgl-worker.html

Index: third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-webgl-worker.html
diff --git a/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-webgl-worker.html b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-webgl-worker.html
index a9be1b22ada0c5d6d183a15eba93cfa215b204ef..e0760ee50d790a2d4fee7ab0d2dd1b3e00bdbcb8 100644
--- a/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-webgl-worker.html
+++ b/third_party/WebKit/LayoutTests/virtual/threaded/fast/idleToBlob/OffscreenCanvas-convertToBlob-webgl-worker.html
@@ -1,4 +1,8 @@
 <img id="png"/>
+<img id="jpeg-high"/>
+<img id="jpeg-low"/>
+<img id="webp-high"/>
+<img id="webp-low"/>
 <script id="myWorker" type="text/worker">
 self.onmessage = function (e) {
   var offCanvas = new OffscreenCanvas(50, 50);
@@ -6,12 +10,31 @@ self.onmessage = function (e) {
   gl.clearColor(0, 1, 0, 1);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
-  // TODO: Add more image types to this test once the toImageData() for webgl
-  // is completed. See crbug.com/657531.
   offCanvas.convertToBlob()
     .then(function(blob) { 
       self.postMessage({version: "png", data:blob});
     });
+
+  offCanvas.convertToBlob({type: "image/jpeg"})
+    .then(function(blob) {
+      self.postMessage({version: "jpeg-high", data:blob});
+    });
+
+  offCanvas.convertToBlob({type: "image/jpeg", quality: 0.2})
+    .then(function(blob) {
+      self.postMessage({version: "jpeg-low", data:blob});
+    });
+
+  offCanvas.convertToBlob({type: "image/webp"})
+    .then(function(blob) { 
+      self.postMessage({version: "webp-high", data:blob});
+    });
+
+  offCanvas.convertToBlob({type: "image/webp", quality: 0.2})
+    .then(function(blob) {
+
+      self.postMessage({version: "webp-low", data:blob});
+    });
 }
 </script>
 <script>
@@ -20,12 +43,22 @@ if (window.testRunner) {
 }
 
 var pngImage = document.getElementById('png');
+var jpegImageHigh = document.getElementById('jpeg-high');
+var jpegImageLow = document.getElementById('jpeg-low');
+var webpImageHigh = document.getElementById('webp-high');
+var webpImageLow = document.getElementById('webp-low');
+var numTestCount = 5;
 function imageLoaded() {
-  if (window.testRunner) {
+  numTestCount--;
+  if (numTestCount == 0 && window.testRunner) {
     window.testRunner.notifyDone();
   }
 }
 pngImage.addEventListener('load', imageLoaded);
+jpegImageHigh.addEventListener('load', imageLoaded);
+jpegImageLow.addEventListener('load', imageLoaded);
+webpImageHigh.addEventListener('load', imageLoaded);
+webpImageLow.addEventListener('load', imageLoaded);
 
 var workerBlob = new Blob([document.getElementById('myWorker').textContent]);
 var worker = new Worker(URL.createObjectURL(workerBlob));
@@ -35,6 +68,18 @@ worker.addEventListener("message", function(msg) {
     case 'png':
       pngImage.src = URL.createObjectURL(blob);
       break;
+    case 'jpeg-high':
+      jpegImageHigh.src = URL.createObjectURL(blob);
+      break;
+    case 'jpeg-low':
+      jpegImageLow.src = URL.createObjectURL(blob);
+      break;
+    case 'webp-high':
+      webpImageHigh.src = URL.createObjectURL(blob);
+      break;
+    case 'webp-low':
+      webpImageLow.src = URL.createObjectURL(blob);
+      break;
   }
 });
 worker.postMessage("");