Allow custom property variant of setProperty to find existing references

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

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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 324 matching lines @@
     removePropertiesInSet(shorthand.properties(), shorthand.length());
 
     RefPtrWillBeRawPtr<CSSValue> value = prpValue;
     for (unsigned i = 0; i < shorthand.length(); ++i)
         m_propertyVector.append(CSSProperty(shorthand.properties()[i], value, important));
 }
 
 bool MutableStylePropertySet::setProperty(const CSSProperty& property, CSSProperty* slot)
 {
     if (!removeShorthandProperty(property.id())) {
-        CSSProperty* toReplace = slot ? slot : findCSSPropertyWithID(property.id());
+        const AtomicString& name = (property.id() == CSSPropertyVariable) ?
+            toCSSCustomPropertyDeclaration(property.value())->name() : nullAtom;
+        CSSProperty* toReplace = slot ? slot : findCSSPropertyWithID(property.id(), name);
         if (toReplace && *toReplace == property)
             return false;
         if (toReplace) {
             *toReplace = property;
             return true;
         }
     }
     m_propertyVector.append(property);
     return true;
 }
@@ skipping 92 matching lines @@
         // Modify m_propertyVector in-place since this method is performance-sensitive.
         properties[newIndex++] = properties[oldIndex];
     }
     if (newIndex != oldSize) {
         m_propertyVector.shrink(newIndex);
         return true;
     }
     return false;
 }
 
-CSSProperty* MutableStylePropertySet::findCSSPropertyWithID(CSSPropertyID propertyID)
+CSSProperty* MutableStylePropertySet::findCSSPropertyWithID(CSSPropertyID propertyID, const AtomicString& customPropertyName)
 {
-    // TODO(leviw): Calling this with a custom property should probably assert, or this
-    // method should alternatively take a string used for custom properties and check it
-    // in that case.
-    if (propertyID == CSSPropertyVariable)
-        return nullptr;
-
-    int foundPropertyIndex = findPropertyIndex(propertyID);
+    int foundPropertyIndex = -1;
+    if (propertyID == CSSPropertyVariable) {
+        ASSERT(customPropertyName != nullAtom);

[Timothy Loh, 2016/02/16 23:49:39]

!x.isNull() maybe

[shans, 2016/02/17 02:41:35]

Done.

+        foundPropertyIndex = findPropertyIndex(customPropertyName);
+    // TODO(shanestephens): fix call sites so we always have a customPropertyName
+    // here.
+    } else if (customPropertyName != nullAtom) {

[Timothy Loh, 2016/02/16 23:49:39]

Isn't this backwards - when we have a regular property, the string will be null?

[shans, 2016/02/17 02:41:35]

uh .. yeah.

+        foundPropertyIndex = findPropertyIndex(propertyID);
+    }
     if (foundPropertyIndex == -1)
         return nullptr;
     return &m_propertyVector.at(foundPropertyIndex);
 }
 
 bool StylePropertySet::propertyMatches(CSSPropertyID propertyID, const CSSValue* propertyValue) const
 {
     int foundPropertyIndex = findPropertyIndex(propertyID);
     if (foundPropertyIndex == -1)
         return false;
@@ skipping 107 matching lines @@
 {
     return adoptRefWillBeNoop(new MutableStylePropertySet(cssParserMode));
 }
 
 PassRefPtrWillBeRawPtr<MutableStylePropertySet> MutableStylePropertySet::create(const CSSProperty* properties, unsigned count)
 {
     return adoptRefWillBeNoop(new MutableStylePropertySet(properties, count));
 }
 
 } // namespace blink