mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Prefix concrete types with 'Servo'.
This commit is contained in:
parent
54f2700ba6
commit
9dd45b9f2a
6 changed files with 90 additions and 90 deletions
|
@ -17,7 +17,7 @@ use std::cell::RefCell;
|
|||
use std::mem;
|
||||
use util::opts;
|
||||
use util::tid::tid;
|
||||
use wrapper::{LayoutNode, LayoutNodeTrait, layout_node_to_unsafe_layout_node};
|
||||
use wrapper::{ServoLayoutNode, LayoutNodeTrait, layout_node_to_unsafe_layout_node};
|
||||
use wrapper::{ThreadSafeLayoutNode, UnsafeLayoutNode};
|
||||
|
||||
/// Every time we do another layout, the old bloom filters are invalid. This is
|
||||
|
@ -51,7 +51,7 @@ thread_local!(
|
|||
///
|
||||
/// If one does not exist, a new one will be made for you. If it is out of date,
|
||||
/// it will be cleared and reused.
|
||||
fn take_task_local_bloom_filter(parent_node: Option<LayoutNode>,
|
||||
fn take_task_local_bloom_filter(parent_node: Option<ServoLayoutNode>,
|
||||
root: OpaqueNode,
|
||||
layout_context: &LayoutContext)
|
||||
-> Box<BloomFilter> {
|
||||
|
@ -98,7 +98,7 @@ fn put_task_local_bloom_filter(bf: Box<BloomFilter>,
|
|||
|
||||
/// "Ancestors" in this context is inclusive of ourselves.
|
||||
fn insert_ancestors_into_bloom_filter(bf: &mut Box<BloomFilter>,
|
||||
mut n: LayoutNode,
|
||||
mut n: ServoLayoutNode,
|
||||
root: OpaqueNode) {
|
||||
debug!("[{}] Inserting ancestors.", tid());
|
||||
let mut ancestors = 0;
|
||||
|
@ -118,13 +118,13 @@ fn insert_ancestors_into_bloom_filter(bf: &mut Box<BloomFilter>,
|
|||
/// A top-down traversal.
|
||||
pub trait PreorderDomTraversal {
|
||||
/// The operation to perform. Return true to continue or false to stop.
|
||||
fn process(&self, node: LayoutNode);
|
||||
fn process(&self, node: ServoLayoutNode);
|
||||
}
|
||||
|
||||
/// A bottom-up traversal, with a optional in-order pass.
|
||||
pub trait PostorderDomTraversal {
|
||||
/// The operation to perform. Return true to continue or false to stop.
|
||||
fn process(&self, node: LayoutNode);
|
||||
fn process(&self, node: ServoLayoutNode);
|
||||
}
|
||||
|
||||
/// A bottom-up, parallelizable traversal.
|
||||
|
@ -144,7 +144,7 @@ pub struct RecalcStyleForNode<'a> {
|
|||
impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> {
|
||||
#[inline]
|
||||
#[allow(unsafe_code)]
|
||||
fn process(&self, node: LayoutNode) {
|
||||
fn process(&self, node: ServoLayoutNode) {
|
||||
// Initialize layout data.
|
||||
//
|
||||
// FIXME(pcwalton): Stop allocating here. Ideally this should just be done by the HTML
|
||||
|
@ -249,7 +249,7 @@ pub struct ConstructFlows<'a> {
|
|||
impl<'a> PostorderDomTraversal for ConstructFlows<'a> {
|
||||
#[inline]
|
||||
#[allow(unsafe_code)]
|
||||
fn process(&self, node: LayoutNode) {
|
||||
fn process(&self, node: ServoLayoutNode) {
|
||||
// Construct flows for this node.
|
||||
{
|
||||
let tnode = ThreadSafeLayoutNode::new(&node);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue