[Variables] Enable get/setProperty and similar APIs from the CSSOM

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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/css/PropertySetCSSStyleDeclaration.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.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/StyleEngine.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
 namespace {
@@ skipping 103 matching lines @@
 
 unsigned AbstractPropertySetCSSStyleDeclaration::length() const
 {
     return propertySet().propertyCount();
 }
 
 String AbstractPropertySetCSSStyleDeclaration::item(unsigned i) const
 {
     if (i >= propertySet().propertyCount())
         return "";
-    return getPropertyName(propertySet().propertyAt(i).id());
+    StylePropertySet::PropertyReference property = propertySet().propertyAt(i);
+    if (RuntimeEnabledFeatures::cssVariablesEnabled() && property.id() == CSSPropertyVariable)
+        return toCSSCustomPropertyDeclaration(property.value())->name();
+    return getPropertyName(property.id());
 }
 
 String AbstractPropertySetCSSStyleDeclaration::cssText() const
 {
     return propertySet().asText();
 }
 
 void AbstractPropertySetCSSStyleDeclaration::setCSSText(const String& text, ExceptionState&)
 {
     StyleAttributeMutationScope mutationScope(this);
     willMutate();
 
     propertySet().parseDeclarationList(text, contextStyleSheet());
 
     didMutate(PropertyChanged);
 
     mutationScope.enqueueMutationRecord();
 }
 
-String AbstractPropertySetCSSStyleDeclaration::getPropertyValue(const String &propertyName)
+String AbstractPropertySetCSSStyleDeclaration::getPropertyValue(const String& propertyName)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
-    if (!propertyID)
-        return String();
+    if (!propertyID) {
+        if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))
+            return String();
+        return propertySet().getCustomPropertyValue(AtomicString(propertyName));
+    }
     return propertySet().getPropertyValue(propertyID);
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyPriority(const String& propertyName)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
-    if (!propertyID)
-        return String();
+    if (!propertyID) {
+        if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))
+            return String();
+        return propertySet().customPropertyIsImportant(AtomicString(propertyName)) ? "important" : "";
+    }
     return propertySet().propertyIsImportant(propertyID) ? "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);
     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)
         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)
-        return;
+    if (!propertyID) {
+        if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))
+            return;
+        propertyID = CSSPropertyVariable;
+    }
 
     bool important = equalIgnoringCase(priority, "important");
     if (!important && !priority.isEmpty())
         return;
 
-    setPropertyInternal(propertyID, value, important, exceptionState);
+    setPropertyInternal(propertyID, propertyName, value, important, exceptionState);
 }
 
 String AbstractPropertySetCSSStyleDeclaration::removeProperty(const String& propertyName, ExceptionState& exceptionState)
 {
+    CSSPropertyID propertyID = cssPropertyID(propertyName);
+    if (!propertyID) {
+        if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))
+            return String();
+        propertyID = CSSPropertyVariable;
+    }
+
     StyleAttributeMutationScope mutationScope(this);
-    CSSPropertyID propertyID = cssPropertyID(propertyName);
-    if (!propertyID)
-        return String();
-
     willMutate();
 
     String result;
-    bool changed = propertySet().removeProperty(propertyID, &result);
+    bool changed = propertyID != CSSPropertyVariable ? propertySet().removeProperty(propertyID, &result)

[Timothy Loh, 2015/11/14 02:21:05]

since it's a ternary, I'd make the comparison an equality check instead of an
inequality check and switch the order of the result

[leviw_travelin_and_unemployed, 2015/11/17 01:25:07]

Done.

+        : propertySet().removeCustomProperty(AtomicString(propertyName), &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& value, bool important, ExceptionState&)
+void AbstractPropertySetCSSStyleDeclaration::setPropertyInternal(CSSPropertyID unresolvedProperty, const String& propertyName, const String& value, bool important, ExceptionState&)
 {
     StyleAttributeMutationScope mutationScope(this);
     willMutate();
 
-    bool changed = propertySet().setProperty(unresolvedProperty, value, important, contextStyleSheet());
+    bool changed = unresolvedProperty == CSSPropertyVariable ? propertySet().setCustomProperty(AtomicString(propertyName), value, important, contextStyleSheet())
+        : 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