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

Move Document to dom::base

Browse source
This commit is contained in:
Brian Anderson 2012-08-19 17:56:38 -07:00
parent 9d42568414
commit 3c9c26e05a
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/servo/content/content_task.rs
View file

@ -6,7 +6,6 @@
export ContentTask;
export ControlMsg, ExecuteMsg, ParseMsg, ExitMsg;
export PingMsg, PongMsg;
export Document;
import std::arc::{arc, clone};
import comm::{Port, Chan, port, chan, listen, select2};
@ -14,7 +13,7 @@ import task::{spawn, spawn_listener};
import io::{read_whole_file, println};
import result::{ok, err};
import dom::base::{Node, NodeScope, define_bindings};
import dom::base::{Document, Node, NodeScope, define_bindings};
import dom::event::{Event, ResizeEvent};
import dom::style;
import dom::style::Stylesheet;
@ -71,16 +70,6 @@ fn join_layout(scope: NodeScope, layout_task: LayoutTask) {
}
}
struct Document {
let root: Node;
let css_rules: arc<Stylesheet>;
new(root: Node, -css_rules: Stylesheet) {
self.root = root;
self.css_rules = arc(css_rules);
}
}
struct Content<C:Compositor send copy> {
let compositor: C;
let layout_task: LayoutTask;

13
src/servo/dom/base.rs
View file

@ -11,8 +11,19 @@ import js::crust::*;
import js::glue::bindgen::RUST_OBJECT_TO_JSVAL;
import dvec::{DVec, dvec};
import ptr::null;
import content::content_task::Document;
import bindings;
import std::arc::arc;
import style::Stylesheet;
struct Document {
let root: Node;
let css_rules: arc<Stylesheet>;
new(root: Node, -css_rules: Stylesheet) {
self.root = root;
self.css_rules = arc(css_rules);
}
}
enum NodeData = {
tree: tree::Tree<Node>,

2
src/servo/dom/bindings/document.rs
View file

@ -12,7 +12,7 @@ import ptr::null;
import libc::c_uint;
import utils::{DOMString, domstring_to_jsval, rust_box, squirrel_away, str};
import bindings::node::create;
import content::content_task::Document;
import base::Document;
enum DOMException {
INVALID_CHARACTER_ERR