Gitweb links:
...log
http://git.netsurf-browser.org/libcss.git/shortlog/42a03a31ea5f3b0ce1b77485906f545f7b21f09a
...commit
http://git.netsurf-browser.org/libcss.git/commit/42a03a31ea5f3b0ce1b77485906f545f7b21f09a
...tree
http://git.netsurf-browser.org/libcss.git/tree/42a03a31ea5f3b0ce1b77485906f545f7b21f09a
The branch, master has been updated
via 42a03a31ea5f3b0ce1b77485906f545f7b21f09a (commit)
via 6bd1692ed84918f06afab3c5fc809fb47510da44 (commit)
via a68fbbe207a3de4459499186ea8172daac5f15fc (commit)
from 100b51e5c47a4fe1ff77dc766a3283b633723ea6 (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=42a03a31ea5f3b0ce1b77485906f545f7b21f09a
commit 42a03a31ea5f3b0ce1b77485906f545f7b21f09a
Author: Michael Drake <Michael Drake [email protected]>
Commit: Michael Drake <Michael Drake [email protected]>
Media queries: A query without a type defaults to type: all.
diff --git a/src/parse/mq.c b/src/parse/mq.c
index 9600eb4..799edf7 100644
--- a/src/parse/mq.c
+++ b/src/parse/mq.c
@@ -997,8 +997,7 @@ static css_error mq_parse_media_query(lwc_string **strings,
return error;
}
- *query = result;
- return CSS_OK;
+ goto finished;
}
token = parserutils_vector_iterate(vector, ctx);
@@ -1047,6 +1046,11 @@ static css_error mq_parse_media_query(lwc_string
**strings,
}
}
+finished:
+ if (result->type == 0) {
+ result->type = CSS_MEDIA_ALL;
+ }
+
*query = result;
return CSS_OK;
}
commitdiff
http://git.netsurf-browser.org/libcss.git/commit/?id=6bd1692ed84918f06afab3c5fc809fb47510da44
commit 6bd1692ed84918f06afab3c5fc809fb47510da44
Author: Michael Drake <Michael Drake [email protected]>
Commit: Michael Drake <Michael Drake [email protected]>
Media queries: Convert to level 4 range in the correct place.
In mq_parse_range we already have a level 4 range.
We need to convert <mf-plain> in mq_parse_media_feature.
diff --git a/src/parse/mq.c b/src/parse/mq.c
index 378259c..9600eb4 100644
--- a/src/parse/mq.c
+++ b/src/parse/mq.c
@@ -441,12 +441,6 @@ static css_error mq_parse_range(lwc_string **strings,
}
}
- error = mq_parse_range__convert_to_level_4(result);
- if (error != CSS_OK) {
- css__mq_feature_destroy(result);
- return error;
- }
-
*feature = result;
return CSS_OK;
@@ -531,6 +525,12 @@ static css_error mq_parse_media_feature(lwc_string
**strings,
}
consumeWhitespace(vector, ctx);
+
+ error = mq_parse_range__convert_to_level_4(result);
+ if (error != CSS_OK) {
+ css__mq_feature_destroy(result);
+ return error;
+ }
} else {
/* mf-range */
error = mq_parse_range(strings, vector, ctx,
commitdiff
http://git.netsurf-browser.org/libcss.git/commit/?id=a68fbbe207a3de4459499186ea8172daac5f15fc
commit a68fbbe207a3de4459499186ea8172daac5f15fc
Author: Michael Drake <Michael Drake [email protected]>
Commit: Michael Drake <Michael Drake [email protected]>
Media queries: Reverse operator for level 4 range conversion.
First op/value are encoded as `value op name`.
diff --git a/src/parse/mq.c b/src/parse/mq.c
index 76d00f9..378259c 100644
--- a/src/parse/mq.c
+++ b/src/parse/mq.c
@@ -245,7 +245,7 @@ static css_error mq_parse_range__convert_to_level_4(
lwc_string_unref(feature->name);
feature->name = new_name;
- feature->op = CSS_MQ_FEATURE_OP_GTE;
+ feature->op = CSS_MQ_FEATURE_OP_LTE;
} else if (name[1] == 'a' && name[2] == 'x') {
if (lwc_intern_substring(feature->name,
@@ -256,7 +256,7 @@ static css_error mq_parse_range__convert_to_level_4(
lwc_string_unref(feature->name);
feature->name = new_name;
- feature->op = CSS_MQ_FEATURE_OP_LTE;
+ feature->op = CSS_MQ_FEATURE_OP_GTE;
}
}
-----------------------------------------------------------------------
Summary of changes:
src/parse/mq.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/parse/mq.c b/src/parse/mq.c
index 76d00f9..799edf7 100644
--- a/src/parse/mq.c
+++ b/src/parse/mq.c
@@ -245,7 +245,7 @@ static css_error mq_parse_range__convert_to_level_4(
lwc_string_unref(feature->name);
feature->name = new_name;
- feature->op = CSS_MQ_FEATURE_OP_GTE;
+ feature->op = CSS_MQ_FEATURE_OP_LTE;
} else if (name[1] == 'a' && name[2] == 'x') {
if (lwc_intern_substring(feature->name,
@@ -256,7 +256,7 @@ static css_error mq_parse_range__convert_to_level_4(
lwc_string_unref(feature->name);
feature->name = new_name;
- feature->op = CSS_MQ_FEATURE_OP_LTE;
+ feature->op = CSS_MQ_FEATURE_OP_GTE;
}
}
@@ -441,12 +441,6 @@ static css_error mq_parse_range(lwc_string **strings,
}
}
- error = mq_parse_range__convert_to_level_4(result);
- if (error != CSS_OK) {
- css__mq_feature_destroy(result);
- return error;
- }
-
*feature = result;
return CSS_OK;
@@ -531,6 +525,12 @@ static css_error mq_parse_media_feature(lwc_string
**strings,
}
consumeWhitespace(vector, ctx);
+
+ error = mq_parse_range__convert_to_level_4(result);
+ if (error != CSS_OK) {
+ css__mq_feature_destroy(result);
+ return error;
+ }
} else {
/* mf-range */
error = mq_parse_range(strings, vector, ctx,
@@ -997,8 +997,7 @@ static css_error mq_parse_media_query(lwc_string **strings,
return error;
}
- *query = result;
- return CSS_OK;
+ goto finished;
}
token = parserutils_vector_iterate(vector, ctx);
@@ -1047,6 +1046,11 @@ static css_error mq_parse_media_query(lwc_string
**strings,
}
}
+finished:
+ if (result->type == 0) {
+ result->type = CSS_MEDIA_ALL;
+ }
+
*query = result;
return CSS_OK;
}
--
Cascading Style Sheets library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
