sdk/lib/html/dart2js/html_dart2js.dart

Index: sdk/lib/html/dart2js/html_dart2js.dart
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 066b61e898bc065d122296463caa4fd7572edead..a3351ed01796f62ebab3d9fa4c52df689883c171 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -72,12 +72,6 @@ class AbstractWorker extends EventTarget native "*AbstractWorker" {
   @DocsEditable
   static const EventStreamProvider<Event> errorEvent = const EventStreamProvider<Event>('error');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  AbstractWorkerEvents get on =>
-    new AbstractWorkerEvents(this);
-
   @JSName('addEventListener')
   @DomName('AbstractWorker.addEventListener')
   @DocsEditable
@@ -96,16 +90,6 @@ class AbstractWorker extends EventTarget native "*AbstractWorker" {
   @DocsEditable
   Stream<Event> get onError => errorEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class AbstractWorkerEvents extends Events {
-  @DocsEditable
-  AbstractWorkerEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get error => this['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.
@@ -257,12 +241,6 @@ class ApplicationCache extends EventTarget native "*DOMApplicationCache" {
   /// Checks if this type is supported on the current platform.
   static bool get supported => JS('bool', '!!(window.applicationCache)');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  ApplicationCacheEvents get on =>
-    new ApplicationCacheEvents(this);
-
   static const int CHECKING = 2;
 
   static const int DOWNLOADING = 3;
@@ -337,37 +315,6 @@ class ApplicationCache extends EventTarget native "*DOMApplicationCache" {
   @DocsEditable
   Stream<Event> get onUpdateReady => updateReadyEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class ApplicationCacheEvents extends Events {
-  @DocsEditable
-  ApplicationCacheEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get cached => this['cached'];
-
-  @DocsEditable
-  EventListenerList get checking => this['checking'];
-
-  @DocsEditable
-  EventListenerList get downloading => this['downloading'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get noUpdate => this['noupdate'];
-
-  @DocsEditable
-  EventListenerList get obsolete => this['obsolete'];
-
-  @DocsEditable
-  EventListenerList get progress => this['progress'];
-
-  @DocsEditable
-  EventListenerList get updateReady => this['updateready'];
-}
 // 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.
@@ -624,12 +571,6 @@ class BatteryManager extends EventTarget native "*BatteryManager" {
   @DocsEditable
   static const EventStreamProvider<Event> levelChangeEvent = const EventStreamProvider<Event>('levelchange');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  BatteryManagerEvents get on =>
-    new BatteryManagerEvents(this);
-
   @DomName('BatteryManager.charging')
   @DocsEditable
   final bool charging;
@@ -676,25 +617,6 @@ class BatteryManager extends EventTarget native "*BatteryManager" {
   @DocsEditable
   Stream<Event> get onLevelChange => levelChangeEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class BatteryManagerEvents extends Events {
-  @DocsEditable
-  BatteryManagerEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get chargingChange => this['chargingchange'];
-
-  @DocsEditable
-  EventListenerList get chargingTimeChange => this['chargingtimechange'];
-
-  @DocsEditable
-  EventListenerList get dischargingTimeChange => this['dischargingtimechange'];
-
-  @DocsEditable
-  EventListenerList get levelChange => this['levelchange'];
-}
 // 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.
@@ -813,12 +735,6 @@ class BodyElement extends Element native "*HTMLBodyElement" {
   @DocsEditable
   factory BodyElement() => document.$dom_createElement("body");
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  BodyElementEvents get on =>
-    new BodyElementEvents(this);
-
   @DomName('HTMLBodyElement.onbeforeunload')
   @DocsEditable
   Stream<Event> get onBeforeUnload => beforeUnloadEvent.forTarget(this);
@@ -871,52 +787,6 @@ class BodyElement extends Element native "*HTMLBodyElement" {
   @DocsEditable
   Stream<Event> get onUnload => unloadEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class BodyElementEvents extends ElementEvents {
-  @DocsEditable
-  BodyElementEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get beforeUnload => this['beforeunload'];
-
-  @DocsEditable
-  EventListenerList get blur => this['blur'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get focus => this['focus'];
-
-  @DocsEditable
-  EventListenerList get hashChange => this['hashchange'];
-
-  @DocsEditable
-  EventListenerList get load => this['load'];
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-
-  @DocsEditable
-  EventListenerList get offline => this['offline'];
-
-  @DocsEditable
-  EventListenerList get online => this['online'];
-
-  @DocsEditable
-  EventListenerList get popState => this['popstate'];
-
-  @DocsEditable
-  EventListenerList get resize => this['resize'];
-
-  @DocsEditable
-  EventListenerList get storage => this['storage'];
-
-  @DocsEditable
-  EventListenerList get unload => this['unload'];
-}
 // 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.
@@ -6169,12 +6039,6 @@ class DedicatedWorkerContext extends WorkerContext native "*DedicatedWorkerConte
   @DocsEditable
   static const EventStreamProvider<MessageEvent> messageEvent = const EventStreamProvider<MessageEvent>('message');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  DedicatedWorkerContextEvents get on =>
-    new DedicatedWorkerContextEvents(this);
-
   @DomName('DedicatedWorkerContext.postMessage')
   @DocsEditable
   void postMessage(/*any*/ message, [List messagePorts]) {
@@ -6200,16 +6064,6 @@ class DedicatedWorkerContext extends WorkerContext native "*DedicatedWorkerConte
   @DocsEditable
   Stream<MessageEvent> get onMessage => messageEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class DedicatedWorkerContextEvents extends WorkerContextEvents {
-  @DocsEditable
-  DedicatedWorkerContextEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-}
 // 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.
@@ -6521,12 +6375,6 @@ class Document extends Node  native "*Document"
   @Experimental
   static const EventStreamProvider<Event> pointerLockErrorEvent = const EventStreamProvider<Event>('webkitpointerlockerror');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  DocumentEvents get on =>
-    new DocumentEvents(this);
-
   @JSName('body')
   /// Moved to [HtmlDocument].
   @DomName('Document.body')
@@ -7079,25 +6927,6 @@ class Document extends Node  native "*Document"
     }
   }
 }
-
-@DocsEditable
-@deprecated
-class DocumentEvents extends ElementEvents {
-  @DocsEditable
-  DocumentEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get readyStateChange => this['readystatechange'];
-
-  @DocsEditable
-  EventListenerList get selectionChange => this['selectionchange'];
-
-  @DocsEditable
-  EventListenerList get pointerLockChange => this['webkitpointerlockchange'];
-
-  @DocsEditable
-  EventListenerList get pointerLockError => this['webkitpointerlockerror'];
-}
 // Copyright (c) 2011, 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.
@@ -7183,12 +7012,6 @@ class DocumentFragment extends Node native "*DocumentFragment" {
   }
 
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  ElementEvents get on =>
-    new ElementEvents(this);
-
   @JSName('querySelector')
   @DomName('DocumentFragment.querySelector')
   @DocsEditable
@@ -9297,12 +9120,6 @@ abstract class Element extends Node implements ElementTraversal native "*Element
   @Experimental
   static const EventStreamProvider<Event> fullscreenErrorEvent = const EventStreamProvider<Event>('webkitfullscreenerror');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  ElementEvents get on =>
-    new ElementEvents(this);
-
   @JSName('children')
   @DomName('Element.children')
   @DocsEditable
@@ -9948,166 +9765,6 @@ class _ElementFactoryProvider {
 // BSD-style license that can be found in the LICENSE file.
 
 
-@deprecated
-class ElementEvents extends Events {
-  ElementEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get abort => this['abort'];
-
-  @DocsEditable
-  EventListenerList get beforeCopy => this['beforecopy'];
-
-  @DocsEditable
-  EventListenerList get beforeCut => this['beforecut'];
-
-  @DocsEditable
-  EventListenerList get beforePaste => this['beforepaste'];
-
-  @DocsEditable
-  EventListenerList get blur => this['blur'];
-
-  @DocsEditable
-  EventListenerList get change => this['change'];
-
-  @DocsEditable
-  EventListenerList get click => this['click'];
-
-  @DocsEditable
-  EventListenerList get contextMenu => this['contextmenu'];
-
-  @DocsEditable
-  EventListenerList get copy => this['copy'];
-
-  @DocsEditable
-  EventListenerList get cut => this['cut'];
-
-  @DocsEditable
-  EventListenerList get doubleClick => this['dblclick'];
-
-  @DocsEditable
-  EventListenerList get drag => this['drag'];
-
-  @DocsEditable
-  EventListenerList get dragEnd => this['dragend'];
-
-  @DocsEditable
-  EventListenerList get dragEnter => this['dragenter'];
-
-  @DocsEditable
-  EventListenerList get dragLeave => this['dragleave'];
-
-  @DocsEditable
-  EventListenerList get dragOver => this['dragover'];
-
-  @DocsEditable
-  EventListenerList get dragStart => this['dragstart'];
-
-  @DocsEditable
-  EventListenerList get drop => this['drop'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get focus => this['focus'];
-
-  @DocsEditable
-  EventListenerList get input => this['input'];
-
-  @DocsEditable
-  EventListenerList get invalid => this['invalid'];
-
-  @DocsEditable
-  EventListenerList get keyDown => this['keydown'];
-
-  @DocsEditable
-  EventListenerList get keyPress => this['keypress'];
-
-  @DocsEditable
-  EventListenerList get keyUp => this['keyup'];
-
-  @DocsEditable
-  EventListenerList get load => this['load'];
-
-  @DocsEditable
-  EventListenerList get mouseDown => this['mousedown'];
-
-  @DocsEditable
-  EventListenerList get mouseMove => this['mousemove'];
-
-  @DocsEditable
-  EventListenerList get mouseOut => this['mouseout'];
-
-  @DocsEditable
-  EventListenerList get mouseOver => this['mouseover'];
-
-  @DocsEditable
-  EventListenerList get mouseUp => this['mouseup'];
-
-  @DocsEditable
-  EventListenerList get paste => this['paste'];
-
-  @DocsEditable
-  EventListenerList get reset => this['reset'];
-
-  @DocsEditable
-  EventListenerList get scroll => this['scroll'];
-
-  @DocsEditable
-  EventListenerList get search => this['search'];
-
-  @DocsEditable
-  EventListenerList get select => this['select'];
-
-  @DocsEditable
-  EventListenerList get selectStart => this['selectstart'];
-
-  @DocsEditable
-  EventListenerList get submit => this['submit'];
-
-  @DocsEditable
-  EventListenerList get touchCancel => this['touchcancel'];
-
-  @DocsEditable
-  EventListenerList get touchEnd => this['touchend'];
-
-  @DocsEditable
-  EventListenerList get touchEnter => this['touchenter'];
-
-  @DocsEditable
-  EventListenerList get touchLeave => this['touchleave'];
-
-  @DocsEditable
-  EventListenerList get touchMove => this['touchmove'];
-
-  @DocsEditable
-  EventListenerList get touchStart => this['touchstart'];
-
-  @DocsEditable
-  EventListenerList get fullscreenChange => this['webkitfullscreenchange'];
-
-  @DocsEditable
-  EventListenerList get fullscreenError => this['webkitfullscreenerror'];
-
-  EventListenerList get mouseWheel {
-    if (JS('bool', '#.onwheel !== undefined', _ptr)) {
-      // W3C spec, and should be IE9+, but IE has a bug exposing onwheel.
-      return this['wheel'];
-    } else if (JS('bool', '#.onmousewheel !== undefined', _ptr)) {
-      // Chrome & IE
-      return this['mousewheel'];
-    } else {
-      // Firefox
-      return this['DOMMouseScroll'];
-    }
-  }
-}
-// 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('ElementTraversal')
 abstract class ElementTraversal {
 
@@ -10545,12 +10202,6 @@ class EventSource extends EventTarget native "*EventSource" {
   static EventSource _create_1(url, eventSourceInit) => JS('EventSource', 'new EventSource(#,#)', url, eventSourceInit);
   static EventSource _create_2(url) => JS('EventSource', 'new EventSource(#)', url);
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  EventSourceEvents get on =>
-    new EventSourceEvents(this);
-
   static const int CLOSED = 2;
 
   static const int CONNECTING = 0;
@@ -10599,22 +10250,6 @@ class EventSource extends EventTarget native "*EventSource" {
   @DocsEditable
   Stream<Event> get onOpen => openEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class EventSourceEvents extends Events {
-  @DocsEditable
-  EventSourceEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-
-  @DocsEditable
-  EventListenerList get open => this['open'];
-}
 // 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.
@@ -10639,45 +10274,8 @@ class Events {
 
   Events(this._ptr);
 
-  EventListenerList operator [](String type) {
-    return new EventListenerList(_ptr, type);
-  }
-}
-
-/**
- * Supports adding, removing, and dispatching events for a specific event type.
- */
-class EventListenerList {
-
-  final EventTarget _ptr;
-  final String _type;
-
-  EventListenerList(this._ptr, this._type);
-
-  // TODO(jacobr): implement equals.
-
-  EventListenerList add(EventListener listener,
-      [bool useCapture = false]) {
-    _add(listener, useCapture);
-    return this;
-  }
-
-  EventListenerList remove(EventListener listener,
-      [bool useCapture = false]) {
-    _remove(listener, useCapture);
-    return this;
-  }
-
-  bool dispatch(Event evt) {
-    return _ptr.dispatchEvent(evt);
-  }
-
-  void _add(EventListener listener, bool useCapture) {
-    _ptr.$dom_addEventListener(_type, listener, useCapture);
-  }
-
-  void _remove(EventListener listener, bool useCapture) {
-    _ptr.$dom_removeEventListener(_type, listener, useCapture);
+  Stream operator [](String type) {
+    return new _EventStream(_ptr, type, false);
   }
 }
 
@@ -11169,12 +10767,6 @@ class FileReader extends EventTarget native "*FileReader" {
   }
   static FileReader _create_1() => JS('FileReader', 'new FileReader()');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  FileReaderEvents get on =>
-    new FileReaderEvents(this);
-
   static const int DONE = 2;
 
   static const int EMPTY = 0;
@@ -11253,34 +10845,9 @@ class FileReader extends EventTarget native "*FileReader" {
   @DocsEditable
   Stream<ProgressEvent> get onProgress => progressEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class FileReaderEvents extends Events {
-  @DocsEditable
-  FileReaderEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get abort => this['abort'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get load => this['load'];
-
-  @DocsEditable
-  EventListenerList get loadEnd => this['loadend'];
-
-  @DocsEditable
-  EventListenerList get loadStart => this['loadstart'];
-
-  @DocsEditable
-  EventListenerList get progress => this['progress'];
-}
-// 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.
+// 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
@@ -11389,12 +10956,6 @@ class FileWriter extends EventTarget native "*FileWriter" {
   @DocsEditable
   static const EventStreamProvider<ProgressEvent> writeStartEvent = const EventStreamProvider<ProgressEvent>('writestart');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  FileWriterEvents get on =>
-    new FileWriterEvents(this);
-
   static const int DONE = 2;
 
   static const int INIT = 0;
@@ -11471,31 +11032,6 @@ class FileWriter extends EventTarget native "*FileWriter" {
   @DocsEditable
   Stream<ProgressEvent> get onWriteStart => writeStartEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class FileWriterEvents extends Events {
-  @DocsEditable
-  FileWriterEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get abort => this['abort'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get progress => this['progress'];
-
-  @DocsEditable
-  EventListenerList get write => this['write'];
-
-  @DocsEditable
-  EventListenerList get writeEnd => this['writeend'];
-
-  @DocsEditable
-  EventListenerList get writeStart => this['writestart'];
-}
 // 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.
@@ -13042,12 +12578,6 @@ class HttpRequest extends EventTarget native "*XMLHttpRequest" {
   }
   static HttpRequest _create_1() => JS('HttpRequest', 'new XMLHttpRequest()');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  HttpRequestEvents get on =>
-    new HttpRequestEvents(this);
-
   static const int DONE = 4;
 
   static const int HEADERS_RECEIVED = 2;
@@ -13322,34 +12852,6 @@ class HttpRequest extends EventTarget native "*XMLHttpRequest" {
   Stream<ProgressEvent> get onReadyStateChange => readyStateChangeEvent.forTarget(this);
 
 }
-
-@DocsEditable
-@deprecated
-class HttpRequestEvents extends Events {
-  @DocsEditable
-  HttpRequestEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get abort => this['abort'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get load => this['load'];
-
-  @DocsEditable
-  EventListenerList get loadEnd => this['loadend'];
-
-  @DocsEditable
-  EventListenerList get loadStart => this['loadstart'];
-
-  @DocsEditable
-  EventListenerList get progress => this['progress'];
-
-  @DocsEditable
-  EventListenerList get readyStateChange => this['readystatechange'];
-}
 // 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.
@@ -13435,12 +12937,6 @@ class HttpRequestUpload extends EventTarget native "*XMLHttpRequestUpload" {
   @DocsEditable
   static const EventStreamProvider<ProgressEvent> progressEvent = const EventStreamProvider<ProgressEvent>('progress');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  HttpRequestUploadEvents get on =>
-    new HttpRequestUploadEvents(this);
-
   @JSName('addEventListener')
   @DomName('XMLHttpRequestUpload.addEventListener')
   @DocsEditable
@@ -13479,31 +12975,6 @@ class HttpRequestUpload extends EventTarget native "*XMLHttpRequestUpload" {
   @DocsEditable
   Stream<ProgressEvent> get onProgress => progressEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class HttpRequestUploadEvents extends Events {
-  @DocsEditable
-  HttpRequestUploadEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get abort => this['abort'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get load => this['load'];
-
-  @DocsEditable
-  EventListenerList get loadEnd => this['loadend'];
-
-  @DocsEditable
-  EventListenerList get loadStart => this['loadstart'];
-
-  @DocsEditable
-  EventListenerList get progress => this['progress'];
-}
 // 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.
@@ -13695,12 +13166,6 @@ class InputElement extends Element implements
   @Experimental
   static const EventStreamProvider<Event> speechChangeEvent = const EventStreamProvider<Event>('webkitSpeechChange');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  InputElementEvents get on =>
-    new InputElementEvents(this);
-
   @DomName('HTMLInputElement.accept')
   @DocsEditable
   String accept;
@@ -14534,16 +13999,6 @@ abstract class ButtonInputElement implements InputElementBase {
   factory ButtonInputElement() => new InputElement(type: 'button');
 }
 
-
-@DocsEditable
-@deprecated
-class InputElementEvents extends ElementEvents {
-  @DocsEditable
-  InputElementEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get speechChange => this['webkitSpeechChange'];
-}
 // 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.
@@ -15833,12 +15288,6 @@ class MediaElement extends Element native "*HTMLMediaElement" {
   @Experimental
   static const EventStreamProvider<MediaKeyEvent> needKeyEvent = const EventStreamProvider<MediaKeyEvent>('webkitneedkey');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  MediaElementEvents get on =>
-    new MediaElementEvents(this);
-
   static const int HAVE_CURRENT_DATA = 2;
 
   static const int HAVE_ENOUGH_DATA = 4;
@@ -16149,88 +15598,6 @@ class MediaElement extends Element native "*HTMLMediaElement" {
   @DocsEditable
   Stream<MediaKeyEvent> get onNeedKey => needKeyEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class MediaElementEvents extends ElementEvents {
-  @DocsEditable
-  MediaElementEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get canPlay => this['canplay'];
-
-  @DocsEditable
-  EventListenerList get canPlayThrough => this['canplaythrough'];
-
-  @DocsEditable
-  EventListenerList get durationChange => this['durationchange'];
-
-  @DocsEditable
-  EventListenerList get emptied => this['emptied'];
-
-  @DocsEditable
-  EventListenerList get ended => this['ended'];
-
-  @DocsEditable
-  EventListenerList get loadedData => this['loadeddata'];
-
-  @DocsEditable
-  EventListenerList get loadedMetadata => this['loadedmetadata'];
-
-  @DocsEditable
-  EventListenerList get loadStart => this['loadstart'];
-
-  @DocsEditable
-  EventListenerList get pause => this['pause'];
-
-  @DocsEditable
-  EventListenerList get play => this['play'];
-
-  @DocsEditable
-  EventListenerList get playing => this['playing'];
-
-  @DocsEditable
-  EventListenerList get progress => this['progress'];
-
-  @DocsEditable
-  EventListenerList get rateChange => this['ratechange'];
-
-  @DocsEditable
-  EventListenerList get seeked => this['seeked'];
-
-  @DocsEditable
-  EventListenerList get seeking => this['seeking'];
-
-  @DocsEditable
-  EventListenerList get show => this['show'];
-
-  @DocsEditable
-  EventListenerList get stalled => this['stalled'];
-
-  @DocsEditable
-  EventListenerList get suspend => this['suspend'];
-
-  @DocsEditable
-  EventListenerList get timeUpdate => this['timeupdate'];
-
-  @DocsEditable
-  EventListenerList get volumeChange => this['volumechange'];
-
-  @DocsEditable
-  EventListenerList get waiting => this['waiting'];
-
-  @DocsEditable
-  EventListenerList get keyAdded => this['webkitkeyadded'];
-
-  @DocsEditable
-  EventListenerList get keyError => this['webkitkeyerror'];
-
-  @DocsEditable
-  EventListenerList get keyMessage => this['webkitkeymessage'];
-
-  @DocsEditable
-  EventListenerList get needKey => this['webkitneedkey'];
-}
 // 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.
@@ -16471,12 +15838,6 @@ class MediaStream extends EventTarget native "*MediaStream" {
   static MediaStream _create_2(stream_OR_tracks) => JS('MediaStream', 'new MediaStream(#)', stream_OR_tracks);
   static MediaStream _create_3(stream_OR_tracks) => JS('MediaStream', 'new MediaStream(#)', stream_OR_tracks);
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  MediaStreamEvents get on =>
-    new MediaStreamEvents(this);
-
   @DomName('MediaStream.ended')
   @DocsEditable
   final bool ended;
@@ -16543,22 +15904,6 @@ class MediaStream extends EventTarget native "*MediaStream" {
         window.navigator,
         window.navigator);
 }
-
-@DocsEditable
-@deprecated
-class MediaStreamEvents extends Events {
-  @DocsEditable
-  MediaStreamEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get addTrack => this['addtrack'];
-
-  @DocsEditable
-  EventListenerList get ended => this['ended'];
-
-  @DocsEditable
-  EventListenerList get removeTrack => this['removetrack'];
-}
 // 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.
@@ -16600,12 +15945,6 @@ class MediaStreamTrack extends EventTarget native "*MediaStreamTrack" {
   @DocsEditable
   static const EventStreamProvider<Event> unmuteEvent = const EventStreamProvider<Event>('unmute');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  MediaStreamTrackEvents get on =>
-    new MediaStreamTrackEvents(this);
-
   @DomName('MediaStreamTrack.enabled')
   @DocsEditable
   bool enabled;
@@ -16652,22 +15991,6 @@ class MediaStreamTrack extends EventTarget native "*MediaStreamTrack" {
   @DocsEditable
   Stream<Event> get onUnmute => unmuteEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class MediaStreamTrackEvents extends Events {
-  @DocsEditable
-  MediaStreamTrackEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get ended => this['ended'];
-
-  @DocsEditable
-  EventListenerList get mute => this['mute'];
-
-  @DocsEditable
-  EventListenerList get unmute => this['unmute'];
-}
 // 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.
@@ -16824,12 +16147,6 @@ class MessagePort extends EventTarget native "*MessagePort" {
   @DocsEditable
   static const EventStreamProvider<MessageEvent> messageEvent = const EventStreamProvider<MessageEvent>('message');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  MessagePortEvents get on =>
-    new MessagePortEvents(this);
-
   @JSName('addEventListener')
   @DomName('MessagePort.addEventListener')
   @DocsEditable
@@ -16877,16 +16194,6 @@ class MessagePort extends EventTarget native "*MessagePort" {
   @DocsEditable
   Stream<MessageEvent> get onMessage => messageEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class MessagePortEvents extends Events {
-  @DocsEditable
-  MessagePortEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-}
 // 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.
@@ -18504,12 +17811,6 @@ class Notification extends EventTarget native "*Notification" {
   @DocsEditable
   static const EventStreamProvider<Event> showEvent = const EventStreamProvider<Event>('show');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  NotificationEvents get on =>
-    new NotificationEvents(this);
-
   @DomName('Notification.dir')
   @DocsEditable
   String dir;
@@ -18577,28 +17878,6 @@ class Notification extends EventTarget native "*Notification" {
   Stream<Event> get onShow => showEvent.forTarget(this);
 
 }
-
-@DocsEditable
-@deprecated
-class NotificationEvents extends Events {
-  @DocsEditable
-  NotificationEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get click => this['click'];
-
-  @DocsEditable
-  EventListenerList get close => this['close'];
-
-  @DocsEditable
-  EventListenerList get display => this['display'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get show => this['show'];
-}
 // 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.
@@ -19663,12 +18942,6 @@ class RtcDataChannel extends EventTarget native "*RTCDataChannel" {
   @DocsEditable
   static const EventStreamProvider<Event> openEvent = const EventStreamProvider<Event>('open');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  RtcDataChannelEvents get on =>
-    new RtcDataChannelEvents(this);
-
   @DomName('RTCDataChannel.binaryType')
   @DocsEditable
   String binaryType;
@@ -19727,25 +19000,6 @@ class RtcDataChannel extends EventTarget native "*RTCDataChannel" {
   @DocsEditable
   Stream<Event> get onOpen => openEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class RtcDataChannelEvents extends Events {
-  @DocsEditable
-  RtcDataChannelEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get close => this['close'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-
-  @DocsEditable
-  EventListenerList get open => this['open'];
-}
 // 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.
@@ -19865,12 +19119,6 @@ class RtcPeerConnection extends EventTarget native "*RTCPeerConnection" {
   @DocsEditable
   static const EventStreamProvider<Event> stateChangeEvent = const EventStreamProvider<Event>('statechange');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  RtcPeerConnectionEvents get on =>
-    new RtcPeerConnectionEvents(this);
-
   @DomName('RTCPeerConnection.iceConnectionState')
   @DocsEditable
   final String iceConnectionState;
@@ -20084,31 +19332,6 @@ class RtcPeerConnection extends EventTarget native "*RTCPeerConnection" {
 }
 
 
-
-@DocsEditable
-@deprecated
-class RtcPeerConnectionEvents extends Events {
-  @DocsEditable
-  RtcPeerConnectionEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get addStream => this['addstream'];
-
-  @DocsEditable
-  EventListenerList get iceCandidate => this['icecandidate'];
-
-  @DocsEditable
-  EventListenerList get iceChange => this['icechange'];
-
-  @DocsEditable
-  EventListenerList get negotiationNeeded => this['negotiationneeded'];
-
-  @DocsEditable
-  EventListenerList get removeStream => this['removestream'];
-
-  @DocsEditable
-  EventListenerList get stateChange => this['statechange'];
-}
 // Copyright (c) 2013, 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.
@@ -20613,12 +19836,6 @@ class SharedWorkerContext extends WorkerContext native "*SharedWorkerContext" {
   @DocsEditable
   static const EventStreamProvider<Event> connectEvent = const EventStreamProvider<Event>('connect');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  SharedWorkerContextEvents get on =>
-    new SharedWorkerContextEvents(this);
-
   @DomName('SharedWorkerContext.name')
   @DocsEditable
   final String name;
@@ -20627,16 +19844,6 @@ class SharedWorkerContext extends WorkerContext native "*SharedWorkerContext" {
   @DocsEditable
   Stream<Event> get onConnect => connectEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class SharedWorkerContextEvents extends WorkerContextEvents {
-  @DocsEditable
-  SharedWorkerContextEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get connect => this['connect'];
-}
 // 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.
@@ -21242,12 +20449,6 @@ class SpeechRecognition extends EventTarget native "*SpeechRecognition" {
   /// Checks if this type is supported on the current platform.
   static bool get supported => JS('bool', '!!(window.SpeechRecognition || window.webkitSpeechRecognition)');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  SpeechRecognitionEvents get on =>
-    new SpeechRecognitionEvents(this);
-
   @DomName('SpeechRecognition.continuous')
   @DocsEditable
   bool continuous;
@@ -21339,49 +20540,9 @@ class SpeechRecognition extends EventTarget native "*SpeechRecognition" {
   Stream<Event> get onStart => startEvent.forTarget(this);
 
   factory SpeechRecognition() {
-    return JS('SpeechRecognition',
-        'new (window.SpeechRecognition || window.webkitSpeechRecognition)()');
-  }
-}
-
-@DocsEditable
-@deprecated
-class SpeechRecognitionEvents extends Events {
-  @DocsEditable
-  SpeechRecognitionEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get audioEnd => this['audioend'];
-
-  @DocsEditable
-  EventListenerList get audioStart => this['audiostart'];
-
-  @DocsEditable
-  EventListenerList get end => this['end'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get noMatch => this['nomatch'];
-
-  @DocsEditable
-  EventListenerList get result => this['result'];
-
-  @DocsEditable
-  EventListenerList get soundEnd => this['soundend'];
-
-  @DocsEditable
-  EventListenerList get soundStart => this['soundstart'];
-
-  @DocsEditable
-  EventListenerList get speechEnd => this['speechend'];
-
-  @DocsEditable
-  EventListenerList get speechStart => this['speechstart'];
-
-  @DocsEditable
-  EventListenerList get start => this['start'];
+    return JS('SpeechRecognition',
+        'new (window.SpeechRecognition || window.webkitSpeechRecognition)()');
+  }
 }
 // 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
@@ -22499,12 +21660,6 @@ class TextTrack extends EventTarget native "*TextTrack" {
   @DocsEditable
   static const EventStreamProvider<Event> cueChangeEvent = const EventStreamProvider<Event>('cuechange');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  TextTrackEvents get on =>
-    new TextTrackEvents(this);
-
   @DomName('TextTrack.activeCues')
   @DocsEditable
   final TextTrackCueList activeCues;
@@ -22555,16 +21710,6 @@ class TextTrack extends EventTarget native "*TextTrack" {
   @DocsEditable
   Stream<Event> get onCueChange => cueChangeEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class TextTrackEvents extends Events {
-  @DocsEditable
-  TextTrackEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get cueChange => this['cuechange'];
-}
 // 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.
@@ -22589,12 +21734,6 @@ class TextTrackCue extends EventTarget native "*TextTrackCue" {
   }
   static TextTrackCue _create_1(startTime, endTime, text) => JS('TextTrackCue', 'new TextTrackCue(#,#,#)', startTime, endTime, text);
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  TextTrackCueEvents get on =>
-    new TextTrackCueEvents(this);
-
   @DomName('TextTrackCue.align')
   @DocsEditable
   String align;
@@ -22670,19 +21809,6 @@ class TextTrackCue extends EventTarget native "*TextTrackCue" {
   @DocsEditable
   Stream<Event> get onExit => exitEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class TextTrackCueEvents extends Events {
-  @DocsEditable
-  TextTrackCueEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get enter => this['enter'];
-
-  @DocsEditable
-  EventListenerList get exit => this['exit'];
-}
 // 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.
@@ -22900,12 +22026,6 @@ class TextTrackList extends EventTarget implements JavaScriptIndexingBehavior, L
   @DocsEditable
   static const EventStreamProvider<TrackEvent> addTrackEvent = const EventStreamProvider<TrackEvent>('addtrack');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  TextTrackListEvents get on =>
-    new TextTrackListEvents(this);
-
   @DomName('TextTrackList.length')
   @DocsEditable
   int get length => JS("int", "#.length", this);
@@ -23115,16 +22235,6 @@ class TextTrackList extends EventTarget implements JavaScriptIndexingBehavior, L
   @DocsEditable
   Stream<TrackEvent> get onAddTrack => addTrackEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class TextTrackListEvents extends Events {
-  @DocsEditable
-  TextTrackListEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get addTrack => this['addtrack'];
-}
 // 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.
@@ -26485,12 +25595,6 @@ class WebSocket extends EventTarget native "*WebSocket" {
   /// Checks if this type is supported on the current platform.
   static bool get supported => JS('bool', 'typeof window.WebSocket != "undefined"');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  WebSocketEvents get on =>
-    new WebSocketEvents(this);
-
   static const int CLOSED = 3;
 
   static const int CLOSING = 2;
@@ -26566,25 +25670,6 @@ class WebSocket extends EventTarget native "*WebSocket" {
   @DocsEditable
   Stream<Event> get onOpen => openEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class WebSocketEvents extends Events {
-  @DocsEditable
-  WebSocketEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get close => this['close'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-
-  @DocsEditable
-  EventListenerList get open => this['open'];
-}
 // 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.
@@ -27037,12 +26122,6 @@ class Window extends EventTarget implements WindowBase native "@*DOMWindow" {
   @Experimental
   static const EventStreamProvider<AnimationEvent> animationStartEvent = const EventStreamProvider<AnimationEvent>('webkitAnimationStart');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  WindowEvents get on =>
-    new WindowEvents(this);
-
   static const int PERSISTENT = 1;
 
   static const int TEMPORARY = 0;
@@ -27646,235 +26725,6 @@ class Window extends EventTarget implements WindowBase native "@*DOMWindow" {
   Stream<TransitionEvent> get onTransitionEnd => Element.transitionEndEvent.forTarget(this);
 
 }
-
-@DocsEditable
-@deprecated
-class WindowEvents extends Events {
-  @DocsEditable
-  WindowEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get contentLoaded => this['DOMContentLoaded'];
-
-  @DocsEditable
-  EventListenerList get abort => this['abort'];
-
-  @DocsEditable
-  EventListenerList get beforeUnload => this['beforeunload'];
-
-  @DocsEditable
-  EventListenerList get blur => this['blur'];
-
-  @DocsEditable
-  EventListenerList get canPlay => this['canplay'];
-
-  @DocsEditable
-  EventListenerList get canPlayThrough => this['canplaythrough'];
-
-  @DocsEditable
-  EventListenerList get change => this['change'];
-
-  @DocsEditable
-  EventListenerList get click => this['click'];
-
-  @DocsEditable
-  EventListenerList get contextMenu => this['contextmenu'];
-
-  @DocsEditable
-  EventListenerList get doubleClick => this['dblclick'];
-
-  @DocsEditable
-  EventListenerList get deviceMotion => this['devicemotion'];
-
-  @DocsEditable
-  EventListenerList get deviceOrientation => this['deviceorientation'];
-
-  @DocsEditable
-  EventListenerList get drag => this['drag'];
-
-  @DocsEditable
-  EventListenerList get dragEnd => this['dragend'];
-
-  @DocsEditable
-  EventListenerList get dragEnter => this['dragenter'];
-
-  @DocsEditable
-  EventListenerList get dragLeave => this['dragleave'];
-
-  @DocsEditable
-  EventListenerList get dragOver => this['dragover'];
-
-  @DocsEditable
-  EventListenerList get dragStart => this['dragstart'];
-
-  @DocsEditable
-  EventListenerList get drop => this['drop'];
-
-  @DocsEditable
-  EventListenerList get durationChange => this['durationchange'];
-
-  @DocsEditable
-  EventListenerList get emptied => this['emptied'];
-
-  @DocsEditable
-  EventListenerList get ended => this['ended'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get focus => this['focus'];
-
-  @DocsEditable
-  EventListenerList get hashChange => this['hashchange'];
-
-  @DocsEditable
-  EventListenerList get input => this['input'];
-
-  @DocsEditable
-  EventListenerList get invalid => this['invalid'];
-
-  @DocsEditable
-  EventListenerList get keyDown => this['keydown'];
-
-  @DocsEditable
-  EventListenerList get keyPress => this['keypress'];
-
-  @DocsEditable
-  EventListenerList get keyUp => this['keyup'];
-
-  @DocsEditable
-  EventListenerList get load => this['load'];
-
-  @DocsEditable
-  EventListenerList get loadedData => this['loadeddata'];
-
-  @DocsEditable
-  EventListenerList get loadedMetadata => this['loadedmetadata'];
-
-  @DocsEditable
-  EventListenerList get loadStart => this['loadstart'];
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-
-  @DocsEditable
-  EventListenerList get mouseDown => this['mousedown'];
-
-  @DocsEditable
-  EventListenerList get mouseMove => this['mousemove'];
-
-  @DocsEditable
-  EventListenerList get mouseOut => this['mouseout'];
-
-  @DocsEditable
-  EventListenerList get mouseOver => this['mouseover'];
-
-  @DocsEditable
-  EventListenerList get mouseUp => this['mouseup'];
-
-  @DocsEditable
-  EventListenerList get mouseWheel => this['mousewheel'];
-
-  @DocsEditable
-  EventListenerList get offline => this['offline'];
-
-  @DocsEditable
-  EventListenerList get online => this['online'];
-
-  @DocsEditable
-  EventListenerList get pageHide => this['pagehide'];
-
-  @DocsEditable
-  EventListenerList get pageShow => this['pageshow'];
-
-  @DocsEditable
-  EventListenerList get pause => this['pause'];
-
-  @DocsEditable
-  EventListenerList get play => this['play'];
-
-  @DocsEditable
-  EventListenerList get playing => this['playing'];
-
-  @DocsEditable
-  EventListenerList get popState => this['popstate'];
-
-  @DocsEditable
-  EventListenerList get progress => this['progress'];
-
-  @DocsEditable
-  EventListenerList get rateChange => this['ratechange'];
-
-  @DocsEditable
-  EventListenerList get reset => this['reset'];
-
-  @DocsEditable
-  EventListenerList get resize => this['resize'];
-
-  @DocsEditable
-  EventListenerList get scroll => this['scroll'];
-
-  @DocsEditable
-  EventListenerList get search => this['search'];
-
-  @DocsEditable
-  EventListenerList get seeked => this['seeked'];
-
-  @DocsEditable
-  EventListenerList get seeking => this['seeking'];
-
-  @DocsEditable
-  EventListenerList get select => this['select'];
-
-  @DocsEditable
-  EventListenerList get stalled => this['stalled'];
-
-  @DocsEditable
-  EventListenerList get storage => this['storage'];
-
-  @DocsEditable
-  EventListenerList get submit => this['submit'];
-
-  @DocsEditable
-  EventListenerList get suspend => this['suspend'];
-
-  @DocsEditable
-  EventListenerList get timeUpdate => this['timeupdate'];
-
-  @DocsEditable
-  EventListenerList get touchCancel => this['touchcancel'];
-
-  @DocsEditable
-  EventListenerList get touchEnd => this['touchend'];
-
-  @DocsEditable
-  EventListenerList get touchMove => this['touchmove'];
-
-  @DocsEditable
-  EventListenerList get touchStart => this['touchstart'];
-
-  @DocsEditable
-  EventListenerList get unload => this['unload'];
-
-  @DocsEditable
-  EventListenerList get volumeChange => this['volumechange'];
-
-  @DocsEditable
-  EventListenerList get waiting => this['waiting'];
-
-  @DocsEditable
-  EventListenerList get animationEnd => this['webkitAnimationEnd'];
-
-  @DocsEditable
-  EventListenerList get animationIteration => this['webkitAnimationIteration'];
-
-  @DocsEditable
-  EventListenerList get animationStart => this['webkitAnimationStart'];
-
-  @DocsEditable
-  EventListenerList get transitionEnd => this['webkitTransitionEnd'];
-}
 // 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.
@@ -27895,12 +26745,6 @@ class Worker extends AbstractWorker native "*Worker" {
   }
   static Worker _create_1(scriptUrl) => JS('Worker', 'new Worker(#)', scriptUrl);
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  WorkerEvents get on =>
-    new WorkerEvents(this);
-
   @DomName('Worker.postMessage')
   @DocsEditable
   void postMessage(/*SerializedScriptValue*/ message, [List messagePorts]) {
@@ -27930,16 +26774,6 @@ class Worker extends AbstractWorker native "*Worker" {
   @DocsEditable
   Stream<MessageEvent> get onMessage => messageEvent.forTarget(this);
 }
-
-@DocsEditable
-@deprecated
-class WorkerEvents extends AbstractWorkerEvents {
-  @DocsEditable
-  WorkerEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-}
 // 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.
@@ -27952,12 +26786,6 @@ class WorkerContext extends EventTarget native "*WorkerContext" {
   @DocsEditable
   static const EventStreamProvider<Event> errorEvent = const EventStreamProvider<Event>('error');
 
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  WorkerContextEvents get on =>
-    new WorkerContextEvents(this);
-
   static const int PERSISTENT = 1;
 
   static const int TEMPORARY = 0;
@@ -28082,16 +26910,6 @@ class WorkerContext extends EventTarget native "*WorkerContext" {
          '#.indexedDB || #.webkitIndexedDB || #.mozIndexedDB',
          this, this, this);
 }
-
-@DocsEditable
-@deprecated
-class WorkerContextEvents extends Events {
-  @DocsEditable
-  WorkerContextEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get error => this['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.
@@ -29642,58 +28460,6 @@ class _HTMLFrameElement extends Element native "*HTMLFrameElement" {
 @DocsEditable
 @DomName('HTMLFrameSetElement')
 class _HTMLFrameSetElement extends Element native "*HTMLFrameSetElement" {
-
-  @DocsEditable
-  @DomName('EventTarget.addEventListener, EventTarget.removeEventListener, EventTarget.dispatchEvent')
-  @deprecated
-  _HTMLFrameSetElementEvents get on =>
-    new _HTMLFrameSetElementEvents(this);
-}
-
-@DocsEditable
-@deprecated
-class _HTMLFrameSetElementEvents extends ElementEvents {
-  @DocsEditable
-  _HTMLFrameSetElementEvents(EventTarget _ptr) : super(_ptr);
-
-  @DocsEditable
-  EventListenerList get beforeUnload => this['beforeunload'];
-
-  @DocsEditable
-  EventListenerList get blur => this['blur'];
-
-  @DocsEditable
-  EventListenerList get error => this['error'];
-
-  @DocsEditable
-  EventListenerList get focus => this['focus'];
-
-  @DocsEditable
-  EventListenerList get hashChange => this['hashchange'];
-
-  @DocsEditable
-  EventListenerList get load => this['load'];
-
-  @DocsEditable
-  EventListenerList get message => this['message'];
-
-  @DocsEditable
-  EventListenerList get offline => this['offline'];
-
-  @DocsEditable
-  EventListenerList get online => this['online'];
-
-  @DocsEditable
-  EventListenerList get popState => this['popstate'];
-
-  @DocsEditable
-  EventListenerList get resize => this['resize'];
-
-  @DocsEditable
-  EventListenerList get storage => this['storage'];
-
-  @DocsEditable
-  EventListenerList get unload => this['unload'];
 }
 // 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
@@ -32612,12 +31378,10 @@ class _RemoteSendPortSync implements SendPortSync {
     // TODO(vsm): Set this up set once, on the first call.
     var source = '$target-result';
     var result = null;
-    var listener = (Event e) {
+    window.on[source].first.then((Event e) {
       result = json.parse(_getPortSyncEventData(e));
-    };
-    window.on[source].add(listener);
+    });
     _dispatchEvent(target, [source, message]);
-    window.on[source].remove(listener);
     return result;
   }
 
@@ -32672,7 +31436,7 @@ class ReceivePortSync {
 
   num _portId;
   Function _callback;
-  EventListener _listener;
+  StreamSubscription _portSubscription;
 
   ReceivePortSync() {
     if (_portIdCount == null) {
@@ -32697,21 +31461,20 @@ class ReceivePortSync {
 
   void receive(callback(var message)) {
     _callback = callback;
-    if (_listener == null) {
-      _listener = (Event e) {
+    if (_portSubscription == null) {
+      _portSubscription = window.on[_listenerName].listen((Event e) {
         var data = json.parse(_getPortSyncEventData(e));
         var replyTo = data[0];
         var message = _deserialize(data[1]);
         var result = _callback(message);
         _dispatchEvent(replyTo, _serialize(result));
-      };
-      window.on[_listenerName].add(_listener);
+      });
     }
   }
 
   void close() {
     _portMap.remove(_portId);
-    if (_listener != null) window.on[_listenerName].remove(_listener);
+    if (_portSubscription != null) _portSubscription.cancel();
   }
 
   SendPortSync toSendPort() {