Merge the Sky Engine changes from the SkyDart branch

sky/tests/resources/run-after-display.sky

Index: sky/tests/resources/run-after-display.sky
diff --git a/sky/tests/resources/run-after-display.sky b/sky/tests/resources/run-after-display.sky
index 4411b6cd59630bc1908fe0fe64131d946eaa9541..f46b941b95716729791fe5672b2364e056d28938 100644
--- a/sky/tests/resources/run-after-display.sky
+++ b/sky/tests/resources/run-after-display.sky
@@ -1,11 +1,14 @@
 <script>
-module.exports = function(callback) {
-    window.requestAnimationFrame(function() {
-        // At this point, only the animate has happened, but no compositing
-        // or layout.  Use a timeout for the callback so that notifyDone
-        // can be called inside of it.
-        // FIXME: we need a better way of waiting for chromium events to happen
-        window.setTimeout(callback);
-    });
-};
+import "dart:async";
+import "dart:sky";
+
+void runAfterDisplay(void callback()) {
+  window.requestAnimationFrame((_) {
+    // At this point, only the animate has happened, but no compositing
+    // or layout.  Use a timeout for the callback so that notifyDone
+    // can be called inside of it.
+    // FIXME: we need a better way of waiting for chromium events to happen
+    new Timer(Duration.ZERO, callback);
+  });
+}
 </script>