Move the transfer object into WindowPostMessageOptions

Spec changes were requested and this change matches the spec changes. whatwg/html#3799 BUG=861735 Change-Id: Ie5f33e6d52eb5d904ae3c439ee488ab75a3b514d Reviewed-on: https://chromium-review.googlesource.com/1151388 Commit-Queue: Dave Tapuska <dtapuska@chromium.org> Reviewed-by: Mustaq Ahmed <mustaq@chromium.org> Cr-Commit-Position: refs/heads/master@{#579152}
web-platform-tests · Jul 30, 2018 · e46eb56 · e46eb56
1 parent fe2c977
commit e46eb56
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 33 deletions.
diff --git a/webmessaging/with-options/broken-origin.tentative.html b/webmessaging/with-options/broken-origin.tentative.html
@@ -6,7 +6,7 @@
 <script>
 test(function() {
   assert_throws('SYNTAX_ERR', function() {
-    postMessage('', [], {targetOrigin: 'http://foo bar'});
+    postMessage('', {targetOrigin: 'http://foo bar'});
   }, 'should have failed to resolve');
 });
 </script>
diff --git a/webmessaging/with-options/host-specific-origin.tentative.html b/webmessaging/with-options/host-specific-origin.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {targetOrigin: location.protocol + '//' + location.host + '//'});
+  postMessage('', {targetOrigin: location.protocol + '//' + location.host + '//'});
   onmessage = this.step_func(function(e) {
     assert_equals(e.origin, location.protocol + '//' + location.host);
     this.done();

diff --git a/webmessaging/with-options/invalid-args.tentative.html b/webmessaging/with-options/invalid-args.tentative.html
diff --git a/webmessaging/with-options/message-channel-transferable.tentative.html b/webmessaging/with-options/message-channel-transferable.tentative.html
@@ -6,7 +6,7 @@
 <script>
 async_test(function(t) {
   var channel = new MessageChannel();
-  postMessage('', [channel.port1, channel.port2], {targetOrigin: '*'});
+  postMessage('', {targetOrigin: '*', transfer: [channel.port1, channel.port2]});
   onmessage = t.step_func(function(e) {
     assert_equals(e.ports.length, 2);
     t.done();

diff --git a/webmessaging/with-options/no-target-origin.tentative.html b/webmessaging/with-options/no-target-origin.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {});
+  postMessage('', {});
   onmessage = this.step_func(function(e) {
     assert_equals(e.data, '');
     this.done();

diff --git a/.../with-options/null-arg-two.tentative.html → ...with-options/null-transfer.tentative.html b/.../with-options/null-arg-two.tentative.html → ...with-options/null-transfer.tentative.html
@@ -1,10 +1,10 @@
 <!doctype html>
-<title>null arg two interpreted as null string</title>
+<title>null transfer</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
 <script>
 test(function(t) {
-  assert_throws(new SyntaxError, () => postMessage('', null));
+  assert_throws(new TypeError, () => postMessage('', {transfer: null}));
 });
 </script>
diff --git a/webmessaging/with-options/slash-origin.tentative.html b/webmessaging/with-options/slash-origin.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {targetOrigin: '/'});
+  postMessage('', {targetOrigin: '/'});
   onmessage = this.step_func(function(e) {
     assert_equals(e.data, '');
     this.done();

diff --git a/webmessaging/with-options/two-arg.tentative.html b/webmessaging/with-options/two-arg.tentative.html
diff --git a/webmessaging/with-options/undefined-transferable.tentative.html b/webmessaging/with-options/undefined-transferable.tentative.html
@@ -5,7 +5,7 @@
 <div id=log></div>
 <script>
 async_test(function() {
-  postMessage('', undefined);
+  postMessage('', {transfer: undefined});
   onmessage = this.step_func(function(e) {
     assert_array_equals(e.ports, []);
     this.done();

diff --git a/webmessaging/with-options/unknown-parameter.tentative.html b/webmessaging/with-options/unknown-parameter.tentative.html
@@ -5,7 +5,7 @@
 <div id="log"></div>
 <script>
 async_test(function() {
-  postMessage('', [], {someBogusParameterOnThisDictionary: 'food'});
+  postMessage('', {someBogusParameterOnThisDictionary: 'food'});
   onmessage = this.step_func(function(e) {
     assert_equals(e.data, '');
     this.done();