Gitweb links:
...log
http://git.netsurf-browser.org/libcss.git/shortlog/a5e287b135558228ccf4d3bcf2e9763b8f7cd367
...commit
http://git.netsurf-browser.org/libcss.git/commit/a5e287b135558228ccf4d3bcf2e9763b8f7cd367
...tree
http://git.netsurf-browser.org/libcss.git/tree/a5e287b135558228ccf4d3bcf2e9763b8f7cd367
The branch, master has been updated
via a5e287b135558228ccf4d3bcf2e9763b8f7cd367 (commit)
from ace5978891ce0c2e1700945a296881fc62109701 (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=a5e287b135558228ccf4d3bcf2e9763b8f7cd367
commit a5e287b135558228ccf4d3bcf2e9763b8f7cd367
Author: Michael Drake <Michael Drake [email protected]>
Commit: Michael Drake <Michael Drake [email protected]>
Media queries: Imported sheets: Media type falls back to "all".
diff --git a/src/parse/language.c b/src/parse/language.c
index 54fac9a..7fbfba7 100644
--- a/src/parse/language.c
+++ b/src/parse/language.c
@@ -428,8 +428,16 @@ css_error handleStartAtRule(css_language *c, const
parserutils_vector *vector)
/* Parse media list */
error = css__mq_parse_media_list(
c->strings, vector, &ctx, &media);
- if (error != CSS_OK)
+ if (error == CSS_NOMEM) {
return error;
+ } else if (media == NULL) {
+ /* Fall back to default media: "all". */
+ media = calloc(1, sizeof(*media));
+ if (media == NULL) {
+ return CSS_NOMEM;
+ }
+ media->type = CSS_MEDIA_ALL;
+ }
/* Create rule */
error = css__stylesheet_rule_create(c->sheet,
-----------------------------------------------------------------------
Summary of changes:
src/parse/language.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/parse/language.c b/src/parse/language.c
index 54fac9a..7fbfba7 100644
--- a/src/parse/language.c
+++ b/src/parse/language.c
@@ -428,8 +428,16 @@ css_error handleStartAtRule(css_language *c, const
parserutils_vector *vector)
/* Parse media list */
error = css__mq_parse_media_list(
c->strings, vector, &ctx, &media);
- if (error != CSS_OK)
+ if (error == CSS_NOMEM) {
return error;
+ } else if (media == NULL) {
+ /* Fall back to default media: "all". */
+ media = calloc(1, sizeof(*media));
+ if (media == NULL) {
+ return CSS_NOMEM;
+ }
+ media->type = CSS_MEDIA_ALL;
+ }
/* Create rule */
error = css__stylesheet_rule_create(c->sheet,
--
Cascading Style Sheets library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
