From c5cfdc52797ef6ae5b13fee7babe71014b56827a Mon Sep 17 00:00:00 2001
From: Terry Lucas <terry@google.com>
Date: Sun, 27 Jan 2019 20:06:58 +0000
Subject: [PATCH] Expose data member 'port' for MessageEvents and automatically
 pull in markupsafe for go.sh script.

Fixes #35730

R=sigmund@google.com

Change-Id: I91d9622601c99bbbfaad87c24f01db2b26303744
Reviewed-on: https://dart-review.googlesource.com/c/91165
Commit-Queue: Terry Lucas <terry@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
---
 DEPS                                   | 5 +++++
 sdk/lib/html/dart2js/html_dart2js.dart | 4 ++++
 tools/dom/scripts/htmlrenamer.py       | 2 --
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/DEPS b/DEPS
index 1959d3aa9d1..6fe9b4600a9 100644
--- a/DEPS
+++ b/DEPS
@@ -97,6 +97,7 @@ vars = {
   "json_rpc_2_tag": "2.0.9",
   "linter_tag": "0.1.79",
   "logging_tag": "0.11.3+2",
+  "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
   "markdown_tag": "2.0.2",
   "matcher_tag": "0.12.3",
   "mime_tag": "0.9.6+2",
@@ -176,6 +177,10 @@ deps = {
       "dep_type": "cipd",
   },
 
+  Var("dart_root") + "/third_party/markupsafe":
+      Var("chromium_git") + "/chromium/src/third_party/markupsafe.git" +
+      "@" + Var("markupsafe_rev"),
+
   Var("dart_root") + "/third_party/zlib":
       Var("chromium_git") + "/chromium/src/third_party/zlib.git" +
       "@" + Var("zlib_rev"),
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index c59829ec0d1..51d104c5b9b 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -20477,6 +20477,10 @@ class MessageEvent extends Event {
 
   final String origin;
 
+  @Unstable()
+  @Creates('JSExtendableArray')
+  final List<MessagePort> ports;
+
   EventTarget get source => _convertNativeToDart_EventTarget(this._get_source);
   @JSName('source')
   @Creates('Null')
diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py
index dc5b6c055f1..d419464ec5b 100644
--- a/tools/dom/scripts/htmlrenamer.py
+++ b/tools/dom/scripts/htmlrenamer.py
@@ -870,8 +870,6 @@ removed_html_members = monitored.Set('htmlrenamer.removed_html_members', [
     'IDBDatabase.transaction', # We do this in a template without the generated implementation at all.
     'Location.valueOf',
     'MessageEvent.data',
-    'MessageEvent.ports',
-    'MessageEvent.webkitInitMessageEvent',
     'MouseEvent.webkitMovementX',
     'MouseEvent.webkitMovementY',
     'MouseEvent.x',