Make CSSStyleValue::toCSSValue() return a const CSSValue*

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"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/cssom/CSSOMTypes.h"
 #include "core/css/cssom/CSSSimpleLength.h"
 #include "core/css/cssom/CSSUnsupportedStyleValue.h"
 #include "core/css/cssom/StyleValueFactory.h"
 
 namespace blink {
 
 namespace {
 
-CSSValue* styleValueToCSSValue(CSSPropertyID propertyID, const CSSStyleValue& styleValue)
+const CSSValue* styleValueToCSSValue(CSSPropertyID propertyID, const CSSStyleValue& styleValue)
 {
     if (!CSSOMTypes::propertyCanTake(propertyID, styleValue))
         return nullptr;
     return styleValue.toCSSValueWithProperty(propertyID);
 }
 
 } // namespace
 
 CSSStyleValueVector InlineStylePropertyMap::getAllInternal(CSSPropertyID propertyID)
 {
@@ skipping 20 matching lines @@
     for (unsigned i = 0; i < inlineStyleSet.propertyCount(); i++) {
         CSSPropertyID propertyID = inlineStyleSet.propertyAt(i).id();
         result.append(getPropertyNameString(propertyID));
     }
     return result;
 }
 
 void InlineStylePropertyMap::set(CSSPropertyID propertyID, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState& exceptionState)
 {
     if (item.isCSSStyleValue()) {
-        CSSValue* cssValue = styleValueToCSSValue(propertyID, *item.getAsCSSStyleValue());
+        const CSSValue* cssValue = styleValueToCSSValue(propertyID, *item.getAsCSSStyleValue());
         if (!cssValue) {
             exceptionState.throwTypeError("Invalid type for property");
             return;
         }
         m_ownerElement->setInlineStyleProperty(propertyID, cssValue);
     } else if (item.isCSSStyleValueSequence()) {
         if (!CSSPropertyMetadata::propertySupportsMultiple(propertyID)) {
             exceptionState.throwTypeError("Property does not support multiple values");
             return;
         }
 
         // TODO(meade): This won't always work. Figure out what kind of CSSValueList to create properly.
         CSSValueList* valueList = CSSValueList::createSpaceSeparated();
         CSSStyleValueVector styleValueVector = item.getAsCSSStyleValueSequence();
         for (const Member<CSSStyleValue> value : styleValueVector) {
-            CSSValue* cssValue = styleValueToCSSValue(propertyID, *value);
+            const CSSValue* cssValue = styleValueToCSSValue(propertyID, *value);
             if (!cssValue) {
                 exceptionState.throwTypeError("Invalid type for property");
                 return;
             }
             valueList->append(*cssValue);
         }
 
         m_ownerElement->setInlineStyleProperty(propertyID, valueList);
     } else {
         // Parse it.
@@ skipping 14 matching lines @@
     CSSValueList* cssValueList = nullptr;
     if (cssValue->isValueList()) {
         cssValueList = toCSSValueList(cssValue)->copy();
     } else {
         // TODO(meade): Figure out what the correct behaviour here is.
         exceptionState.throwTypeError("Property is not already list valued");
         return;
     }
 
     if (item.isCSSStyleValue()) {
-        CSSValue* cssValue = styleValueToCSSValue(propertyID, *item.getAsCSSStyleValue());
+        const CSSValue* cssValue = styleValueToCSSValue(propertyID, *item.getAsCSSStyleValue());
         if (!cssValue) {
             exceptionState.throwTypeError("Invalid type for property");
             return;
         }
         cssValueList->append(*cssValue);
     } else if (item.isCSSStyleValueSequence()) {
         for (CSSStyleValue* styleValue : item.getAsCSSStyleValueSequence()) {
-            CSSValue* cssValue = styleValueToCSSValue(propertyID, *styleValue);
+            const CSSValue* cssValue = styleValueToCSSValue(propertyID, *styleValue);
             if (!cssValue) {
                 exceptionState.throwTypeError("Invalid type for property");
                 return;
             }
             cssValueList->append(*cssValue);
         }
     } else {
         // Parse it.
         DCHECK(item.isString());
         // TODO(meade): Implement this.
@@ skipping 34 matching lines @@
             else
                 value.setCSSStyleValueSequence(styleValueVector);
         }
         result.append(std::make_pair(name, value));
     }
     return result;
 }
 
 } // namespace blink