Changed EVerticalAlign to an enum class and renamed its members

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

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 228 matching lines @@
                                               EVerticalAlign verticalAlign,
                                               SubtreeLayoutScope& layouter) {
   int oldIntrinsicPaddingBefore = intrinsicPaddingBefore();
   int oldIntrinsicPaddingAfter = intrinsicPaddingAfter();
   int logicalHeightWithoutIntrinsicPadding = pixelSnappedLogicalHeight() -
                                              oldIntrinsicPaddingBefore -
                                              oldIntrinsicPaddingAfter;
 
   int intrinsicPaddingBefore = 0;
   switch (verticalAlign) {
-    case VerticalAlignSub:
-    case VerticalAlignSuper:
-    case VerticalAlignTextTop:
-    case VerticalAlignTextBottom:
-    case VerticalAlignLength:
-    case VerticalAlignBaseline: {
+    case EVerticalAlign::Sub:
+    case EVerticalAlign::Super:
+    case EVerticalAlign::TextTop:
+    case EVerticalAlign::TextBottom:
+    case EVerticalAlign::Length:
+    case EVerticalAlign::Baseline: {
       int baseline = cellBaselinePosition();
       if (baseline > borderBefore() + paddingBefore())
         intrinsicPaddingBefore = section()->rowBaseline(rowIndex()) -
                                  (baseline - oldIntrinsicPaddingBefore);
       break;
     }
-    case VerticalAlignTop:
+    case EVerticalAlign::Top:
       break;
-    case VerticalAlignMiddle:
+    case EVerticalAlign::Middle:
       intrinsicPaddingBefore =
           (rowHeight - logicalHeightWithoutIntrinsicPadding) / 2;
       break;
-    case VerticalAlignBottom:
+    case EVerticalAlign::Bottom:
       intrinsicPaddingBefore = rowHeight - logicalHeightWithoutIntrinsicPadding;
       break;
-    case VerticalAlignBaselineMiddle:
+    case EVerticalAlign::BaselineMiddle:
       break;
   }
 
   int intrinsicPaddingAfter =
       rowHeight - logicalHeightWithoutIntrinsicPadding - intrinsicPaddingBefore;
   setIntrinsicPaddingBefore(intrinsicPaddingBefore);
   setIntrinsicPaddingAfter(intrinsicPaddingAfter);
 
   // FIXME: Changing an intrinsic padding shouldn't trigger a relayout as it
   // only shifts the cell inside the row but doesn't change the logical height.
@@ skipping 1112 matching lines @@
     return;
 
   // We only care if the scrollbar that affects our intrinsic padding has been
   // added.
   if ((isHorizontalWritingMode() && !horizontalScrollbarChanged) ||
       (!isHorizontalWritingMode() && !verticalScrollbarChanged))
     return;
 
   // Shrink our intrinsic padding as much as possible to accommodate the
   // scrollbar.
-  if (style()->verticalAlign() == VerticalAlignMiddle) {
+  if (style()->verticalAlign() == EVerticalAlign::Middle) {
     LayoutUnit totalHeight = logicalHeight();
     LayoutUnit heightWithoutIntrinsicPadding =
         totalHeight - intrinsicPaddingBefore() - intrinsicPaddingAfter();
     totalHeight -= scrollbarHeight;
     LayoutUnit newBeforePadding =
         (totalHeight - heightWithoutIntrinsicPadding) / 2;
     LayoutUnit newAfterPadding =
         totalHeight - heightWithoutIntrinsicPadding - newBeforePadding;
     setIntrinsicPaddingBefore(newBeforePadding.toInt());
     setIntrinsicPaddingAfter(newAfterPadding.toInt());
@@ skipping 67 matching lines @@
     cb->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 void LayoutTableCell::adjustChildDebugRect(LayoutRect& r) const {
   r.move(0, -intrinsicPaddingBefore());
 }
 
 }  // namespace blink