*** NOT FOR LANDING *** Unprefix multicol behind a flag

Source/core/css/CSSComputedStyleDeclaration.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 75 matching lines @@
     CSSPropertyBorderTopRightRadius,
     CSSPropertyBorderTopStyle,
     CSSPropertyBorderTopWidth,
     CSSPropertyBottom,
     CSSPropertyBoxShadow,
     CSSPropertyBoxSizing,
     CSSPropertyCaptionSide,
     CSSPropertyClear,
     CSSPropertyClip,
     CSSPropertyColor,
+    CSSPropertyColumnCount,
+    CSSPropertyColumnGap,
+    CSSPropertyColumnRuleColor,
+    CSSPropertyColumnRuleStyle,
+    CSSPropertyColumnRuleWidth,
+    CSSPropertyColumnSpan,
+    CSSPropertyColumnWidth,
     CSSPropertyCursor,
     CSSPropertyDirection,
     CSSPropertyDisplay,
     CSSPropertyEmptyCells,
     CSSPropertyFloat,
     CSSPropertyFontFamily,
     CSSPropertyFontKerning,
     CSSPropertyFontSize,
     CSSPropertyFontSizeAdjust,
     CSSPropertyFontStretch,
@@ skipping 95 matching lines @@
     CSSPropertyWebkitBoxFlexGroup,
     CSSPropertyWebkitBoxLines,
     CSSPropertyWebkitBoxOrdinalGroup,
     CSSPropertyWebkitBoxOrient,
     CSSPropertyWebkitBoxPack,
     CSSPropertyWebkitBoxReflect,
     CSSPropertyWebkitClipPath,
     CSSPropertyWebkitColumnBreakAfter,
     CSSPropertyWebkitColumnBreakBefore,
     CSSPropertyWebkitColumnBreakInside,
-    CSSPropertyWebkitColumnCount,
-    CSSPropertyWebkitColumnGap,
-    CSSPropertyWebkitColumnRuleColor,
-    CSSPropertyWebkitColumnRuleStyle,
-    CSSPropertyWebkitColumnRuleWidth,
-    CSSPropertyWebkitColumnSpan,
-    CSSPropertyWebkitColumnWidth,
     CSSPropertyWebkitFilter,
     CSSPropertyAlignContent,
     CSSPropertyAlignItems,
     CSSPropertyAlignSelf,
     CSSPropertyFlexBasis,
     CSSPropertyFlexGrow,
     CSSPropertyFlexShrink,
     CSSPropertyFlexDirection,
     CSSPropertyFlexWrap,
     CSSPropertyJustifyContent,
@@ skipping 286 matching lines @@
 {
     if (!m_node)
         return 0;
     if (m_node->isElementNode()) {
         if (PseudoElement* element = toElement(m_node)->pseudoElement(m_pseudoElementSpecifier))
             return element;
     }
     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;
     LayoutObject* layoutObject = styledNode->layoutObject();
     const ComputedStyle* style;
 
     Document& document = styledNode->document();
 
     // A timing update may be required if a compositor animation is running.
     DocumentAnimations::updateAnimationTimingForGetComputedStyle(*styledNode, propertyID);
@@ skipping 14 matching lines @@
     if (forceFullLayout) {
         document.updateLayoutIgnorePendingStylesheets();
         styledNode = this->styledNode();
         style = computeComputedStyle();
         layoutObject = styledNode->layoutObject();
     }
 
     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;
 
     logUnimplementedPropertyID(propertyID);
     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";
 }
 
 
 unsigned CSSComputedStyleDeclaration::length() const
 {
     if (!m_node || !m_node->inActiveDocument())
         return 0;
     return computableProperties().size();
 }
 
@@ skipping 72 matching lines @@
 {
     exceptionState.throwDOMException(NoModificationAllowedError, "These styles are computed, and therefore the '" + name + "' property is read-only.");
 }
 
 String CSSComputedStyleDeclaration::removeProperty(const String& name, ExceptionState& exceptionState)
 {
     exceptionState.throwDOMException(NoModificationAllowedError, "These styles are computed, and therefore the '" + name + "' property is read-only.");
     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)
 {
     exceptionState.throwDOMException(NoModificationAllowedError, "These styles are computed, and therefore the '" + getPropertyNameString(id) + "' property is read-only.");
 }
 
 DEFINE_TRACE(CSSComputedStyleDeclaration)
 {
     visitor->trace(m_node);
     CSSStyleDeclaration::trace(visitor);
 }
 
 } // namespace blink