| Index: sdk/lib/html/dartium/html_dartium.dart
|
| diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
|
| index aa47bcbefec71e885c63f8fb8b2671b512edf9ce..83a4816309f95c07c8f249b7f54aa74252556656 100644
|
| --- a/sdk/lib/html/dartium/html_dartium.dart
|
| +++ b/sdk/lib/html/dartium/html_dartium.dart
|
| @@ -39131,6 +39131,84 @@ class WheelEvent extends MouseEvent {
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
|
|
| +typedef void RemoveFrameRequestMapping(int id);
|
| +
|
| +/**
|
| + * The task object representing animation-frame requests.
|
| + *
|
| + * For historical reasons, [Window.requestAnimationFrame] returns an integer
|
| + * to users. However, zone tasks must be unique objects, and an integer can
|
| + * therefore not be used as task object. The [Window] class thus keeps a mapping
|
| + * from the integer ID to the corresponding task object. All zone related
|
| + * operations work on this task object, whereas users of
|
| + * [Window.requestAnimationFrame] only see the integer ID.
|
| + *
|
| + * Since this mapping takes up space, it must be removed as soon as the
|
| + * animation-frame task has triggered. The default implementation does this
|
| + * automatically, but intercepted implementations of `requestAnimationFrame`
|
| + * must ensure to call the [AnimationFrameTask.removeMapping]
|
| + * function that is provided in the task specification.
|
| + */
|
| +abstract class AnimationFrameTask {
|
| + /** The ID that is returned to users. */
|
| + int get id;
|
| +
|
| + /** The function that is invoked when the user cancels the request. */
|
| + void cancel(Window window);
|
| +
|
| + /** The zone in which the task should run. */
|
| + Zone get zone;
|
| +
|
| + /**
|
| + * Maps animation-frame request IDs to their task objects.
|
| + */
|
| + static final Map<int, _AnimationFrameTask> _tasks = {};
|
| +
|
| + /**
|
| + * The function that should be invoked by user-implemented animation-frame
|
| + * tasks, before running [callback].
|
| + *
|
| + * See [AnimationFrameTask].
|
| + */
|
| + static void removeMapping(int id) {
|
| + _tasks.remove(id);
|
| + }
|
| +}
|
| +
|
| +class _AnimationFrameTask implements AnimationFrameTask {
|
| + final int id;
|
| + final Zone zone;
|
| + final FrameRequestCallback _callback;
|
| +
|
| + _AnimationFrameTask(this.id, this.zone, this._callback);
|
| +
|
| + void cancel(Window window) {
|
| + window._cancelAnimationFrame(this.id);
|
| + }
|
| +}
|
| +
|
| +/**
|
| + * The task specification for an animation-frame request.
|
| + */
|
| +class AnimationFrameRequestSpecification implements TaskSpecification {
|
| + /**
|
| + * The window on which [Window.requestAnimationFrame] was invoked.
|
| + */
|
| + final Window window;
|
| +
|
| + /**
|
| + * The callback that should be executed when the animation-frame is ready.
|
| + *
|
| + * Note that the callback hasn't been registered in any zone yet.
|
| + */
|
| + final FrameRequestCallback callback;
|
| +
|
| + AnimationFrameRequestSpecification(this.window, this.callback);
|
| +
|
| + String get name => "dart.html.request-animation-frame";
|
| + bool get isOneShot => true;
|
| +}
|
| +
|
| @DocsEditable()
|
| /**
|
| * Top-level container for the current browser tab or window.
|
| @@ -39185,9 +39263,7 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo
|
| */
|
| Future<num> get animationFrame {
|
| var completer = new Completer<num>.sync();
|
| - requestAnimationFrame((time) {
|
| - completer.complete(time);
|
| - });
|
| + requestAnimationFrame(completer.complete);
|
| return completer.future;
|
| }
|
|
|
|
|