Merge (large!).

1 files changed, 12 insertions, 0 deletions

diff --git a/src/css.hh b/src/css.hh
index 6b142827..a7143c27 100644
--- a/src/css.hh
+++ b/src/css.hh
@@ -37,6 +37,8 @@ typedef enum {
                                    'margin-*-width'). */
    CSS_TYPE_SIGNED_LENGTH,      /* As CSS_TYPE_LENGTH but may be negative. */
    CSS_TYPE_LENGTH_PERCENTAGE_NUMBER,  /* <length> or <percentage>, or <number> */
+   CSS_TYPE_AUTO,               /* Represented as CssLength of type
+                                   CSS_LENGTH_TYPE_AUTO */
    CSS_TYPE_COLOR,              /* Represented as integer. */
    CSS_TYPE_FONT_WEIGHT,        /* this very special and only used by
                                    'font-weight' */
@@ -45,6 +47,8 @@ typedef enum {
                                    opposed to CSS_TYPE_ENUM and
                                    CSS_TYPE_MULTI_ENUM). Used for
                                    'font-family'. */
+   CSS_TYPE_URI,                /* <uri> */
+   CSS_TYPE_BACKGROUND_POSITION,
    CSS_TYPE_UNUSED              /* Not yet used. Will itself get unused some
                                    day. */
 } CssValueType;
@@ -229,9 +233,15 @@ typedef enum {
    CSS_PROPERTY_LAST
 } CssPropertyName;
 
+typedef struct {
+   int32_t posX;
+   int32_t posY;
+} CssBackgroundPosition;
+
 typedef union {
    int32_t intVal;
    char *strVal;
+   CssBackgroundPosition *posVal;
 } CssPropertyValue;
 
 typedef enum {
@@ -285,6 +295,8 @@ class CssProperty {
             case CSS_TYPE_SYMBOL:
                dFree (value.strVal);
                break;
+            case CSS_TYPE_BACKGROUND_POSITION:
+               dFree (value.posVal);
             default:
                break;
          }