Recognise variable names when parsing CSS property names

third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 10 matching lines @@
 
 #include "core/css/PropertySetCSSStyleDeclaration.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSCustomPropertyDeclaration.h"
 #include "core/css/CSSKeyframesRule.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StylePropertySet.h"
-#include "core/css/parser/CSSVariableParser.h"
 #include "core/dom/Element.h"
 #include "core/dom/MutationObserverInterestGroup.h"
 #include "core/dom/MutationRecord.h"
 #include "core/dom/StyleChangeReason.h"
 #include "core/dom/StyleEngine.h"
 #include "core/dom/custom/CustomElement.h"
 #include "core/dom/custom/CustomElementDefinition.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
@@ skipping 137 matching lines @@
     propertySet().parseDeclarationList(text, contextStyleSheet());
 
     didMutate(PropertyChanged);
 
     mutationScope.enqueueMutationRecord();
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyValue(const String& propertyName)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
-    if (!propertyID) {
-        if (!CSSVariableParser::isValidVariableName(propertyName))
-            return String();
+    if (!propertyID)
+        return String();
+    if (propertyID == CSSPropertyVariable)
         return propertySet().getPropertyValue(AtomicString(propertyName));
-    }
     return propertySet().getPropertyValue(propertyID);
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyPriority(const String& propertyName)
 {
+    CSSPropertyID propertyID = cssPropertyID(propertyName);
+    if (!propertyID)
+        return String();
+
     bool important = false;
-    CSSPropertyID propertyID = cssPropertyID(propertyName);
-    if (!propertyID) {
-        if (!CSSVariableParser::isValidVariableName(propertyName))
-            return String();
+    if (propertyID == CSSPropertyVariable)
         important = propertySet().propertyIsImportant(AtomicString(propertyName));
-    } else {
+    else
         important = propertySet().propertyIsImportant(propertyID);
-    }
     return important ? "important" : "";
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyShorthand(const String& propertyName)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
 
     // Custom properties don't have shorthands, so we can ignore them here.
-    if (!propertyID)
+    if (!propertyID || propertyID == CSSPropertyVariable)
         return String();
     if (isShorthandProperty(propertyID))
         return String();
     CSSPropertyID shorthandID = propertySet().getPropertyShorthand(propertyID);
     if (!shorthandID)
         return String();
     return getPropertyNameString(shorthandID);
 }
 
 bool AbstractPropertySetCSSStyleDeclaration::isPropertyImplicit(const String& propertyName)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
 
     // Custom properties don't have shorthands, so we can ignore them here.
-    if (!propertyID)
+    if (!propertyID || propertyID == CSSPropertyVariable)
         return false;
     return propertySet().isPropertyImplicit(propertyID);
 }
 
 void AbstractPropertySetCSSStyleDeclaration::setProperty(const String& propertyName, const String& value, const String& priority, ExceptionState& exceptionState)
 {
     CSSPropertyID propertyID = unresolvedCSSPropertyID(propertyName);
-    if (!propertyID) {
-        if (!CSSVariableParser::isValidVariableName(propertyName))
-            return;
-        propertyID = CSSPropertyVariable;
-    }
+    if (!propertyID)
+        return;
 
     bool important = equalIgnoringCase(priority, "important");
     if (!important && !priority.isEmpty())
         return;
 
     setPropertyInternal(propertyID, propertyName, value, important, exceptionState);
 }
 
 String AbstractPropertySetCSSStyleDeclaration::removeProperty(const String& propertyName, ExceptionState& exceptionState)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
-    if (!propertyID) {
-        if (!CSSVariableParser::isValidVariableName(propertyName))
-            return String();
-        propertyID = CSSPropertyVariable;
-    }
+    if (!propertyID)
+        return String();
 
     StyleAttributeMutationScope mutationScope(this);
     willMutate();
 
     String result;
     bool changed = false;
     if (propertyID == CSSPropertyVariable)
         changed = propertySet().removeProperty(AtomicString(propertyName), &result);
     else
         changed = propertySet().removeProperty(propertyID, &result);
@@ skipping 121 matching lines @@
     return m_parentElement ? &m_parentElement->document().elementSheet() : nullptr;
 }
 
 DEFINE_TRACE(InlineCSSStyleDeclaration)
 {
     visitor->trace(m_parentElement);
     AbstractPropertySetCSSStyleDeclaration::trace(visitor);
 }
 
 } // namespace blink