Gitweb links:
...log
http://git.netsurf-browser.org/libcss.git/shortlog/f87801ced60e92888325b0732d3e737f50abe1c9
...commit
http://git.netsurf-browser.org/libcss.git/commit/f87801ced60e92888325b0732d3e737f50abe1c9
...tree
http://git.netsurf-browser.org/libcss.git/tree/f87801ced60e92888325b0732d3e737f50abe1c9
The branch, master has been updated
via f87801ced60e92888325b0732d3e737f50abe1c9 (commit)
via 88223375fcdeed95afa708f934909b23b7765ed4 (commit)
from 42a03a31ea5f3b0ce1b77485906f545f7b21f09a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/libcss.git/commit/?id=f87801ced60e92888325b0732d3e737f50abe1c9
commit f87801ced60e92888325b0732d3e737f50abe1c9
Author: Michael Drake <Michael Drake [email protected]>
Commit: Michael Drake <Michael Drake [email protected]>
Media queries: Pass the right tokens to mq_populate_value.
diff --git a/src/parse/mq.c b/src/parse/mq.c
index 799edf7..f3510c1 100644
--- a/src/parse/mq.c
+++ b/src/parse/mq.c
@@ -420,7 +420,7 @@ static css_error mq_parse_range(lwc_string **strings,
result->value.data.num_or_ratio = ratio;
} else {
/* num/dim/ident */
- error = mq_populate_value(&result->value, token);
+ error = mq_populate_value(&result->value, name_or_value);
if (error != CSS_OK) {
free(result);
return error;
@@ -433,7 +433,7 @@ static css_error mq_parse_range(lwc_string **strings,
result->value2.data.num_or_ratio = ratio;
} else {
/* num/dim/ident */
- error = mq_populate_value(&result->value2, token);
+ error = mq_populate_value(&result->value2, value2);
if (error != CSS_OK) {
css__mq_feature_destroy(result);
return error;
commitdiff
http://git.netsurf-browser.org/libcss.git/commit/?id=88223375fcdeed95afa708f934909b23b7765ed4
commit 88223375fcdeed95afa708f934909b23b7765ed4
Author: Michael Drake <Michael Drake [email protected]>
Commit: Michael Drake <Michael Drake [email protected]>
lexer: Emit "<=" as a CSS_TOKEN_CHAR.
Previously the "<" was output as a CSS_TOKEN_CHAR, and the
"=" was in the next token.
CSS media queries adds "<=".
diff --git a/src/lex/lex.c b/src/lex/lex.c
index 2be1145..d5a1e33 100644
--- a/src/lex/lex.c
+++ b/src/lex/lex.c
@@ -698,6 +698,11 @@ css_error CDO(css_lexer *lexer, css_token **token)
if (c == '!') {
APPEND(lexer, cptr, clen);
+ } else if (c == '=') {
+ /* This is not relatated to comment parsing but
+ * media queries add a comment token. */
+ APPEND(lexer, cptr, clen);
+ return emitToken(lexer, CSS_TOKEN_CHAR, token);
} else {
return emitToken(lexer, CSS_TOKEN_CHAR, token);
}
-----------------------------------------------------------------------
Summary of changes:
src/lex/lex.c | 5 +++++
src/parse/mq.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/lex/lex.c b/src/lex/lex.c
index 2be1145..d5a1e33 100644
--- a/src/lex/lex.c
+++ b/src/lex/lex.c
@@ -698,6 +698,11 @@ css_error CDO(css_lexer *lexer, css_token **token)
if (c == '!') {
APPEND(lexer, cptr, clen);
+ } else if (c == '=') {
+ /* This is not relatated to comment parsing but
+ * media queries add a comment token. */
+ APPEND(lexer, cptr, clen);
+ return emitToken(lexer, CSS_TOKEN_CHAR, token);
} else {
return emitToken(lexer, CSS_TOKEN_CHAR, token);
}
diff --git a/src/parse/mq.c b/src/parse/mq.c
index 799edf7..f3510c1 100644
--- a/src/parse/mq.c
+++ b/src/parse/mq.c
@@ -420,7 +420,7 @@ static css_error mq_parse_range(lwc_string **strings,
result->value.data.num_or_ratio = ratio;
} else {
/* num/dim/ident */
- error = mq_populate_value(&result->value, token);
+ error = mq_populate_value(&result->value, name_or_value);
if (error != CSS_OK) {
free(result);
return error;
@@ -433,7 +433,7 @@ static css_error mq_parse_range(lwc_string **strings,
result->value2.data.num_or_ratio = ratio;
} else {
/* num/dim/ident */
- error = mq_populate_value(&result->value2, token);
+ error = mq_populate_value(&result->value2, value2);
if (error != CSS_OK) {
css__mq_feature_destroy(result);
return error;
--
Cascading Style Sheets library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
