Changed EDisplay to an enum class and renamed its members to be keywords

third_party/WebKit/Source/core/layout/LayoutTable.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, 2010, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 103 matching lines @@
         o = o->previousSibling();
     if (!o)
         ptr = 0;
 }
 
 static inline bool needsTableSection(LayoutObject* object)
 {
     // Return true if 'object' can't exist in an anonymous table without being
     // wrapped in a table section box.
     EDisplay display = object->style()->display();
-    return display != TABLE_CAPTION && display != TABLE_COLUMN_GROUP && display != TABLE_COLUMN;
+    return display != EDisplay::TableCaption && display != EDisplay::TableColumnGroup && display != EDisplay::TableColumn;
 }
 
 void LayoutTable::addChild(LayoutObject* child, LayoutObject* beforeChild)
 {
     bool wrapInAnonymousSection = !child->isOutOfFlowPositioned();
 
     if (child->isTableCaption()) {
         wrapInAnonymousSection = false;
     } else if (child->isLayoutTableCol()) {
         m_hasColElements = true;
         wrapInAnonymousSection = false;
     } else if (child->isTableSection()) {
         switch (child->style()->display()) {
-        case TABLE_HEADER_GROUP:
+        case EDisplay::TableHeaderGroup:
             resetSectionPointerIfNotBefore(m_head, beforeChild);
             if (!m_head) {
                 m_head = toLayoutTableSection(child);
             } else {
                 resetSectionPointerIfNotBefore(m_firstBody, beforeChild);
                 if (!m_firstBody)
                     m_firstBody = toLayoutTableSection(child);
             }
             wrapInAnonymousSection = false;
             break;
-        case TABLE_FOOTER_GROUP:
+        case EDisplay::TableFooterGroup:
             resetSectionPointerIfNotBefore(m_foot, beforeChild);
             if (!m_foot) {
                 m_foot = toLayoutTableSection(child);
                 wrapInAnonymousSection = false;
                 break;
             }
             // Fall through.
-        case TABLE_ROW_GROUP:
+        case EDisplay::TableRowGroup:
             resetSectionPointerIfNotBefore(m_firstBody, beforeChild);
             if (!m_firstBody)
                 m_firstBody = toLayoutTableSection(child);
             wrapInAnonymousSection = false;
             break;
         default:
             ASSERT_NOT_REACHED();
         }
     } else {
         wrapInAnonymousSection = true;
@@ skipping 731 matching lines @@
     m_foot = nullptr;
     m_firstBody = nullptr;
     m_hasColElements = false;
     m_noCellColspanAtLeast = calcNoCellColspanAtLeast();
 
     // We need to get valid pointers to caption, head, foot and first body again
     LayoutObject* nextSibling;
     for (LayoutObject* child = firstChild(); child; child = nextSibling) {
         nextSibling = child->nextSibling();
         switch (child->style()->display()) {
-        case TABLE_COLUMN:
-        case TABLE_COLUMN_GROUP:
+        case EDisplay::TableColumn:
+        case EDisplay::TableColumnGroup:
             m_hasColElements = true;
             break;
-        case TABLE_HEADER_GROUP:
+        case EDisplay::TableHeaderGroup:
             if (child->isTableSection()) {
                 LayoutTableSection* section = toLayoutTableSection(child);
                 if (!m_head)
                     m_head = section;
                 else if (!m_firstBody)
                     m_firstBody = section;
                 section->recalcCellsIfNeeded();
             }
             break;
-        case TABLE_FOOTER_GROUP:
+        case EDisplay::TableFooterGroup:
             if (child->isTableSection()) {
                 LayoutTableSection* section = toLayoutTableSection(child);
                 if (!m_foot)
                     m_foot = section;
                 else if (!m_firstBody)
                     m_firstBody = section;
                 section->recalcCellsIfNeeded();
             }
             break;
-        case TABLE_ROW_GROUP:
+        case EDisplay::TableRowGroup:
             if (child->isTableSection()) {
                 LayoutTableSection* section = toLayoutTableSection(child);
                 if (!m_firstBody)
                     m_firstBody = section;
                 section->recalcCellsIfNeeded();
             }
             break;
         default:
             break;
         }
@@ skipping 467 matching lines @@
         updateHitTestResult(result, flipForWritingMode(locationInContainer.point() - toLayoutSize(adjustedLocation)));
         if (result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect) == StopHitTesting)
             return true;
     }
 
     return false;
 }
 
 LayoutTable* LayoutTable::createAnonymousWithParent(const LayoutObject* parent)
 {
-    RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(parent->styleRef(), parent->isLayoutInline() ? INLINE_TABLE : TABLE);
+    RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisplay(parent->styleRef(), parent->isLayoutInline() ? EDisplay::InlineTable : EDisplay::Table);
     LayoutTable* newTable = new LayoutTable(nullptr);
     newTable->setDocumentForAnonymous(&parent->document());
     newTable->setStyle(newStyle.release());
     return newTable;
 }
 
 const BorderValue& LayoutTable::tableStartBorderAdjoiningCell(const LayoutTableCell* cell) const
 {
     ASSERT(cell->isFirstOrLastCellInRow());
     if (hasSameDirectionAs(cell->row()))
@@ skipping 56 matching lines @@
 
 LayoutUnit LayoutTable::paddingRight() const
 {
     if (collapseBorders())
         return LayoutUnit();
 
     return LayoutBlock::paddingRight();
 }
 
 } // namespace blink