From b80eab68dd947f7f56bc2c80af74ca2486282b9f Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <devnull@localhost>
Date: Fri, 11 Apr 2014 18:06:26 +0200
Subject: Negative Werte für 'background-position'; 'none' für
 'background-image'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cssparser.cc | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'src/cssparser.cc')

diff --git a/src/cssparser.cc b/src/cssparser.cc
index f567c333..794bf6b7 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -732,7 +732,9 @@ bool CssParser::tokenMatchesProperty(CssPropertyName prop, CssValueType *type)
               dStrAsciiCasecmp(tval, "top") == 0 ||
               dStrAsciiCasecmp(tval, "bottom") == 0))
             return true;
-         // Fall Through (lenght and percentage)
+         if (ttype == CSS_TK_DECINT || ttype == CSS_TK_FLOAT)
+            return true;
+         break;
       case CSS_TYPE_LENGTH_PERCENTAGE:
       case CSS_TYPE_LENGTH_PERCENTAGE_NUMBER:
       case CSS_TYPE_LENGTH:
@@ -778,7 +780,8 @@ bool CssParser::tokenMatchesProperty(CssPropertyName prop, CssValueType *type)
 
       case CSS_TYPE_URI:
          if (ttype == CSS_TK_SYMBOL &&
-             dStrAsciiCasecmp(tval, "url") == 0)
+             (dStrAsciiCasecmp(tval, "url") == 0 ||
+              dStrAsciiCasecmp(tval, "none") == 0))
             return true;
          break;
 
@@ -1056,12 +1059,16 @@ bool CssParser::parseValue(CssPropertyName prop,
       break;
 
    case CSS_TYPE_URI:
-      if (ttype == CSS_TK_SYMBOL &&
-          dStrAsciiCasecmp(tval, "url") == 0) {
-         val->strVal = parseUrl();
-         nextToken();
-         if (val->strVal)
+      if (ttype == CSS_TK_SYMBOL) {
+         if (dStrAsciiCasecmp(tval, "url") == 0) {
+            val->strVal = parseUrl();
+            if (val->strVal)
+               ret = true;
+         } else if (dStrAsciiCasecmp(tval, "none") == 0) {
+            val->strVal = NULL;
             ret = true;
+         }
+         nextToken();
       }
       break;
 
@@ -1118,6 +1125,9 @@ bool CssParser::parseValue(CssPropertyName prop,
                if (parseValue(prop, CSS_TYPE_LENGTH_PERCENTAGE, &valTmp)) {
                   pos[i] = valTmp.intVal;
                   ret = true;
+               } else if (parseValue(prop, CSS_TYPE_SIGNED_LENGTH, &valTmp)) {
+                  pos[i] = valTmp.intVal;
+                  ret = true;
                } else
                   // ... but something may still fail.
                   h[i] = v[i] = false;
-- 
cgit v1.2.3