Spec-compliant shorthand parsing of foo-break-(after,before,inside).

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

 // Copyright 2015 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/parser/CSSPropertyParser.h"
 
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
 #include "core/css/CSSCalculationValue.h"
@@ skipping 4415 matching lines @@
             return false;
         }
     }
     return false;
 }
 
 static inline CSSValueID mapFromPageBreakBetween(CSSValueID value)
 {
     if (value == CSSValueAlways)
         return CSSValuePage;
-    // TODO(mstensho): "avoid" should just return "avoid", not "avoid-page", according to the spec.
-    if (value == CSSValueAvoid)
-        return CSSValueAvoidPage;
-    if (value == CSSValueAuto || value == CSSValueLeft || value == CSSValueRight)
+    if (value == CSSValueAuto || value == CSSValueAvoid || value == CSSValueLeft || value == CSSValueRight)
         return value;
     return CSSValueInvalid;
 }
 
 static inline CSSValueID mapFromColumnBreakBetween(CSSValueID value)
 {
     if (value == CSSValueAlways)
         return CSSValueColumn;
-    // TODO(mstensho): "avoid" should just return "avoid", not "avoid-column".
-    if (value == CSSValueAvoid)
-        return CSSValueAvoidColumn;
-    // TODO(mstensho): column break properties shouldn't take 'left' and 'right' values (but
-    // allowing it for now, since that's what we've always done).
-    if (value == CSSValueAuto || value == CSSValueLeft || value == CSSValueRight)
+    if (value == CSSValueAuto || value == CSSValueAvoid)
         return value;
     return CSSValueInvalid;
 }
 
-static inline CSSValueID mapFromPageBreakInside(CSSValueID value)
+static inline CSSValueID mapFromColumnOrPageBreakInside(CSSValueID value)
 {
-    // TODO(mstensho): "avoid" should just return "avoid", not "avoid-page", according to the spec.
-    if (value == CSSValueAvoid)
-        return CSSValueAvoidPage;
-    if (value == CSSValueAuto)
+    if (value == CSSValueAuto || value == CSSValueAvoid)
         return value;
     return CSSValueInvalid;
 }
-
-static inline CSSValueID mapFromColumnBreakInside(CSSValueID value)
-{
-    // TODO(mstensho): "avoid" should just return "avoid", not "avoid-column".
-    if (value == CSSValueAvoid)
-        return CSSValueAvoidColumn;
-    if (value == CSSValueAuto)
-        return value;
-    return CSSValueInvalid;
-}
 
 static inline CSSPropertyID mapFromLegacyBreakProperty(CSSPropertyID property)
 {
     if (property == CSSPropertyPageBreakAfter || property == CSSPropertyWebkitColumnBreakAfter)
         return CSSPropertyBreakAfter;
     if (property == CSSPropertyPageBreakBefore || property == CSSPropertyWebkitColumnBreakBefore)
         return CSSPropertyBreakBefore;
     ASSERT(property == CSSPropertyPageBreakInside || property == CSSPropertyWebkitColumnBreakInside);
     return CSSPropertyBreakInside;
 }
@@ skipping 12 matching lines @@
     switch (property) {
     case CSSPropertyPageBreakAfter:
     case CSSPropertyPageBreakBefore:
         value = mapFromPageBreakBetween(value);
         break;
     case CSSPropertyWebkitColumnBreakAfter:
     case CSSPropertyWebkitColumnBreakBefore:
         value = mapFromColumnBreakBetween(value);
         break;
     case CSSPropertyPageBreakInside:
-        value = mapFromPageBreakInside(value);
-        break;
     case CSSPropertyWebkitColumnBreakInside:
-        value = mapFromColumnBreakInside(value);
+        value = mapFromColumnOrPageBreakInside(value);
         break;
     default:
         ASSERT_NOT_REACHED();
     }
     if (value == CSSValueInvalid)
         return false;
 
     CSSPropertyID genericBreakProperty = mapFromLegacyBreakProperty(property);
     addProperty(genericBreakProperty, cssValuePool().createIdentifierValue(value), important);
     return true;
@@ skipping 144 matching lines @@
         m_currentShorthand = oldShorthand;
         CSSParserValueList valueList(m_range);
         if (!valueList.size())
             return false;
         m_valueList = &valueList;
         return legacyParseShorthand(unresolvedProperty, important);
     }
 }
 
 } // namespace blink