diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-12-06 13:18:12 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-12-06 16:45:18 +0000 |
| commit | d4cafaf627dd7ceb1a1dfd8292323c4b474ec57c (patch) | |
| tree | bda6e1e1f89daa315ad7020cc52ea8311327c2d5 /src/select/propset.h | |
| parent | 0e2da043cbfe4f4df8e7978c52aa919199925424 (diff) | |
| download | libcss-d4cafaf627dd7ceb1a1dfd8292323c4b474ec57c.tar.gz libcss-d4cafaf627dd7ceb1a1dfd8292323c4b474ec57c.tar.bz2 | |
Add column-span property to computed styles.
Diffstat (limited to 'src/select/propset.h')
| -rw-r--r-- | src/select/propset.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/select/propset.h b/src/select/propset.h index 6dcfbc6..baac10b 100644 --- a/src/select/propset.h +++ b/src/select/propset.h @@ -29,7 +29,8 @@ static const css_computed_uncommon default_uncommon = { (CSS_COLUMN_COUNT_AUTO << 6) | (CSS_COLUMN_FILL_BALANCE << 4) | (CSS_COLUMN_RULE_STYLE_NONE << 0), (CSS_COLUMN_GAP_NORMAL << 2) | (CSS_COLUMN_RULE_COLOR_CURRENT_COLOR), - (CSS_COLUMN_RULE_WIDTH_MEDIUM << 1) + (CSS_COLUMN_RULE_WIDTH_MEDIUM << 1), + (CSS_COLUMN_SPAN_NONE << 6) }, { 0, 0 }, { 0, 0, 0, 0 }, @@ -555,6 +556,28 @@ static inline css_error set_column_rule_width( #undef COLUMN_RULE_WIDTH_SHIFT #undef COLUMN_RULE_WIDTH_INDEX +#define COLUMN_SPAN_INDEX 11 +#define COLUMN_SPAN_SHIFT 6 +#define COLUMN_SPAN_MASK 0xc0 +static inline css_error set_column_span( + css_computed_style *style, uint8_t type) +{ + uint8_t *bits; + + ENSURE_UNCOMMON; + + bits = &style->uncommon->bits[COLUMN_SPAN_INDEX]; + + /* 2bits: tt : type */ + *bits = (*bits & ~COLUMN_SPAN_MASK) | + ((type & 0x3) << COLUMN_SPAN_SHIFT); + + return CSS_OK; +} +#undef COLUMN_SPAN_MASK +#undef COLUMN_SPAN_SHIFT +#undef COLUMN_SPAN_INDEX + #define CONTENT_INDEX 7 #define CONTENT_SHIFT 0 #define CONTENT_MASK 0x3 |