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

Move the contents of BuildMsg to a struct

Browse source
This commit is contained in:
Brian Anderson 2012-10-15 18:39:23 -07:00
parent fdf7dc1a02
commit 83bb1bda0e
2 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/servo/content/content_task.rs
View file

@ -20,7 +20,7 @@ use dom::event::{Event, ResizeEvent, ReflowEvent};
use dom::window::Window; use dom::window::Window;
use geom::size::Size2D; use geom::size::Size2D;
use layout::layout_task; use layout::layout_task;
use layout_task::{LayoutTask, BuildMsg}; use layout_task::{LayoutTask, BuildMsg, BuildData};
use resource::image_cache_task::ImageCacheTask; use resource::image_cache_task::ImageCacheTask;
use css::values::Stylesheet; use css::values::Stylesheet;
@ -300,9 +300,17 @@ impl Content {
self.layout_join_port = move Some(join_port); self.layout_join_port = move Some(join_port);
// Send new document and relevant styles to layout // Send new document and relevant styles to layout
// FIXME: Put CSS rules in an arc or something.
self.layout_task.send(BuildMsg(document.root, clone(&document.css_rules), copy *doc_url, let data = BuildData {
self.event_chan.clone(), self.window_size, join_chan)); node: document.root,
style: clone(&document.css_rules),
url: copy *doc_url,
dom_event_chan: self.event_chan.clone(),
window_size: self.window_size,
content_join_chan: move join_chan
};
self.layout_task.send(BuildMsg(move data));
// Indicate that reader was forked so any further // Indicate that reader was forked so any further
// changes will be isolated. // changes will be isolated.

44
src/servo/layout/layout_task.rs
View file

@ -47,11 +47,20 @@ enum LayoutQueryResponse_ {
} }
pub enum Msg { pub enum Msg {
BuildMsg(Node, ARC<Stylesheet>, Url, pipes::SharedChan<Event>, Size2D<uint>, pipes::Chan<()>), BuildMsg(BuildData),
QueryMsg(LayoutQuery, comm::Chan<LayoutQueryResponse>), QueryMsg(LayoutQuery, comm::Chan<LayoutQueryResponse>),
ExitMsg ExitMsg
} }
struct BuildData {
node: Node,
style: ARC<Stylesheet>,
url: Url,
dom_event_chan: pipes::SharedChan<Event>,
window_size: Size2D<uint>,
content_join_chan: pipes::Chan<()>
}
fn LayoutTask(render_task: RenderTask, fn LayoutTask(render_task: RenderTask,
img_cache_task: ImageCacheTask) -> LayoutTask { img_cache_task: ImageCacheTask) -> LayoutTask {
do spawn_listener::<Msg> |from_content| { do spawn_listener::<Msg> |from_content| {
@ -95,15 +104,11 @@ impl Layout {
fn handle_request() -> bool { fn handle_request() -> bool {
match self.from_content.recv() { match self.from_content.recv() {
BuildMsg(move node, move styles, move doc_url, BuildMsg(move data) => {
move dom_event_chan, move window_size, move join_chan) => { let data = Cell(data);
let styles = Cell(styles);
let doc_url = Cell(doc_url);
let join_chan = Cell(join_chan);
do time("layout: performing layout") { do time("layout: performing layout") {
self.handle_build(node, styles.take(), doc_url.take(), dom_event_chan.clone(), window_size, join_chan.take()); self.handle_build(data.take());
} }
} }
@ -121,9 +126,14 @@ impl Layout {
true true
} }
fn handle_build(node: Node, styles: ARC<Stylesheet>, doc_url: Url, fn handle_build(data: BuildData) {
dom_event_chan: pipes::SharedChan<Event>, window_size: Size2D<uint>,
content_join_chan: pipes::Chan<()>) { let node = &data.node;
// FIXME: Bad copy
let doc_url = copy data.url;
// FIXME: Bad clone
let dom_event_chan = data.dom_event_chan.clone();
debug!("layout: received layout request for: %s", doc_url.to_str()); debug!("layout: received layout request for: %s", doc_url.to_str());
debug!("layout: parsed Node tree"); debug!("layout: parsed Node tree");
debug!("%?", node.dump()); debug!("%?", node.dump());
@ -131,8 +141,8 @@ impl Layout {
// Reset the image cache // Reset the image cache
self.local_image_cache.next_round(self.make_on_image_available_cb(move dom_event_chan)); self.local_image_cache.next_round(self.make_on_image_available_cb(move dom_event_chan));
let screen_size = Size2D(au::from_px(window_size.width as int), let screen_size = Size2D(au::from_px(data.window_size.width as int),
au::from_px(window_size.height as int)); au::from_px(data.window_size.height as int));
let layout_ctx = LayoutContext { let layout_ctx = LayoutContext {
image_cache: self.local_image_cache, image_cache: self.local_image_cache,
@ -144,13 +154,13 @@ impl Layout {
let layout_root: @FlowContext = do time("layout: tree construction") { let layout_root: @FlowContext = do time("layout: tree construction") {
// TODO: this is dumb. we don't need 3 separate traversals. // TODO: this is dumb. we don't need 3 separate traversals.
node.initialize_style_for_subtree(&layout_ctx, &self.layout_refs); node.initialize_style_for_subtree(&layout_ctx, &self.layout_refs);
node.recompute_style_for_subtree(&layout_ctx, &styles); node.recompute_style_for_subtree(&layout_ctx, &data.style);
/* resolve styles (convert relative values) down the node tree */ /* resolve styles (convert relative values) down the node tree */
apply_style(&layout_ctx, node); apply_style(&layout_ctx, *node);
let builder = LayoutTreeBuilder(); let builder = LayoutTreeBuilder();
let layout_root: @FlowContext = match builder.construct_trees(&layout_ctx, let layout_root: @FlowContext = match builder.construct_trees(&layout_ctx,
node) { *node) {
Ok(root) => root, Ok(root) => root,
Err(*) => fail ~"Root flow should always exist" Err(*) => fail ~"Root flow should always exist"
}; };
@ -187,7 +197,7 @@ impl Layout {
} // time(layout: display list building) } // time(layout: display list building)
// Tell content we're done // Tell content we're done
content_join_chan.send(()); data.content_join_chan.send(());
} }