Split EBreak enum into EBreakBetween & EBreakInside

third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Index: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
index ffbc1f79827b8d2003ab881d9bde40e039b582dc..10ce58214069818d31a4e488c72ca3a7a2e5acd5 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
@@ -1951,69 +1951,106 @@ inline EOverflow CSSIdentifierValue::convertTo() const {
 }
 
 template <>
-inline CSSIdentifierValue::CSSIdentifierValue(EBreak e)
+inline CSSIdentifierValue::CSSIdentifierValue(EBreakBetween e)

[amoylan, 2017/02/07 04:35:02]

Sorted this switch to match enum ordering. Same below.

     : CSSValue(IdentifierClass) {
   switch (e) {
     default:
       ASSERT_NOT_REACHED();
-    case BreakAuto:
+    case EBreakBetween::kAuto:
       m_valueID = CSSValueAuto;
       break;
-    case BreakAvoid:
+    case EBreakBetween::kAvoid:
       m_valueID = CSSValueAvoid;
       break;
-    case BreakAvoidPage:
+    case EBreakBetween::kAvoidColumn:
+      m_valueID = CSSValueAvoidColumn;
+      break;
+    case EBreakBetween::kAvoidPage:
       m_valueID = CSSValueAvoidPage;
       break;
-    case BreakPage:
-      m_valueID = CSSValuePage;
+    case EBreakBetween::kColumn:
+      m_valueID = CSSValueColumn;
       break;
-    case BreakLeft:
+    case EBreakBetween::kLeft:
       m_valueID = CSSValueLeft;
       break;
-    case BreakRight:
-      m_valueID = CSSValueRight;
+    case EBreakBetween::kPage:
+      m_valueID = CSSValuePage;
       break;
-    case BreakRecto:
+    case EBreakBetween::kRecto:
       m_valueID = CSSValueRecto;
       break;
-    case BreakVerso:
-      m_valueID = CSSValueVerso;
-      break;
-    case BreakAvoidColumn:
-      m_valueID = CSSValueAvoidColumn;
+    case EBreakBetween::kRight:
+      m_valueID = CSSValueRight;
       break;
-    case BreakColumn:
-      m_valueID = CSSValueColumn;
+    case EBreakBetween::kVerso:
+      m_valueID = CSSValueVerso;
       break;
   }
 }
 
 template <>
-inline EBreak CSSIdentifierValue::convertTo() const {
+inline EBreakBetween CSSIdentifierValue::convertTo() const {
   switch (m_valueID) {
     default:
       ASSERT_NOT_REACHED();
     case CSSValueAuto:
-      return BreakAuto;
+      return EBreakBetween::kAuto;
     case CSSValueAvoid:
-      return BreakAvoid;
+      return EBreakBetween::kAvoid;
+    case CSSValueAvoidColumn:
+      return EBreakBetween::kAvoidColumn;
     case CSSValueAvoidPage:
-      return BreakAvoidPage;
-    case CSSValuePage:
-      return BreakPage;
+      return EBreakBetween::kAvoidPage;
+    case CSSValueColumn:
+      return EBreakBetween::kColumn;
     case CSSValueLeft:
-      return BreakLeft;
-    case CSSValueRight:
-      return BreakRight;
+      return EBreakBetween::kLeft;
+    case CSSValuePage:
+      return EBreakBetween::kPage;
     case CSSValueRecto:
-      return BreakRecto;
+      return EBreakBetween::kRecto;
+    case CSSValueRight:
+      return EBreakBetween::kRight;
     case CSSValueVerso:
-      return BreakVerso;
+      return EBreakBetween::kVerso;
+  }
+}
+
+template <>
+inline CSSIdentifierValue::CSSIdentifierValue(EBreakInside e)
+    : CSSValue(IdentifierClass) {
+  switch (e) {
+    default:
+      NOTREACHED();
+    case EBreakInside::kAuto:
+      m_valueID = CSSValueAuto;
+      break;
+    case EBreakInside::kAvoid:
+      m_valueID = CSSValueAvoid;
+      break;
+    case EBreakInside::kAvoidColumn:
+      m_valueID = CSSValueAvoidColumn;
+      break;
+    case EBreakInside::kAvoidPage:
+      m_valueID = CSSValueAvoidPage;
+      break;
+  }
+}
+
+template <>
+inline EBreakInside CSSIdentifierValue::convertTo() const {
+  switch (m_valueID) {
+    default:
+      NOTREACHED();
+    case CSSValueAuto:
+      return EBreakInside::kAuto;
+    case CSSValueAvoid:
+      return EBreakInside::kAvoid;
     case CSSValueAvoidColumn:
-      return BreakAvoidColumn;
-    case CSSValueColumn:
-      return BreakColumn;
+      return EBreakInside::kAvoidColumn;
+    case CSSValueAvoidPage:
+      return EBreakInside::kAvoidPage;
   }
 }