Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17665 - jdm:postmessage-panic, r=KiChjang

Browse source 
Avoid panic when postMessage targets closed window.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #17664
- [X] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17665)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-11 12:28:33 -07:00 • committed by GitHub
commit 2a575acabe
3 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/window.rs
View file

@ -2000,7 +2000,8 @@ impl Runnable for PostMessageHandler {
impl Window { impl Window {
pub fn post_message(&self, origin: Option<ImmutableOrigin>, data: StructuredCloneData) { pub fn post_message(&self, origin: Option<ImmutableOrigin>, data: StructuredCloneData) {
let runnable = PostMessageHandler::new(self, origin, data); let runnable = PostMessageHandler::new(self, origin, data);
let msg = CommonScriptMsg::RunnableMsg(ScriptThreadEventCategory::DomEvent, box runnable); let runnable = self.get_runnable_wrapper().wrap_runnable(box runnable);
let msg = CommonScriptMsg::RunnableMsg(ScriptThreadEventCategory::DomEvent, runnable);
// TODO(#12718): Use the "posted message task source". // TODO(#12718): Use the "posted message task source".
let _ = self.script_chan.send(msg); let _ = self.script_chan.send(msg);
} }

10
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -13929,6 +13929,12 @@
{} {}
] ]
], ],
"mozilla/postmessage_closed.html": [
[
"/_mozilla/mozilla/postmessage_closed.html",
{}
]
],
"mozilla/preferences.html": [ "mozilla/preferences.html": [
[ [
"/_mozilla/mozilla/preferences.html", "/_mozilla/mozilla/preferences.html",
@ -26770,6 +26776,10 @@
"47c91f505cb8120a7f4b310b260f13408f06b8fc", "47c91f505cb8120a7f4b310b260f13408f06b8fc",
"testharness" "testharness"
], ],
"mozilla/postmessage_closed.html": [
"70fc1b9dad5f611285f8f4ed04454800283e223c",
"testharness"
],
"mozilla/preferences.html": [ "mozilla/preferences.html": [
"7584699a938adf516ea3b7d6f22fd11d0b0942cf", "7584699a938adf516ea3b7d6f22fd11d0b0942cf",
"testharness" "testharness"

14
tests/wpt/mozilla/tests/mozilla/postmessage_closed.html Normal file
View file

@ -0,0 +1,14 @@
<!doctype html>
<meta charset="utf-8">
<title>Window.postMessage does not panic when a window is closed before the message is received</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<iframe></iframe>
<script>
async_test(function(t) {
var i = document.querySelector('iframe');
i.contentWindow.postMessage('hi', '*');
i.remove();
t.step_timeout(function() { t.done() }, 0);
});
</script>