summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-07-15 23:05:02 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-07-15 23:05:02 +0000
commit85f7d81cfb45c8804507f175b1c3a05b717f589c (patch)
treedf6a57e3a9554e8661ef83cea5ed77fd6a4d36e6 /src
parent1ebed74cd8be22ff805bffb10f6d1e55f2a9866f (diff)
downloadlibcss-85f7d81cfb45c8804507f175b1c3a05b717f589c.tar.gz
libcss-85f7d81cfb45c8804507f175b1c3a05b717f589c.tar.bz2
Provide accessor for computed value of display assuming static position.
Modify css_computed_display to follow $9.7. svn path=/trunk/libcss/; revision=8568
Diffstat (limited to 'src')
-rw-r--r--src/select/computed.c56
-rw-r--r--src/select/properties.c4
2 files changed, 2 insertions, 58 deletions
diff --git a/src/select/computed.c b/src/select/computed.c
index 9c146da..9bbaa52 100644
--- a/src/select/computed.c
+++ b/src/select/computed.c
@@ -13,8 +13,6 @@
#include "utils/utils.h"
static css_error compute_border_colors(css_computed_style *style);
-static css_error compute_display(const css_computed_style *parent,
- css_computed_style *style);
static css_error compute_float(css_computed_style *style);
static css_error compute_absolute_border_width(css_computed_style *style,
@@ -325,11 +323,6 @@ css_error compute_absolute_values(const css_computed_style *parent,
if (error != CSS_OK)
return error;
- /* Fix up display */
- error = compute_display(parent, style);
- if (error != CSS_OK)
- return error;
-
/* Fix up float */
error = compute_float(style);
if (error != CSS_OK)
@@ -502,55 +495,6 @@ css_error compute_border_colors(css_computed_style *style)
}
/**
- * Compute display, considering position and float ($9.7)
- *
- * \param parent Parent style
- * \param style Style to process
- * \return CSS_OK on success
- */
-css_error compute_display(const css_computed_style *parent,
- css_computed_style *style)
-{
- uint8_t display;
- uint8_t pos;
- css_error error;
-
- display = css_computed_display(style);
- if (display == CSS_DISPLAY_NONE)
- return CSS_OK; /*1*/
-
- pos = css_computed_position(style);
-
- if ((pos == CSS_POSITION_ABSOLUTE || pos == CSS_POSITION_FIXED)/*2*/ ||
- css_computed_float(style) != CSS_FLOAT_NONE /*3*/ ||
- parent == NULL/*4*/) {
- if (display == CSS_DISPLAY_INLINE_TABLE) {
- display = CSS_DISPLAY_TABLE;
- } else if (display == CSS_DISPLAY_INLINE ||
- display == CSS_DISPLAY_RUN_IN ||
- display == CSS_DISPLAY_TABLE_ROW_GROUP ||
- display == CSS_DISPLAY_TABLE_COLUMN ||
- display == CSS_DISPLAY_TABLE_COLUMN_GROUP ||
- display == CSS_DISPLAY_TABLE_HEADER_GROUP ||
- display == CSS_DISPLAY_TABLE_FOOTER_GROUP ||
- display == CSS_DISPLAY_TABLE_ROW ||
- display == CSS_DISPLAY_TABLE_CELL ||
- display == CSS_DISPLAY_TABLE_CAPTION ||
- display == CSS_DISPLAY_INLINE_BLOCK) {
- display = CSS_DISPLAY_BLOCK;
- }
-
- error = set_display(style, display);
- if (error != CSS_OK)
- return error;
- }
-
- /*5*/
-
- return CSS_OK;
-}
-
-/**
* Compute float, considering position ($9.7)
*
* \param style Style to process
diff --git a/src/select/properties.c b/src/select/properties.c
index c6d1f75..b62dcb1 100644
--- a/src/select/properties.c
+++ b/src/select/properties.c
@@ -2029,8 +2029,8 @@ css_error compose_display(const css_computed_style *parent,
const css_computed_style *child,
css_computed_style *result)
{
- if (css_computed_display(child) == CSS_DISPLAY_INHERIT) {
- return set_display(result, css_computed_display(parent));
+ if (css_computed_display_static(child) == CSS_DISPLAY_INHERIT) {
+ return set_display(result, css_computed_display_static(parent));
}
return CSS_OK;