From 49e0803e2637f825f04f750eeb21acd35cf48d3d Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 11 Jul 2012 19:33:35 -0700 Subject: [PATCH] Fix imports for new resolve logic --- src/servo/content.rs | 4 +++- src/servo/engine.rs | 2 +- src/servo/gfx/pngsink.rs | 2 +- src/servo/layout/base.rs | 5 +++-- src/servo/layout/block.rs | 2 +- src/servo/layout/display_list_builder.rs | 2 +- src/servo/layout/inline.rs | 3 +-- src/servo/layout/style/apply.rs | 2 +- src/servo/layout/style/style.rs | 2 +- src/servo/layout/text.rs | 2 +- src/servo/platform/osmain.rs | 3 ++- 11 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/servo/content.rs b/src/servo/content.rs index cebdfbeed9dd..99a4bdc70cd8 100644 --- a/src/servo/content.rs +++ b/src/servo/content.rs @@ -3,7 +3,9 @@ tasks. "] -export Content, ControlMsg, PingMsg; +export Content; +export ControlMsg, ExecuteMsg, ParseMsg, ExitMsg; +export PingMsg, PongMsg; import comm::{port, chan, listen}; import task::{spawn, spawn_listener}; diff --git a/src/servo/engine.rs b/src/servo/engine.rs index 507575e1f1f0..92ae708a2d67 100644 --- a/src/servo/engine.rs +++ b/src/servo/engine.rs @@ -3,7 +3,7 @@ import task::spawn_listener; import comm::chan; import layout::layout_task; import layout_task::Layout; -import content::{Content, ExecuteMsg, ParseMsg}; +import content::{Content, ExecuteMsg, ParseMsg, ExitMsg}; type Engine = chan; diff --git a/src/servo/gfx/pngsink.rs b/src/servo/gfx/pngsink.rs index b34345990a27..3e51e57ccee6 100644 --- a/src/servo/gfx/pngsink.rs +++ b/src/servo/gfx/pngsink.rs @@ -5,7 +5,7 @@ Each time the renderer renders a frame the bufsink will output a `[u8]` containing the frame in PNG format. "]; -export PngSink, Msg; +export PngSink, Msg, Exit; import libc::{c_int, c_uint, c_void, c_uchar}; import azure::AzDrawTargetRef; diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs index 7cc0b3d4695f..d11951e157c0 100644 --- a/src/servo/layout/base.rs +++ b/src/servo/layout/base.rs @@ -12,10 +12,11 @@ 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 util::tree; import util::color::Color; +import text::text_box; +import style::style::computed_style; +import text::text_layout_methods; enum BoxKind { BlockBox, diff --git a/src/servo/layout/block.rs b/src/servo/layout/block.rs index d08f8581a95b..ded4fd70ec84 100644 --- a/src/servo/layout/block.rs +++ b/src/servo/layout/block.rs @@ -3,8 +3,8 @@ import geom::point::Point2D; import geom::size::Size2D; import gfx::geometry::au; -import layout::base::*; // FIXME: Can't get around import *; resolve bug. import util::tree; +import base::{Box, BlockBox, BTree, layout_methods, BoxTreeReadMethods}; #[doc="The public block layout methods."] impl block_layout_methods for @Box { diff --git a/src/servo/layout/display_list_builder.rs b/src/servo/layout/display_list_builder.rs index e79ee1c6be84..db677de54bc1 100644 --- a/src/servo/layout/display_list_builder.rs +++ b/src/servo/layout/display_list_builder.rs @@ -5,7 +5,6 @@ import dom::rcu::Scope; import dom::base::{Text, NodeScope}; import gfx::geometry::{au, au_to_px, box, px_to_au}; import gfx::renderer; -import layout::base::*; import util::color::methods; import util::tree; import box_builder::box_builder_methods; @@ -13,6 +12,7 @@ import text::text_layout_methods; import geom::size::Size2D; import geom::point::Point2D; import geom::rect::Rect; +import base::{Box, TextBox, BTree, BoxTreeReadMethods}; #[doc = " diff --git a/src/servo/layout/inline.rs b/src/servo/layout/inline.rs index b6fda6999b20..b7f75e1265f2 100644 --- a/src/servo/layout/inline.rs +++ b/src/servo/layout/inline.rs @@ -5,9 +5,8 @@ import dom::rcu::ReaderMethods; 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 util::tree; +import base::{Box, InlineBox, BTree, layout_methods, BoxTreeReadMethods}; #[doc="The main reflow routine for inline layout."] impl inline_layout_methods for @Box { diff --git a/src/servo/layout/style/apply.rs b/src/servo/layout/style/apply.rs index 952f4bfbceed..ba05db2dfbf1 100644 --- a/src/servo/layout/style/apply.rs +++ b/src/servo/layout/style/apply.rs @@ -3,7 +3,7 @@ import dom::base::{Element, HTMLImageElement, Node}; import dom::rcu::ReaderMethods; import image::base::load; -import layout::base::*; +import base::{Box, BTree, NTree, LayoutData, BoxTreeReadMethods}; import style::style_methods; impl ApplyStyleBoxMethods for @Box { diff --git a/src/servo/layout/style/style.rs b/src/servo/layout/style/style.rs index ab0c6a633c73..0d878d0ad7e6 100644 --- a/src/servo/layout/style/style.rs +++ b/src/servo/layout/style/style.rs @@ -6,10 +6,10 @@ import dom::style::{DisplayType, DisBlock, DisInline, DisNone, Stylesheet}; import dom::base::{Element, HTMLDivElement, HTMLHeadElement, HTMLImageElement, Node, NodeKind}; import dom::base::{Text}; import dom::rcu::ReaderMethods; -import layout::base::*; // FIXME: resolve bug requires * import matching::matching_methods; import util::color::{Color, rgb}; import util::color::css_colors::{white, black}; +import base::{LayoutData, NTree, NodeTreeReadMethods}; type computed_style = {mut display : DisplayType, mut back_color : Color}; diff --git a/src/servo/layout/text.rs b/src/servo/layout/text.rs index b1ada58279c7..6c473bbe921a 100644 --- a/src/servo/layout/text.rs +++ b/src/servo/layout/text.rs @@ -2,9 +2,9 @@ import geom::size::Size2D; import gfx::geometry::au; -import layout::base::*; // FIXME: Can't get around import *; resolve bug. import servo_text::text_run::TextRun; import servo_text::font_library::FontLibrary; +import base::{Box, TextBox}; class text_box { let text: str; diff --git a/src/servo/platform/osmain.rs b/src/servo/platform/osmain.rs index 6d0eab549890..b1ef2abd7d91 100644 --- a/src/servo/platform/osmain.rs +++ b/src/servo/platform/osmain.rs @@ -1,4 +1,5 @@ -export OSMain, Msg; +export OSMain; +export Msg, BeginDrawing, Draw, AddKeyHandler, Exit; import azure::*; import azure::bindgen::*;