aboutsummaryrefslogtreecommitdiff
path: root/src/cssparser.cc
diff options
context:
space:
mode:
authorJeremy Henty <onepoint@starurchin.org>2010-12-18 17:18:13 +0000
committerJeremy Henty <onepoint@starurchin.org>2010-12-18 17:18:13 +0000
commita45f583b19df9a10c28717214851ae2447ab13b9 (patch)
treeab8349a964691b7275ee3e4af20286f657667674 /src/cssparser.cc
parentb0bdd878746015a9c03904cea587e46f27b971c9 (diff)
cssparser.cc: move some calls to nextToken().
Diffstat (limited to 'src/cssparser.cc')
-rw-r--r--src/cssparser.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cssparser.cc b/src/cssparser.cc
index 5886a1e1..16fcdf03 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -1424,6 +1424,8 @@ void CssParser::parseImport(DilloHtml *html, DilloUrl *baseUrl)
{
char *urlStr = NULL;
+ nextToken();
+
if (ttype == CSS_TK_SYMBOL &&
dStrcasecmp(tval, "url") == 0)
urlStr = parseUrl();
@@ -1447,6 +1449,8 @@ void CssParser::parseMedia()
bool mediaSyntaxIsOK = false;
bool mediaIsSelected = false;
+ nextToken();
+
/* parse a comma-separated list of media */
while (ttype == CSS_TK_SYMBOL) {
if (dStrcasecmp(tval, "all") == 0 ||
@@ -1539,10 +1543,8 @@ void CssParser::parse(DilloHtml *html, DilloUrl *url, CssContext * context,
if (dStrcasecmp(parser.tval, "import") == 0 &&
html != NULL &&
importsAreAllowed) {
- parser.nextToken();
parser.parseImport(html, url);
} else if (dStrcasecmp(parser.tval, "media") == 0) {
- parser.nextToken();
parser.parseMedia();
} else {
parser.ignoreStatement();