From b5b50e5d2058a4a99c418c4e3effc59eed128cbe Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Thu, 14 Jun 2012 14:59:05 -0700 Subject: [PATCH] layout -> layout_task. Fixes a bunch of ugly imports. --- src/servo/content.rs | 19 ++++++++++++------- src/servo/engine.rs | 4 ++-- src/servo/layout/base.rs | 8 ++++---- src/servo/layout/block.rs | 2 +- src/servo/layout/box_builder.rs | 10 +++++----- src/servo/layout/inline.rs | 4 ++-- .../layout/{layout.rs => layout_task.rs} | 6 +++--- src/servo/layout/style/apply.rs | 2 +- src/servo/layout/style/style.rs | 2 +- src/servo/layout/text.rs | 2 +- src/servo/servo.rc | 2 +- 11 files changed, 33 insertions(+), 28 deletions(-) rename src/servo/layout/{layout.rs => layout_task.rs} (96%) diff --git a/src/servo/content.rs b/src/servo/content.rs index 457841f8b4e..f90b7a285ef 100644 --- a/src/servo/content.rs +++ b/src/servo/content.rs @@ -1,11 +1,16 @@ +#[doc=" + The content task is the main task that runs JavaScript and spawns layout + tasks. +"] + export msg, ping; export content; import result::extensions; import dom::rcu::writer_methods; import dom::style; -import dom=dom::base; -import layout::layout; +import dom = dom::base; +import layout::layout_task; import js::rust::methods; enum msg { @@ -20,17 +25,17 @@ enum ping { // sends a ping to layout and awaits the response. fn join_layout(scope: dom::node_scope, - to_layout: chan) { + to_layout: chan) { if scope.is_reader_forked() { comm::listen { |ch| - to_layout.send(layout::ping(ch)); + to_layout.send(layout_task::ping(ch)); ch.recv(); } scope.reader_joined(); } } -fn content(to_layout: chan) -> chan { +fn content(to_layout: chan) -> chan { task::spawn_listener:: {|from_master| let scope = dom::node_scope(); let rt = js::rust::rt(); @@ -75,7 +80,7 @@ fn content(to_layout: chan) -> chan { join_layout(scope, to_layout); // Send new document to layout. - to_layout.send(layout::build(root, css_rules)); + to_layout.send(layout_task::build(root, css_rules)); // Indicate that reader was forked so any further // changes will be isolated. @@ -102,7 +107,7 @@ fn content(to_layout: chan) -> chan { } } exit { - to_layout.send(layout::exit); + to_layout.send(layout_task::exit); break; } } diff --git a/src/servo/engine.rs b/src/servo/engine.rs index 1828353b2f3..decf05fffa6 100644 --- a/src/servo/engine.rs +++ b/src/servo/engine.rs @@ -12,7 +12,7 @@ fn engine(sink: S) -> comm::chan { let renderer = renderer::renderer(sink); // The layout task - let layout = layout::layout::layout(renderer); + let layout = layout::layout_task::layout(renderer); // The content task let content = content::content(layout); @@ -29,7 +29,7 @@ fn engine(sink: S) -> comm::chan { } exit(sender) { content.send(content::exit); - layout.send(layout::layout::exit); + layout.send(layout::layout_task::exit); listen {|resp_ch| renderer.send(renderer::exit(resp_ch)); resp_ch.recv(); diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs index 6c3d6b932bc..c2ba9b5db5b 100644 --- a/src/servo/layout/base.rs +++ b/src/servo/layout/base.rs @@ -9,10 +9,10 @@ import geom::point::Point2D; import geom::rect::Rect; import geom::size::Size2D; import image::base::image; -import /*layout::*/block::block_layout_methods; -import /*layout::*/inline::inline_layout_methods; -import /*layout::*/style::style::*; -import /*layout::*/text::*; +import layout::block::block_layout_methods; +import layout::inline::inline_layout_methods; +import layout::style::style::*; +import layout::text::*; import util::tree; enum box_kind { diff --git a/src/servo/layout/block.rs b/src/servo/layout/block.rs index 1e1e0e3b8e9..fbf46ddf9a7 100644 --- a/src/servo/layout/block.rs +++ b/src/servo/layout/block.rs @@ -3,7 +3,7 @@ import geom::point::Point2D; import geom::size::Size2D; import gfx::geometry::au; -import /*layout::*/base::*; // FIXME: Can't get around import *; resolve bug. +import layout::base::*; // FIXME: Can't get around import *; resolve bug. import util::tree; #[doc="The public block layout methods."] diff --git a/src/servo/layout/box_builder.rs b/src/servo/layout/box_builder.rs index c95b4ec15bb..5eb268a5e63 100644 --- a/src/servo/layout/box_builder.rs +++ b/src/servo/layout/box_builder.rs @@ -4,11 +4,11 @@ import dom::base::{element, es_div, es_img, nk_element, nk_text, node}; import dom::style::{display_type, di_block, di_inline, di_none}; import dom::rcu::reader_methods; import gfx::geometry; -import /*layout::*/base::{appearance, bk_block, bk_inline, bk_intrinsic}; -import /*layout::*/base::{bk_text, box, box_kind, btree, node_methods, ntree}; -import /*layout::*/base::{rd_tree_ops, wr_tree_ops}; -import /*layout::*/style::style::{style_methods}; -import /*layout::*/text::text_box; +import layout::base::{appearance, bk_block, bk_inline, bk_intrinsic}; +import layout::base::{bk_text, box, box_kind, btree, node_methods, ntree}; +import layout::base::{rd_tree_ops, wr_tree_ops}; +import layout::style::style::{style_methods}; +import layout::text::text_box; import util::tree; import option::is_none; diff --git a/src/servo/layout/inline.rs b/src/servo/layout/inline.rs index 7c5b388092d..58363375e1f 100644 --- a/src/servo/layout/inline.rs +++ b/src/servo/layout/inline.rs @@ -5,8 +5,8 @@ import dom::rcu::reader_methods; import geom::point::Point2D; import geom::size::Size2D; import gfx::geometry::au; -import /*layout::*/base::*; // FIXME: Can't get around import *; resolve bug. -import /*layout::*/style::style::*; // ditto +import layout::base::*; // FIXME: Can't get around import *; resolve bug. +import layout::style::style::*; // ditto import util::tree; #[doc="The main reflow routine for inline layout."] diff --git a/src/servo/layout/layout.rs b/src/servo/layout/layout_task.rs similarity index 96% rename from src/servo/layout/layout.rs rename to src/servo/layout/layout_task.rs index a83e5393b2a..fdb730d9b82 100644 --- a/src/servo/layout/layout.rs +++ b/src/servo/layout/layout_task.rs @@ -14,9 +14,9 @@ import gfx::renderer; import dom::base::node; import dom::rcu::scope; import dom::style::stylesheet; -import /*layout::*/base::*; -import /*layout::*/style::apply::apply_style_methods; -import /*layout::*/style::style::style_methods; +import layout::base::*; +import layout::style::apply::apply_style_methods; +import layout::style::style::style_methods; import box_builder::box_builder_methods; import dl = display_list; diff --git a/src/servo/layout/style/apply.rs b/src/servo/layout/style/apply.rs index e2fc94e8ffc..4c6bc769aaf 100644 --- a/src/servo/layout/style/apply.rs +++ b/src/servo/layout/style/apply.rs @@ -2,7 +2,7 @@ import dom::base::{es_img, nk_element, node}; import dom::rcu::reader_methods; import image::base::load; -import /*layout::*/base::*; +import layout::base::*; import style::style_methods; impl apply_style_methods for @box { diff --git a/src/servo/layout/style/style.rs b/src/servo/layout/style/style.rs index 515871a5e1f..f0b34ba9a1a 100644 --- a/src/servo/layout/style/style.rs +++ b/src/servo/layout/style/style.rs @@ -6,7 +6,7 @@ import dom::base::{element, es_div, es_head, es_img, nk_element, nk_text}; import dom::base::{node}; import dom::base::node_kind; import dom::rcu::reader_methods; -import /*layout::*/base::*; // FIXME: resolve bug requires * +import layout::base::*; // FIXME: resolve bug requires * import matching::matching_methods; type computed_style = {mut display : display_type, diff --git a/src/servo/layout/text.rs b/src/servo/layout/text.rs index 6bb8f5def9f..bb382a5a2cd 100644 --- a/src/servo/layout/text.rs +++ b/src/servo/layout/text.rs @@ -2,7 +2,7 @@ import geom::size::Size2D; import gfx::geometry::au; -import /*layout::*/base::*; // FIXME: Can't get around import *; resolve bug. +import layout::base::*; // FIXME: Can't get around import *; resolve bug. import servo_text::text_run::text_run; class text_box { diff --git a/src/servo/servo.rc b/src/servo/servo.rc index e18f182a67a..2bee3b90721 100755 --- a/src/servo/servo.rc +++ b/src/servo/servo.rc @@ -45,7 +45,7 @@ mod layout { mod box_builder; mod display_list; mod inline; - mod layout; + mod layout_task; mod text; }