Revert "Fixing up Navigator.getUserMedia."

sdk/lib/html/dart2js/html_dart2js.dart

 library html;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:collection-dev';
 import 'dart:html_common';
 import 'dart:indexed_db';
 import 'dart:isolate';
 import 'dart:json' as json;
 import 'dart:math';
@@ skipping 14079 matching lines @@
   @DocsEditable @DomName('MediaSource.endOfStream')
   void endOfStream(String error) native;
 
   @JSName('removeEventListener')
   @DocsEditable @DomName('MediaSource.removeEventListener')
   void $dom_removeEventListener(String type, EventListener listener, [bool useCapture]) native;
 
   @DocsEditable @DomName('MediaSource.removeSourceBuffer')
   void removeSourceBuffer(SourceBuffer buffer) native;
 }
-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
+// 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.
 
 
-/// @domName MediaStream; @docsEditable true
+
 @DocsEditable
 @DomName('MediaStream')
 class MediaStream extends EventTarget native "*MediaStream" {
 
   static const EventStreamProvider<Event> endedEvent = const EventStreamProvider<Event>('ended');
 
   @DocsEditable
   factory MediaStream() => MediaStream._create();
   static MediaStream _create() => JS('MediaStream', 'new MediaStream()');
 
@@ skipping 32 matching lines @@
   List<MediaStreamTrack> getVideoTracks() native;
 
   @JSName('removeEventListener')
   @DocsEditable @DomName('MediaStream.removeEventListener')
   void $dom_removeEventListener(String type, EventListener listener, [bool useCapture]) native;
 
   @DocsEditable @DomName('MediaStream.removeTrack')
   void removeTrack(MediaStreamTrack track) native;
 
   Stream<Event> get onEnded => endedEvent.forTarget(this);
-
-
-  /**
-   * Checks if the MediaStream APIs are supported on the current platform.
-   *
-   * See also:
-   *
-   * * [Navigator.getUserMedia]
-   */
-  static bool get supported =>
-    JS('bool', '''!!(#.getUserMedia || #.webkitGetUserMedia ||
-        #.mozGetUserMedia || #.msGetUserMedia)''',
-        window.navigator,
-        window.navigator,
-        window.navigator,
-        window.navigator);
 }
 
 @DocsEditable
 class MediaStreamEvents extends Events {
   @DocsEditable
   MediaStreamEvents(EventTarget _ptr) : super(_ptr);
 
   @DocsEditable
   EventListenerList get addTrack => this['addtrack'];
 
@@ skipping 864 matching lines @@
 // BSD-style license that can be found in the LICENSE file.
 
 
 @DocsEditable
 @DomName('Navigator')
 class Navigator native "*Navigator" {
 
   @DomName('Navigator.language')
   String get language => JS('String', '#.language || #.userLanguage', this,
       this);
-
-  /**
-   * Gets a stream (video and or audio) from the local computer.
-   *
-   * Use [MediaStream.supported] to check if this is supported by the current
-   * platform.
-   *
-   * Example use:
-   *
-   *     window.navigator.getUserMedia(audio:true, video: true).then((stream) {
-   *       var video = new VideoElement()
-   *         ..autoplay = true
-   *         ..src = Url.createObjectUrl(stream);
-   *       document.body.append(video);
-   *     });
-   *
-   * See also:
-   * * [MediaStream.supported]
-   */
-  @DomName('Navigator.webkitGetUserMedia')
-  @SupportedBrowser(SupportedBrowser.CHROME)
-  @Experimental()
-  Future<LocalMediaStream> getUserMedia({bool audio=false, bool video=false}) {
-    var completer = new Completer<LocalMediaStream>();
-    var options = {
-      'audio': audio,
-      'video': video
-    };
-    _ensureGetUserMedia();
-    this._getUserMedia(convertDartToNative_Dictionary(options),
-      (stream) {
-        completer.complete(stream);
-      },
-      (error) {
-        completer.completeError(error);
-      });
-    return completer.future;
-  }
-
-  _ensureGetUserMedia() {
-    if (JS('bool', '!(#.getUserMedia)', this)) {
-      JS('void', '#.getUserMedia = '
-          '(#.getUserMedia || #.webkitGetUserMedia || #.mozGetUserMedia ||'
-          '#.msGetUserMedia)', this, this, this, this, this);
-    }
-  }
-
-  @JSName('getUserMedia')
-  void _getUserMedia(options, _NavigatorUserMediaSuccessCallback success,
-      _NavigatorUserMediaErrorCallback error) native;
-
-
+  
   @DocsEditable @DomName('Navigator.appCodeName')
   final String appCodeName;
 
   @DocsEditable @DomName('Navigator.appName')
   final String appName;
 
   @DocsEditable @DomName('Navigator.appVersion')
   final String appVersion;
 
   @DocsEditable @DomName('Navigator.cookieEnabled')
@@ skipping 35 matching lines @@
   @DocsEditable @DomName('Navigator.getStorageUpdates')
   void getStorageUpdates() native;
 
   @DocsEditable @DomName('Navigator.javaEnabled')
   bool javaEnabled() native;
 
   @DocsEditable @DomName('Navigator.webkitGetGamepads')
   @Returns('_GamepadList') @Creates('_GamepadList')
   List<Gamepad> webkitGetGamepads() native;
 
+  void webkitGetUserMedia(Map options, NavigatorUserMediaSuccessCallback successCallback, [NavigatorUserMediaErrorCallback errorCallback]) {
+    if (?errorCallback) {
+      var options_1 = convertDartToNative_Dictionary(options);
+      _webkitGetUserMedia_1(options_1, successCallback, errorCallback);
+      return;
+    }
+    var options_2 = convertDartToNative_Dictionary(options);
+    _webkitGetUserMedia_2(options_2, successCallback);
+    return;
+  }
+  @JSName('webkitGetUserMedia')
+  @DocsEditable @DomName('Navigator.webkitGetUserMedia')
+  void _webkitGetUserMedia_1(options, NavigatorUserMediaSuccessCallback successCallback, NavigatorUserMediaErrorCallback errorCallback) native;
+  @JSName('webkitGetUserMedia')
+  @DocsEditable @DomName('Navigator.webkitGetUserMedia')
+  void _webkitGetUserMedia_2(options, NavigatorUserMediaSuccessCallback successCallback) native;
+
 }
 // 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.
 
 
 
 @DocsEditable
 @DomName('NavigatorUserMediaError')
 class NavigatorUserMediaError native "*NavigatorUserMediaError" {
 
   static const int PERMISSION_DENIED = 1;
 
   @DocsEditable @DomName('NavigatorUserMediaError.code')
   final int code;
 }
 // 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.
 
 // WARNING: Do not edit - generated code.
 
 
-typedef void _NavigatorUserMediaErrorCallback(NavigatorUserMediaError error);
+typedef void NavigatorUserMediaErrorCallback(NavigatorUserMediaError error);
 // 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.
 
 // WARNING: Do not edit - generated code.
 
 
-typedef void _NavigatorUserMediaSuccessCallback(LocalMediaStream stream);
+typedef void NavigatorUserMediaSuccessCallback(LocalMediaStream stream);
 // 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.
 
 
 /**
  * Lazy implementation of the child nodes of an element that does not request
  * the actual child nodes of an element until strictly necessary greatly
  * improving performance for the typical cases where it is not required.
  */
@@ skipping 14192 matching lines @@
       _position = nextPosition;
       return true;
     }
     _current = null;
     _position = _array.length;
     return false;
   }
 
   T get current => _current;
 }