Exposing DOM float & double types as double rather than num.

tests/html/canvasrenderingcontext2d_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library canvas_rendering_context_2d_test; import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
 import 'dart:math';
 
 // Some rounding errors in the browsers.
@@ skipping 17 matching lines @@
 
   context = canvas.context2D;
 }
 
 void createOtherCanvas() {
   otherCanvas = new CanvasElement();
   otherCanvas.width = 10;
   otherCanvas.height = 10;
   otherContext = otherCanvas.context2D;
   otherContext.fillStyle = "red";
-  otherContext.fillRect(0, 0, otherCanvas.width, otherCanvas.height);
+  otherContext.fillRect(0.0, 0.0,
+      otherCanvas.width.toDouble(), otherCanvas.height.toDouble());
 }
 
 void setupFunc() {
   createCanvas();
   createOtherCanvas();
   video = new VideoElement();
 }
 
 void tearDownFunc() {
   canvas = null;
   context = null;
   otherCanvas = null;
   otherContext = null;
   video = null;
 }
 
-List<int> readPixel(int x, int y) {
-  var imageData = context.getImageData(x, y, 1, 1);
+List<int> readPixel(num x, num y) {
+  var imageData = context.getImageData(x.toDouble(), y.toDouble(), 1.0, 1.0);
   return imageData.data;
 }
 
 /// Returns true if the pixel has some data in it, false otherwise.
-bool isPixelFilled(int x, int y) => readPixel(x,y).any((p) => p != 0);
+bool isPixelFilled(num x, num y) => readPixel(x,y).any((p) => p != 0);
 
-String pixelDataToString(List<int> data, int x, int y) {
+String pixelDataToString(List<int> data, num x, num y) {
   return '[${data.join(", ")}]';
 }
 
 String _filled(bool v) => v ? "filled" : "unfilled";
 
-void expectPixelFilled(int x, int y, [bool filled = true]) {
-  expect(isPixelFilled(x, y), filled, reason:
+void expectPixelFilled(num x, num y, [bool filled = true]) {
+  expect(isPixelFilled(x.toInt(), y.toInt()), filled, reason:
       'Pixel at ($x, $y) was expected to'
       ' be: <${_filled(filled)}> but was: <${_filled(!filled)}> with data: '
       '${pixelDataToString(readPixel(x, y), x, y)}');
 }
 
-void expectPixelUnfilled(int x, int y) {
+void expectPixelUnfilled(num x, num y) {
   expectPixelFilled(x, y, false);
 }
 
 main() {
   useHtmlIndividualConfiguration();
 
   group('pixel_manipulation', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
 
     test('setFillColorRgb', () {
       context.setFillColorRgb(255, 0, 255, 1);
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       expect(readPixel(2, 2), [255, 0, 255, 255]);
     });
 
     test('setFillColorHsl hue', () {
       context.setFillColorHsl(0, 100, 50);
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       checkPixel(readPixel(2, 2), [255, 0, 0, 255]);
     });
 
     test('setFillColorHsl hue 2', () {
       context.setFillColorHsl(240, 100, 50);
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       checkPixel(readPixel(2, 2), [0, 0, 255, 255]);
     });
 
     test('setFillColorHsl sat', () {
       context.setFillColorHsl(0, 0, 50);
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       checkPixel(readPixel(2, 2), [127, 127, 127, 255]);
     });
 
     test('setStrokeColorRgb', () {
       context.setStrokeColorRgb(255, 0, 255, 1);
-      context.lineWidth = 10;
-      context.strokeRect(0, 0, canvas.width, canvas.height);
+      context.lineWidth = 10.0;
+      context.strokeRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       expect(readPixel(2, 2), [255, 0, 255, 255]);
     });
 
     test('setStrokeColorHsl hue', () {
       context.setStrokeColorHsl(0, 100, 50);
-      context.lineWidth = 10;
-      context.strokeRect(0, 0, canvas.width, canvas.height);
+      context.lineWidth = 10.0;
+      context.strokeRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       expect(readPixel(2, 2), [255, 0, 0, 255]);
     });
 
     test('setStrokeColorHsl hue 2', () {
       context.setStrokeColorHsl(240, 100, 50);
-      context.lineWidth = 10;
-      context.strokeRect(0, 0, canvas.width, canvas.height);
+      context.lineWidth = 10.0;
+      context.strokeRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       expect(readPixel(2, 2), [0, 0, 255, 255]);
     });
 
     test('setStrokeColorHsl sat', () {
       context.setStrokeColorHsl(0, 0, 50);
-      context.lineWidth = 10;
-      context.strokeRect(0, 0, canvas.width, canvas.height);
+      context.lineWidth = 10.0;
+      context.strokeRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       checkPixel(readPixel(2, 2), [127, 127, 127, 255]);
     });
 
     test('fillStyle', () {
       context.fillStyle = "red";
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       checkPixel(readPixel(2, 2), [255, 0, 0, 255]);
     });
 
     test('strokeStyle', () {
       context.strokeStyle = "blue";
-      context.lineWidth = 10;
-      context.strokeRect(0, 0, canvas.width, canvas.height);
+      context.lineWidth = 10.0;
+      context.strokeRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       expect(readPixel(2, 2), [0, 0, 255, 255]);
     });
 
     test('fillStyle linearGradient', () {
-      var gradient = context.createLinearGradient(0,0,20,20);
-      gradient.addColorStop(0,'red');
-      gradient.addColorStop(1,'blue');
+      var gradient = context.createLinearGradient(0.0,0.0,20.0,20.0);
+      gradient.addColorStop(0.0,'red');
+      gradient.addColorStop(1.0,'blue');
       context.fillStyle = gradient;
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
       expect(context.fillStyle is CanvasGradient, isTrue);
     });
 
     test('putImageData', () {
       context.fillStyle = 'green';
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0,
+          canvas.width.toDouble(), canvas.height.toDouble());
 
-      ImageData expectedData = context.getImageData(0, 0, 10, 10);
+      ImageData expectedData = context.getImageData(0.0, 0.0, 10.0, 10.0);
       expectedData.data[0] = 25;
       expectedData.data[1] = 65;
       expectedData.data[2] = 255;
       // Set alpha to 255 to make the pixels show up.
       expectedData.data[3] = 255;
 
-      context.putImageData(expectedData, 0, 0);
+      context.putImageData(expectedData, 0.0, 0.0);
 
-      var resultingData = context.getImageData(0, 0, 10, 10);
+      var resultingData = context.getImageData(0.0, 0.0, 10.0, 10.0);
       // Make sure that we read back what we wrote.
       expect(resultingData.data, expectedData.data);
     });
 
     test('putImageData dirty rectangle', () {
       context.fillStyle = 'green';
-      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.fillRect(0.0, 0.0, canvas.width.toDouble(), canvas.height.toDouble());
 
-      ImageData drawnData = context.getImageData(0, 0, 10, 10);
+      ImageData drawnData = context.getImageData(0.0, 0.0, 10.0, 10.0);
       drawnData.data[0] = 25;
       drawnData.data[1] = 65;
       drawnData.data[2] = 255;
       drawnData.data[3] = 255;
 
       // Draw these pixels to the 2nd pixel.
       drawnData.data[2 * 4 + 0] = 25;
       drawnData.data[2 * 4 + 1] = 65;
       drawnData.data[2 * 4 + 2] = 255;
       drawnData.data[2 * 4 + 3] = 255;
 
       // Draw these pixels to the 8th pixel.
       drawnData.data[7 * 4 + 0] = 25;
       drawnData.data[7 * 4 + 1] = 65;
       drawnData.data[7 * 4 + 2] = 255;
       drawnData.data[7 * 4 + 3] = 255;
 
       // Use a dirty rectangle to limit what pixels are drawn.
-      context.putImageData(drawnData, 0, 0, 1, 0, 5, 5);
+      context.putImageData(drawnData, 0.0, 0.0, 1.0, 0.0, 5.0, 5.0);
 
       // Expect the data to be all green, as we skip all drawn pixels.
-      ImageData expectedData = context.createImageData(10, 10);
+      ImageData expectedData = context.createImageData(10.0, 10.0);
       for (int i = 0; i < expectedData.data.length; i++) {
         switch (i % 4) {
           case 0:
             expectedData.data[i] =  0;
             break;
           case 1:
             expectedData.data[i] =  128;
             break;
           case 2:
             expectedData.data[i] =  0;
             break;
           case 3:
             expectedData.data[i] =  255;
             break;
         }
       }
       // Third pixel was copied.
       expectedData.data[2 * 4 + 0] = 25;
       expectedData.data[2 * 4 + 1] = 65;
       expectedData.data[2 * 4 + 2] = 255;
       expectedData.data[2 * 4 + 3] = 255;
 
       // Make sure that our data is all green.
-      var resultingData = context.getImageData(0, 0, 10, 10);
+      var resultingData = context.getImageData(0.0, 0.0, 10.0, 10.0);
       expect(resultingData.data, expectedData.data);
     });
 
     test('putImageData throws with wrong number of arguments', () {
-      ImageData expectedData = context.getImageData(0, 0, 10, 10);
+      ImageData expectedData = context.getImageData(0.0, 0.0, 10.0, 10.0);
 
       // TODO(antonm): in Dartium ArgumentError should be thrown too.
-      expect(() => context.putImageData(expectedData, 0, 0, 1),
+      expect(() => context.putImageData(expectedData, 0.0, 0.0, 1.0),
         throws);
-      expect(() => context.putImageData(expectedData, 0, 0, 1, 1),
+      expect(() => context.putImageData(expectedData, 0.0, 0.0, 1.0, 1.0),
         throws);
-      expect(() => context.putImageData(expectedData, 0, 0, 1, 1, 5),
+      expect(() => context.putImageData(expectedData, 0.0, 0.0, 1.0, 1.0, 5.0),
         throws);
     });
   });
 
   group('arc', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
 
     test('default arc should be clockwise', () {
       context.beginPath();
-      final r = 10;
+      final r = 10.0;
 
       // Center of arc.
-      final cx = 20;
-      final cy = 20;
+      final cx = 20.0;
+      final cy = 20.0;
       // Arc centered at (20, 20) with radius 10 will go clockwise
       // from (20 + r, 20) to (20, 20 + r), which is 1/4 of a circle.
-      context.arc(cx, cy, r, 0, PI/2);
+      context.arc(cx, cy, r, 0.0, PI/2);
 
       context.strokeStyle = 'green';
-      context.lineWidth = 2;
+      context.lineWidth = 2.0;
       context.stroke();
 
       // Center should not be filled.
       expectPixelUnfilled(cx, cy);
 
       // (cx + r, cy) should be filled.
       expectPixelFilled(cx + r, cy, true);
       // (cx, cy + r) should be filled.
       expectPixelFilled(cx, cy + r, true);
       // (cx - r, cy) should be empty.
       expectPixelFilled(cx - r, cy, false);
       // (cx, cy - r) should be empty.
       expectPixelFilled(cx, cy - r, false);
 
       // (cx + r/SQRT2, cy + r/SQRT2) should be filled.
       expectPixelFilled((cx + r/SQRT2).toInt(), (cy + r/SQRT2).toInt(), true);
 
       // (cx - r/SQRT2, cy - r/SQRT2) should be empty.
       expectPixelFilled((cx - r/SQRT2).toInt(), (cy + r/SQRT2).toInt(), false);
 
       // (cx + r/SQRT2, cy + r/SQRT2) should be empty.
       expectPixelFilled((cx - r/SQRT2).toInt(), (cy - r/SQRT2).toInt(), false);
 
       // (cx - r/SQRT2, cy - r/SQRT2) should be empty.
       expectPixelFilled((cx + r/SQRT2).toInt(), (cy - r/SQRT2).toInt(), false);
     });
 
     test('arc anticlockwise', () {
       context.beginPath();
-      final r = 10;
+      final r = 10.0;
 
       // Center of arc.
-      final cx = 20;
-      final cy = 20;
+      final cx = 20.0;
+      final cy = 20.0;
       // Arc centered at (20, 20) with radius 10 will go anticlockwise
       // from (20 + r, 20) to (20, 20 + r), which is 3/4 of a circle.
       // Because of the way arc work, when going anti-clockwise, the end points
       // are not included, so small values are added to radius to make a little
       // more than a 3/4 circle.
       context.arc(cx, cy, r, .1, PI/2 - .1, true);
 
       context.strokeStyle = 'green';
-      context.lineWidth = 2;
+      context.lineWidth = 2.0;
       context.stroke();
 
       // Center should not be filled.
       expectPixelUnfilled(cx, cy);
 
       // (cx + r, cy) should be filled.
       expectPixelFilled(cx + r, cy, true);
       // (cx, cy + r) should be filled.
       expectPixelFilled(cx, cy + r, true);
       // (cx - r, cy) should be filled.
@@ skipping 17 matching lines @@
 
   group('drawImage_image_element', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
     // Draw an image to the canvas from an image element.
     test('with 3 params', () {
       var dataUrl = otherCanvas.toDataUrl('image/gif');
       var img = new ImageElement();
 
       img.onLoad.listen(expectAsync1((_) {
-        context.drawImage(img, 50, 50);
+        context.drawImage(img, 50.0, 50.0);
 
         expectPixelFilled(50, 50);
         expectPixelFilled(55, 55);
         expectPixelFilled(59, 59);
         expectPixelUnfilled(60, 60);
         expectPixelUnfilled(0, 0);
         expectPixelUnfilled(70, 70);
       }));
       img.onError.listen((_) {
         guardAsync(() {
@@ skipping 24 matching lines @@
         guardAsync(() {
           fail('URL failed to load.');
         });
       });
       img.src = dataUrl;
     });
 
     // Draw an image to the canvas from an image element and scale it.
     test('with 9 params', () {
       otherContext.fillStyle = "blue";
-      otherContext.fillRect(5, 5, 5, 5);
+      otherContext.fillRect(5.0, 5.0, 5.0, 5.0);
       var dataUrl = otherCanvas.toDataUrl('image/gif');
       var img = new ImageElement();
 
       img.onLoad.listen(expectAsync1((_) {
         // This will take a 6x6 square from the first canvas from position 2,2
         // and then scale it to a 20x20 square and place it to the second
         // canvas at 50,50.
         context.drawImageToRect(img, new Rect(50, 50, 20, 20),
           sourceRect: new Rect(2, 2, 6, 6));
 
@@ skipping 77 matching lines @@
       'W5khoVWX1ZQOIOBASPjg4QCYloA4AEAAAAAAAASsIEIuoEIVLCBCFS6gQhUsoEDH0O2d'
       'QEAAAAAAABZ54EAo72BAACA8AIAnQEqCAAIAABHCIWFiIWEiAICAnWqA/gD+gINTRgA/'
       'v0hRf/kb+PnRv/I4//8WE8DijI//FRAo5WBACgAsQEAARAQABgAGFgv9AAIAAAcU7trA'
       'QAAAAAAAA67jLOBALeH94EB8YIBfw==';
   group('drawImage_video_element', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
 
     test('with 3 params', () {
       video.onCanPlay.listen(expectAsync1((_) {
-        context.drawImage(video, 50, 50);
+        context.drawImage(video, 50.0, 50.0);
 
         expectPixelFilled(50, 50);
         expectPixelFilled(54, 54);
         expectPixelFilled(57, 57);
         expectPixelUnfilled(58, 58);
         expectPixelUnfilled(0, 0);
         expectPixelUnfilled(70, 70);
       }));
 
       video.onError.listen((_) {
@@ skipping 111 matching lines @@
       }
     });
   });
 
   group('drawImage_canvas_element', () {
     setUp(setupFunc);
     tearDown(tearDownFunc);
 
     test('with 3 params', () {
       // Draw an image to the canvas from a canvas element.
-      context.drawImage(otherCanvas, 50, 50);
+      context.drawImage(otherCanvas, 50.0, 50.0);
 
       expectPixelFilled(50, 50);
       expectPixelFilled(55, 55);
       expectPixelFilled(59, 59);
       expectPixelUnfilled(60, 60);
       expectPixelUnfilled(0, 0);
       expectPixelUnfilled(70, 70);
     });
     test('with 5 params', () {
       // Draw an image to the canvas from a canvas element.
       context.drawImageToRect(otherCanvas, new Rect(50, 50, 20, 20));
 
       expectPixelFilled(50, 50);
       expectPixelFilled(55, 55);
       expectPixelFilled(59, 59);
       expectPixelFilled(60, 60);
       expectPixelFilled(69, 69);
       expectPixelUnfilled(70, 70);
       expectPixelUnfilled(0, 0);
       expectPixelUnfilled(80, 80);
     });
     test('with 9 params', () {
       // Draw an image to the canvas from a canvas element.
       otherContext.fillStyle = "blue";
-      otherContext.fillRect(5, 5, 5, 5);
+      otherContext.fillRect(5.0, 5.0, 5.0, 5.0);
       context.drawImageToRect(otherCanvas, new Rect(50, 50, 20, 20),
           sourceRect: new Rect(2, 2, 6, 6));
 
       checkPixel(readPixel(50, 50), [255, 0, 0, 255]);
       checkPixel(readPixel(55, 55), [255, 0, 0, 255]);
       checkPixel(readPixel(60, 50), [255, 0, 0, 255]);
       checkPixel(readPixel(65, 65), [0, 0, 255, 255]);
       checkPixel(readPixel(69, 69), [0, 0, 255, 255]);
       expectPixelFilled(50, 50);
       expectPixelFilled(55, 55);
       expectPixelFilled(59, 59);
       expectPixelFilled(60, 60);
       expectPixelFilled(69, 69);
       expectPixelUnfilled(70, 70);
       expectPixelUnfilled(0, 0);
       expectPixelUnfilled(80, 80);
     });
 
     test('createImageData', () {
-      var imageData = context.createImageData(15, 15);
+      var imageData = context.createImageData(15.0, 15.0);
       expect(imageData.width, 15);
       expect(imageData.height, 15);
 
       var other = context.createImageDataFromImageData(imageData);
       expect(other.width, 15);
       expect(other.height, 15);
     });
   });
 }