Changed EClear 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 295 matching lines @@
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             static_cast<unsigned>(initialDisplay());
     m_nonInheritedData.m_overflowAnchor =
         static_cast<unsigned>(initialOverflowAnchor());
     m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
     m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
     m_nonInheritedData.m_verticalAlign =
         static_cast<unsigned>(initialVerticalAlign());
-    m_nonInheritedData.m_clear = initialClear();
+    m_nonInheritedData.m_clear = static_cast<unsigned>(initialClear());
     m_nonInheritedData.m_position = initialPosition();
     m_nonInheritedData.m_tableLayout =
         static_cast<unsigned>(initialTableLayout());
     m_nonInheritedData.m_breakBefore = initialBreakBefore();
     m_nonInheritedData.m_breakAfter = initialBreakAfter();
     m_nonInheritedData.m_breakInside = initialBreakInside();
     m_nonInheritedData.m_styleType = PseudoIdNone;
     m_nonInheritedData.m_pseudoBits = 0;
     m_nonInheritedData.m_explicitInheritance = false;
     m_nonInheritedData.m_variableReference = false;
@@ skipping 433 matching lines @@
   void setBoxShadow(PassRefPtr<ShadowList>);
 
   // box-sizing (aka -webkit-box-sizing)
   static EBoxSizing initialBoxSizing() { return EBoxSizing::kContentBox; }
   EBoxSizing boxSizing() const { return m_box->boxSizing(); }
   void setBoxSizing(EBoxSizing s) {
     SET_VAR(m_box, m_boxSizing, static_cast<unsigned>(s));
   }
 
   // clear
-  static EClear initialClear() { return ClearNone; }
+  static EClear initialClear() { return EClear::kNone; }
   EClear clear() const {
     return static_cast<EClear>(m_nonInheritedData.m_clear);
   }
-  void setClear(EClear v) { m_nonInheritedData.m_clear = v; }
+  void setClear(EClear v) {
+    m_nonInheritedData.m_clear = static_cast<unsigned>(v);
+  }
 
   // Page break properties.
   // break-after (shorthand for page-break-after and -webkit-column-break-after)
   static EBreak initialBreakAfter() { return BreakAuto; }
   EBreak breakAfter() const {
     return static_cast<EBreak>(m_nonInheritedData.m_breakAfter);
   }
   void setBreakAfter(EBreak b) {
     DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore);
     m_nonInheritedData.m_breakAfter = b;
@@ skipping 3162 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