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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 162 matching lines @@
             image->setImageResource(LayoutImageResourceStyleImage::create(const_cast<StyleImage*>(styleImage)));
             image->setIsGeneratedContent();
         } else {
             image->setImageResource(LayoutImageResource::create());
         }
         image->setStyleInternal(nullptr);
         return image;
     }
 
     switch (style.display()) {
-    case NONE:
+    case EDisplay::None:
         return nullptr;
-    case INLINE:
+    case EDisplay::Inline:
         return new LayoutInline(element);
-    case BLOCK:
-    case INLINE_BLOCK:
+    case EDisplay::Block:
+    case EDisplay::InlineBlock:
         if (RuntimeEnabledFeatures::layoutNGEnabled())
             return new LayoutNGBlockFlow(element);
         return new LayoutBlockFlow(element);
-    case LIST_ITEM:
+    case EDisplay::ListItem:
         return new LayoutListItem(element);
-    case TABLE:
-    case INLINE_TABLE:
+    case EDisplay::Table:
+    case EDisplay::InlineTable:
         return new LayoutTable(element);
-    case TABLE_ROW_GROUP:
-    case TABLE_HEADER_GROUP:
-    case TABLE_FOOTER_GROUP:
+    case EDisplay::TableRowGroup:
+    case EDisplay::TableHeaderGroup:
+    case EDisplay::TableFooterGroup:
         return new LayoutTableSection(element);
-    case TABLE_ROW:
+    case EDisplay::TableRow:
         return new LayoutTableRow(element);
-    case TABLE_COLUMN_GROUP:
-    case TABLE_COLUMN:
+    case EDisplay::TableColumnGroup:
+    case EDisplay::TableColumn:
         return new LayoutTableCol(element);
-    case TABLE_CELL:
+    case EDisplay::TableCell:
         return new LayoutTableCell(element);
-    case TABLE_CAPTION:
+    case EDisplay::TableCaption:
         return new LayoutTableCaption(element);
-    case BOX:
-    case INLINE_BOX:
+    case EDisplay::Box:
+    case EDisplay::InlineBox:
         return new LayoutDeprecatedFlexibleBox(*element);
-    case FLEX:
-    case INLINE_FLEX:
+    case EDisplay::Flex:
+    case EDisplay::InlineFlex:
         return new LayoutFlexibleBox(element);
-    case GRID:
-    case INLINE_GRID:
+    case EDisplay::Grid:
+    case EDisplay::InlineGrid:
         return new LayoutGrid(element);
     }
 
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 LayoutObject::LayoutObject(Node* node)
     : m_style(nullptr)
     , m_node(node)
@@ skipping 3059 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
     }
 }
 
 #endif