Changed EClear to an enum class and renamed its members

third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2037 matching lines @@
           grandchildBox->style()->hasMarginBeforeQuirk());
       grandchildBlock->setHasMarginAfterQuirk(
           grandchildBox->style()->hasMarginAfterQuirk());
     }
   }
 
   // If we have a 'clear' value but also have a margin we may not actually
   // require clearance to move past any floats. If that's the case we want to be
   // sure we estimate the correct position including margins after any floats
   // rather than use 'clearance' later which could give us the wrong position.
-  if (grandchildBox->style()->clear() != ClearNone &&
+  if (grandchildBox->style()->clear() != EClear::kNone &&
       childBlockFlow->marginBeforeForChild(*grandchildBox) == 0)
     return;
 
   // Collapse the margin of the grandchild box with our own to produce an
   // estimate.
   childBlockFlow->marginBeforeEstimateForChild(
       *grandchildBox, positiveMarginBefore, negativeMarginBefore,
       discardMarginBefore);
 }
 
@@ skipping 625 matching lines @@
   if (!containsFloats())
     return LayoutUnit();
 
   // At least one float is present. We need to perform the clearance
   // computation.
   EClear clear = child->style()->clear();
   LayoutUnit logicalBottom = lowestFloatLogicalBottom(clear);
 
   // We also clear floats if we are too big to sit on the same line as a float
   // (and wish to avoid floats by default).
-  LayoutUnit result = clear != ClearNone
+  LayoutUnit result = clear != EClear::kNone
                           ? (logicalBottom - logicalTop).clampNegativeToZero()
                           : LayoutUnit();
   if (!result && child->avoidsFloats()) {
     LayoutUnit newLogicalTop = logicalTop;
     LayoutRect borderBox = child->borderBoxRect();
     LayoutUnit childLogicalWidthAtOldLogicalTopOffset =
         isHorizontalWritingMode() ? borderBox.width() : borderBox.height();
     while (true) {
       LayoutUnit availableLogicalWidthAtNewLogicalTopOffset =
           availableLogicalWidthForLine(newLogicalTop, DoNotIndentText,
@@ skipping 1191 matching lines @@
       if (floatingObject.isDescendant())
         child->addOverflowFromChild(
             floatingObject.layoutObject(),
             LayoutSize(xPositionForFloatIncludingMargin(floatingObject),
                        yPositionForFloatIncludingMargin(floatingObject)));
     }
   }
 }
 
 LayoutUnit LayoutBlockFlow::lowestFloatLogicalBottom(EClear clear) const {
-  if (clear == ClearNone || !m_floatingObjects)
+  if (clear == EClear::kNone || !m_floatingObjects)
     return LayoutUnit();
 
-  FloatingObject::Type floatType =
-      clear == ClearLeft ? FloatingObject::FloatLeft
-                         : clear == ClearRight ? FloatingObject::FloatRight
-                                               : FloatingObject::FloatLeftRight;
+  FloatingObject::Type floatType = clear == EClear::kLeft
+                                       ? FloatingObject::FloatLeft
+                                       : clear == EClear::kRight
+                                             ? FloatingObject::FloatRight
+                                             : FloatingObject::FloatLeftRight;
   return m_floatingObjects->lowestFloatLogicalBottom(floatType);
 }
 
 LayoutUnit LayoutBlockFlow::nextFloatLogicalBottomBelow(
     LayoutUnit logicalHeight) const {
   if (!m_floatingObjects)
     return logicalHeight;
   return m_floatingObjects->findNextFloatLogicalBottomBelow(logicalHeight);
 }
 
@@ skipping 667 matching lines @@
   return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 void LayoutBlockFlow::invalidateDisplayItemClients(
     PaintInvalidationReason invalidationReason) const {
   BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
       invalidationReason);
 }
 
 }  // namespace blink