Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: sdk/lib/html/dart2js/html_dart2js.dart

Issue 15138002: Added tests to previously broken functionality and added null checks. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /// The Dart HTML library. 1 /// The Dart HTML library.
2 library dart.dom.html; 2 library dart.dom.html;
3 3
4 import 'dart:async'; 4 import 'dart:async';
5 import 'dart:collection'; 5 import 'dart:collection';
6 import 'dart:_collection-dev' hide Symbol; 6 import 'dart:_collection-dev' hide Symbol;
7 import 'dart:html_common'; 7 import 'dart:html_common';
8 import 'dart:indexed_db'; 8 import 'dart:indexed_db';
9 import 'dart:isolate'; 9 import 'dart:isolate';
10 import 'dart:json' as json; 10 import 'dart:json' as json;
(...skipping 1185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 void moveTo(num x, num y) native; 1196 void moveTo(num x, num y) native;
1197 1197
1198 @DomName('CanvasRenderingContext2D.putImageData') 1198 @DomName('CanvasRenderingContext2D.putImageData')
1199 @DocsEditable 1199 @DocsEditable
1200 void putImageData(ImageData imagedata, num dx, num dy, [num dirtyX, num dirtyY , num dirtyWidth, num dirtyHeight]) { 1200 void putImageData(ImageData imagedata, num dx, num dy, [num dirtyX, num dirtyY , num dirtyWidth, num dirtyHeight]) {
1201 if (!?dirtyX && !?dirtyY && !?dirtyWidth && !?dirtyHeight) { 1201 if (!?dirtyX && !?dirtyY && !?dirtyWidth && !?dirtyHeight) {
1202 var imagedata_1 = _convertDartToNative_ImageData(imagedata); 1202 var imagedata_1 = _convertDartToNative_ImageData(imagedata);
1203 _putImageData_1(imagedata_1, dx, dy); 1203 _putImageData_1(imagedata_1, dx, dy);
1204 return; 1204 return;
1205 } 1205 }
1206 var imagedata_2 = _convertDartToNative_ImageData(imagedata); 1206 if (dirtyHeight != null && dirtyWidth != null && dirtyY != null && dirtyX != null) {
1207 _putImageData_2(imagedata_2, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight ); 1207 var imagedata_2 = _convertDartToNative_ImageData(imagedata);
1208 return; 1208 _putImageData_2(imagedata_2, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeig ht);
1209 return;
1210 }
1209 throw new ArgumentError("Incorrect number or type of arguments"); 1211 throw new ArgumentError("Incorrect number or type of arguments");
1210 } 1212 }
1211 @JSName('putImageData') 1213 @JSName('putImageData')
1212 @DomName('CanvasRenderingContext2D.putImageData') 1214 @DomName('CanvasRenderingContext2D.putImageData')
1213 @DocsEditable 1215 @DocsEditable
1214 void _putImageData_1(imagedata, dx, dy) native; 1216 void _putImageData_1(imagedata, dx, dy) native;
1215 @JSName('putImageData') 1217 @JSName('putImageData')
1216 @DomName('CanvasRenderingContext2D.putImageData') 1218 @DomName('CanvasRenderingContext2D.putImageData')
1217 @DocsEditable 1219 @DocsEditable
1218 void _putImageData_2(imagedata, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeigh t) native; 1220 void _putImageData_2(imagedata, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeigh t) native;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 @DocsEditable 1293 @DocsEditable
1292 @SupportedBrowser(SupportedBrowser.CHROME) 1294 @SupportedBrowser(SupportedBrowser.CHROME)
1293 @SupportedBrowser(SupportedBrowser.SAFARI) 1295 @SupportedBrowser(SupportedBrowser.SAFARI)
1294 @Experimental 1296 @Experimental
1295 void putImageDataHD(ImageData imagedata, num dx, num dy, [num dirtyX, num dirt yY, num dirtyWidth, num dirtyHeight]) { 1297 void putImageDataHD(ImageData imagedata, num dx, num dy, [num dirtyX, num dirt yY, num dirtyWidth, num dirtyHeight]) {
1296 if (!?dirtyX && !?dirtyY && !?dirtyWidth && !?dirtyHeight) { 1298 if (!?dirtyX && !?dirtyY && !?dirtyWidth && !?dirtyHeight) {
1297 var imagedata_1 = _convertDartToNative_ImageData(imagedata); 1299 var imagedata_1 = _convertDartToNative_ImageData(imagedata);
1298 _putImageDataHD_1(imagedata_1, dx, dy); 1300 _putImageDataHD_1(imagedata_1, dx, dy);
1299 return; 1301 return;
1300 } 1302 }
1301 var imagedata_2 = _convertDartToNative_ImageData(imagedata); 1303 if (dirtyHeight != null && dirtyWidth != null && dirtyY != null && dirtyX != null) {
1302 _putImageDataHD_2(imagedata_2, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeig ht); 1304 var imagedata_2 = _convertDartToNative_ImageData(imagedata);
1303 return; 1305 _putImageDataHD_2(imagedata_2, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHe ight);
1306 return;
1307 }
1304 throw new ArgumentError("Incorrect number or type of arguments"); 1308 throw new ArgumentError("Incorrect number or type of arguments");
1305 } 1309 }
1306 @JSName('webkitPutImageDataHD') 1310 @JSName('webkitPutImageDataHD')
1307 @DomName('CanvasRenderingContext2D.webkitPutImageDataHD') 1311 @DomName('CanvasRenderingContext2D.webkitPutImageDataHD')
1308 @DocsEditable 1312 @DocsEditable
1309 @SupportedBrowser(SupportedBrowser.CHROME) 1313 @SupportedBrowser(SupportedBrowser.CHROME)
1310 @SupportedBrowser(SupportedBrowser.SAFARI) 1314 @SupportedBrowser(SupportedBrowser.SAFARI)
1311 @Experimental 1315 @Experimental
1312 void _putImageDataHD_1(imagedata, dx, dy) native; 1316 void _putImageDataHD_1(imagedata, dx, dy) native;
1313 @JSName('webkitPutImageDataHD') 1317 @JSName('webkitPutImageDataHD')
(...skipping 12326 matching lines...) Expand 10 before | Expand all | Expand 10 after
13640 @DomName('MediaStream.removetrackEvent') 13644 @DomName('MediaStream.removetrackEvent')
13641 @DocsEditable 13645 @DocsEditable
13642 static const EventStreamProvider<Event> removeTrackEvent = const EventStreamPr ovider<Event>('removetrack'); 13646 static const EventStreamProvider<Event> removeTrackEvent = const EventStreamPr ovider<Event>('removetrack');
13643 13647
13644 @DomName('MediaStream.MediaStream') 13648 @DomName('MediaStream.MediaStream')
13645 @DocsEditable 13649 @DocsEditable
13646 factory MediaStream([stream_OR_tracks]) { 13650 factory MediaStream([stream_OR_tracks]) {
13647 if (!?stream_OR_tracks) { 13651 if (!?stream_OR_tracks) {
13648 return MediaStream._create_1(); 13652 return MediaStream._create_1();
13649 } 13653 }
13650 if ((stream_OR_tracks is MediaStream || stream_OR_tracks == null)) { 13654 if (stream_OR_tracks is MediaStream && stream_OR_tracks != null) {
13651 return MediaStream._create_2(stream_OR_tracks); 13655 return MediaStream._create_2(stream_OR_tracks);
13652 } 13656 }
13653 if ((stream_OR_tracks is List<MediaStreamTrack> || stream_OR_tracks == null) ) { 13657 if (stream_OR_tracks is List<MediaStreamTrack> && stream_OR_tracks != null) {
13654 return MediaStream._create_3(stream_OR_tracks); 13658 return MediaStream._create_3(stream_OR_tracks);
13655 } 13659 }
13656 throw new ArgumentError("Incorrect number or type of arguments"); 13660 throw new ArgumentError("Incorrect number or type of arguments");
13657 } 13661 }
13658 static MediaStream _create_1() => JS('MediaStream', 'new MediaStream()'); 13662 static MediaStream _create_1() => JS('MediaStream', 'new MediaStream()');
13659 static MediaStream _create_2(stream_OR_tracks) => JS('MediaStream', 'new Media Stream(#)', stream_OR_tracks); 13663 static MediaStream _create_2(stream_OR_tracks) => JS('MediaStream', 'new Media Stream(#)', stream_OR_tracks);
13660 static MediaStream _create_3(stream_OR_tracks) => JS('MediaStream', 'new Media Stream(#)', stream_OR_tracks); 13664 static MediaStream _create_3(stream_OR_tracks) => JS('MediaStream', 'new Media Stream(#)', stream_OR_tracks);
13661 13665
13662 @DomName('MediaStream.ended') 13666 @DomName('MediaStream.ended')
13663 @DocsEditable 13667 @DocsEditable
(...skipping 2364 matching lines...) Expand 10 before | Expand all | Expand 10 after
16028 @DocsEditable 16032 @DocsEditable
16029 @DomName('Path') 16033 @DomName('Path')
16030 class Path native "Path" { 16034 class Path native "Path" {
16031 16035
16032 @DomName('Path.DOMPath') 16036 @DomName('Path.DOMPath')
16033 @DocsEditable 16037 @DocsEditable
16034 factory Path([path_OR_text]) { 16038 factory Path([path_OR_text]) {
16035 if (!?path_OR_text) { 16039 if (!?path_OR_text) {
16036 return Path._create_1(); 16040 return Path._create_1();
16037 } 16041 }
16038 if ((path_OR_text is Path || path_OR_text == null)) { 16042 if (path_OR_text is Path && path_OR_text != null) {
16039 return Path._create_2(path_OR_text); 16043 return Path._create_2(path_OR_text);
16040 } 16044 }
16041 if ((path_OR_text is String || path_OR_text == null)) { 16045 if (path_OR_text is String && path_OR_text != null) {
16042 return Path._create_3(path_OR_text); 16046 return Path._create_3(path_OR_text);
16043 } 16047 }
16044 throw new ArgumentError("Incorrect number or type of arguments"); 16048 throw new ArgumentError("Incorrect number or type of arguments");
16045 } 16049 }
16046 static Path _create_1() => JS('Path', 'new Path()'); 16050 static Path _create_1() => JS('Path', 'new Path()');
16047 static Path _create_2(path_OR_text) => JS('Path', 'new Path(#)', path_OR_text) ; 16051 static Path _create_2(path_OR_text) => JS('Path', 'new Path(#)', path_OR_text) ;
16048 static Path _create_3(path_OR_text) => JS('Path', 'new Path(#)', path_OR_text) ; 16052 static Path _create_3(path_OR_text) => JS('Path', 'new Path(#)', path_OR_text) ;
16049 16053
16050 @DomName('Path.arc') 16054 @DomName('Path.arc')
16051 @DocsEditable 16055 @DocsEditable
(...skipping 4664 matching lines...) Expand 10 before | Expand all | Expand 10 after
20716 @DocsEditable 20720 @DocsEditable
20717 static const EventStreamProvider<MessageEvent> messageEvent = const EventStrea mProvider<MessageEvent>('message'); 20721 static const EventStreamProvider<MessageEvent> messageEvent = const EventStrea mProvider<MessageEvent>('message');
20718 20722
20719 @DomName('WebSocket.openEvent') 20723 @DomName('WebSocket.openEvent')
20720 @DocsEditable 20724 @DocsEditable
20721 static const EventStreamProvider<Event> openEvent = const EventStreamProvider< Event>('open'); 20725 static const EventStreamProvider<Event> openEvent = const EventStreamProvider< Event>('open');
20722 20726
20723 @DomName('WebSocket.WebSocket') 20727 @DomName('WebSocket.WebSocket')
20724 @DocsEditable 20728 @DocsEditable
20725 factory WebSocket(String url, [protocol_OR_protocols]) { 20729 factory WebSocket(String url, [protocol_OR_protocols]) {
20726 if ((url is String || url == null) && !?protocol_OR_protocols) { 20730 if (url is String && !?protocol_OR_protocols) {
20727 return WebSocket._create_1(url); 20731 return WebSocket._create_1(url);
20728 } 20732 }
20729 if ((url is String || url == null) && (protocol_OR_protocols is List<String> || protocol_OR_protocols == null)) { 20733 if (protocol_OR_protocols is List<String> && protocol_OR_protocols != null & & url is String) {
blois 2013/05/13 21:09:16 why are the "url is String" checks here- it's type
Andrei Mouravski 2013/05/14 00:00:53 Because that's what the code does? It was being ch
20730 return WebSocket._create_2(url, protocol_OR_protocols); 20734 return WebSocket._create_2(url, protocol_OR_protocols);
20731 } 20735 }
20732 if ((url is String || url == null) && (protocol_OR_protocols is String || pr otocol_OR_protocols == null)) { 20736 if (protocol_OR_protocols is String && protocol_OR_protocols != null && url is String) {
20733 return WebSocket._create_3(url, protocol_OR_protocols); 20737 return WebSocket._create_3(url, protocol_OR_protocols);
20734 } 20738 }
20735 throw new ArgumentError("Incorrect number or type of arguments"); 20739 throw new ArgumentError("Incorrect number or type of arguments");
20736 } 20740 }
20737 static WebSocket _create_1(url) => JS('WebSocket', 'new WebSocket(#)', url); 20741 static WebSocket _create_1(url) => JS('WebSocket', 'new WebSocket(#)', url);
20738 static WebSocket _create_2(url, protocol_OR_protocols) => JS('WebSocket', 'new WebSocket(#,#)', url, protocol_OR_protocols); 20742 static WebSocket _create_2(url, protocol_OR_protocols) => JS('WebSocket', 'new WebSocket(#,#)', url, protocol_OR_protocols);
20739 static WebSocket _create_3(url, protocol_OR_protocols) => JS('WebSocket', 'new WebSocket(#,#)', url, protocol_OR_protocols); 20743 static WebSocket _create_3(url, protocol_OR_protocols) => JS('WebSocket', 'new WebSocket(#,#)', url, protocol_OR_protocols);
20740 20744
20741 /// Checks if this type is supported on the current platform. 20745 /// Checks if this type is supported on the current platform.
20742 static bool get supported => JS('bool', 'typeof window.WebSocket != "undefined "'); 20746 static bool get supported => JS('bool', 'typeof window.WebSocket != "undefined "');
(...skipping 7208 matching lines...) Expand 10 before | Expand all | Expand 10 after
27951 _position = nextPosition; 27955 _position = nextPosition;
27952 return true; 27956 return true;
27953 } 27957 }
27954 _current = null; 27958 _current = null;
27955 _position = _array.length; 27959 _position = _array.length;
27956 return false; 27960 return false;
27957 } 27961 }
27958 27962
27959 T get current => _current; 27963 T get current => _current;
27960 } 27964 }
OLDNEW
« no previous file with comments | « no previous file | sdk/lib/html/dartium/html_dartium.dart » ('j') | sdk/lib/html/dartium/html_dartium.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698