| Index: sdk/lib/html/dart2js/html_dart2js.dart | 
| diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart | 
| index 3b3087051f058ec95981ee4659fb6fc2c1054d53..5da1bdfb5b877687ba9ba83831c2a3a3588f7590 100644 | 
| --- a/sdk/lib/html/dart2js/html_dart2js.dart | 
| +++ b/sdk/lib/html/dart2js/html_dart2js.dart | 
| @@ -1008,12 +1008,12 @@ class CanvasRenderingContext2D extends CanvasRenderingContext native "*CanvasRen | 
|  | 
| /// @domName CanvasRenderingContext2D.createImageData; @docsEditable true | 
| ImageData createImageData(imagedata_OR_sw, [num sh]) { | 
| -    if ((?imagedata_OR_sw && (imagedata_OR_sw is ImageData || imagedata_OR_sw == null)) && | 
| +    if ((imagedata_OR_sw is ImageData || imagedata_OR_sw == null) && | 
| !?sh) { | 
| var imagedata_1 = _convertDartToNative_ImageData(imagedata_OR_sw); | 
| return _convertNativeToDart_ImageData(_createImageData_1(imagedata_1)); | 
| } | 
| -    if ((?imagedata_OR_sw && (imagedata_OR_sw is num || imagedata_OR_sw == null))) { | 
| +    if ((imagedata_OR_sw is num || imagedata_OR_sw == null)) { | 
| return _convertNativeToDart_ImageData(_createImageData_2(imagedata_OR_sw, sh)); | 
| } | 
| throw new ArgumentError("Incorrect number or type of arguments"); | 
| @@ -19780,11 +19780,11 @@ class WebGLRenderingContext extends CanvasRenderingContext native "*WebGLRenderi | 
|  | 
| /// @domName WebGLRenderingContext.texImage2D; @docsEditable true | 
| void texImage2D(int target, int level, int internalformat, int format_OR_width, int height_OR_type, border_OR_canvas_OR_image_OR_pixels_OR_video, [int format, int type, ArrayBufferView pixels]) { | 
| -    if ((?border_OR_canvas_OR_image_OR_pixels_OR_video && (border_OR_canvas_OR_image_OR_pixels_OR_video is int || border_OR_canvas_OR_image_OR_pixels_OR_video == null))) { | 
| +    if ((border_OR_canvas_OR_image_OR_pixels_OR_video is int || border_OR_canvas_OR_image_OR_pixels_OR_video == null)) { | 
| _texImage2D_1(target, level, internalformat, format_OR_width, height_OR_type, border_OR_canvas_OR_image_OR_pixels_OR_video, format, type, pixels); | 
| return; | 
| } | 
| -    if ((?border_OR_canvas_OR_image_OR_pixels_OR_video && (border_OR_canvas_OR_image_OR_pixels_OR_video is ImageData || border_OR_canvas_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((border_OR_canvas_OR_image_OR_pixels_OR_video is ImageData || border_OR_canvas_OR_image_OR_pixels_OR_video == null) && | 
| !?format && | 
| !?type && | 
| !?pixels) { | 
| @@ -19792,21 +19792,21 @@ class WebGLRenderingContext extends CanvasRenderingContext native "*WebGLRenderi | 
| _texImage2D_2(target, level, internalformat, format_OR_width, height_OR_type, pixels_1); | 
| return; | 
| } | 
| -    if ((?border_OR_canvas_OR_image_OR_pixels_OR_video && (border_OR_canvas_OR_image_OR_pixels_OR_video is ImageElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((border_OR_canvas_OR_image_OR_pixels_OR_video is ImageElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null) && | 
| !?format && | 
| !?type && | 
| !?pixels) { | 
| _texImage2D_3(target, level, internalformat, format_OR_width, height_OR_type, border_OR_canvas_OR_image_OR_pixels_OR_video); | 
| return; | 
| } | 
| -    if ((?border_OR_canvas_OR_image_OR_pixels_OR_video && (border_OR_canvas_OR_image_OR_pixels_OR_video is CanvasElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((border_OR_canvas_OR_image_OR_pixels_OR_video is CanvasElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null) && | 
| !?format && | 
| !?type && | 
| !?pixels) { | 
| _texImage2D_4(target, level, internalformat, format_OR_width, height_OR_type, border_OR_canvas_OR_image_OR_pixels_OR_video); | 
| return; | 
| } | 
| -    if ((?border_OR_canvas_OR_image_OR_pixels_OR_video && (border_OR_canvas_OR_image_OR_pixels_OR_video is VideoElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((border_OR_canvas_OR_image_OR_pixels_OR_video is VideoElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null) && | 
| !?format && | 
| !?type && | 
| !?pixels) { | 
| @@ -19834,30 +19834,30 @@ class WebGLRenderingContext extends CanvasRenderingContext native "*WebGLRenderi | 
|  | 
| /// @domName WebGLRenderingContext.texSubImage2D; @docsEditable true | 
| void texSubImage2D(int target, int level, int xoffset, int yoffset, int format_OR_width, int height_OR_type, canvas_OR_format_OR_image_OR_pixels_OR_video, [int type, ArrayBufferView pixels]) { | 
| -    if ((?canvas_OR_format_OR_image_OR_pixels_OR_video && (canvas_OR_format_OR_image_OR_pixels_OR_video is int || canvas_OR_format_OR_image_OR_pixels_OR_video == null))) { | 
| +    if ((canvas_OR_format_OR_image_OR_pixels_OR_video is int || canvas_OR_format_OR_image_OR_pixels_OR_video == null)) { | 
| _texSubImage2D_1(target, level, xoffset, yoffset, format_OR_width, height_OR_type, canvas_OR_format_OR_image_OR_pixels_OR_video, type, pixels); | 
| return; | 
| } | 
| -    if ((?canvas_OR_format_OR_image_OR_pixels_OR_video && (canvas_OR_format_OR_image_OR_pixels_OR_video is ImageData || canvas_OR_format_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((canvas_OR_format_OR_image_OR_pixels_OR_video is ImageData || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && | 
| !?type && | 
| !?pixels) { | 
| var pixels_1 = _convertDartToNative_ImageData(canvas_OR_format_OR_image_OR_pixels_OR_video); | 
| _texSubImage2D_2(target, level, xoffset, yoffset, format_OR_width, height_OR_type, pixels_1); | 
| return; | 
| } | 
| -    if ((?canvas_OR_format_OR_image_OR_pixels_OR_video && (canvas_OR_format_OR_image_OR_pixels_OR_video is ImageElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((canvas_OR_format_OR_image_OR_pixels_OR_video is ImageElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && | 
| !?type && | 
| !?pixels) { | 
| _texSubImage2D_3(target, level, xoffset, yoffset, format_OR_width, height_OR_type, canvas_OR_format_OR_image_OR_pixels_OR_video); | 
| return; | 
| } | 
| -    if ((?canvas_OR_format_OR_image_OR_pixels_OR_video && (canvas_OR_format_OR_image_OR_pixels_OR_video is CanvasElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((canvas_OR_format_OR_image_OR_pixels_OR_video is CanvasElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && | 
| !?type && | 
| !?pixels) { | 
| _texSubImage2D_4(target, level, xoffset, yoffset, format_OR_width, height_OR_type, canvas_OR_format_OR_image_OR_pixels_OR_video); | 
| return; | 
| } | 
| -    if ((?canvas_OR_format_OR_image_OR_pixels_OR_video && (canvas_OR_format_OR_image_OR_pixels_OR_video is VideoElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null)) && | 
| +    if ((canvas_OR_format_OR_image_OR_pixels_OR_video is VideoElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && | 
| !?type && | 
| !?pixels) { | 
| _texSubImage2D_5(target, level, xoffset, yoffset, format_OR_width, height_OR_type, canvas_OR_format_OR_image_OR_pixels_OR_video); | 
|  |