Remove BreakAlways from EBreak enum

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1888 matching lines @@
   for (auto& coordinate : coordinates) {
     auto pair = CSSValueList::createSpaceSeparated();
     pair->append(*zoomAdjustedPixelValueForLength(coordinate.x(), style));
     pair->append(*zoomAdjustedPixelValueForLength(coordinate.y(), style));
     list->append(*pair);
   }
 
   return list;
 }
 
-static EBreak mapToPageBreakValue(EBreak genericBreakValue) {
-  switch (genericBreakValue) {
+// Returns a suitable value for the page-break-(before|after|inside) property,
+// given the computed value of the more general break-(before|after|inside)
+// property.
+static CSSValue* valueForPageBreak(EBreak breakValue) {
+  switch (breakValue) {
     case BreakAvoidColumn:
     case BreakColumn:
     case BreakRecto:
     case BreakVerso:
-      return BreakAuto;
+      return CSSIdentifierValue::create(CSSValueAuto);
     case BreakPage:
-      return BreakAlways;
+      return CSSIdentifierValue::create(CSSValueAlways);
     case BreakAvoidPage:
-      return BreakAvoid;
+      return CSSIdentifierValue::create(CSSValueAvoid);
     default:
-      return genericBreakValue;
+      return CSSIdentifierValue::create(breakValue);
   }
 }
 
-static EBreak mapToColumnBreakValue(EBreak genericBreakValue) {
-  switch (genericBreakValue) {
+// Returns a suitable value for the -webkit-column-break-(before|after|inside)
+// property, given the computed value of the more general
+// break-(before|after|inside) property.
+static CSSValue* valueForWebkitColumnBreak(EBreak breakValue) {
+  switch (breakValue) {
     case BreakAvoidPage:
     case BreakLeft:
     case BreakPage:
     case BreakRecto:
     case BreakRight:
     case BreakVerso:
-      return BreakAuto;
+      return CSSIdentifierValue::create(CSSValueAuto);
     case BreakColumn:
-      return BreakAlways;
+      return CSSIdentifierValue::create(CSSValueAlways);
     case BreakAvoidColumn:
-      return BreakAvoid;
+      return CSSIdentifierValue::create(CSSValueAvoid);
     default:
-      return genericBreakValue;
+      return CSSIdentifierValue::create(breakValue);
   }
 }
 
 const CSSValue* ComputedStyleCSSValueMapping::get(
     const AtomicString customPropertyName,
     const ComputedStyle& style,
     const PropertyRegistry* registry) {
   if (registry) {
     const PropertyRegistry::Registration* registration =
         registry->registration(customPropertyName);
@@ skipping 280 matching lines @@
                            .rgb())
                  : currentColorOrValidColor(style, style.columnRuleColor());
     case CSSPropertyColumnRuleStyle:
       return CSSIdentifierValue::create(style.columnRuleStyle());
     case CSSPropertyColumnRuleWidth:
       return zoomAdjustedPixelValue(style.columnRuleWidth(), style);
     case CSSPropertyColumnSpan:
       return CSSIdentifierValue::create(style.getColumnSpan() ? CSSValueAll
                                                               : CSSValueNone);
     case CSSPropertyWebkitColumnBreakAfter:
-      return CSSIdentifierValue::create(
-          mapToColumnBreakValue(style.breakAfter()));
+      return valueForWebkitColumnBreak(style.breakAfter());
     case CSSPropertyWebkitColumnBreakBefore:
-      return CSSIdentifierValue::create(
-          mapToColumnBreakValue(style.breakBefore()));
+      return valueForWebkitColumnBreak(style.breakBefore());
     case CSSPropertyWebkitColumnBreakInside:
-      return CSSIdentifierValue::create(
-          mapToColumnBreakValue(style.breakInside()));
+      return valueForWebkitColumnBreak(style.breakInside());
     case CSSPropertyColumnWidth:
       if (style.hasAutoColumnWidth())
         return CSSIdentifierValue::create(CSSValueAuto);
       return zoomAdjustedPixelValue(style.columnWidth(), style);
     case CSSPropertyTabSize:
       return CSSPrimitiveValue::create(
           style.getTabSize().getPixelSize(1.0),
           style.getTabSize().isSpaces() ? CSSPrimitiveValue::UnitType::Number
                                         : CSSPrimitiveValue::UnitType::Pixels);
     case CSSPropertyTextSizeAdjust:
@@ skipping 395 matching lines @@
       return zoomAdjustedPixelValue(
           toLayoutBox(layoutObject)->computedCSSPaddingLeft(), style);
     }
     case CSSPropertyBreakAfter:
       return CSSIdentifierValue::create(style.breakAfter());
     case CSSPropertyBreakBefore:
       return CSSIdentifierValue::create(style.breakBefore());
     case CSSPropertyBreakInside:
       return CSSIdentifierValue::create(style.breakInside());
     case CSSPropertyPageBreakAfter:
-      return CSSIdentifierValue::create(
-          mapToPageBreakValue(style.breakAfter()));
+      return valueForPageBreak(style.breakAfter());
     case CSSPropertyPageBreakBefore:
-      return CSSIdentifierValue::create(
-          mapToPageBreakValue(style.breakBefore()));
+      return valueForPageBreak(style.breakBefore());
     case CSSPropertyPageBreakInside:
-      return CSSIdentifierValue::create(
-          mapToPageBreakValue(style.breakInside()));
+      return valueForPageBreak(style.breakInside());
     case CSSPropertyPosition:
       return CSSIdentifierValue::create(style.position());
     case CSSPropertyQuotes:
       if (!style.quotes()) {
         // TODO(ramya.v): We should return the quote values that we're actually
         // using.
         return nullptr;
       }
       if (style.quotes()->size()) {
         CSSValueList* list = CSSValueList::createSpaceSeparated();
@@ skipping 960 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 }  // namespace blink