[CSSTypedOM] Computed StylePropertyMap use ComputedStyle for Lengths

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/cssom/CSSCalcLength.h"
+#include "core/css/cssom/CSSKeywordValue.h"
+#include "core/css/cssom/CSSSimpleLength.h"
 #include "core/css/cssom/StyleValueFactory.h"
 
 namespace blink {
 
+CSSStyleValue* styleValueForLength(const Length& length)

[meade_UTC10, 2016/09/27 04:41:39]

Nit: It's conventional to put pure methods like this in anonymous namespaces to
avoid polluting the blink namespace.

[rjwright, 2016/09/28 01:38:24]

Done.

+{
+    if (length.isAuto()) {
+        return CSSKeywordValue::create("auto");
+    }
+    if (length.isFixed()) {
+        return CSSSimpleLength::create(length.pixels(), CSSPrimitiveValue::UnitType::Pixels);
+    }
+    if (length.isPercent()) {
+        return CSSSimpleLength::create(length.percent(), CSSPrimitiveValue::UnitType::Percentage);
+    }
+    if (length.isCalculated()) {
+        return CSSCalcLength::fromLength(length);
+    }
+    NOTREACHED();
+    return nullptr;
+}
+
 CSSStyleValueVector ComputedStylePropertyMap::getAllInternal(CSSPropertyID propertyID)
 {
+    Document& document = m_node->document();
+    // TODO(rjwright): This style recalc is copied from
+    // CSSComputedStyleDeclaration::getPropertyValue, which also does a bunch of other stuff.
+    // Need to look back to it and see if I need to do more here.

[meade_UTC10, 2016/09/27 04:41:39]

Did you end up asking anyone about this?

[rjwright, 2016/09/28 01:38:24]

No. I'm not sure who to ask. I was planning to just suss it out and add it in a
follow up. Shall we get it sorted before landing this?

[meade_UTC10, 2016/09/28 01:51:32]

No strong opinions - but we may be able to ask Bugs+Naina, or Shane?

+    document.updateStyleAndLayoutTreeForNode(m_node);
+    const ComputedStyle* style = m_node->ensureComputedStyle();
+    CSSStyleValueVector styleValueVector;
+    CSSStyleValue* styleValue = nullptr;
+    switch (propertyID) {
+    case CSSPropertyLeft:
+        styleValue = styleValueForLength(style->left());
+    case CSSPropertyRight:
+        styleValue = styleValueForLength(style->right());
+    case CSSPropertyTop:
+        styleValue = styleValueForLength(style->top());
+    case CSSPropertyBottom:
+        styleValue = styleValueForLength(style->bottom());
+    case CSSPropertyHeight:
+        styleValue = styleValueForLength(style->height());
+    case CSSPropertyWidth: {
+        styleValue = styleValueForLength(style->width());
+    }
+    default:
+        break;
+    }
+
+    if (styleValue) {
+        styleValueVector.append(styleValue);
+        return styleValueVector;
+    }
+    // Note: this is just a stopgap to make prototyping easier. cssValue represents a resolved
+    // style, not a computed style; so the cssText in the unsupportedCSSValue won't necessarily
+    // match the typed CSSStyleValue that will eventually be returned here.
     const CSSValue* cssValue = m_computedStyleDeclaration->getPropertyCSSValueInternal(propertyID);
-    if (!cssValue)
-        return CSSStyleValueVector();
-    return StyleValueFactory::cssValueToStyleValueVector(propertyID, *cssValue);
+    if (cssValue) {
+        return StyleValueFactory::unsupportedCSSValue(*cssValue);

[meade_UTC10, 2016/09/27 04:41:39]

We're going to get rid of UnsupportedCSSValue after all (decided at TPAC last
week), so you can remove this :) 

[rjwright, 2016/09/28 01:38:24]

Done.

+    }
+    return styleValueVector;
 }
 
 CSSStyleValueVector ComputedStylePropertyMap::getAllInternal(AtomicString customPropertyName)
 {
     const CSSValue* cssValue = m_computedStyleDeclaration->getPropertyCSSValueInternal(customPropertyName);
     if (!cssValue)
         return CSSStyleValueVector();
     return StyleValueFactory::cssValueToStyleValueVector(CSSPropertyInvalid, *cssValue);
 }
 
 Vector<String> ComputedStylePropertyMap::getProperties()
 {
     Vector<String> result;
     for (unsigned i = 0; i < m_computedStyleDeclaration->length(); i++) {
         result.append(m_computedStyleDeclaration->item(i));
     }
     return result;
 }
 
 } // namespace blink