Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +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; import gfx::renderer;
enum msg { enum Msg {
load_url(~str), LoadURLMsg(~str),
exit(comm::chan<()>) ExitMsg(comm::chan<()>)
} }
fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> { fn engine<S:renderer::sink send copy>(sink: S) -> chan<Msg> {
task::spawn_listener::<Msg> {|self_ch|
task::spawn_listener::<msg> {|self_ch|
// The renderer // The renderer
let renderer = renderer::renderer(sink); let renderer = renderer::renderer(sink);
@ -19,7 +19,7 @@ fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> {
loop { loop {
alt self_ch.recv() { alt self_ch.recv() {
load_url(url) { LoadURLMsg(url) {
let url <- url; let url <- url;
if (*url).ends_with(".js") { if (*url).ends_with(".js") {
content.send(content::execute(url)) 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)) content.send(content::parse(url))
} }
} }
exit(sender) {
ExitMsg(sender) {
content.send(content::exit); content.send(content::exit);
layout.send(layout::layout_task::exit); layout.send(layout::layout_task::exit);
listen {|resp_ch| listen {
|resp_ch|
renderer.send(renderer::exit(resp_ch)); renderer.send(renderer::exit(resp_ch));
resp_ch.recv(); resp_ch.recv();
} }

12
src/servo/servo.rs
View file

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