aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/layout/context.rs2
-rw-r--r--components/layout/css/matching.rs2
-rw-r--r--components/layout/css/node_style.rs1
-rw-r--r--components/layout/flow.rs3
-rw-r--r--components/layout/flow_ref.rs8
-rw-r--r--components/layout/layout_debug.rs1
-rw-r--r--components/layout/layout_task.rs2
-rw-r--r--components/layout/lib.rs1
-rw-r--r--components/layout/parallel.rs2
-rw-r--r--components/layout/traversal.rs6
-rw-r--r--components/layout/util.rs15
-rw-r--r--components/layout/wrapper.rs2
12 files changed, 30 insertions, 15 deletions
diff --git a/components/layout/context.rs b/components/layout/context.rs
index 29a96358ff5..96925bbc55a 100644
--- a/components/layout/context.rs
+++ b/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};
diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs
index 6a491eabd79..bc096e7728d 100644
--- a/components/layout/css/matching.rs
+++ b/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};
diff --git a/components/layout/css/node_style.rs b/components/layout/css/node_style.rs
index a153447f7a3..946ac11a5e7 100644
--- a/components/layout/css/node_style.rs
+++ b/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();
diff --git a/components/layout/flow.rs b/components/layout/flow.rs
index 9ca0446b9c4..cb1658879cd 100644
--- a/components/layout/flow.rs
+++ b/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);
diff --git a/components/layout/flow_ref.rs b/components/layout/flow_ref.rs
index 605a7e4ede5..83243df2c8d 100644
--- a/components/layout/flow_ref.rs
+++ b/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;
diff --git a/components/layout/layout_debug.rs b/components/layout/layout_debug.rs
index 5fc606b8705..a3a11a3d085 100644
--- a/components/layout/layout_debug.rs
+++ b/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 }
}
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index cd2328df866..c0aa1f6fdb9 100644
--- a/components/layout/layout_task.rs
+++ b/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};
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 17812c262c2..df523fb6915 100644
--- a/components/layout/lib.rs
+++ b/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)]
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs
index 05eb9168a04..5483a12594e 100644
--- a/components/layout/parallel.rs
+++ b/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;
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index d0123afdcf7..c31d4dcde1a 100644
--- a/components/layout/traversal.rs
+++ b/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));
})
}
diff --git a/components/layout/util.rs b/components/layout/util.rs
index 270c796781e..a5e8328118f 100644
--- a/components/layout/util.rs
+++ b/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)
}
}
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index baaf848c68c..6f7d1059264 100644
--- a/components/layout/wrapper.rs
+++ b/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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 01:08:28 +0000