Revert "Don't call _ensureRequestAnimationFrame in Dartium."

tools/dom/templates/html/impl/impl_Window.darttemplate

 // 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 $LIBRARYNAME;
 
 @DocsEditable()
 $if DART2JS
 $(ANNOTATIONS)@Native("Window,DOMWindow")
 $(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS {
@@ skipping 78 matching lines @@
   set location(value) {
     _location = value;
   }
 
   // Native getter and setter to access raw Location object.
   dynamic get _location => JS('Location|Null', '#.location', this);
   set _location(value) {
     JS('void', '#.location = #', this, value);
   }
 
-$endif
-
   /**
    * Called to draw an animation frame and then request the window to repaint
    * after [callback] has finished (creating the animation).
    *
    * Use this method only if you need to later call [cancelAnimationFrame]. If
    * not, the preferred Dart idiom is to set animation frames by calling
    * [animationFrame], which returns a Future.
    *
    * Returns a non-zero valued integer to represent the request id for this
    * request. This value only needs to be saved if you intend to call
    * [cancelAnimationFrame] so you can specify the particular animation to
    * cancel.
    *
    * Note: The supplied [callback] needs to call [requestAnimationFrame] again
    * for the animation to continue.
    */
   @DomName('Window.requestAnimationFrame')
   int requestAnimationFrame(FrameRequestCallback callback) {
-$if DART2JS
     _ensureRequestAnimationFrame();
-$endif
     return _requestAnimationFrame(_wrapZone/*<num, dynamic>*/(callback));
   }
 
   /**
    * Cancels an animation frame request.
    *
    * ## Other resources
    *
    * * [Window.cancelAnimationFrame](https://developer.mozilla.org/en-US/docs/Web/API/Window.cancelAnimationFrame)
    *   from MDN.
    */
-  @DomName('Window.cancelAnimationFrame')
   void cancelAnimationFrame(int id) {
-$if DART2JS
     _ensureRequestAnimationFrame();
-$endif
     _cancelAnimationFrame(id);
   }
 
-$if DART2JS
   @JSName('requestAnimationFrame')
   int _requestAnimationFrame(FrameRequestCallback callback) native;
 
   @JSName('cancelAnimationFrame')
   void _cancelAnimationFrame(int id) native;
 
   _ensureRequestAnimationFrame() {
     if (JS('bool',
            '!!(#.requestAnimationFrame && #.cancelAnimationFrame)', this, this))
       return;
@@ skipping 30 matching lines @@
   @SupportedBrowser(SupportedBrowser.IE, '10.0')
   @Experimental()
   IdbFactory get indexedDB =>
       JS('IdbFactory|Null',  // If not supported, returns null.
          '#.indexedDB || #.webkitIndexedDB || #.mozIndexedDB',
          this, this, this);
 
   /// The debugging console for this window.
   @DomName('Window.console')
   Console get console => Console._safeConsole;
+
+$else
+  /**
+   * Called to draw an animation frame and then request the window to repaint
+   * after [callback] has finished (creating the animation).
+   *
+   * Use this method only if you need to later call [cancelAnimationFrame]. If
+   * not, the preferred Dart idiom is to set animation frames by calling
+   * [animationFrame], which returns a Future.
+   *
+   * Returns a non-zero valued integer to represent the request id for this
+   * request. This value only needs to be saved if you intend to call
+   * [cancelAnimationFrame] so you can specify the particular animation to
+   * cancel.
+   *
+   * Note: The supplied [callback] needs to call [requestAnimationFrame] again
+   * for the animation to continue.
+   */
+  @DomName('Window.requestAnimationFrame')
+  int requestAnimationFrame(FrameRequestCallback callback) {
+    return _requestAnimationFrame(_wrapZone(callback));
+  }
 $endif
 
   /**
    * Access a sandboxed file system of the specified `size`. If `persistent` is
    * true, the application will request permission from the user to create
    * lasting storage. This storage cannot be freed without the user's
    * permission. Returns a [Future] whose value stores a reference to the
    * sandboxed file system for use. Because the file system is sandboxed,
    * applications cannot access file systems created in other web pages.
    */
@@ skipping 159 matching lines @@
       {bool useCapture: false}) {
 $if DART2JS
     // Specify the generic type for _ElementEventStreamImpl only in dart2js to
     // avoid checked mode errors in dartium.
     return new _ElementListEventStreamImpl<BeforeUnloadEvent>(e, _eventType, useCapture);
 $else
     return new _ElementListEventStreamImpl(e, _eventType, useCapture);
 $endif
   }
 }