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

Source/core/css/ComputedStyleCSSValueMapping.h

Index: Source/core/css/ComputedStyleCSSValueMapping.h
diff --git a/Source/core/css/ComputedStyleCSSValueMapping.h b/Source/core/css/ComputedStyleCSSValueMapping.h
index ca8b9fa2c586d1a54ccc73a7d1d241033eac714c..1fde631794ac01cd80dd05914878ab4d0acb2c0d 100644
--- a/Source/core/css/ComputedStyleCSSValueMapping.h
+++ b/Source/core/css/ComputedStyleCSSValueMapping.h
@@ -20,8 +20,9 @@ class Node;
 
 class ComputedStyleCSSValueMapping {
 public:
+    enum ShorthandState { NotDoingShorthand, DoingShorthand };
     // FIXME: Resolve computed auto alignment in applyProperty/ComputedStyle and remove this non-const styledNode parameter.
-    static PassRefPtrWillBeRawPtr<CSSValue> get(CSSPropertyID, const ComputedStyle&, const LayoutObject* = nullptr, Node* styledNode = nullptr, bool allowVisitedStyle = false);
+    static PassRefPtrWillBeRawPtr<CSSValue> get(CSSPropertyID, const ComputedStyle&, const LayoutObject* = nullptr, Node* styledNode = nullptr, ShorthandState = NotDoingShorthand, bool allowVisitedStyle = false);
 private:
     static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> currentColorOrValidColor(const ComputedStyle&, const StyleColor&);
     static PassRefPtrWillBeRawPtr<CSSValue> valueForShadowData(const ShadowData&, const ComputedStyle&, bool useSpread);