aboutsummaryrefslogtreecommitdiffstats
path: root/src/servo/css/resolve
diff options
context:
space:
mode:
Diffstat (limited to 'src/servo/css/resolve')
-rw-r--r--src/servo/css/resolve/apply.rs4
-rw-r--r--src/servo/css/resolve/matching.rs28
2 files changed, 16 insertions, 16 deletions
diff --git a/src/servo/css/resolve/apply.rs b/src/servo/css/resolve/apply.rs
index e3933aa03dd..85ef3bdddc8 100644
--- a/src/servo/css/resolve/apply.rs
+++ b/src/servo/css/resolve/apply.rs
@@ -40,7 +40,7 @@ struct StyleApplicator {
}
// TODO: normalize this into a normal preorder tree traversal function
-fn apply_style(layout_ctx: &LayoutContext, node: Node, +reflow: fn~()) {
+fn apply_style(layout_ctx: &LayoutContext, node: Node, reflow: fn~()) {
let applicator = StyleApplicator {
node: node,
reflow: reflow
@@ -54,7 +54,7 @@ fn apply_style(layout_ctx: &LayoutContext, node: Node, +reflow: fn~()) {
/** A wrapper around a set of functions that can be applied as a
* top-down traversal of layout boxes.
*/
-fn inheritance_wrapper(layout_ctx: &LayoutContext, node : Node, +reflow: fn~()) {
+fn inheritance_wrapper(layout_ctx: &LayoutContext, node : Node, reflow: fn~()) {
let applicator = StyleApplicator {
node: node,
reflow: reflow
diff --git a/src/servo/css/resolve/matching.rs b/src/servo/css/resolve/matching.rs
index 94822b25ca3..c71e4518e95 100644
--- a/src/servo/css/resolve/matching.rs
+++ b/src/servo/css/resolve/matching.rs
@@ -225,7 +225,7 @@ mod test {
use dvec::DVec;
#[allow(non_implicitly_copyable_typarams)]
- fn new_node_from_attr(scope: NodeScope, +name: ~str, +val: ~str) -> Node {
+ fn new_node_from_attr(scope: &NodeScope, name: ~str, val: ~str) -> Node {
let elmt = ElementData(~"div", ~HTMLDivElement);
let attr = ~Attr(name, val);
elmt.attrs.push(attr);
@@ -235,7 +235,7 @@ mod test {
#[test]
fn test_match_pipe1() {
let scope = NodeScope();
- let node = new_node_from_attr(scope, ~"lang", ~"en-us");
+ let node = new_node_from_attr(&scope, ~"lang", ~"en-us");
let sel = Element(~"*", ~[StartsWith(~"lang", ~"en")]);
@@ -245,7 +245,7 @@ mod test {
#[test]
fn test_match_pipe2() {
let scope = NodeScope();
- let node = new_node_from_attr(scope, ~"lang", ~"en");
+ let node = new_node_from_attr(&scope, ~"lang", ~"en");
let sel = Element(~"*", ~[StartsWith(~"lang", ~"en")]);
@@ -255,7 +255,7 @@ mod test {
#[test]
fn test_not_match_pipe() {
let scope = NodeScope();
- let node = new_node_from_attr(scope, ~"lang", ~"english");
+ let node = new_node_from_attr(&scope, ~"lang", ~"english");
let sel = Element(~"*", ~[StartsWith(~"lang", ~"en")]);
@@ -265,7 +265,7 @@ mod test {
#[test]
fn test_match_includes() {
let scope = NodeScope();
- let node = new_node_from_attr(scope, ~"mad", ~"hatter cobler cooper");
+ let node = new_node_from_attr(&scope, ~"mad", ~"hatter cobler cooper");
let sel = Element(~"div", ~[Includes(~"mad", ~"hatter")]);
@@ -275,7 +275,7 @@ mod test {
#[test]
fn test_match_exists() {
let scope = NodeScope();
- let node = new_node_from_attr(scope, ~"mad", ~"hatter cobler cooper");
+ let node = new_node_from_attr(&scope, ~"mad", ~"hatter cobler cooper");
let sel1 = Element(~"div", ~[Exists(~"mad")]);
let sel2 = Element(~"div", ~[Exists(~"hatter")]);
@@ -287,8 +287,8 @@ mod test {
#[test]
fn test_match_exact() {
let scope = NodeScope();
- let node1 = new_node_from_attr(scope, ~"mad", ~"hatter cobler cooper");
- let node2 = new_node_from_attr(scope, ~"mad", ~"hatter");
+ let node1 = new_node_from_attr(&scope, ~"mad", ~"hatter cobler cooper");
+ let node2 = new_node_from_attr(&scope, ~"mad", ~"hatter");
let sel = Element(~"div", ~[Exact(~"mad", ~"hatter")]);
@@ -300,12 +300,12 @@ mod test {
fn match_tree() {
let scope = NodeScope();
- let root = new_node_from_attr(scope, ~"class", ~"blue");
- let child1 = new_node_from_attr(scope, ~"id", ~"green");
- let child2 = new_node_from_attr(scope, ~"flag", ~"black");
- let gchild = new_node_from_attr(scope, ~"flag", ~"grey");
- let ggchild = new_node_from_attr(scope, ~"flag", ~"white");
- let gggchild = new_node_from_attr(scope, ~"flag", ~"purple");
+ let root = new_node_from_attr(&scope, ~"class", ~"blue");
+ let child1 = new_node_from_attr(&scope, ~"id", ~"green");
+ let child2 = new_node_from_attr(&scope, ~"flag", ~"black");
+ let gchild = new_node_from_attr(&scope, ~"flag", ~"grey");
+ let ggchild = new_node_from_attr(&scope, ~"flag", ~"white");
+ let gggchild = new_node_from_attr(&scope, ~"flag", ~"purple");
scope.add_child(root, child1);
scope.add_child(root, child2);