Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
index b25d8b9af100a52b84fc9b90b82448a9eb371312..911ecc7cf74c4875033035700049e0ea3623708d 100644 |
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp |
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp |
@@ -93,6 +93,13 @@ static const CSSPropertyID staticComputableProperties[] = { |
CSSPropertyClear, |
CSSPropertyClip, |
CSSPropertyColor, |
+ CSSPropertyColumnCount, |
+ CSSPropertyColumnGap, |
+ CSSPropertyColumnRuleColor, |
+ CSSPropertyColumnRuleStyle, |
+ CSSPropertyColumnRuleWidth, |
+ CSSPropertyColumnSpan, |
+ CSSPropertyColumnWidth, |
CSSPropertyCursor, |
CSSPropertyDirection, |
CSSPropertyDisplay, |
@@ -208,13 +215,6 @@ static const CSSPropertyID staticComputableProperties[] = { |
CSSPropertyWebkitColumnBreakAfter, |
CSSPropertyWebkitColumnBreakBefore, |
CSSPropertyWebkitColumnBreakInside, |
- CSSPropertyWebkitColumnCount, |
- CSSPropertyWebkitColumnGap, |
- CSSPropertyWebkitColumnRuleColor, |
- CSSPropertyWebkitColumnRuleStyle, |
- CSSPropertyWebkitColumnRuleWidth, |
- CSSPropertyWebkitColumnSpan, |
- CSSPropertyWebkitColumnWidth, |
CSSPropertyWebkitFilter, |
CSSPropertyAlignContent, |
CSSPropertyAlignItems, |
@@ -521,8 +521,9 @@ Node* CSSComputedStyleDeclaration::styledNode() const |
return m_node.get(); |
} |
-PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID) const |
+PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID unresolvedProperty) const |
{ |
+ CSSPropertyID propertyID = resolveCSSPropertyID(unresolvedProperty); |
Node* styledNode = this->styledNode(); |
if (!styledNode) |
return nullptr; |
@@ -557,7 +558,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu |
if (!style) |
return nullptr; |
- RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(propertyID, *style, layoutObject, styledNode, m_allowVisitedStyle); |
+ RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(unresolvedProperty, *style, layoutObject, styledNode, ComputedStyleCSSValueMapping::NotDoingShorthand, m_allowVisitedStyle); |
if (value) |
return value; |
@@ -565,12 +566,12 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu |
return nullptr; |
} |
-String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID propertyID) const |
+String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID unresolvedProperty) const |
{ |
- RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID); |
+ RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(unresolvedProperty); |
if (value) |
return value->cssText(); |
- return ""; |
+ return "undefined"; |
} |
@@ -663,14 +664,14 @@ String CSSComputedStyleDeclaration::removeProperty(const String& name, Exception |
return String(); |
} |
-PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID) |
+PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID unresolvedProperty) |
{ |
- return getPropertyCSSValue(propertyID); |
+ return getPropertyCSSValue(unresolvedProperty); |
} |
-String CSSComputedStyleDeclaration::getPropertyValueInternal(CSSPropertyID propertyID) |
+String CSSComputedStyleDeclaration::getPropertyValueInternal(CSSPropertyID unresolvedProperty) |
{ |
- return getPropertyValue(propertyID); |
+ return getPropertyValue(unresolvedProperty); |
} |
void CSSComputedStyleDeclaration::setPropertyInternal(CSSPropertyID id, const String&, bool, ExceptionState& exceptionState) |