Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Provide the source window as part of postMessage events.

Browse source
This commit is contained in:
Josh Matthews 2018-12-20 16:16:51 -05:00
parent 212ae3b94a
commit 45619db0ba
12 changed files with 128 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -859,6 +859,9 @@ impl WindowMethods for Window {
message: HandleValue,
origin: DOMString,
) -> ErrorResult {
let source_global = GlobalScope::incumbent().expect("no incumbent global??");
let source = source_global.as_window();
// Step 3-5.
let origin = match &origin[..] {
"*" => None,
@ -878,7 +881,7 @@ impl WindowMethods for Window {
let data = StructuredCloneData::write(cx, message)?;
// Step 9.
self.post_message(origin, data);
self.post_message(origin, &*source.window_proxy(), data);
Ok(())
}
@ -2194,11 +2197,14 @@ impl Window {
pub fn post_message(
&self,
target_origin: Option<ImmutableOrigin>,
source: &WindowProxy,
serialize_with_transfer_result: StructuredCloneData,
) {
let this = Trusted::new(self);
let source = Trusted::new(source);
let task = task!(post_serialised_message: move || {
let this = this.root();
let source = source.root();
// Step 7.1.
if let Some(target_origin) = target_origin {
@ -2226,7 +2232,8 @@ impl Window {
this.upcast(),
this.upcast(),
message_clone.handle(),
None
None,
Some(&*source),
);
});
// FIXME(nox): Why are errors silenced here?