From b5f4825e539e1b79863451fee2edcd48ab31bb89 Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Fri, 9 Feb 2018 23:54:02 -0800
Subject: [PATCH] Work around dart-lang/sdk#32113 (#760)
The memory leak occurs when window.parent is accessed through
dart:html, so we access it directly through JS interop instead.
Closes #724
---
.../runner/browser/post_message_channel.dart | 17 +++++++++++++----
pubspec.yaml | 2 +-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/lib/src/runner/browser/post_message_channel.dart b/lib/src/runner/browser/post_message_channel.dart
index 50149eba..fc453769 100644
--- a/lib/src/runner/browser/post_message_channel.dart
+++ b/lib/src/runner/browser/post_message_channel.dart
@@ -2,10 +2,19 @@
// 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.
+@JS()
+library test.src.runner.browser.post_message_channel;
+
import 'dart:html';
+import 'dart:js_util';
+import 'package:js/js.dart';
import 'package:stream_channel/stream_channel.dart';
+// Avoid using this from dart:html to work around dart-lang/sdk#32113.
+@JS("window.parent.postMessage")
+external void _postParentMessage(Object message, String targetOrigin);
+
/// Constructs a [StreamChannel] wrapping `postMessage` communication with the
/// host page.
StreamChannel postMessageChannel() {
@@ -25,14 +34,14 @@ StreamChannel postMessageChannel() {
controller.local.stream.listen((data) {
// TODO(nweiz): Stop manually adding href here once issue 22554 is
// fixed.
- window.parent.postMessage(
- {"href": window.location.href, "data": data}, window.location.origin);
+ _postParentMessage(jsify({"href": window.location.href, "data": data}),
+ window.location.origin);
});
// Send a ready message once we're listening so the host knows it's safe to
// start sending events.
- window.parent.postMessage(
- {"href": window.location.href, "ready": true}, window.location.origin);
+ _postParentMessage(jsify({"href": window.location.href, "ready": true}),
+ window.location.origin);
return controller.foreign;
}
diff --git a/pubspec.yaml b/pubspec.yaml
index a7dc7a61..d595e3be 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: test
-version: 0.12.30-dev
+version: 0.12.30+3
author: Dart Team <misc@dartlang.org>
description: A library for writing dart unit tests.
homepage: https://github.com/dart-lang/test
--
GitLab