summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2017-04-27 11:57:37 +0100
committerMichael Drake <michael.drake@codethink.co.uk>2017-04-27 11:57:37 +0100
commit8d583fbe94b801353faec8e3a5a6729e3fe767a5 (patch)
tree76f7e72bbf31a9adf3271f0d95672e41eec2802a
parent24f23765517bd02445835dd543a07b1a883ca316 (diff)
downloadlibcss-8d583fbe94b801353faec8e3a5a6729e3fe767a5.tar.gz
libcss-8d583fbe94b801353faec8e3a5a6729e3fe767a5.tar.bz2
Selection: Add support for the CSS3 box-sizing property.
-rw-r--r--src/select/computed.h5
-rw-r--r--src/select/properties/box_sizing.c27
-rw-r--r--src/select/propget.h17
-rw-r--r--src/select/propset.h18
4 files changed, 52 insertions, 15 deletions
diff --git a/src/select/computed.h b/src/select/computed.h
index f77bda2..d2301f5 100644
--- a/src/select/computed.h
+++ b/src/select/computed.h
@@ -159,8 +159,9 @@ struct css_computed_style_i {
* unicode_bidi 2
* visibility 2
* white_space 3
+ * box_sizing 2
* ---
- * 84 bits
+ * 86 bits
*
* Colours are 32bits of AARRGGBB
* Dimensions are encoded as a fixed point value + 4 bits of unit data
@@ -250,7 +251,7 @@ struct css_computed_style_i {
* 21 mmmmmccc min-width | clear
* 22 tttttxxx padding-top | overflow-x
* 23 rrrrrppp padding-right | position
- * 24 bbbbbo.. padding-bottom | opacity | <unused>
+ * 24 bbbbboss padding-bottom | opacity | box-sizing
* 25 lllllttt padding-left | text-transform
* 26 tttttwww text-indent | white-space
* 27 bbbbbbbb background-position
diff --git a/src/select/properties/box_sizing.c b/src/select/properties/box_sizing.c
index 357dd3c..91c475d 100644
--- a/src/select/properties/box_sizing.c
+++ b/src/select/properties/box_sizing.c
@@ -17,20 +17,24 @@
css_error css__cascade_box_sizing(uint32_t opv, css_style *style,
css_select_state *state)
{
+ uint16_t value = CSS_BOX_SIZING_INHERIT;
+
UNUSED(style);
if (isInherit(opv) == false) {
switch (getValue(opv)) {
case BOX_SIZING_CONTENT_BOX:
+ value = CSS_BOX_SIZING_CONTENT_BOX;
+ break;
case BOX_SIZING_BORDER_BOX:
- /** \todo convert to public values */
+ value = CSS_BOX_SIZING_BORDER_BOX;
break;
}
}
if (css__outranks_existing(getOpcode(opv), isImportant(opv), state,
isInherit(opv))) {
- /** \todo set computed value */
+ return set_box_sizing(state->computed, value);
}
return CSS_OK;
@@ -39,17 +43,12 @@ css_error css__cascade_box_sizing(uint32_t opv, css_style *style,
css_error css__set_box_sizing_from_hint(const css_hint *hint,
css_computed_style *style)
{
- UNUSED(hint);
- UNUSED(style);
-
- return CSS_OK;
+ return set_box_sizing(style, hint->status);
}
css_error css__initial_box_sizing(css_select_state *state)
{
- UNUSED(state);
-
- return CSS_OK;
+ return set_box_sizing(state->computed, CSS_BOX_SIZING_CONTENT_BOX);
}
css_error css__compose_box_sizing(
@@ -57,10 +56,12 @@ css_error css__compose_box_sizing(
const css_computed_style *child,
css_computed_style *result)
{
- UNUSED(parent);
- UNUSED(child);
- UNUSED(result);
+ uint8_t type = get_box_sizing(child);
- return CSS_OK;
+ if (type == CSS_BOX_SIZING_INHERIT) {
+ type = get_box_sizing(parent);
+ }
+
+ return set_box_sizing(result, type);
}
diff --git a/src/select/propget.h b/src/select/propget.h
index 5552e39..6719443 100644
--- a/src/select/propget.h
+++ b/src/select/propget.h
@@ -1268,6 +1268,23 @@ static inline uint8_t get_background_attachment(
#undef BACKGROUND_ATTACHMENT_SHIFT
#undef BACKGROUND_ATTACHMENT_INDEX
+#define BOX_SIZING_INDEX 34
+#define BOX_SIZING_SHIFT 0
+#define BOX_SIZING_MASK 0x3
+static inline uint8_t get_box_sizing(
+ const css_computed_style *style)
+{
+ uint8_t bits = style->i.bits[BOX_SIZING_INDEX];
+ bits &= BOX_SIZING_MASK;
+ bits >>= BOX_SIZING_SHIFT;
+
+ /* 2bits: type */
+ return bits;
+}
+#undef BOX_SIZING_MASK
+#undef BOX_SIZING_SHIFT
+#undef BOX_SIZING_INDEX
+
#define BORDER_COLLAPSE_INDEX 13
#define BORDER_COLLAPSE_SHIFT 0
#define BORDER_COLLAPSE_MASK 0x3
diff --git a/src/select/propset.h b/src/select/propset.h
index 76e4fe6..3f4038c 100644
--- a/src/select/propset.h
+++ b/src/select/propset.h
@@ -1361,6 +1361,24 @@ static inline css_error set_background_attachment(
#undef BACKGROUND_ATTACHMENT_SHIFT
#undef BACKGROUND_ATTACHMENT_INDEX
+#define BOX_SIZING_INDEX 34
+#define BOX_SIZING_SHIFT 0
+#define BOX_SIZING_MASK 0x3
+static inline css_error set_box_sizing(
+ css_computed_style *style, uint8_t type)
+{
+ uint8_t *bits = &style->i.bits[BOX_SIZING_INDEX];
+
+ /* 2bits: type */
+ *bits = (*bits & ~BOX_SIZING_MASK) |
+ ((type & 0x3) << BOX_SIZING_SHIFT);
+
+ return CSS_OK;
+}
+#undef BOX_SIZING_MASK
+#undef BOX_SIZING_SHIFT
+#undef BOX_SIZING_INDEX
+
#define BORDER_COLLAPSE_INDEX 13
#define BORDER_COLLAPSE_SHIFT 0
#define BORDER_COLLAPSE_MASK 0x3