Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-11 22:10:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add transparent Traceable and Untraceable types to aid proper rooting practices, and replace ad-hoc Untraceable structs with empty Encodable implementations.

Browse source
This commit is contained in:
Josh Matthews 2014-04-17 14:54:11 -04:00
parent 7441dae1af
commit 742f73ded5
14 changed files with 217 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/components/script/layout_interface.rs
View file

@ -6,7 +6,8 @@
/// coupling between these two components, and enables the DOM to be placed in a separate crate
/// from layout.
use dom::node::LayoutDataRef;
use dom::bindings::js::JS;
use dom::node::{Node, LayoutDataRef};
use geom::point::Point2D;
use geom::rect::Rect;
@ -19,6 +20,8 @@ use std::libc::c_void;
use style::Stylesheet;
use url::Url;
use serialize::{Encodable, Encoder};
/// Asynchronous messages that script can send to layout.
///
/// FIXME(pcwalton): I think this should probably be merged with `LayoutQuery` below.
@ -62,7 +65,17 @@ pub enum LayoutQuery {
/// The address of a node known to be valid. These must only be sent from content -> layout,
/// because we do not trust layout.
pub type TrustedNodeAddress = *c_void;
pub struct TrustedNodeAddress(*c_void);
impl<S: Encoder> Encodable<S> for TrustedNodeAddress {
fn encode(&self, s: &mut S) {
let TrustedNodeAddress(addr) = *self;
let node = addr as *Node as *mut Node;
unsafe {
JS::from_raw(node).encode(s)
}
}
}
/// The address of a node. Layout sends these back. They must be validated via
/// `from_untrusted_node_address` before they can be used, because we do not trust layout.
@ -74,7 +87,7 @@ pub struct HitTestResponse(UntrustedNodeAddress);
pub struct MouseOverResponse(~[UntrustedNodeAddress]);
/// Determines which part of the
#[deriving(Eq, Ord, TotalEq, TotalOrd)]
#[deriving(Eq, Ord, TotalEq, TotalOrd, Encodable)]
pub enum DocumentDamageLevel {
/// Reflow, but do not perform CSS selector matching.
ReflowDocumentDamage,
@ -94,6 +107,7 @@ impl DocumentDamageLevel {
/// What parts of the document have changed, as far as the script task can tell.
///
/// Note that this is fairly coarse-grained and is separate from layout's notion of the document
#[deriving(Encodable)]
pub struct DocumentDamage {
/// The topmost node in the tree that has changed.
root: TrustedNodeAddress,