Allow use of @apply and custom properties in InlineStylePropertyMap::getProperties()

third_party/WebKit/Source/core/css/cssom/InlineStylePropertyMap.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/cssom/InlineStylePropertyMap.h"
 
 #include "bindings/core/v8/Iterable.h"
 #include "core/CSSPropertyNames.h"
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSCustomPropertyDeclaration.h"
@@ skipping 36 matching lines @@
 
     return StyleValueFactory::cssValueToStyleValueVector(CSSPropertyInvalid, *cssValue);
 }
 
 Vector<String> InlineStylePropertyMap::getProperties()
 {
     Vector<String> result;
     StylePropertySet& inlineStyleSet = m_ownerElement->ensureMutableInlineStyle();
     for (unsigned i = 0; i < inlineStyleSet.propertyCount(); i++) {
         CSSPropertyID propertyID = inlineStyleSet.propertyAt(i).id();
-        result.append(getPropertyNameString(propertyID));
+        if (propertyID == CSSPropertyVariable) {
+            StylePropertySet::PropertyReference propertyReference = inlineStyleSet.propertyAt(i);
+            const CSSCustomPropertyDeclaration& customDeclaration = toCSSCustomPropertyDeclaration(propertyReference.value());
+            result.append(customDeclaration.name());
+        } else if (propertyID == CSSPropertyApplyAtRule) {
+            result.append("@apply");
+        } else if (propertyID >= firstCSSProperty && propertyID <= lastUnresolvedCSSProperty) {

[sashab, 2016/08/08 05:30:38]

This should really be a function... But it's used everywhere atm :'( So this is
fine for now.

[meade_UTC10, 2016/08/08 06:04:00]

Oops, that shouldn't even be there! Removed.

+            result.append(getPropertyNameString(propertyID));
+        }
     }
     return result;
 }
 
 void InlineStylePropertyMap::set(CSSPropertyID propertyID, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState& exceptionState)
 {
     if (item.isCSSStyleValue()) {
         const CSSValue* cssValue = styleValueToCSSValue(propertyID, *item.getAsCSSStyleValue());
         if (!cssValue) {
             exceptionState.throwTypeError("Invalid type for property");
@@ skipping 101 matching lines @@
             else
                 value.setCSSStyleValueSequence(styleValueVector);
         }
         result.append(std::make_pair(name, value));
     }
     return result;
 }
 
 } // namespace blink