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

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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
@@ skipping 343 matching lines @@
         m_inheritedData.m_direction = initialDirection();
         m_inheritedData.m_whiteSpace = initialWhiteSpace();
         m_inheritedData.m_borderCollapse = initialBorderCollapse();
         m_inheritedData.m_rtlOrdering = initialRTLOrdering();
         m_inheritedData.m_boxDirection = initialBoxDirection();
         m_inheritedData.m_printColorAdjust = initialPrintColorAdjust();
         m_inheritedData.m_pointerEvents = initialPointerEvents();
         m_inheritedData.m_insideLink = NotInsideLink;
         m_inheritedData.m_writingMode = initialWritingMode();
 
-        m_nonInheritedData.m_effectiveDisplay = m_nonInheritedData.m_originalDisplay = initialDisplay();
+        m_nonInheritedData.m_effectiveDisplay = m_nonInheritedData.m_originalDisplay = static_cast<unsigned>(initialDisplay());
         m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor();
         m_nonInheritedData.m_overflowX = initialOverflowX();
         m_nonInheritedData.m_overflowY = initialOverflowY();
         m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
         m_nonInheritedData.m_clear = initialClear();
         m_nonInheritedData.m_position = initialPosition();
         m_nonInheritedData.m_floating = static_cast<unsigned>(initialFloating());
         m_nonInheritedData.m_tableLayout = initialTableLayout();
         m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
         m_nonInheritedData.m_breakBefore = initialBreakBefore();
@@ skipping 365 matching lines @@
     // contain
     static Containment initialContain() { return ContainsNone; }
     Containment contain() const { return static_cast<Containment>(m_rareNonInheritedData->m_contain); }
     void setContain(Containment contain) { SET_VAR(m_rareNonInheritedData, m_contain, contain); }
 
     // content
     ContentData* contentData() const { return m_rareNonInheritedData->m_content.get(); }
     void setContent(ContentData*);
 
     // display
-    static EDisplay initialDisplay() { return INLINE; }
+    static EDisplay initialDisplay() { return EDisplay::Inline; }
     EDisplay display() const { return static_cast<EDisplay>(m_nonInheritedData.m_effectiveDisplay); }
     EDisplay originalDisplay() const { return static_cast<EDisplay>(m_nonInheritedData.m_originalDisplay); }
-    void setDisplay(EDisplay v) { m_nonInheritedData.m_effectiveDisplay = v; }
-    void setOriginalDisplay(EDisplay v) { m_nonInheritedData.m_originalDisplay = v; }
+    void setDisplay(EDisplay v) { m_nonInheritedData.m_effectiveDisplay = static_cast<unsigned>(v); }
+    void setOriginalDisplay(EDisplay v) { m_nonInheritedData.m_originalDisplay = static_cast<unsigned>(v); }
 
     // Flex properties.
     // flex-basis (aka -webkit-flex-basis)
     static Length initialFlexBasis() { return Length(Auto); }
     const Length& flexBasis() const { return m_rareNonInheritedData->m_flexibleBox->m_flexBasis; }
     void setFlexBasis(const Length& length) { SET_NESTED_VAR(m_rareNonInheritedData, m_flexibleBox, m_flexBasis, length); }
 
     // flex-direction (aka -webkit-flex-direction)
     static EFlexDirection initialFlexDirection() { return FlowRow; }
     EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(m_rareNonInheritedData->m_flexibleBox->m_flexDirection); }
@@ skipping 1697 matching lines @@
     void setVisitedLinkColumnRuleColor(const StyleColor& v) { SET_NESTED_VAR(m_rareNonInheritedData, m_multiCol, m_visitedLinkColumnRuleColor, v); }
     void setVisitedLinkTextDecorationColor(const StyleColor& v) { SET_VAR(m_rareNonInheritedData, m_visitedLinkTextDecorationColor, v); }
     void setVisitedLinkTextEmphasisColor(const StyleColor& v) { SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextEmphasisColor, setVisitedLinkTextEmphasisColor, v); }
     void setVisitedLinkTextFillColor(const StyleColor& v) { SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextFillColor, setVisitedLinkTextFillColor, v); }
     void setVisitedLinkTextStrokeColor(const StyleColor& v) { SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextStrokeColor, setVisitedLinkTextStrokeColor, v); }
 
     void inheritUnicodeBidiFrom(const ComputedStyle& parent) { m_nonInheritedData.m_unicodeBidi = parent.m_nonInheritedData.m_unicodeBidi; }
 
     static bool isDisplayFlexibleBox(EDisplay display)
     {
-        return display == FLEX || display == INLINE_FLEX;
+        return display == EDisplay::Flex || display == EDisplay::InlineFlex;
     }
 
     static bool isDisplayGridBox(EDisplay display)
     {
-        return display == GRID || display == INLINE_GRID;
+        return display == EDisplay::Grid || display == EDisplay::InlineGrid;
     }
 
     static bool isDisplayReplacedType(EDisplay display)
     {
-        return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEX
-            || display == INLINE_TABLE || display == INLINE_GRID;
+        return display == EDisplay::InlineBlock || display == EDisplay::InlineBox || display == EDisplay::InlineFlex
+            || display == EDisplay::InlineTable || display == EDisplay::InlineGrid;
     }
 
     static bool isDisplayInlineType(EDisplay display)
     {
-        return display == INLINE || isDisplayReplacedType(display);
+        return display == EDisplay::Inline || isDisplayReplacedType(display);
     }
 
     static bool isDisplayTableType(EDisplay display)
     {
-        return display == TABLE || display == INLINE_TABLE || display == TABLE_ROW_GROUP
-            || display == TABLE_HEADER_GROUP || display == TABLE_FOOTER_GROUP || display == TABLE_ROW
-            || display == TABLE_COLUMN_GROUP || display == TABLE_COLUMN || display == TABLE_CELL
-            || display == TABLE_CAPTION;
+        return display == EDisplay::Table || display == EDisplay::InlineTable || display == EDisplay::TableRowGroup
+            || display == EDisplay::TableHeaderGroup || display == EDisplay::TableFooterGroup || display == EDisplay::TableRow
+            || display == EDisplay::TableColumnGroup || display == EDisplay::TableColumn || display == EDisplay::TableCell
+            || display == EDisplay::TableCaption;
     }
 
     // Color accessors are all private to make sure callers use visitedDependentColor instead to access them.
     StyleColor borderLeftColor() const { return m_surround->border.left().color(); }
     StyleColor borderRightColor() const { return m_surround->border.right().color(); }
     StyleColor borderTopColor() const { return m_surround->border.top().color(); }
     StyleColor borderBottomColor() const { return m_surround->border.bottom().color(); }
     StyleColor backgroundColor() const { return m_background->color(); }
     Color color() const;
     StyleColor columnRuleColor() const { return m_rareNonInheritedData->m_multiCol->m_rule.color(); }
@@ skipping 131 matching lines @@
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const
 {
     return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 } // namespace blink
 
 #endif // ComputedStyle_h