summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-01-02 20:26:17 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-01-02 20:26:17 +0000
commit606cf0251feacadcaa63191a643dc8fc57a7c613 (patch)
tree9e58e34a3abbb5eb7a58e9cfe8852b3aa7aebba8 /src
parentce4c97183035bcef5c4c0095b75f442c03987426 (diff)
downloadlibcss-606cf0251feacadcaa63191a643dc8fc57a7c613.tar.gz
libcss-606cf0251feacadcaa63191a643dc8fc57a7c613.tar.bz2
Complete the fix for pseudo element selection: inline styles and presentational hints must not be applied to pseudo elements.
svn path=/trunk/libcss/; revision=11181
Diffstat (limited to 'src')
-rw-r--r--src/select/select.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/select/select.c b/src/select/select.c
index 5723a9b..48062d7 100644
--- a/src/select/select.c
+++ b/src/select/select.c
@@ -303,6 +303,10 @@ css_error css_select_style(css_select_ctx *ctx, void *node,
if (ctx == NULL || node == NULL || result == NULL || handler == NULL)
return CSS_BADPARM;
+ /* Inline style has no meaning if selecting for a pseudo element */
+ if (pseudo_element != CSS_PSEUDO_ELEMENT_NONE && inline_style != NULL)
+ return CSS_BADPARM;
+
/* Set up the selection state */
memset(&state, 0, sizeof(css_select_state));
state.node = node;
@@ -353,12 +357,14 @@ css_error css_select_style(css_select_ctx *ctx, void *node,
/* Take account of presentational hints and fix up any remaining
* unset properties. */
for (i = 0; i < CSS_N_PROPERTIES; i++) {
- /* If the existing property value came from an author
- * stylesheet or a user sheet using !important, then leave
- * it alone. */
- if (state.props[i].set == false ||
+ /* Apply presentational hints if we're not selecting for
+ * a pseudo element, and the property is unset or the
+ * existing property value did not come from an author
+ * stylesheet or a user sheet using !important. */
+ if (pseudo_element == CSS_PSEUDO_ELEMENT_NONE &&
+ (state.props[i].set == false ||
(state.props[i].origin != CSS_ORIGIN_AUTHOR &&
- state.props[i].important == false)) {
+ state.props[i].important == false))) {
error = set_hint(&state, i);
if (error != CSS_OK)
goto cleanup;
@@ -891,7 +897,13 @@ css_error match_selector_chain(css_select_ctx *ctx,
/* If this is the first selector in the chain, we must match
* its details. The details of subsequent selectors will be
- * matched when processing the combinator. */
+ * matched when processing the combinator.
+ *
+ * Note that pseudo elements will only appear as details of
+ * the first selector in the chain, as the parser will reject
+ * any selector chains containing pseudo elements anywhere
+ * else.
+ */
if (s == selector) {
/* Match details on this selector */
error = match_details(ctx, node, detail, state, &match);