diff options
Diffstat (limited to 'src/components/main')
| -rw-r--r-- | src/components/main/layout/box.rs | 4 | ||||
| -rw-r--r-- | src/components/main/layout/construct.rs | 30 | ||||
| -rw-r--r-- | src/components/main/layout/context.rs | 2 | ||||
| -rw-r--r-- | src/components/main/layout/layout_task.rs | 17 | ||||
| -rw-r--r-- | src/components/main/layout/text.rs | 4 |
5 files changed, 27 insertions, 30 deletions
diff --git a/src/components/main/layout/box.rs b/src/components/main/layout/box.rs index 275d9a125e2..da7f9e350a7 100644 --- a/src/components/main/layout/box.rs +++ b/src/components/main/layout/box.rs @@ -635,14 +635,12 @@ impl Box { // Create the text box. do list.with_mut_ref |list| { - // FIXME(pcwalton): Allocation? Why?! - let run = text_box.run.clone(); let text_display_item = ~TextDisplayItem { base: BaseDisplayItem { bounds: absolute_box_bounds, extra: ExtraDisplayListData::new(self), }, - text_run: run, + text_run: text_box.run.clone(), range: text_box.range, color: color, }; diff --git a/src/components/main/layout/construct.rs b/src/components/main/layout/construct.rs index 7fb87ab47ea..0e00d2979d3 100644 --- a/src/components/main/layout/construct.rs +++ b/src/components/main/layout/construct.rs @@ -33,7 +33,7 @@ use layout::util::LayoutDataAccess; use script::dom::element::HTMLImageElementTypeId; use script::dom::node::{AbstractNode, CommentNodeTypeId, DoctypeNodeTypeId}; use script::dom::node::{DocumentFragmentNodeTypeId, DocumentNodeTypeId, ElementNodeTypeId}; -use script::dom::node::{LayoutView, PostorderNodeTraversal, TextNodeTypeId}; +use script::dom::node::{LayoutView, PostorderNodeMutTraversal, TextNodeTypeId}; use servo_util::slot::Slot; use servo_util::tree::TreeNodeRef; use std::util; @@ -173,7 +173,7 @@ pub struct FlowConstructor<'self> { /// The layout context. /// /// FIXME(pcwalton): Why does this contain `@`??? That destroys parallelism!!! - layout_context: &'self LayoutContext, + layout_context: &'self mut LayoutContext, /// The next flow ID to assign. /// @@ -183,7 +183,7 @@ pub struct FlowConstructor<'self> { impl<'self> FlowConstructor<'self> { /// Creates a new flow constructor. - pub fn init<'a>(layout_context: &'a LayoutContext) -> FlowConstructor<'a> { + pub fn init<'a>(layout_context: &'a mut LayoutContext) -> FlowConstructor<'a> { FlowConstructor { layout_context: layout_context, next_flow_id: Slot::init(0), @@ -198,7 +198,7 @@ impl<'self> FlowConstructor<'self> { } /// Builds the `ImageBoxInfo` for the given image. This is out of line to guide inlining. - fn build_box_info_for_image(&self, node: AbstractNode<LayoutView>) -> Option<ImageBoxInfo> { + fn build_box_info_for_image(&mut self, node: AbstractNode<LayoutView>) -> Option<ImageBoxInfo> { // FIXME(pcwalton): Don't copy URLs. let url = node.with_imm_image_element(|image_element| { image_element.image.as_ref().map(|url| (*url).clone()) @@ -215,7 +215,7 @@ impl<'self> FlowConstructor<'self> { } /// Builds a `Box` for the given node. - fn build_box_for_node(&self, node: AbstractNode<LayoutView>) -> Box { + fn build_box_for_node(&mut self, node: AbstractNode<LayoutView>) -> Box { let specific = match node.type_id() { ElementNodeTypeId(HTMLImageElementTypeId) => { match self.build_box_info_for_image(node) { @@ -234,7 +234,7 @@ impl<'self> FlowConstructor<'self> { /// `#[inline(always)]` because this is performance critical and LLVM will not inline it /// otherwise. #[inline(always)] - fn flush_inline_boxes_to_flow(&self, + fn flush_inline_boxes_to_flow(&mut self, boxes: ~[Box], flow: &mut ~Flow:, node: AbstractNode<LayoutView>) { @@ -248,7 +248,7 @@ impl<'self> FlowConstructor<'self> { /// Creates an inline flow from a set of inline boxes, if present, and adds it as a child of /// the given flow. - fn flush_inline_boxes_to_flow_if_necessary(&self, + fn flush_inline_boxes_to_flow_if_necessary(&mut self, opt_boxes: &mut Option<~[Box]>, flow: &mut ~Flow:, node: AbstractNode<LayoutView>) { @@ -261,7 +261,7 @@ impl<'self> FlowConstructor<'self> { /// Builds the children flows underneath a node with `display: block`. After this call, /// other `BlockFlow`s or `InlineFlow`s will be populated underneath this node, depending on /// whether {ib} splits needed to happen. - fn build_children_of_block_flow(&self, + fn build_children_of_block_flow(&mut self, flow: &mut ~Flow:, node: AbstractNode<LayoutView>) { // Gather up boxes for the inline flows we might need to create. @@ -341,7 +341,7 @@ impl<'self> FlowConstructor<'self> { /// Builds a flow for a node with `display: block`. This yields a `BlockFlow` with possibly /// other `BlockFlow`s or `InlineFlow`s underneath it, depending on whether {ib} splits needed /// to happen. - fn build_flow_for_block(&self, node: AbstractNode<LayoutView>) -> ~Flow: { + fn build_flow_for_block(&mut self, node: AbstractNode<LayoutView>) -> ~Flow: { let base = FlowData::new(self.next_flow_id(), node); let box = self.build_box_for_node(node); let mut flow = ~BlockFlow::from_box(base, box) as ~Flow:; @@ -351,7 +351,7 @@ impl<'self> FlowConstructor<'self> { /// Builds the flow for a node with `float: {left|right}`. This yields a float `BlockFlow` with /// a `BlockFlow` underneath it. - fn build_flow_for_floated_block(&self, node: AbstractNode<LayoutView>, float_type: FloatType) + fn build_flow_for_floated_block(&mut self, node: AbstractNode<LayoutView>, float_type: FloatType) -> ~Flow: { let base = FlowData::new(self.next_flow_id(), node); let box = self.build_box_for_node(node); @@ -363,7 +363,7 @@ impl<'self> FlowConstructor<'self> { /// Concatenates the boxes of kids, adding in our own borders/padding/margins if necessary. /// Returns the `InlineBoxesConstructionResult`, if any. There will be no /// `InlineBoxesConstructionResult` if this node consisted entirely of ignorable whitespace. - fn build_boxes_for_nonreplaced_inline_content(&self, node: AbstractNode<LayoutView>) + fn build_boxes_for_nonreplaced_inline_content(&mut self, node: AbstractNode<LayoutView>) -> ConstructionResult { let mut opt_inline_block_splits = None; let mut opt_box_accumulator = None; @@ -429,7 +429,7 @@ impl<'self> FlowConstructor<'self> { /// Creates an `InlineBoxesConstructionResult` for replaced content. Replaced content doesn't /// render its children, so this just nukes a child's boxes and creates a `Box`. - fn build_boxes_for_replaced_inline_content(&self, node: AbstractNode<LayoutView>) + fn build_boxes_for_replaced_inline_content(&mut self, node: AbstractNode<LayoutView>) -> ConstructionResult { for kid in node.children() { kid.set_flow_construction_result(NoConstructionResult) @@ -446,7 +446,7 @@ impl<'self> FlowConstructor<'self> { /// Builds one or more boxes for a node with `display: inline`. This yields an /// `InlineBoxesConstructionResult`. - fn build_boxes_for_inline(&self, node: AbstractNode<LayoutView>) -> ConstructionResult { + fn build_boxes_for_inline(&mut self, node: AbstractNode<LayoutView>) -> ConstructionResult { // Is this node replaced content? if !node.is_replaced_content() { // Go to a path that concatenates our kids' boxes. @@ -458,11 +458,11 @@ impl<'self> FlowConstructor<'self> { } } -impl<'self> PostorderNodeTraversal for FlowConstructor<'self> { +impl<'self> PostorderNodeMutTraversal for FlowConstructor<'self> { // `#[inline(always)]` because this is always called from the traversal function and for some // reason LLVM's inlining heuristics go awry here. #[inline(always)] - fn process(&self, node: AbstractNode<LayoutView>) -> bool { + fn process(&mut self, node: AbstractNode<LayoutView>) -> bool { // Get the `display` property for this node, and determine whether this node is floated. let (display, float) = match node.type_id() { ElementNodeTypeId(_) => (node.style().Box.display, node.style().Box.float), diff --git a/src/components/main/layout/context.rs b/src/components/main/layout/context.rs index 748ed66d4ad..2eaa7eafc8c 100644 --- a/src/components/main/layout/context.rs +++ b/src/components/main/layout/context.rs @@ -13,7 +13,7 @@ use extra::arc::MutexArc; /// Data needed by the layout task. pub struct LayoutContext { - font_ctx: @mut FontContext, + font_ctx: ~FontContext, image_cache: MutexArc<LocalImageCache>, screen_size: Rect<Au> } diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs index d1e8cb63671..fdface606fd 100644 --- a/src/components/main/layout/layout_task.rs +++ b/src/components/main/layout/layout_task.rs @@ -77,9 +77,6 @@ struct LayoutTask { /// The local image cache. local_image_cache: MutexArc<LocalImageCache>, - /// The local font context. - font_ctx: @mut FontContext, - /// The size of the viewport. screen_size: Option<Size2D<Au>>, @@ -90,6 +87,8 @@ struct LayoutTask { /// The channel on which messages can be sent to the profiler. profiler_chan: ProfilerChan, + + opts: Opts } /// The damage computation traversal. @@ -229,7 +228,6 @@ impl LayoutTask { opts: &Opts, profiler_chan: ProfilerChan) -> LayoutTask { - let fctx = @mut FontContext::new(opts.render_backend, true, profiler_chan.clone()); LayoutTask { id: id, @@ -239,13 +237,13 @@ impl LayoutTask { render_chan: render_chan, image_cache_task: image_cache_task.clone(), local_image_cache: MutexArc::new(LocalImageCache(image_cache_task)), - font_ctx: fctx, screen_size: None, display_list: None, stylist: RWArc::new(new_stylist()), profiler_chan: profiler_chan, + opts: opts.clone() } } @@ -259,7 +257,8 @@ impl LayoutTask { // Create a layout context for use in building display lists, hit testing, &c. fn build_layout_context(&self) -> LayoutContext { let image_cache = self.local_image_cache.clone(); - let font_ctx = self.font_ctx; + let font_ctx = ~FontContext::new(self.opts.render_backend, true, + self.profiler_chan.clone()); let screen_size = self.screen_size.unwrap(); LayoutContext { @@ -344,9 +343,9 @@ impl LayoutTask { /// is intertwined with selector matching, making it difficult to compare directly. It is /// marked `#[inline(never)]` to aid benchmarking in sampling profilers. #[inline(never)] - fn construct_flow_tree(&self, layout_context: &LayoutContext, node: AbstractNode<LayoutView>) + fn construct_flow_tree(&self, layout_context: &mut LayoutContext, node: AbstractNode<LayoutView>) -> ~Flow: { - node.traverse_postorder(&FlowConstructor::init(layout_context)); + node.traverse_postorder_mut(&mut FlowConstructor::init(layout_context)); let result = match *node.mutate_layout_data().ptr { Some(ref mut layout_data) => { @@ -441,7 +440,7 @@ impl LayoutTask { // Construct the flow tree. let mut layout_root = profile(time::LayoutTreeBuilderCategory, self.profiler_chan.clone(), - || self.construct_flow_tree(&layout_ctx, *node)); + || self.construct_flow_tree(&mut layout_ctx, *node)); // Propagate damage. layout_root.traverse_preorder(&mut PropagateDamageTraversal { diff --git a/src/components/main/layout/text.rs b/src/components/main/layout/text.rs index 59d4a2976c8..88a2f93f460 100644 --- a/src/components/main/layout/text.rs +++ b/src/components/main/layout/text.rs @@ -25,7 +25,7 @@ impl TextRunScanner { } } - pub fn scan_for_runs(&mut self, ctx: &LayoutContext, flow: &mut Flow) { + pub fn scan_for_runs(&mut self, ctx: &mut LayoutContext, flow: &mut Flow) { { let inline = flow.as_immutable_inline(); // FIXME: this assertion fails on wikipedia, but doesn't seem @@ -75,7 +75,7 @@ impl TextRunScanner { /// responsible for swapping out the list. It is not clear to me (pcwalton) that this is still /// necessary. pub fn flush_clump_to_list(&mut self, - ctx: &LayoutContext, + ctx: &mut LayoutContext, flow: &mut Flow, last_whitespace: bool, out_boxes: &mut ~[Box]) |