[Typed CSSOM] Get computed values for custom properties

third_party/WebKit/Source/core/css/cssom/ComputedStylePropertyMap.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/ComputedStylePropertyMap.h"
 
 #include "core/css/CSSComputedStyleDeclaration.h"
 #include "core/css/ComputedStyleCSSValueMapping.h"
+#include "core/css/PropertyRegistry.h"
 #include "core/css/cssom/CSSCalcLength.h"
 #include "core/css/cssom/CSSKeywordValue.h"
 #include "core/css/cssom/CSSNumberValue.h"
 #include "core/css/cssom/CSSSimpleLength.h"
 #include "core/css/cssom/CSSUnsupportedStyleValue.h"
 #include "core/css/cssom/StyleValueFactory.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/PseudoElement.h"
 #include "core/dom/StyleEngine.h"
 
@@ skipping 33 matching lines @@
     // Seems to only support before, after, backdrop, first-letter. See
     // PseudoElementData::pseudoElement.
     if (PseudoElement* element =
             (toElement(m_node))->pseudoElement(m_pseudoId)) {
       return element;
     }
   }
   return nullptr;
 }
 
-// ComputedStylePropertyMap::getAllInternal/get should return computed styles
-// (as opposed to resolved styles a la getComputedStyle()).
-//
-// Property values are read from an up-to-date ComputedStyle and converted into
-// CSSStyleValues. This has not been implemented for all properties yet.
-// Unsupported properties fall back to using resolved styles & converting them
-// to CSSStyleValues via StyleValueFactory. For some types of values, such as
-// images, the difference between the two is minor.
-CSSStyleValueVector ComputedStylePropertyMap::getAllInternal(
-    CSSPropertyID propertyID) {
-  CSSStyleValueVector styleValueVector;
-
+const ComputedStyle* ComputedStylePropertyMap::updateStyle() const {
   Node* node = this->node();
   if (!node || !node->inActiveDocument()) {
-    return styleValueVector;
+    return nullptr;
   }
 
   // Update style before getting the value for the property
   node->document().updateStyleAndLayoutTreeForNode(node);
   node = this->node();
   if (!node) {
-    return styleValueVector;
+    return nullptr;
   }
   // I have copied this from
   // CSSComputedStyleDeclaration::computeComputedStyle(). I don't know if there
   // is any use in passing m_pseudoId if node is not already a PseudoElement,
   // but passing pseudo_Id when it IS already a PseudoElement leads to disaster.
   const ComputedStyle* style = node->ensureComputedStyle(
       node->isPseudoElement() ? PseudoIdNone : m_pseudoId);
   node = this->node();
   if (!node || !node->inActiveDocument() || !style) {
+    return nullptr;
+  }
+  return style;
+}
+
+// ComputedStylePropertyMap::getAllInternal/get should return computed styles
+// (as opposed to resolved styles a la getComputedStyle()).
+//
+// Property values are read from an up-to-date ComputedStyle and converted into
+// CSSStyleValues. This has not been implemented for all properties yet.
+// Unsupported properties fall back to using resolved styles & converting them
+// to CSSStyleValues via StyleValueFactory. For some types of values, such as
+// images, the difference between the two is minor.
+CSSStyleValueVector ComputedStylePropertyMap::getAllInternal(
+    CSSPropertyID propertyID) {
+  CSSStyleValueVector styleValueVector;
+  const ComputedStyle* style = this->updateStyle();
+  if (!style)
     return styleValueVector;
-  }
 
   CSSStyleValue* styleValue = nullptr;
-
   switch (propertyID) {
     // TODO(rjwright): Generate this code.
     case CSSPropertyLeft:
       styleValue = styleValueForLength(style->left());
       break;
     case CSSPropertyRight:
       styleValue = styleValueForLength(style->right());
       break;
     case CSSPropertyTop:
       styleValue = styleValueForLength(style->top());
@@ skipping 26 matching lines @@
             lineHeight.pixels(), CSSPrimitiveValue::UnitType::Pixels);
         break;
       }
       NOTREACHED();
       break;
     }
     default:
       // For properties not yet handled above, fall back to using resolved
       // style.
       const CSSValue* value = ComputedStyleCSSValueMapping::get(
-          propertyID, *style, nullptr, node, false);
+          propertyID, *style, nullptr, this->node(), false);
       if (value) {
         return StyleValueFactory::cssValueToStyleValueVector(propertyID,
                                                              *value);
       }
       break;
   }
 
   if (styleValue) {
     styleValueVector.push_back(styleValue);
   }
   return styleValueVector;
 }
 
 CSSStyleValueVector ComputedStylePropertyMap::getAllInternal(
-    AtomicString customPropertyName) {
-  const CSSValue* cssValue =
-      m_computedStyleDeclaration->getPropertyCSSValue(customPropertyName);
-  if (!cssValue)
+    AtomicString customPropertyName,
+    ExceptionState& exceptionState) {
+  const ComputedStyle* style = this->updateStyle();
+  if (!style) {
     return CSSStyleValueVector();
-  return StyleValueFactory::cssValueToStyleValueVector(CSSPropertyInvalid,
-                                                       *cssValue);
+  }
+  const CSSValue* value = ComputedStyleCSSValueMapping::get(
+      customPropertyName, *style, m_node->document().propertyRegistry());
+  if (!value) {
+    return CSSStyleValueVector();
+  }
+  return StyleValueFactory::cssValueToStyleValueVector(*value);
 }
 
 Vector<String> ComputedStylePropertyMap::getProperties() {
   Vector<String> result;
   for (unsigned i = 0; i < m_computedStyleDeclaration->length(); i++) {
     result.push_back(m_computedStyleDeclaration->item(i));
   }
   return result;
 }
 
 }  // namespace blink