Chromium Code Reviews| Index: sdk/lib/web_gl/dart2js/web_gl_dart2js.dart |
| diff --git a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart |
| index de46851ff2d9a7c072418b30fd28df2557defffb..37b811c9b31aaee9e104e68d3f540b68787cb1d9 100644 |
| --- a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart |
| +++ b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart |
| @@ -2406,24 +2406,24 @@ class RenderingContext extends CanvasRenderingContext native "WebGLRenderingCont |
| @DomName('WebGLRenderingContext.texImage2D') |
| @DocsEditable |
| 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, TypedData pixels]) { |
|
blois
2013/05/13 21:09:16
Which reminds me, would be great to fix https://co
|
| - if ((border_OR_canvas_OR_image_OR_pixels_OR_video is int || border_OR_canvas_OR_image_OR_pixels_OR_video == null)) { |
| + if (pixels != null && border_OR_canvas_OR_image_OR_pixels_OR_video is int && border_OR_canvas_OR_image_OR_pixels_OR_video != null && height_OR_type != null && format_OR_width != 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 is ImageData || border_OR_canvas_OR_image_OR_pixels_OR_video == null) && !?format && !?type && !?pixels) { |
| + 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) { |
| var pixels_1 = _convertDartToNative_ImageData(border_OR_canvas_OR_image_OR_pixels_OR_video); |
| _texImage2D_2(target, level, internalformat, format_OR_width, height_OR_type, pixels_1); |
| return; |
| } |
| - 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) { |
| + 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 is CanvasElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null) && !?format && !?type && !?pixels) { |
| + 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 is VideoElement || border_OR_canvas_OR_image_OR_pixels_OR_video == null) && !?format && !?type && !?pixels) { |
| + 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) { |
| _texImage2D_5(target, level, internalformat, format_OR_width, height_OR_type, border_OR_canvas_OR_image_OR_pixels_OR_video); |
| return; |
| } |
| @@ -2461,24 +2461,24 @@ class RenderingContext extends CanvasRenderingContext native "WebGLRenderingCont |
| @DomName('WebGLRenderingContext.texSubImage2D') |
| @DocsEditable |
| 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, TypedData pixels]) { |
| - if ((canvas_OR_format_OR_image_OR_pixels_OR_video is int || canvas_OR_format_OR_image_OR_pixels_OR_video == null)) { |
| + if (pixels != null && canvas_OR_format_OR_image_OR_pixels_OR_video is int && height_OR_type != null && format_OR_width != 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 is ImageData || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && !?type && !?pixels) { |
| + 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 is ImageElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && !?type && !?pixels) { |
| + 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 is CanvasElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && !?type && !?pixels) { |
| + 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 is VideoElement || canvas_OR_format_OR_image_OR_pixels_OR_video == null) && !?type && !?pixels) { |
| + 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); |
| return; |
| } |