servo: Merge #4869 - Various layout cleanup (from Ms2ger:layout-unsafe); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 1a47f176ffb059a7a3f29f94485859163cb1284b

servo/components/layout/context.rs

@@ -4,6 +4,8 @@
 
 //! Data needed by the layout task.
 
+#![allow(unsafe_blocks)]
+
 use css::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache};
 
 use geom::{Rect, Size2D};

servo/components/layout/css/matching.rs

@@ -4,6 +4,8 @@
 
 //! High-level interface to CSS selector matching.
 
+#![allow(unsafe_blocks)]
+
 use css::node_style::StyledNode;
 use incremental::{self, RestyleDamage};
 use util::{LayoutDataAccess, LayoutDataWrapper};

servo/components/layout/css/node_style.rs

@@ -23,6 +23,7 @@ pub trait StyledNode {
 
 impl<'ln> StyledNode for ThreadSafeLayoutNode<'ln> {
     #[inline]
+    #[allow(unsafe_blocks)]
     fn style<'a>(&'a self) -> &'a Arc<ComputedValues> {
         unsafe {
             let layout_data_ref = self.borrow_layout_data();

servo/components/layout/flow.rs

@@ -294,6 +294,7 @@ pub trait Flow: fmt::Show + Sync {
     }
 
     /// Returns a layer ID for the given fragment.
+    #[allow(unsafe_blocks)]
     fn layer_id(&self, fragment_id: uint) -> LayerId {
         unsafe {
             let obj = mem::transmute::<&&Self, &raw::TraitObject>(&self);
@@ -310,6 +311,7 @@ pub trait Flow: fmt::Show + Sync {
 // Base access
 
 #[inline(always)]
+#[allow(unsafe_blocks)]
 pub fn base<'a, T: ?Sized + Flow>(this: &'a T) -> &'a BaseFlow {
     unsafe {
         let obj = mem::transmute::<&&'a T, &'a raw::TraitObject>(&this);
@@ -323,6 +325,7 @@ pub fn imm_child_iter<'a>(flow: &'a Flow) -> FlowListIterator<'a> {
 }
 
 #[inline(always)]
+#[allow(unsafe_blocks)]
 pub fn mut_base<'a, T: ?Sized + Flow>(this: &'a mut T) -> &'a mut BaseFlow {
     unsafe {
         let obj = mem::transmute::<&&'a mut T, &'a raw::TraitObject>(&this);

servo/components/layout/flow_ref.rs

@@ -2,9 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/// Reference-counted pointers to flows.
-///
-/// Eventually, with dynamically sized types in Rust, much of this code will be superfluous.
+//! Reference-counted pointers to flows.
+//!
+//! Eventually, with dynamically sized types in Rust, much of this code will be superfluous.
+
+#![allow(unsafe_blocks)]
 
 use flow::Flow;
 use flow;

servo/components/layout/layout_debug.rs

@@ -95,6 +95,7 @@ impl Drop for Scope {
 /// Generate a unique ID. This is used for items such as Fragment
 /// which are often reallocated but represent essentially the
 /// same data.
+#[allow(unsafe_blocks)]
 pub fn generate_unique_debug_id() -> u16 {
     unsafe { DEBUG_ID_COUNTER.fetch_add(1, Ordering::SeqCst) as u16 }
 }

servo/components/layout/layout_task.rs

@@ -5,6 +5,8 @@
 //! The layout task. Performs layout on the DOM, builds display lists and sends them to be
 //! painted.
 
+#![allow(unsafe_blocks)]
+
 use css::node_style::StyledNode;
 use construct::ConstructionResult;
 use context::{SharedLayoutContext, SharedLayoutContextWrapper};

servo/components/layout/lib.rs

@@ -4,6 +4,7 @@
 
 #![feature(thread_local, unsafe_destructor, box_syntax, plugin, int_uint)]
 
+#![deny(unsafe_blocks)]
 #![deny(unused_imports)]
 #![deny(unused_variables)]
 #![allow(unrooted_must_root)]

servo/components/layout/parallel.rs

@@ -6,6 +6,8 @@
 //!
 //! This code is highly unsafe. Keep this file small and easy to audit.
 
+#![allow(unsafe_blocks)]
+
 use context::{LayoutContext, SharedLayoutContextWrapper, SharedLayoutContext};
 use flow::{Flow, MutableFlowUtils, PreorderFlowTraversal, PostorderFlowTraversal};
 use flow;

servo/components/layout/traversal.rs

@@ -4,6 +4,8 @@
 
 //! Traversals over the DOM and flow trees, running the layout computations.
 
+#![allow(unsafe_blocks)]
+
 use css::node_style::StyledNode;
 use css::matching::{ApplicableDeclarations, MatchMethods, StyleSharingResult};
 use construct::FlowConstructor;
@@ -91,11 +93,9 @@ fn take_task_local_bloom_filter(parent_node: Option<LayoutNode>, layout_context:
 fn put_task_local_bloom_filter(bf: Box<BloomFilter>,
                                unsafe_node: &UnsafeLayoutNode,
                                layout_context: &LayoutContext) {
-    let bf: *mut BloomFilter = unsafe { mem::transmute(bf) };
-    STYLE_BLOOM.with(|style_bloom| {
+    STYLE_BLOOM.with(move |style_bloom| {
         assert!(style_bloom.borrow().is_none(),
                 "Putting into a never-taken task-local bloom filter");
-        let bf: Box<BloomFilter> = unsafe { mem::transmute(bf) };
         *style_bloom.borrow_mut() = Some((bf, *unsafe_node, layout_context.shared.generation));
     })
 }

servo/components/layout/util.rs

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![allow(unsafe_blocks)]
+
 use construct::ConstructionResult;
 use incremental::RestyleDamage;
 use parallel::DomParallelInfo;
@@ -9,7 +11,7 @@ use wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode};
 
 use gfx::display_list::OpaqueNode;
 use gfx;
-use libc::uintptr_t;
+use libc::{c_void, uintptr_t};
 use script::dom::bindings::js::LayoutJS;
 use script::dom::node::{Node, SharedLayoutData};
 use script::layout_interface::{LayoutChan, TrustedNodeAddress};
@@ -141,9 +143,7 @@ impl OpaqueNodeMethods for OpaqueNode {
 
     fn from_thread_safe_layout_node(node: &ThreadSafeLayoutNode) -> OpaqueNode {
         unsafe {
-            let abstract_node = node.get_jsmanaged();
-            let ptr: uintptr_t = abstract_node.get_jsobject() as uintptr_t;
-            OpaqueNode(ptr)
+            OpaqueNodeMethods::from_jsmanaged(node.get_jsmanaged())
         }
     }
 
@@ -161,11 +161,8 @@ impl OpaqueNodeMethods for OpaqueNode {
     }
 
     fn to_untrusted_node_address(&self) -> UntrustedNodeAddress {
-        unsafe {
-            let OpaqueNode(addr) = *self;
-            let addr: UntrustedNodeAddress = mem::transmute(addr);
-            addr
-        }
+        let OpaqueNode(addr) = *self;
+        UntrustedNodeAddress(addr as *const c_void)
     }
 }
 

servo/components/layout/wrapper.rs

@@ -30,6 +30,8 @@
 //!   o Instead of `html_element_in_html_document()`, use
 //!     `html_element_in_html_document_for_layout()`.
 
+#![allow(unsafe_blocks)]
+
 use canvas::canvas_paint_task::CanvasMsg;
 use context::SharedLayoutContext;
 use css::node_style::StyledNode;