Changed ETextAlign to an enum class and renamed its members to keywords

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
  *               All right reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 345 matching lines @@
 }
 
 ETextAlign LayoutBlockFlow::textAlignmentForLine(bool endsWithSoftBreak) const {
   ETextAlign alignment = style()->textAlign();
   if (endsWithSoftBreak)
     return alignment;
 
   TextAlignLast alignmentLast = style()->getTextAlignLast();
   switch (alignmentLast) {
     case TextAlignLastStart:
-      return TASTART;
+      return ETextAlign::Start;
     case TextAlignLastEnd:
-      return TAEND;
+      return ETextAlign::End;
     case TextAlignLastLeft:
-      return LEFT;
+      return ETextAlign::Left;
     case TextAlignLastRight:
-      return RIGHT;
+      return ETextAlign::Right;
     case TextAlignLastCenter:
-      return CENTER;
+      return ETextAlign::Center;
     case TextAlignLastJustify:
-      return JUSTIFY;
+      return ETextAlign::Justify;
     case TextAlignLastAuto:
-      if (alignment == JUSTIFY)
-        return TASTART;
+      if (alignment == ETextAlign::Justify)
+        return ETextAlign::Start;
       return alignment;
   }
 
   return alignment;
 }
 
 static void updateLogicalWidthForLeftAlignedBlock(
     bool isLeftToRightDirection,
     BidiRun* trailingSpaceRun,
     LayoutUnit& logicalLeft,
@@ skipping 273 matching lines @@
       rootInlineBox->getLineLayoutItem().style()->unicodeBidi() == Plaintext)
     direction = rootInlineBox->direction();
   else
     direction = style()->direction();
 
   // Armed with the total width of the line (without justification),
   // we now examine our text-align property in order to determine where to
   // position the objects horizontally. The total width of the line can be
   // increased if we end up justifying text.
   switch (textAlign) {
-    case LEFT:
-    case WEBKIT_LEFT:
+    case ETextAlign::Left:
+    case ETextAlign::WebkitLeft:
       updateLogicalWidthForLeftAlignedBlock(
           style()->isLeftToRightDirection(), trailingSpaceRun, logicalLeft,
           totalLogicalWidth, availableLogicalWidth);
       break;
-    case RIGHT:
-    case WEBKIT_RIGHT:
+    case ETextAlign::Right:
+    case ETextAlign::WebkitRight:
       updateLogicalWidthForRightAlignedBlock(
           style()->isLeftToRightDirection(), trailingSpaceRun, logicalLeft,
           totalLogicalWidth, availableLogicalWidth);
       break;
-    case CENTER:
-    case WEBKIT_CENTER:
+    case ETextAlign::Center:
+    case ETextAlign::WebkitCenter:
       updateLogicalWidthForCenterAlignedBlock(
           style()->isLeftToRightDirection(), trailingSpaceRun, logicalLeft,
           totalLogicalWidth, availableLogicalWidth);
       break;
-    case JUSTIFY:
+    case ETextAlign::Justify:
       adjustInlineDirectionLineBounds(expansionOpportunityCount, logicalLeft,
                                       availableLogicalWidth);
       if (expansionOpportunityCount) {
         if (trailingSpaceRun) {
           totalLogicalWidth -= trailingSpaceRun->m_box->logicalWidth();
           trailingSpaceRun->m_box->setLogicalWidth(LayoutUnit());
         }
         break;
       }
     // Fall through
-    case TASTART:
+    case ETextAlign::Start:
       if (direction == LTR)
         updateLogicalWidthForLeftAlignedBlock(
             style()->isLeftToRightDirection(), trailingSpaceRun, logicalLeft,
             totalLogicalWidth, availableLogicalWidth);
       else
         updateLogicalWidthForRightAlignedBlock(
             style()->isLeftToRightDirection(), trailingSpaceRun, logicalLeft,
             totalLogicalWidth, availableLogicalWidth);
       break;
-    case TAEND:
+    case ETextAlign::End:
       if (direction == LTR)
         updateLogicalWidthForRightAlignedBlock(
             style()->isLeftToRightDirection(), trailingSpaceRun, logicalLeft,
             totalLogicalWidth, availableLogicalWidth);
       else
         updateLogicalWidthForLeftAlignedBlock(
             style()->isLeftToRightDirection(), trailingSpaceRun, logicalLeft,
             totalLogicalWidth, availableLogicalWidth);
       break;
   }
@@ skipping 90 matching lines @@
   for (; r; r = r->next()) {
     if (!r->m_box || r->m_lineLayoutItem.isOutOfFlowPositioned() ||
         r->m_box->isLineBreak()) {
       continue;  // Positioned objects are only participating to figure out
                  // their correct static x position. They have no effect on the
                  // width. Similarly, line break boxes have no effect on the
                  // width.
     }
     if (r->m_lineLayoutItem.isText()) {
       LineLayoutText rt(r->m_lineLayoutItem);
-      if (textAlign == JUSTIFY && r != trailingSpaceRun &&
+      if (textAlign == ETextAlign::Justify && r != trailingSpaceRun &&
           textJustify != TextJustifyNone) {
         if (!isAfterExpansion)
           toInlineTextBox(r->m_box)->setCanHaveLeadingExpansion(true);
         expansions.addRunWithExpansions(*r, isAfterExpansion, textJustify);
       }
 
       if (rt.textLength()) {
         if (!r->m_start && needsWordSpacing &&
             isSpaceOrNewline(rt.characterAt(r->m_start)))
           totalLogicalWidth += rt.style(lineInfo.isFirstLine())
@@ skipping 1629 matching lines @@
   }
 }
 
 LayoutUnit LayoutBlockFlow::startAlignedOffsetForLine(
     LayoutUnit position,
     IndentTextOrNot indentText) {
   ETextAlign textAlign = style()->textAlign();
 
   bool applyIndentText;
   switch (textAlign) {  // FIXME: Handle TAEND here
-    case LEFT:
-    case WEBKIT_LEFT:
+    case ETextAlign::Left:
+    case ETextAlign::WebkitLeft:
       applyIndentText = style()->isLeftToRightDirection();
       break;
-    case RIGHT:
-    case WEBKIT_RIGHT:
+    case ETextAlign::Right:
+    case ETextAlign::WebkitRight:
       applyIndentText = !style()->isLeftToRightDirection();
       break;
-    case TASTART:
+    case ETextAlign::Start:
       applyIndentText = true;
       break;
     default:
       applyIndentText = false;
   }
 
   if (applyIndentText)
     return startOffsetForLine(position, indentText);
 
   // updateLogicalWidthForAlignment() handles the direction of the block so no
@@ skipping 19 matching lines @@
 
 bool LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const {
   // LayoutBlockFlow is in charge of paint invalidation of the first line.
   if (firstLineBox())
     return false;
 
   return LayoutBlock::paintedOutputOfObjectHasNoEffectRegardlessOfSize();
 }
 
 }  // namespace blink