changeset 7685:afbc7b22b7ab

RT-38313: [CSS] Serious rendering artifacts running Ensemble8 Backed out changeset e59c3dfc28e0
author kcr
date Thu, 14 Aug 2014 14:48:05 -0700
parents 7e5faca81800
children 2056b7f57799
files modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSParser.java
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSParser.java	Thu Aug 14 15:27:10 2014 -0600
+++ b/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSParser.java	Thu Aug 14 14:48:05 2014 -0700
@@ -705,7 +705,7 @@
                 return new ParsedValueImpl<String,String>("null", null);
             }
         }
-        if ("-fx-fill".equals(prop)) {
+        if ("-fx-fill".equals(property)) {
              ParsedValueImpl pv = parse(root);
             if (pv.getConverter() == StyleConverter.getUrlConverter()) {
                 // ImagePatternConverter expects array of ParsedValue where element 0 is the URL
@@ -714,7 +714,7 @@
             }
             return pv;
         }
-        else if ("-fx-background-color".equals(prop)) {
+        else if ("-fx-background-color".equals(property)) {
             return parsePaintLayers(root);
         } else if ("-fx-background-image".equals(prop)) {
             return parseURILayers(root);
@@ -878,9 +878,9 @@
                 value = new ParsedValueImpl<String,Boolean>("false",BooleanConverter.getInstance());
             } else {
                 // if the property value is another property, then it needs to be looked up.
-                boolean needsLookup = isIdent && properties.containsKey(text);
-                if (needsLookup || ((value = colorValueOfString(text)) == null )) {
-                    value = new ParsedValueImpl<String,String>(text, null, needsLookup);
+                boolean needsLookup = isIdent && properties.containsKey(str);
+                if (needsLookup || ((value = colorValueOfString(str)) == null )) {
+                    value = new ParsedValueImpl<String,String>(str, null, isIdent || needsLookup);
                 }
             }
             break;