Custom property CSSOM patch with templates [not for landing]

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 163 matching lines @@
 
     mutationScope.enqueueMutationRecord();
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyValue(const String& propertyName)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
     if (!propertyID) {
         if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))
             return String();
-        return propertySet().getCustomPropertyValue(AtomicString(propertyName));
+        return propertySet().getPropertyValue(AtomicString(propertyName));
     }
     return propertySet().getPropertyValue(propertyID);
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyPriority(const String& propertyName)
 {
+    bool important = false;
     CSSPropertyID propertyID = cssPropertyID(propertyName);
     if (!propertyID) {
         if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))
             return String();
-        return propertySet().customPropertyIsImportant(AtomicString(propertyName)) ? "important" : "";
+        important = propertySet().propertyIsImportant(AtomicString(propertyName));
+    } else {
+        important = propertySet().propertyIsImportant(propertyID);
     }
-    return propertySet().propertyIsImportant(propertyID) ? "important" : "";
+    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)
         return String();
     CSSPropertyID shorthandID = propertySet().getPropertyShorthand(propertyID);
@@ skipping 34 matching lines @@
     if (!propertyID) {
         if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))
             return String();
         propertyID = CSSPropertyVariable;
     }
 
     StyleAttributeMutationScope mutationScope(this);
     willMutate();
 
     String result;
-    bool changed = propertyID == CSSPropertyVariable ? propertySet().removeCustomProperty(AtomicString(propertyName), &result)
-        : propertySet().removeProperty(propertyID, &result);
+    bool changed = false;
+    if (propertyID == CSSPropertyVariable)
+        changed = propertySet().removeProperty(AtomicString(propertyName), &result);
+    else
+        changed = propertySet().removeProperty(propertyID, &result);
 
     didMutate(changed ? PropertyChanged : NoChanges);
 
     if (changed)
         mutationScope.enqueueMutationRecord();
     return result;
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> AbstractPropertySetCSSStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID)
 {
     return propertySet().getPropertyCSSValue(propertyID);
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyValueInternal(CSSPropertyID propertyID)
 {
     return propertySet().getPropertyValue(propertyID);
 }
 
-void AbstractPropertySetCSSStyleDeclaration::setPropertyInternal(CSSPropertyID unresolvedProperty, const String& propertyName, const String& value, bool important, ExceptionState&)
+void AbstractPropertySetCSSStyleDeclaration::setPropertyInternal(CSSPropertyID unresolvedProperty, const String& customPropertyName, const String& value, bool important, ExceptionState&)
 {
     StyleAttributeMutationScope mutationScope(this);
     willMutate();
 
-    bool changed = unresolvedProperty == CSSPropertyVariable ? propertySet().setCustomProperty(AtomicString(propertyName), value, important, contextStyleSheet())
-        : propertySet().setProperty(unresolvedProperty, value, important, contextStyleSheet());
+    bool changed = false;
+    if (unresolvedProperty == CSSPropertyVariable)
+        changed = propertySet().setProperty(AtomicString(customPropertyName), value, important, contextStyleSheet());
+    else
+        changed = propertySet().setProperty(unresolvedProperty, value, important, contextStyleSheet());
 
     didMutate(changed ? PropertyChanged : NoChanges);
 
     if (!changed)
         return;
 
     Element* parent = parentElement();
     if (parent && parent->inActiveDocument() && parent->document().styleResolver())
         parent->document().styleEngine().attributeChangedForElement(HTMLNames::styleAttr, *parent);
     mutationScope.enqueueMutationRecord();
@@ skipping 119 matching lines @@
 }
 #endif
 
 DEFINE_TRACE(InlineCSSStyleDeclaration)
 {
     visitor->trace(m_parentElement);
     AbstractPropertySetCSSStyleDeclaration::trace(visitor);
 }
 
 } // namespace blink