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

Unified Diff: sdk/lib/_internal/compiler/implementation/lib/async_patch.dart

Issue 12342014: Remove deprecated ms arguments for Timer and Future. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/compiler/implementation/lib/async_patch.dart
diff --git a/sdk/lib/_internal/compiler/implementation/lib/async_patch.dart b/sdk/lib/_internal/compiler/implementation/lib/async_patch.dart
index cd63a24d691ac2fb2dab85521dc25eb4623d38df..ade4c9955cffabd6c993b61c16995070b429e3f8 100644
--- a/sdk/lib/_internal/compiler/implementation/lib/async_patch.dart
+++ b/sdk/lib/_internal/compiler/implementation/lib/async_patch.dart
@@ -7,34 +7,15 @@
import 'dart:_isolate_helper' show IsolateNatives, TimerImpl;
import 'dart:_foreign_helper' show JS, DART_CLOSURE_TO_JS;
-typedef void _TimerCallback0();
-typedef void _TimerCallback1(Timer timer);
-
patch class Timer {
- patch factory Timer(var duration, var callback) {
- // TODO(floitsch): remove these checks when we remove the deprecated
- // millisecond argument and the 1-argument callback. Also remove the
- // int-test below.
- if (callback is! _TimerCallback0 && callback is! _TimerCallback1) {
- throw new ArgumentError(callback);
- }
- int milliseconds = duration is int ? duration : duration.inMilliseconds;
+ patch factory Timer(Duration duration, void callback()) {
+ int milliseconds = duration.inMilliseconds;
if (milliseconds < 0) milliseconds = 0;
- Timer timer;
- _TimerCallback0 zeroArgumentCallback =
- callback is _TimerCallback0 ? callback : () => callback(timer);
- timer = new TimerImpl(milliseconds, zeroArgumentCallback);
- return timer;
+ return new TimerImpl(milliseconds, callback);
}
- /**
- * Creates a new repeating timer. The [callback] is invoked every
- * [milliseconds] millisecond until cancelled.
- */
- patch factory Timer.repeating(var duration, void callback(Timer timer)) {
- // TODO(floitsch): remove this check when we remove the deprecated
- // millisecond argument.
- int milliseconds = duration is int ? duration : duration.inMilliseconds;
+ patch factory Timer.repeating(Duration duration, void callback(Timer timer)) {
+ int milliseconds = duration.inMilliseconds;
if (milliseconds < 0) milliseconds = 0;
return new TimerImpl.repeating(milliseconds, callback);
}
@@ -78,7 +59,7 @@ Future<bool> _load(String libraryName, String uri) {
JS('', '#.addEventListener("load", #, false)', script, onLoad);
JS('', 'document.body.appendChild(#)', script);
} else if (JS('String', 'typeof load') == 'function') {
- new Timer(0, (_) {
+ Timer.run(() {
JS('void', 'load(#)', uri);
completer.complete(true);
});

Powered by Google App Engine
This is Rietveld 408576698