From 2fc58495a7865170a05e385aa54ca931c0c453c3 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 29 Dec 2014 21:30:04 +0000 Subject: Fixup break-inside. --- src/select/properties/break_inside.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'src/select') diff --git a/src/select/properties/break_inside.c b/src/select/properties/break_inside.c index 58931b3..af0259f 100644 --- a/src/select/properties/break_inside.c +++ b/src/select/properties/break_inside.c @@ -17,8 +17,33 @@ css_error css__cascade_break_inside(uint32_t opv, css_style *style, css_select_state *state) { - return css__cascade_break_after_before_inside(opv, style, state, - set_break_inside); + uint16_t value = CSS_BREAK_AFTER_AUTO; + + UNUSED(style); + + if (isInherit(opv) == false) { + switch (getValue(opv)) { + case BREAK_INSIDE_AUTO: + value = CSS_BREAK_AFTER_AUTO; + break; + case BREAK_INSIDE_AVOID: + value = CSS_BREAK_AFTER_AVOID; + break; + case BREAK_INSIDE_AVOID_PAGE: + value = CSS_BREAK_AFTER_AVOID_PAGE; + break; + case BREAK_INSIDE_AVOID_COLUMN: + value = CSS_BREAK_AFTER_AVOID_COLUMN; + break; + } + } + + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, + isInherit(opv))) { + return set_break_inside(state->computed, value); + } + + return CSS_OK; } css_error css__set_break_inside_from_hint(const css_hint *hint, -- cgit v1.2.3