Split EBreak enum into EBreakBetween & EBreakInside

third_party/WebKit/Source/core/layout/LayoutBox.h

Index: third_party/WebKit/Source/core/layout/LayoutBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
index 495fd6b7b79c1c4d4d228fde777f940a34b1b04b..ee66f33417fa6f07f04ed04696ad09c62de5a273 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
@@ -836,15 +836,15 @@ class CORE_EXPORT LayoutBox : public LayoutBoxModelObject {
   // Is the specified break-before or break-after value supported on this
   // object? It needs to be in-flow all the way up to a fragmentation context
   // that supports the specified value.
-  bool isBreakBetweenControllable(EBreak) const;
+  bool isBreakBetweenControllable(EBreakBetween) const;
 
   // Is the specified break-inside value supported on this object? It needs to
   // be contained by a fragmentation context that supports the specified value.
-  bool isBreakInsideControllable(EBreak) const;
+  bool isBreakInsideControllable(EBreakInside) const;
 
-  virtual EBreak breakAfter() const;
-  virtual EBreak breakBefore() const;
-  EBreak breakInside() const;
+  virtual EBreakBetween breakAfter() const;
+  virtual EBreakBetween breakBefore() const;
+  EBreakInside breakInside() const;
 
   // Join two adjacent break values specified on break-before and/or break-
   // after. avoid* values win over auto values, and forced break values win over
@@ -856,18 +856,19 @@ class CORE_EXPORT LayoutBox : public LayoutBoxModelObject {
   // break-after values on last children to their container.
   //
   // [1] https://drafts.csswg.org/css-break/#possible-breaks
-  static EBreak joinFragmentainerBreakValues(EBreak firstValue,
-                                             EBreak secondValue);
+  static EBreakBetween joinFragmentainerBreakValues(EBreakBetween firstValue,
+                                                    EBreakBetween secondValue);
 
-  static bool isForcedFragmentainerBreakValue(EBreak);
+  static bool isForcedFragmentainerBreakValue(EBreakBetween);
 
-  EBreak classABreakPointValue(EBreak previousBreakAfterValue) const;
+  EBreakBetween classABreakPointValue(
+      EBreakBetween previousBreakAfterValue) const;
 
   // Return true if we should insert a break in front of this box. The box needs
   // to start at a valid class A break point in order to allow a forced break.
   // To determine whether or not to break, we also need to know the break-after
   // value of the previous in-flow sibling.
-  bool needsForcedBreakBefore(EBreak previousBreakAfterValue) const;
+  bool needsForcedBreakBefore(EBreakBetween previousBreakAfterValue) const;
 
   bool paintedOutputOfObjectHasNoEffectRegardlessOfSize() const override;
   LayoutRect localVisualRect() const override;
@@ -1630,10 +1631,14 @@ inline void LayoutBox::setInlineBoxWrapper(InlineBox* boxWrapper) {
   m_inlineBoxWrapper = boxWrapper;
 }
 
-inline bool LayoutBox::isForcedFragmentainerBreakValue(EBreak breakValue) {
-  return breakValue == BreakColumn || breakValue == BreakLeft ||
-         breakValue == BreakPage || breakValue == BreakRecto ||
-         breakValue == BreakRight || breakValue == BreakVerso;
+inline bool LayoutBox::isForcedFragmentainerBreakValue(

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

For "Between" type breaks, this function was used to test whether the break was
a "forced"-type break (i.e. not "avoid" or "auto"). This use is retained.

For "Inside" type breaks, this function was used to assert that a given EBreak
only had "Inside"-type values. This use is no longer required now that
EBreakInside is split out.

[mstensho (USE GERRIT), 2017/02/07 10:21:35]

Acknowledged.

+    EBreakBetween breakValue) {
+  return breakValue == EBreakBetween::kColumn ||
+         breakValue == EBreakBetween::kLeft ||
+         breakValue == EBreakBetween::kPage ||
+         breakValue == EBreakBetween::kRecto ||
+         breakValue == EBreakBetween::kRight ||
+         breakValue == EBreakBetween::kVerso;
 }
 
 }  // namespace blink