aboutsummaryrefslogtreecommitdiffstats
path: root/src/servo/parser/css_lexer.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-07-27 17:24:44 -0700
committerBrian Anderson <banderson@mozilla.com>2012-07-27 17:24:44 -0700
commit633c0135672ca161ce9feb6ad6f85145930419ee (patch)
treebe14abe3227ed7f1dc018c1d11e0320ff9ec05f8 /src/servo/parser/css_lexer.rs
parent1d7e37e299a74d3192bdecf5aa7fbc5a174db75b (diff)
downloadservo-633c0135672ca161ce9feb6ad6f85145930419ee.tar.gz
servo-633c0135672ca161ce9feb6ad6f85145930419ee.zip
Represent URLs as url objects, not strings
Diffstat (limited to 'src/servo/parser/css_lexer.rs')
-rw-r--r--src/servo/parser/css_lexer.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/servo/parser/css_lexer.rs b/src/servo/parser/css_lexer.rs
index 1e8bf6d246f..0b65ce66f7c 100644
--- a/src/servo/parser/css_lexer.rs
+++ b/src/servo/parser/css_lexer.rs
@@ -9,6 +9,8 @@ import pipes::{port, chan};
import lexer_util::*;
+import std::net::url::url;
+
enum ParserState {
CssElement,
CssRelation,
@@ -252,21 +254,21 @@ fn spawn_css_lexer_from_string(-content : ~str) -> port<Token> {
}
#[warn(no_non_implicitly_copyable_typarams)]
-fn spawn_css_lexer_task(-filename: ~str) -> pipes::port<Token> {
+fn spawn_css_lexer_task(-url: url) -> pipes::port<Token> {
let (result_chan, result_port) = pipes::stream();
task::spawn(|| {
- assert filename.ends_with(".css");
- let file_try = io::read_whole_file(filename);
+ assert url.path.ends_with(".css");
+ let file_try = io::read_whole_file(url.path);
// Check if the given css file existed, if it does, parse it,
// otherwise just send an eof.
if file_try.is_ok() {
- #debug["Lexing css sheet %?", filename];
+ #debug["Lexing css sheet %?", url.path];
let file_data = file_try.get();
lex_css_from_bytes(file_data, result_chan);
} else {
- #debug["Failed to open css sheet %?", filename];
+ #debug["Failed to open css sheet %?", url.path];
result_chan.send(Eof);
}
});