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

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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 716 matching lines @@
         if (m_inheritedData.m_borderCollapse
             && ((borderTopStyle() == BorderStyleHidden && other.borderTopStyle() == BorderStyleNone)
                 || (borderTopStyle() == BorderStyleNone && other.borderTopStyle() == BorderStyleHidden)
                 || (borderBottomStyle() == BorderStyleHidden && other.borderBottomStyle() == BorderStyleNone)
                 || (borderBottomStyle() == BorderStyleNone && other.borderBottomStyle() == BorderStyleHidden)
                 || (borderLeftStyle() == BorderStyleHidden && other.borderLeftStyle() == BorderStyleNone)
                 || (borderLeftStyle() == BorderStyleNone && other.borderLeftStyle() == BorderStyleHidden)
                 || (borderRightStyle() == BorderStyleHidden && other.borderRightStyle() == BorderStyleNone)
                 || (borderRightStyle() == BorderStyleNone && other.borderRightStyle() == BorderStyleHidden)))
             return true;
-    } else if (m_nonInheritedData.m_effectiveDisplay == LIST_ITEM) {
+    } else if (display() == EDisplay::ListItem) {
         if (m_inheritedData.m_listStyleType != other.m_inheritedData.m_listStyleType
             || m_inheritedData.m_listStylePosition != other.m_inheritedData.m_listStylePosition)
             return true;
     }
 
     if ((visibility() == EVisibility::Collapse) != (other.visibility() == EVisibility::Collapse))
         return true;
 
     if (hasPseudoStyle(PseudoIdScrollbar) != other.hasPseudoStyle(PseudoIdScrollbar))
         return true;
@@ skipping 1305 matching lines @@
         if (value < 0)
             fvalue -= 0.5f;
         else
             fvalue += 0.5f;
     }
 
     return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 } // namespace blink