aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/main/layout/layout_task.rs
diff options
context:
space:
mode:
authorYoungmin Yoo <youngmin.yoo@samsung.com>2014-02-10 11:26:39 +0900
committerYoungmin Yoo <youngmin.yoo@samsung.com>2014-02-20 17:31:16 +0900
commit13f9a66632644ea91711ce1ab5cfa92ffee88484 (patch)
tree6d3f5bc6d3f615c169998aae55b489ec8b3f06dd /src/components/main/layout/layout_task.rs
parentec4c31c214724b60a41a700c4eb0cb8333e26d60 (diff)
downloadservo-13f9a66632644ea91711ce1ab5cfa92ffee88484.tar.gz
servo-13f9a66632644ea91711ce1ab5cfa92ffee88484.zip
Impl Basic support for object element
Diffstat (limited to 'src/components/main/layout/layout_task.rs')
-rw-r--r--src/components/main/layout/layout_task.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs
index 2d79208b6ed..64482cd9803 100644
--- a/src/components/main/layout/layout_task.rs
+++ b/src/components/main/layout/layout_task.rs
@@ -22,6 +22,7 @@ use layout::parallel;
use layout::util::{LayoutDataAccess, OpaqueNode, LayoutDataWrapper};
use layout::wrapper::{DomLeafSet, LayoutNode, TLayoutNode, ThreadSafeLayoutNode};
+use extra::url::Url;
use extra::arc::{Arc, MutexArc};
use geom::rect::Rect;
use geom::size::Size2D;
@@ -427,9 +428,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: &mut LayoutContext, node: LayoutNode) -> ~Flow {
+ fn construct_flow_tree(&self, layout_context: &mut LayoutContext, node: LayoutNode, url: &Url) -> ~Flow {
let node = ThreadSafeLayoutNode::new(node);
- node.traverse_postorder_mut(&mut FlowConstructor::init(layout_context));
+ node.traverse_postorder_mut(&mut FlowConstructor::init(layout_context, url));
let mut layout_data_ref = node.mutate_layout_data();
let result = match *layout_data_ref.get() {
@@ -594,7 +595,7 @@ impl LayoutTask {
// Construct the flow tree.
profile(time::LayoutTreeBuilderCategory,
self.profiler_chan.clone(),
- || self.construct_flow_tree(&mut layout_ctx, *node))
+ || self.construct_flow_tree(&mut layout_ctx, *node, &data.url))
});
// Verification of the flow tree, which ensures that all nodes were either marked as leaves