Changed Order to an enum class and renamed its members

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
@@ skipping 223 matching lines @@
                                         // text decoration on this element.
     unsigned m_cursorStyle : 6;     // ECursor
     unsigned m_direction : 1;       // TextDirection
     unsigned m_whiteSpace : 3;      // EWhiteSpace
     unsigned m_borderCollapse : 1;  // EBorderCollapse
     unsigned m_boxDirection : 1;  // EBoxDirection (CSS3 box_direction property,
                                   // flexible box layout module)
     // 32 bits
 
     // non CSS2 inherited
-    unsigned m_rtlOrdering : 1;  // Order
+    unsigned m_rtlOrdering : 1;       // EOrder
     unsigned m_printColorAdjust : 1;  // PrintColorAdjust
     unsigned m_pointerEvents : 4;  // EPointerEvents
     unsigned m_insideLink : 2;     // EInsideLink
 
     // CSS Text Layout Module Level 3: Vertical writing support
     unsigned m_writingMode : 2;  // WritingMode
                                  // 42 bits
   } m_inheritedData;
 
   // don't inherit
@@ skipping 105 matching lines @@
     ComputedStyleBase::setBitDefaults();
     m_inheritedData.m_listStyleType =
         static_cast<unsigned>(initialListStyleType());
     m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
     m_inheritedData.m_hasSimpleUnderline = false;
     m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
     m_inheritedData.m_direction = initialDirection();
     m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace());
     m_inheritedData.m_borderCollapse =
         static_cast<unsigned>(initialBorderCollapse());
-    m_inheritedData.m_rtlOrdering = initialRTLOrdering();
+    m_inheritedData.m_rtlOrdering = static_cast<unsigned>(initialRTLOrdering());
     m_inheritedData.m_boxDirection =
         static_cast<unsigned>(initialBoxDirection());
     m_inheritedData.m_printColorAdjust =
         static_cast<unsigned>(initialPrintColorAdjust());
     m_inheritedData.m_pointerEvents = initialPointerEvents();
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
@@ skipping 2015 matching lines @@
     return PrintColorAdjust::Economy;
   }
   PrintColorAdjust getPrintColorAdjust() const {
     return static_cast<PrintColorAdjust>(m_inheritedData.m_printColorAdjust);
   }
   void setPrintColorAdjust(PrintColorAdjust value) {
     m_inheritedData.m_printColorAdjust = static_cast<unsigned>(value);
   }
 
   // -webkit-rtl-ordering
-  static Order initialRTLOrdering() { return LogicalOrder; }
-  Order rtlOrdering() const {
-    return static_cast<Order>(m_inheritedData.m_rtlOrdering);
+  static EOrder initialRTLOrdering() { return EOrder::Logical; }
+  EOrder rtlOrdering() const {
+    return static_cast<EOrder>(m_inheritedData.m_rtlOrdering);
   }
-  void setRTLOrdering(Order o) { m_inheritedData.m_rtlOrdering = o; }
+  void setRTLOrdering(EOrder o) {
+    m_inheritedData.m_rtlOrdering = static_cast<unsigned>(o);
+  }
 
   // -webkit-ruby-position
   static RubyPosition initialRubyPosition() { return RubyPositionBefore; }
   RubyPosition getRubyPosition() const {
     return static_cast<RubyPosition>(m_rareInheritedData->m_rubyPosition);
   }
   void setRubyPosition(RubyPosition position) {
     SET_VAR(m_rareInheritedData, m_rubyPosition, position);
   }
 
@@ skipping 1680 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h