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

engine::msg -> Msg

Browse source
This commit is contained in:
Patrick Walton 2012-06-14 15:06:42 -07:00
parent b5b50e5d20
commit 9026bd1f00
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rust-geom

@ -1 +1 @@
Subproject commit 2aab07f798ffbd783ff48c9312b28576022eded3
Subproject commit 5141a7ff6c225f8265eecff496988efcbe41004b

20
src/servo/engine.rs
View file

@ -1,13 +1,13 @@
import comm::chan;
import gfx::renderer;
enum msg {
load_url(~str),
exit(comm::chan<()>)
enum Msg {
LoadURLMsg(~str),
ExitMsg(comm::chan<()>)
}
fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> {
task::spawn_listener::<msg> {|self_ch|
fn engine<S:renderer::sink send copy>(sink: S) -> chan<Msg> {
task::spawn_listener::<Msg> {|self_ch|
// The renderer
let renderer = renderer::renderer(sink);
@ -19,7 +19,7 @@ fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> {
loop {
alt self_ch.recv() {
load_url(url) {
LoadURLMsg(url) {
let url <- url;
if (*url).ends_with(".js") {
content.send(content::execute(url))
@ -27,10 +27,12 @@ fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> {
content.send(content::parse(url))
}
}
exit(sender) {
ExitMsg(sender) {
content.send(content::exit);
layout.send(layout::layout_task::exit);
listen {|resp_ch|
listen {
|resp_ch|
renderer.send(renderer::exit(resp_ch));
resp_ch.recv();
}

12
src/servo/servo.rs
View file

@ -41,7 +41,7 @@ fn run_pipeline_screen(urls: [str]) {
for urls.each { |filename|
#debug["master: Sending filename `%s`", filename];
engine.send(engine::load_url(~copy filename));
engine.send(engine::LoadURLMsg(~copy filename));
#debug["master: Waiting for keypress"];
key_ch.recv();
}
@ -50,7 +50,7 @@ fn run_pipeline_screen(urls: [str]) {
// Shut everything down
#debug["master: Shut down"];
listen {|resp_ch|
engine.send(engine::exit(resp_ch));
engine.send(engine::ExitMsg(resp_ch));
resp_ch.recv();
}
osmain.send(platform::osmain::exit);
@ -66,7 +66,7 @@ fn run_pipeline_png(-url: str, outfile: str) {
let sink = pngsink::pngsink(pngdata);
let engine = engine::engine(sink);
let url <- url;
engine.send(engine::load_url(~url));
engine.send(engine::LoadURLMsg(~url));
alt io::buffered_file_writer(outfile) {
result::ok(writer) {
import io::writer;
@ -74,9 +74,9 @@ fn run_pipeline_png(-url: str, outfile: str) {
}
result::err(e) { fail e }
}
listen {|resp_ch|
engine.send(engine::exit(resp_ch));
resp_ch.recv();
listen {|response_channel|
engine.send(engine::ExitMsg(response_channel));
response_channel.recv();
}
sink.send(pngsink::exit);
}