From 84e4adc0d4211ad434333aa657efc2753eb4535f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 30 Oct 2015 13:14:17 +0501 Subject: [PATCH] servo: Merge #8187 - Introduce a Layoutnode::new function and use it (from Ms2ger:layoutnode-new); r=pcwalton Source-Repo: https://github.com/servo/servo Source-Revision: 6cc8186481110370205e7979f3942ad005889a30 --- servo/components/layout/layout_task.rs | 38 ++++++++------------------ servo/components/layout/wrapper.rs | 26 ++++++++++++++---- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/servo/components/layout/layout_task.rs b/servo/components/layout/layout_task.rs index 6e8c62b65f7d..5f9c732d87c2 100644 --- a/servo/components/layout/layout_task.rs +++ b/servo/components/layout/layout_task.rs @@ -51,9 +51,7 @@ use profile_traits::time::{self, ProfilerMetadata, profile}; use query::{LayoutRPCImpl, process_content_box_request, process_content_boxes_request}; use query::{MarginPadding, MarginRetrievingFragmentBorderBoxIterator, PositionProperty}; use query::{PositionRetrievingFragmentBorderBoxIterator, Side}; -use script::dom::bindings::js::LayoutJS; -use script::dom::document::Document; -use script::dom::node::{LayoutData, Node}; +use script::dom::node::LayoutData; use script::layout_interface::Animation; use script::layout_interface::{LayoutChan, LayoutRPC, OffsetParentResponse}; use script::layout_interface::{Msg, NewLayoutTaskInfo, Reflow, ReflowGoal, ReflowQueryType}; @@ -90,7 +88,7 @@ use util::opts; use util::task::spawn_named_with_send_on_failure; use util::task_state; use util::workqueue::WorkQueue; -use wrapper::{LayoutDocument, LayoutNode, ThreadSafeLayoutNode}; +use wrapper::{LayoutNode, ThreadSafeLayoutNode}; /// The number of screens of data we're allowed to generate display lists for in each direction. pub const DISPLAY_PORT_SIZE_FACTOR: i32 = 8; @@ -892,17 +890,9 @@ impl LayoutTask { property: &Atom, layout_root: &mut FlowRef) -> Option { - // FIXME: Isolate this transmutation into a "bridge" module. - // FIXME(rust#16366): The following line had to be moved because of a - // rustc bug. It should be in the next unsafe block. - let node: LayoutJS = unsafe { - LayoutJS::from_trusted_node_address(requested_node) - }; - let node: &LayoutNode = unsafe { - transmute(&node) - }; + let node = unsafe { LayoutNode::new(&requested_node) }; - let layout_node = ThreadSafeLayoutNode::new(node); + let layout_node = ThreadSafeLayoutNode::new(&node); let layout_node = match pseudo { &Some(PseudoElement::Before) => layout_node.get_before_pseudo(), &Some(PseudoElement::After) => layout_node.get_after_pseudo(), @@ -1133,15 +1123,9 @@ impl LayoutTask { }; let _ajst = AutoJoinScriptTask { data: data }; - // FIXME: Isolate this transmutation into a "bridge" module. - let mut doc: LayoutJS = unsafe { - LayoutJS::from_trusted_node_address(data.document).downcast::().unwrap() - }; - let doc: &mut LayoutDocument = unsafe { - transmute(&mut doc) - }; - - let mut node: LayoutNode = match doc.root_node() { + let document = unsafe { LayoutNode::new(&data.document) }; + let document = document.as_document().unwrap(); + let node: LayoutNode = match document.root_node() { None => return, Some(x) => x, }; @@ -1187,7 +1171,7 @@ impl LayoutTask { let needs_reflow = screen_size_changed && !needs_dirtying; unsafe { if needs_dirtying { - LayoutTask::dirty_all_nodes(&mut node); + LayoutTask::dirty_all_nodes(node); } } if needs_reflow { @@ -1196,7 +1180,7 @@ impl LayoutTask { } } - let event_state_changes = doc.drain_event_state_changes(); + let event_state_changes = document.drain_event_state_changes(); if !needs_dirtying { for &(el, state) in event_state_changes.iter() { assert!(!state.is_empty()); @@ -1229,7 +1213,7 @@ impl LayoutTask { }); // Retrieve the (possibly rebuilt) root flow. - rw_data.root_flow = self.try_get_layout_root(node.clone()); + rw_data.root_flow = self.try_get_layout_root(node); } // Send new canvas renderers to the paint task @@ -1459,7 +1443,7 @@ impl LayoutTask { } } - unsafe fn dirty_all_nodes(node: &mut LayoutNode) { + unsafe fn dirty_all_nodes(node: LayoutNode) { for node in node.traverse_preorder() { // TODO(cgaebel): mark nodes which are sensitive to media queries as // "changed": diff --git a/servo/components/layout/wrapper.rs b/servo/components/layout/wrapper.rs index 8d6467e9b646..c9a809dc07ae 100644 --- a/servo/components/layout/wrapper.rs +++ b/servo/components/layout/wrapper.rs @@ -53,6 +53,7 @@ use script::dom::htmltextareaelement::{HTMLTextAreaElement, LayoutHTMLTextAreaEl use script::dom::node::{HAS_CHANGED, HAS_DIRTY_DESCENDANTS, IS_DIRTY}; use script::dom::node::{LayoutNodeHelpers, Node, SharedLayoutData}; use script::dom::text::Text; +use script::layout_interface::TrustedNodeAddress; use selectors::matching::DeclarationBlock; use selectors::parser::{AttrSelector, NamespaceConstraint}; use smallvec::VecLike; @@ -80,7 +81,7 @@ pub struct LayoutNode<'a> { node: LayoutJS, /// Being chained to a PhantomData prevents `LayoutNode`s from escaping. - pub chain: PhantomData<&'a ()>, + chain: PhantomData<&'a ()>, } impl<'a> PartialEq for LayoutNode<'a> { @@ -91,6 +92,14 @@ impl<'a> PartialEq for LayoutNode<'a> { } impl<'ln> LayoutNode<'ln> { + pub unsafe fn new(address: &TrustedNodeAddress) -> LayoutNode { + let node = LayoutJS::from_trusted_node_address(*address); + LayoutNode { + node: node, + chain: PhantomData, + } + } + /// Creates a new layout node with the same lifetime as this layout node. pub unsafe fn new_with_this_lifetime(&self, node: &LayoutJS) -> LayoutNode<'ln> { LayoutNode { @@ -206,6 +215,15 @@ impl<'ln> LayoutNode<'ln> { as_element(self.node) } + pub fn as_document(&self) -> Option> { + self.node.downcast().map(|document| { + LayoutDocument { + document: document, + chain: PhantomData, + } + }) + } + fn parent_node(&self) -> Option> { unsafe { self.node.parent_node_ref().map(|node| self.new_with_this_lifetime(&node)) @@ -354,11 +372,7 @@ impl<'le> LayoutDocument<'le> { } pub fn root_node(&self) -> Option> { - let mut node = self.as_node().first_child(); - while node.is_some() && !node.unwrap().is_element() { - node = node.unwrap().next_sibling(); - } - node + self.as_node().children().find(LayoutNode::is_element) } pub fn drain_event_state_changes(&self) -> Vec<(LayoutElement, EventState)> {