[Typed CSSOM] Get computed values for custom properties

third_party/WebKit/Source/core/css/cssom/StylePropertyMap.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/StylePropertyMap.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/cssom/CSSSimpleLength.h"
 #include "core/css/cssom/CSSStyleValue.h"
@@ skipping 33 matching lines @@
 
  private:
   size_t m_index;
   const HeapVector<StylePropertyMap::StylePropertyMapEntry> m_values;
 };
 
 }  // namespace
 
 CSSStyleValue* StylePropertyMap::get(const String& propertyName,
                                      ExceptionState& exceptionState) {
-  CSSPropertyID propertyID = cssPropertyID(propertyName);
-  if (propertyID == CSSPropertyInvalid || propertyID == CSSPropertyVariable) {
-    // TODO(meade): Handle custom properties here.
-    exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
-    return nullptr;
-  }
-
-  CSSStyleValueVector styleVector = getAllInternal(propertyID);
-  if (styleVector.isEmpty())
-    return nullptr;
-
-  return styleVector[0];
+  CSSStyleValueVector styleVector = getAll(propertyName, exceptionState);
+  return styleVector.isEmpty() ? nullptr : styleVector[0];
 }
 
 CSSStyleValueVector StylePropertyMap::getAll(const String& propertyName,
                                              ExceptionState& exceptionState) {
   CSSPropertyID propertyID = cssPropertyID(propertyName);
-  if (propertyID != CSSPropertyInvalid && propertyID != CSSPropertyVariable)
-    return getAllInternal(propertyID);
-
-  // TODO(meade): Handle custom properties here.
-  exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
-  return CSSStyleValueVector();
+  if (propertyID == CSSPropertyInvalid) {
+    exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
+    return CSSStyleValueVector();
+  }
+  if (propertyID == CSSPropertyVariable) {
+    return getAllInternal(AtomicString(propertyName), exceptionState);
+  }
+  return getAllInternal(propertyID);
 }
 
 bool StylePropertyMap::has(const String& propertyName,
                            ExceptionState& exceptionState) {
-  CSSPropertyID propertyID = cssPropertyID(propertyName);
-  if (propertyID != CSSPropertyInvalid && propertyID != CSSPropertyVariable)
-    return !getAllInternal(propertyID).isEmpty();
-
-  // TODO(meade): Handle custom properties here.
-  exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
-  return false;
+  return !getAll(propertyName, exceptionState).isEmpty();
 }
 
 void StylePropertyMap::set(const String& propertyName,
                            CSSStyleValueOrCSSStyleValueSequenceOrString& item,
                            ExceptionState& exceptionState) {
   CSSPropertyID propertyID = cssPropertyID(propertyName);
   if (propertyID != CSSPropertyInvalid && propertyID != CSSPropertyVariable) {
     set(propertyID, item, exceptionState);
     return;
   }
@@ skipping 25 matching lines @@
   exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
 }
 
 StylePropertyMap::IterationSource* StylePropertyMap::startIteration(
     ScriptState*,
     ExceptionState&) {
   return new StylePropertyMapIterationSource(getIterationEntries());
 }
 
 }  // namespace blink