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

Move root flow size initialization into root.rs; move screen size into LayoutContext

Browse source
This commit is contained in:
Brian J. Burg 2012-09-17 17:55:17 -07:00
parent 972791bb9f
commit 09e17ffc6b
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,12 +4,16 @@
"]; "];
use au = gfx::geometry; use au = gfx::geometry;
use au::au;
use content::content_task; use content::content_task;
use css::resolve::apply::apply_style; use css::resolve::apply::apply_style;
use css::values::Stylesheet; use css::values::Stylesheet;
use display_list_builder::build_display_list; use display_list_builder::build_display_list;
use dom::base::Node; use dom::base::Node;
use dom::event::{Event, ReflowEvent}; use dom::event::{Event, ReflowEvent};
use geom::point::Point2D;
use geom::rect::Rect;
use geom::size::Size2D;
use gfx::render_task; use gfx::render_task;
use layout::base::Box; use layout::base::Box;
use layout::box_builder::LayoutTreeBuilder; use layout::box_builder::LayoutTreeBuilder;
@ -55,6 +59,8 @@ fn LayoutTask(render_task: RenderTask, image_cache_task: ImageCacheTask) -> Layo
image_cache: image_cache_task, image_cache: image_cache_task,
font_cache: font_cache, font_cache: font_cache,
doc_url: doc_url, doc_url: doc_url,
// TODO: obtain screen size from a real data source
screen_size: Rect(Point2D(au(0), au(0)), Size2D(au::from_px(800), au::from_px(600)))
}; };
do util::time::time(~"layout") { do util::time::time(~"layout") {
@ -81,10 +87,6 @@ fn LayoutTask(render_task: RenderTask, image_cache_task: ImageCacheTask) -> Layo
/* perform layout passes over the flow tree */ /* perform layout passes over the flow tree */
let root_flow = root_box.ctx; let root_flow = root_box.ctx;
do root_flow.traverse_postorder |f| { f.bubble_widths(&layout_ctx) } do root_flow.traverse_postorder |f| { f.bubble_widths(&layout_ctx) }
// TODO: window/frame size should be set inside RootBox::assign_widths
root_flow.data.position.origin = au::zero_point();
root_flow.data.position.size.width = au::from_px(800);
// end TODO
do root_flow.traverse_preorder |f| { f.assign_widths(&layout_ctx) } do root_flow.traverse_preorder |f| { f.assign_widths(&layout_ctx) }
do root_flow.traverse_postorder |f| { f.assign_height(&layout_ctx) } do root_flow.traverse_postorder |f| { f.assign_height(&layout_ctx) }

8
src/servo/layout/root.rs
View file

@ -1,7 +1,5 @@
use au = gfx::geometry; use au = gfx::geometry;
use css::values::*; use css::values::*;
use geom::point::Point2D;
use geom::size::Size2D;
use gfx::geometry::au; use gfx::geometry::au;
use layout::base::{Box, FlowContext, FlowTree, InlineBlockFlow, BlockFlow, RootFlow}; use layout::base::{Box, FlowContext, FlowTree, InlineBlockFlow, BlockFlow, RootFlow};
use layout::context::LayoutContext; use layout::context::LayoutContext;
@ -51,9 +49,9 @@ impl @FlowContext : RootLayout {
fn assign_widths_root(ctx: &LayoutContext) { fn assign_widths_root(ctx: &LayoutContext) {
assert self.starts_root_flow(); assert self.starts_root_flow();
/* TODO: should determine frame width here, not in self.data.position = copy ctx.screen_size;
LayoutTask. Until then, defer to block. */ self.assign_widths_block(ctx)
self.assign_widths_block(ctx) } }
fn assign_height_root(ctx: &LayoutContext) { fn assign_height_root(ctx: &LayoutContext) {
assert self.starts_root_flow(); assert self.starts_root_flow();