Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Associate ResourceTask with UrlProvenance #2152

Merged
merged 1 commit into from Apr 18, 2014
Merged

Associate ResourceTask with UrlProvenance #2152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions src/components/script/html/cssparse.rs
View file
Open in desktop
Expand Up @@ -14,23 +14,21 @@ use url::Url;

/// Where a style sheet comes from.
pub enum StylesheetProvenance {
UrlProvenance(Url),
UrlProvenance(Url, ResourceTask),
InlineProvenance(Url, ~str),
}

// Parses the style data and returns the stylesheet
pub fn parse_inline_css(url: Url, data: ~str) -> Stylesheet {
let resource_task = ResourceTask(); // Resource task is not used for inline parsing
parse_css(InlineProvenance(url, data), resource_task)
parse_css(InlineProvenance(url, data))
}

fn parse_css(provenance: StylesheetProvenance,
resource_task: ResourceTask) -> Stylesheet {
fn parse_css(provenance: StylesheetProvenance) -> Stylesheet {
// TODO: Get the actual value. http://dev.w3.org/csswg/css-syntax/#environment-encoding
let environment_encoding = UTF_8 as EncodingRef;

match provenance {
UrlProvenance(url) => {
UrlProvenance(url, resource_task) => {
debug!("cssparse: loading style sheet at {:s}", url.to_str());
let (input_chan, input_port) = channel();
resource_task.send(Load(url, input_chan));
Expand All @@ -50,13 +48,11 @@ fn parse_css(provenance: StylesheetProvenance,
}
}

pub fn spawn_css_parser(provenance: StylesheetProvenance,
resource_task: ResourceTask)
-> Receiver<Stylesheet> {
pub fn spawn_css_parser(provenance: StylesheetProvenance) -> Receiver<Stylesheet> {
let (result_chan, result_port) = channel();

spawn_named("cssparser", proc() {
result_chan.send(parse_css(provenance, resource_task));
result_chan.send(parse_css(provenance));
});

return result_port;
Expand Down
4 changes: 2 additions & 2 deletions src/components/script/html/hubbub_html_parser.rs
View file
Open in desktop
Expand Up @@ -111,7 +111,7 @@ fn css_link_listener(to_parent: Sender<HtmlDiscoveryMessage>,
loop {
match from_parent.recv_opt() {
Some(CSSTaskNewFile(provenance)) => {
result_vec.push(spawn_css_parser(provenance, resource_task.clone()));
result_vec.push(spawn_css_parser(provenance));
}
Some(CSSTaskExit) | None => {
break;
Expand Down Expand Up @@ -357,7 +357,7 @@ pub fn parse_html(page: &Page,
}) => {
debug!("found CSS stylesheet: {:s}", href.get().value_ref());
let url = parse_url(href.get().value_ref(), Some(url2.clone()));
css_chan2.send(CSSTaskNewFile(UrlProvenance(url)));
css_chan2.send(CSSTaskNewFile(UrlProvenance(url, resource_task.clone())));
}
_ => {}
}
Expand Down