[Typed CSSOM] New design for computed styles which includes custom properties

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

Index: third_party/WebKit/Source/core/css/cssom/StylePropertyMapReadonly.cpp
diff --git a/third_party/WebKit/Source/core/css/cssom/StylePropertyMapReadonly.cpp b/third_party/WebKit/Source/core/css/cssom/StylePropertyMapReadonly.cpp
index 10be8c3120485252880f978c7dc5cb8ef377e24d..6bb2012db854fec599e7a6a921598de22dbf1176 100644
--- a/third_party/WebKit/Source/core/css/cssom/StylePropertyMapReadonly.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/StylePropertyMapReadonly.cpp
@@ -51,41 +51,26 @@ class StylePropertyMapIterationSource final
 
 CSSStyleValue* StylePropertyMapReadonly::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 StylePropertyMapReadonly::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 StylePropertyMapReadonly::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();
 }
 
 StylePropertyMapReadonly::IterationSource*