Changed ETableLayout 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 297 matching lines @@
         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_position = initialPosition();
-    m_nonInheritedData.m_tableLayout = initialTableLayout();
+    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;
     m_nonInheritedData.m_unique = false;
     m_nonInheritedData.m_emptyState = false;
     m_nonInheritedData.m_hasViewportUnits = false;
@@ skipping 1443 matching lines @@
   PageSizeType getPageSizeType() const {
     return static_cast<PageSizeType>(m_rareNonInheritedData->m_pageSizeType);
   }
   void setPageSize(const FloatSize& s) {
     SET_VAR(m_rareNonInheritedData, m_pageSize, s);
   }
   void setPageSizeType(PageSizeType t) {
     SET_VAR(m_rareNonInheritedData, m_pageSizeType, t);
   }
   // table-layout
-  static ETableLayout initialTableLayout() { return TableLayoutAuto; }
+  static ETableLayout initialTableLayout() { return ETableLayout::kAuto; }
   ETableLayout tableLayout() const {
     return static_cast<ETableLayout>(m_nonInheritedData.m_tableLayout);
   }
-  void setTableLayout(ETableLayout v) { m_nonInheritedData.m_tableLayout = v; }
+  void setTableLayout(ETableLayout v) {
+    m_nonInheritedData.m_tableLayout = static_cast<unsigned>(v);
+  }
 
   // Text decoration properties.
   // text-decoration-line
   static TextDecoration initialTextDecoration() { return TextDecorationNone; }
   TextDecoration getTextDecoration() const {
     return static_cast<TextDecoration>(m_visual->textDecoration);
   }
   void setTextDecoration(TextDecoration v) {
     SET_VAR(m_visual, textDecoration, v);
   }
@@ skipping 1629 matching lines @@
            isRunningTransformAnimationOnCompositor() ||
            isRunningFilterAnimationOnCompositor() ||
            isRunningBackdropFilterAnimationOnCompositor();
   }
 
   // Opacity utility functions.
   bool hasOpacity() const { return opacity() < 1.0f; }
 
   // Table layout utility functions.
   bool isFixedTableLayout() const {
-    return tableLayout() == TableLayoutFixed && !logicalWidth().isAuto();
+    return tableLayout() == ETableLayout::kFixed && !logicalWidth().isAuto();
   }
 
   // Filter/transform utility functions.
   bool has3DTransform() const {
     return m_rareNonInheritedData->m_transform->has3DTransform();
   }
   bool hasTransform() const {
     return hasTransformOperations() || hasOffset() ||
            hasCurrentTransformAnimation() || translate() || rotate() || scale();
   }
@@ skipping 497 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