Add tasks to zones.

sdk/lib/async/timer.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.
 
 part of dart.async;
 
 /**
  * A count-down timer that can be configured to fire once or repeatedly.
  *
  * The timer counts down from the specified duration to 0.
@@ skipping 29 matching lines @@
   /**
    * Creates a new timer.
    *
    * The [callback] function is invoked after the given [duration].
    *
    */
   factory Timer(Duration duration, void callback()) {
     if (Zone.current == Zone.ROOT) {
       // No need to bind the callback. We know that the root's timer will
       // be invoked in the root zone.
-      return Zone.current.createTimer(duration, callback);
+      return Timer._createTimer(duration, callback);
     }
-    return Zone.current.createTimer(
-        duration, Zone.current.bindCallback(callback, runGuarded: true));
+    SingleShotTimerTaskSpecification specification =
+        new SingleShotTimerTaskSpecification(duration, callback);
+    Task task =
+        Zone.current.createTask(specification, _createSingleShotTimerTask);
+    return new _TimerTaskWrapper(task);
   }
 
   /**
    * Creates a new repeating timer.
    *
    * The [callback] is invoked repeatedly with [duration] intervals until
    * canceled with the [cancel] function.
    *
    * The exact timing depends on the underlying timer implementation.
    * No more than `n` callbacks will be made in `duration * n` time,
    * but the time between two consecutive callbacks
    * can be shorter and longer than `duration`.
    *
    * In particular, an implementation may schedule the next callback, e.g.,
    * a `duration` after either when the previous callback ended,
    * when the previous callback started, or when the previous callback was
    * scheduled for - even if the actual callback was delayed.
    */
   factory Timer.periodic(Duration duration,
-                         void callback(Timer timer)) {
+      void callback(Timer timer)) {
     if (Zone.current == Zone.ROOT) {
       // No need to bind the callback. We know that the root's timer will
       // be invoked in the root zone.
-      return Zone.current.createPeriodicTimer(duration, callback);
+      return Timer._createPeriodicTimer(duration, callback);
     }
-    return Zone.current.createPeriodicTimer(
-        duration, Zone.current.bindUnaryCallback(callback, runGuarded: true));
+    PeriodicTimerTaskSpecification specification =
+        new PeriodicTimerTaskSpecification(duration, callback);
+    Task task =
+        Zone.current.createTask(specification, _createPeriodicTimerTask);
+    return new _TimerTaskWrapper(task);
+  }
+
+  static TimerTask _createSingleShotTimerTask(
+      SingleShotTimerTaskSpecification specification, Zone zone) {
+    ZoneCallback registeredCallback =
+        zone.registerCallback(specification.callback);
+
+    TimerTask timerTask;
+
+    Timer timer = Timer._createTimer(specification.duration, () {
+      timerTask.zone.runTask(timerTask, null, _runSingleShotCallback);
+    });
+
+    timerTask = new SingleShotTimerTask(
+        timer, registeredCallback, specification, zone);
+    return timerTask;
+  }
+
+  static void _runSingleShotCallback(
+      SingleShotTimerTask timerTask, Object _, Zone zone) {
+    timerTask.callback();
+  }
+
+  static TimerTask _createPeriodicTimerTask(
+      PeriodicTimerTaskSpecification specification, Zone zone) {
+    ZoneUnaryCallback registeredCallback =
+        zone.registerUnaryCallback(specification.callback);
+
+    TimerTask timerTask;
+
+    Timer timer = Timer._createPeriodicTimer(specification.duration, (Timer _) {
+      timerTask.zone.runTask(timerTask, null, _runPeriodicCallback);
+    });
+
+    timerTask = new PeriodicTimerTask(
+        timer, registeredCallback, specification, zone);
+    return timerTask;
+  }
+
+  static void _runPeriodicCallback(
+      PeriodicTimerTask timerTask, Object _, Zone zone) {
+    // TODO(floitsch): cache the TimerWrapper?
+    timerTask.callback(new _TimerTaskWrapper(timerTask));
   }
 
   /**
    * Runs the given [callback] asynchronously as soon as possible.
    *
    * This function is equivalent to `new Timer(Duration.ZERO, callback)`.
    */
   static void run(void callback()) {
     new Timer(Duration.ZERO, callback);
   }
@@ skipping 11 matching lines @@
    *
    * A periodic timer is active if it has not been canceled.
    */
   bool get isActive;
 
   external static Timer _createTimer(Duration duration, void callback());
   external static Timer _createPeriodicTimer(Duration duration,
                                              void callback(Timer timer));
 }