| 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 a8f6e5696ea82a9a6664c44da0c6f1a64d8506e4..19395c473387b6c0e7d16d943639917bb3005f99 100644
|
| --- a/sdk/lib/html/dartium/html_dartium.dart
|
| +++ b/sdk/lib/html/dartium/html_dartium.dart
|
| @@ -28964,13 +28964,13 @@ class Url extends NativeFieldWrapperClass2 implements UrlUtils {
|
| if ((blob_OR_source_OR_stream is Blob || blob_OR_source_OR_stream == null)) {
|
| return _createObjectURL_1(blob_OR_source_OR_stream);
|
| }
|
| - if ((blob_OR_source_OR_stream is MediaStream || blob_OR_source_OR_stream == null)) {
|
| + if ((blob_OR_source_OR_stream is MediaSource || blob_OR_source_OR_stream == null)) {
|
| return _createObjectURL_2(blob_OR_source_OR_stream);
|
| }
|
| - if ((blob_OR_source_OR_stream is MediaSource || blob_OR_source_OR_stream == null)) {
|
| + if ((blob_OR_source_OR_stream is _WebKitMediaSource || blob_OR_source_OR_stream == null)) {
|
| return _createObjectURL_3(blob_OR_source_OR_stream);
|
| }
|
| - if ((blob_OR_source_OR_stream is _WebKitMediaSource || blob_OR_source_OR_stream == null)) {
|
| + if ((blob_OR_source_OR_stream is MediaStream || blob_OR_source_OR_stream == null)) {
|
| return _createObjectURL_4(blob_OR_source_OR_stream);
|
| }
|
| throw new ArgumentError("Incorrect number or type of arguments");
|
| @@ -35098,13 +35098,14 @@ class _EventStreamSubscription<T extends Event> extends StreamSubscription<T> {
|
| _tryResume();
|
| }
|
|
|
| - void cancel() {
|
| - if (_canceled) return;
|
| + Future cancel() {
|
| + if (_canceled) return null;
|
|
|
| _unlisten();
|
| // Clear out the target to indicate this is complete.
|
| _target = null;
|
| _onData = null;
|
| + return null;
|
| }
|
|
|
| bool get _canceled => _target == null;
|
| @@ -36731,7 +36732,7 @@ class _KeyboardEventHandler extends EventStreamProvider<KeyEvent> {
|
| * KeyboardEvent controller.
|
| */
|
| _KeyboardEventHandler(this._type): super(_EVENT_TYPE),
|
| - _stream = new _CustomKeyEventStreamImpl('event');
|
| + _stream = new _CustomKeyEventStreamImpl('event'), _target = null;
|
|
|
| /**
|
| * Hook up all event listeners under the covers so we can estimate keycodes
|
| @@ -38522,7 +38523,7 @@ class _Utils {
|
| // TODO(vsm): Move these checks into native code.
|
| ClassMirror cls = reflectClass(type);
|
| if (_isBuiltinType(cls)) {
|
| - throw new UnsupportedError("Invalid custom element from $libName.");
|
| + throw new UnsupportedError("Invalid custom element from ${cls.owner.uri}.");
|
| }
|
| var className = MirrorSystem.getName(cls.simpleName);
|
| var createdConstructor = cls.declarations[new Symbol('$className.created')];
|
| @@ -38629,6 +38630,9 @@ class _DOMStringMap extends NativeFieldWrapperClass2 implements Map<String, Stri
|
| int get length => Maps.length(this);
|
| bool get isEmpty => Maps.isEmpty(this);
|
| bool get isNotEmpty => Maps.isNotEmpty(this);
|
| + void addAll(Map<String, String> other) {
|
| + other.forEach((key, value) => this[key] = value);
|
| + }
|
| }
|
|
|
| final _printClosure = window.console.log;
|
|
|