Custom property CSSOM patch with templates [not for landing]

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

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. 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.
  */
 
 #ifndef StylePropertySet_h
 #define StylePropertySet_h
 
 #include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
-#include "core/css/CSSCustomPropertyDeclaration.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSProperty.h"
 #include "core/css/PropertySetCSSStyleDeclaration.h"
 #include "core/css/parser/CSSParserMode.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
@@ skipping 47 matching lines @@
     private:
         const CSSValue* propertyValue() const;
 
         RawPtrWillBeMember<const StylePropertySet> m_propertySet;
         unsigned m_index;
     };
 
     unsigned propertyCount() const;
     bool isEmpty() const;
     PropertyReference propertyAt(unsigned index) const { return PropertyReference(*this, index); }
-    int findPropertyIndex(CSSPropertyID) const;
-    int findCustomPropertyIndex(const AtomicString& propertyName) const;
+
+    template<typename T> // CSSPropertyID or AtomicString
+    int findPropertyIndex(T property) const;
+
     bool hasProperty(CSSPropertyID property) const { return findPropertyIndex(property) != -1; }
 
-    PassRefPtrWillBeRawPtr<CSSValue> getPropertyCSSValue(CSSPropertyID) const;
-    PassRefPtrWillBeRawPtr<CSSCustomPropertyDeclaration> getCustomPropertyCSSValue(const AtomicString&) const;
-    String getPropertyValue(CSSPropertyID) const;
-    String getCustomPropertyValue(const AtomicString&) const;
+    template<typename T> // CSSPropertyID or AtomicString
+    PassRefPtrWillBeRawPtr<CSSValue> getPropertyCSSValue(T property) const;
 
-    bool propertyIsImportant(CSSPropertyID) const;
-    bool customPropertyIsImportant(const AtomicString&) const;
+    template<typename T> // CSSPropertyID or AtomicString
+    String getPropertyValue(T property) const;
+
+    template<typename T> // CSSPropertyID or AtomicString
+    bool propertyIsImportant(T property) const;
+
+    bool shorthandIsImportant(CSSPropertyID) const;
+    bool shorthandIsImportant(const AtomicString& customPropertyName) const;
+
     CSSPropertyID getPropertyShorthand(CSSPropertyID) const;
     bool isPropertyImplicit(CSSPropertyID) const;
 
     CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cssParserMode); }
 
     PassRefPtrWillBeRawPtr<MutableStylePropertySet> mutableCopy() const;
     PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
 
     PassRefPtrWillBeRawPtr<MutableStylePropertySet> copyPropertiesInSet(const Vector<CSSPropertyID>&) const;
 
@@ skipping 39 matching lines @@
 
 class CORE_EXPORT ImmutableStylePropertySet : public StylePropertySet {
 public:
     ~ImmutableStylePropertySet();
     static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
 
     unsigned propertyCount() const { return m_arraySize; }
 
     const RawPtrWillBeMember<CSSValue>* valueArray() const;
     const StylePropertyMetadata* metadataArray() const;
-    int findPropertyIndex(CSSPropertyID) const;
-    int findCustomPropertyIndex(const AtomicString& propertyName) const;
+
+    template<typename T> // CSSPropertyID or AtomicString
+    int findPropertyIndex(T property) const;
 
     DECLARE_TRACE_AFTER_DISPATCH();
 
     void* operator new(std::size_t, void* location)
     {
         return location;
     }
 
     void* m_storage;
 
@@ skipping 20 matching lines @@
     static PassRefPtrWillBeRawPtr<MutableStylePropertySet> create(const CSSProperty* properties, unsigned count);
 
     unsigned propertyCount() const { return m_propertyVector.size(); }
 
     // Returns whether this style set was changed.
     bool addParsedProperties(const WillBeHeapVector<CSSProperty, 256>&);
     bool addRespectingCascade(const CSSProperty&);
 
     // These expand shorthand properties into multiple properties.
     bool setProperty(CSSPropertyID unresolvedProperty, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
+    bool setProperty(const AtomicString& customPropertyName, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
     void setProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important = false);
-    bool setCustomProperty(const AtomicString& propertyName, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
 
     // These do not. FIXME: This is too messy, we can do better.
     bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
     bool setProperty(const CSSProperty&, CSSProperty* slot = 0);
 
-    bool removeProperty(CSSPropertyID, String* returnText = 0);
-    bool removeCustomProperty(const AtomicString&, String* returnText = 0);
+    template<typename T> // CSSPropertyID or AtomicString
+    bool removeProperty(T property, String* returnText = 0);
     bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
     void removeEquivalentProperties(const StylePropertySet*);
     void removeEquivalentProperties(const CSSStyleDeclaration*);
 
     void mergeAndOverrideOnConflict(const StylePropertySet*);
 
     void clear();
     void parseDeclarationList(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
 
     CSSStyleDeclaration* ensureCSSStyleDeclaration();
-    int findPropertyIndex(CSSPropertyID) const;
-    int findCustomPropertyIndex(const AtomicString& propertyName) const;
+
+    template<typename T> // CSSPropertyID or AtomicString
+    int findPropertyIndex(T property) const;
 
     DECLARE_TRACE_AFTER_DISPATCH();
 
 private:
     explicit MutableStylePropertySet(CSSParserMode);
     explicit MutableStylePropertySet(const StylePropertySet&);
     MutableStylePropertySet(const CSSProperty* properties, unsigned count);
 
     bool removePropertyAtIndex(int, String* returnText);
 
     bool removeShorthandProperty(CSSPropertyID);
+    bool removeShorthandProperty(const AtomicString& customPropertyName) { return false; }
     CSSProperty* findCSSPropertyWithID(CSSPropertyID);
     OwnPtrWillBeMember<PropertySetCSSStyleDeclaration> m_cssomWrapper;
 
     friend class StylePropertySet;
 
     WillBeHeapVector<CSSProperty, 4> m_propertyVector;
 };
 
 DEFINE_TYPE_CASTS(MutableStylePropertySet, StylePropertySet, set, set->isMutable(), set.isMutable());
 
@@ skipping 44 matching lines @@
     if (!derefBase())
         return;
 
     if (m_isMutable)
         delete toMutableStylePropertySet(this);
     else
         delete toImmutableStylePropertySet(this);
 }
 #endif // !ENABLE(OILPAN)
 
-inline int StylePropertySet::findPropertyIndex(CSSPropertyID propertyID) const
+template<typename T>
+inline int StylePropertySet::findPropertyIndex(T property) const
 {
     if (m_isMutable)
-        return toMutableStylePropertySet(this)->findPropertyIndex(propertyID);
-    return toImmutableStylePropertySet(this)->findPropertyIndex(propertyID);
-}
-
-inline int StylePropertySet::findCustomPropertyIndex(const AtomicString& propertyName) const
-{
-    if (m_isMutable)
-        return toMutableStylePropertySet(this)->findCustomPropertyIndex(propertyName);
-    return toImmutableStylePropertySet(this)->findCustomPropertyIndex(propertyName);
+        return toMutableStylePropertySet(this)->findPropertyIndex(property);
+    return toImmutableStylePropertySet(this)->findPropertyIndex(property);
 }
 
 } // namespace blink
 
 #endif // StylePropertySet_h