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

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

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
  *
  * 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 66 matching lines @@
     , m_platformTheme(platformTheme)
 {
 }
 
 void LayoutTheme::adjustStyle(ComputedStyle& style, Element* e)
 {
     ASSERT(style.hasAppearance());
 
     // Force inline and table display styles to be inline-block (except for table- which is block)
     ControlPart part = style.appearance();
-    if (style.display() == INLINE || style.display() == INLINE_TABLE || style.display() == TABLE_ROW_GROUP
-        || style.display() == TABLE_HEADER_GROUP || style.display() == TABLE_FOOTER_GROUP
-        || style.display() == TABLE_ROW || style.display() == TABLE_COLUMN_GROUP || style.display() == TABLE_COLUMN
-        || style.display() == TABLE_CELL || style.display() == TABLE_CAPTION)
-        style.setDisplay(INLINE_BLOCK);
-    else if (style.display() == LIST_ITEM || style.display() == TABLE)
-        style.setDisplay(BLOCK);
+    if (style.display() == EDisplay::Inline || style.display() == EDisplay::InlineTable || style.display() == EDisplay::TableRowGroup
+        || style.display() == EDisplay::TableHeaderGroup || style.display() == EDisplay::TableFooterGroup
+        || style.display() == EDisplay::TableRow || style.display() == EDisplay::TableColumnGroup || style.display() == EDisplay::TableColumn
+        || style.display() == EDisplay::TableCell || style.display() == EDisplay::TableCaption)
+        style.setDisplay(EDisplay::InlineBlock);
+    else if (style.display() == EDisplay::ListItem || style.display() == EDisplay::Table)
+        style.setDisplay(EDisplay::Block);
 
     if (isControlStyled(style)) {
         if (part == MenulistPart) {
             style.setAppearance(MenulistButtonPart);
             part = MenulistButtonPart;
         } else {
             style.setAppearance(NoControlPart);
             return;
         }
     }
@@ skipping 833 matching lines @@
 
     // padding - not honored by WinIE, needs to be removed.
     style.resetPadding();
 
     // border - honored by WinIE, but looks terrible (just paints in the control box and turns off the Windows XP theme)
     // for now, we will not honor it.
     style.resetBorder();
 }
 
 } // namespace blink