diff options
| author | Margaret Meyerhofer <mmeyerhofer@mozilla.com> | 2012-06-04 10:25:15 -0700 |
|---|---|---|
| committer | Margaret Meyerhofer <mmeyerhofer@mozilla.com> | 2012-06-08 10:50:55 -0700 |
| commit | e3d965019684c4c24382c2380898d37871d5638d (patch) | |
| tree | ece84fb4c79f1780fd758015ac21223702ad3cf6 /src/servo/parser/css_builder.rs | |
| parent | 10294134abeb6cb4d6ca9a2a1e386e235e1054c9 (diff) | |
| download | servo-e3d965019684c4c24382c2380898d37871d5638d.tar.gz servo-e3d965019684c4c24382c2380898d37871d5638d.zip | |
Added css selector matching and now render specified background colors
added comments and put back random colors for unspecified boxes
Diffstat (limited to 'src/servo/parser/css_builder.rs')
| -rw-r--r-- | src/servo/parser/css_builder.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/servo/parser/css_builder.rs b/src/servo/parser/css_builder.rs index cc74afb5f5d..01dd83fe951 100644 --- a/src/servo/parser/css_builder.rs +++ b/src/servo/parser/css_builder.rs @@ -21,6 +21,7 @@ impl methods for token_reader { } fn unget(tok : token) { + assert self.lookahead.is_none(); self.lookahead = some(tok); } } @@ -85,7 +86,7 @@ fn parse_color(color : str) -> uint { i += 1u; - while i < color_vec.len() && color_vec[i] != ',' as u8 { + while i < color_vec.len() && color_vec[i] != ')' as u8 { blue_vec += [color_vec[i]]; i += 1u; } @@ -220,8 +221,9 @@ fn parse_rule(reader : token_reader) -> option<~rule> { } "display" { alt val { - "inline" { desc_list += [display(inline)]; } - "block" { desc_list += [display(block)]; } + "inline" { desc_list += [display(di_inline)]; } + "block" { desc_list += [display(di_block)]; } + "none" { desc_list += [display(di_none)]; } _ { #debug["Recieved unknown display value '%s'", val]; } } |