aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/worklet.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-08-15 02:20:10 -0500
committerGitHub <noreply@github.com>2017-08-15 02:20:10 -0500
commit74558990b258cb55f230ebe8ec3fc557fd286f94 (patch)
tree69fcdcf92cca98dad2710d15dd7979b0f4079117 /components/script/dom/worklet.rs
parentfff50acd8188865c50a12ba6f623d14f94761919 (diff)
parent10b52669d7dbe0f7d538bbd51135b66ad9488890 (diff)
downloadservo-74558990b258cb55f230ebe8ec3fc557fd286f94.tar.gz
servo-74558990b258cb55f230ebe8ec3fc557fd286f94.zip
Auto merge of #17425 - paulrouget:attach-pipeline-2, r=asajeffrey
cleanup embedder/compositor/constellation/script messages Fix: #17226 #17200 #17201 This is work in progress. Some tests still fail. I'd like to get early feedback as it's a pretty large PR. There is nothing fundamentally new. Basically, I added TopLevelBrowsingContrextId to the relevant messages between the embedder, the compositor and the constellation, and enforced the PipelineId to be attached to each ScriptMsg (see #17201). I unaliased all the ScriptMsg. It was getting difficult to understand the nature of the message as ScriptMsg was used aliased CompositorMsg sometimes (CompositorMsg is an actually type of message already). I renamed constellation_chan to script_to_constellation_chan, again, for clarification. This cleanup code is necessary for #15934 and for tabs support. /cc @asajeffrey can I ask you to look at this? No need for a formal review, I need feedback at this stage. <!-- 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/17425) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/worklet.rs')
-rw-r--r--components/script/dom/worklet.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/worklet.rs b/components/script/dom/worklet.rs
index c492bb3ea16..653155a9433 100644
--- a/components/script/dom/worklet.rs
+++ b/components/script/dom/worklet.rs
@@ -609,7 +609,7 @@ impl WorkletThread {
if old_counter == 1 {
debug!("Resolving promise.");
let msg = MainThreadScriptMsg::WorkletLoaded(pipeline_id);
- self.global_init.script_sender.send(msg).expect("Worklet thread outlived script thread.");
+ self.global_init.to_script_thread_sender.send(msg).expect("Worklet thread outlived script thread.");
self.run_in_script_thread(promise.resolve_runnable(()));
}
}
@@ -651,7 +651,7 @@ impl WorkletThread {
{
let msg = CommonScriptMsg::RunnableMsg(ScriptThreadEventCategory::WorkletEvent, box runnable);
let msg = MainThreadScriptMsg::Common(msg);
- self.global_init.script_sender.send(msg).expect("Worklet thread outlived script thread.");
+ self.global_init.to_script_thread_sender.send(msg).expect("Worklet thread outlived script thread.");
}
}