Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Use newcss::Stylesheet for the stylesheet type

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 8c98b0e49c1b9a4c7ffc3cd7a2f4a62a82cba4ec
This commit is contained in:
Brian Anderson 2012-10-30 23:51:09 -07:00
parent 3f531f0a63
commit b27ed5ef9a
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servo/src/servo/content/content_task.rs
View File

@ -23,7 +23,7 @@ use layout::layout_task;
use layout_task::{LayoutTask, BuildMsg, BuildData, AddStylesheet};
use resource::image_cache_task::ImageCacheTask;
use newcss::values::Stylesheet;
use newcss::Stylesheet;
use jsrt = js::rust::rt;
use js::rust::{cx, methods};

1
servo/src/servo/css/matching.rs
View File

@ -6,6 +6,7 @@ use dom::node::{LayoutData, Node, Text};
use dom::element::ElementData;
use newcss::values::*;
use newcss::Stylesheet;
use styles::{SpecifiedStyle};
/**

2
servo/src/servo/css/styles.rs
View File

@ -5,7 +5,7 @@ use std::arc::{ARC, get, clone};
use core::dvec::DVec;
use newcss::values::*;
use newcss::values::Stylesheet;
use newcss::Stylesheet;
use dom::element::{HTMLDivElement, HTMLHeadElement, HTMLImageElement, UnknownElement, HTMLScriptElement};
use dom::node::{Comment, Doctype, Element, Text,
Node, NodeKind, NodeTree, LayoutData};

18
servo/src/servo/html/cssparse.rs
View File

@ -5,27 +5,25 @@ Some little helpers for hooking up the HTML parser with the CSS parser
use std::net::url::Url;
use std::cell::Cell;
use resource::resource_task::{ResourceTask, ProgressMsg, Load, Payload, Done};
use newcss::values::Stylesheet;
use newcss::util::{DataStream, DataStreamFactory};
use newcss::Stylesheet;
use newcss::util::DataStream;
pub fn spawn_css_parser(url: Url, resource_task: ResourceTask) -> comm::Port<Stylesheet> {
let result_port = comm::Port();
let result_chan = comm::Chan(&result_port);
do task::spawn |move url, copy resource_task| {
let sheet = newcss::parser::parse_stylesheet(copy url, data_stream_factory(copy url, resource_task));
let sheet = Stylesheet::new(copy url, data_stream(copy url, resource_task));
result_chan.send(move sheet);
}
return result_port;
}
fn data_stream_factory(url: Url, resource_task: ResourceTask) -> DataStreamFactory {
let url = Cell(move url);
return |move url| {
let input_port = Port();
resource_task.send(Load(url.take(), input_port.chan()));
resource_port_to_data_stream(input_port)
}
fn data_stream(url: Url, resource_task: ResourceTask) -> DataStream {
let input_port = Port();
resource_task.send(Load(move url, input_port.chan()));
resource_port_to_data_stream(input_port)
}
fn resource_port_to_data_stream(input_port: comm::Port<ProgressMsg>) -> DataStream {

2
servo/src/servo/html/hubbub_html_parser.rs
View File

@ -1,6 +1,6 @@
use au = gfx::geometry;
use content::content_task::ContentTask;
use newcss::values::Stylesheet;
use newcss::Stylesheet;
use dom::cow;
use dom::element::*;
use dom::event::{Event, ReflowEvent};

2
servo/src/servo/layout/layout_task.rs
View File

@ -8,7 +8,7 @@ use au::Au;
use content::content_task;
use core::dvec::DVec;
use css::styles::apply_style;
use newcss::values::Stylesheet;
use newcss::Stylesheet;
use dl = gfx::display_list;
use dom::event::{Event, ReflowEvent};
use dom::node::{Node, LayoutData};