Changed EOverflow 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 352 matching lines @@
     m_inheritedData.m_pointerEvents =
         static_cast<unsigned>(initialPointerEvents());
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             static_cast<unsigned>(initialDisplay());
     m_nonInheritedData.m_overflowAnchor =
         static_cast<unsigned>(initialOverflowAnchor());
-    m_nonInheritedData.m_overflowX = initialOverflowX();
-    m_nonInheritedData.m_overflowY = initialOverflowY();
+    m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
+    m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
     m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
     m_nonInheritedData.m_clear = initialClear();
     m_nonInheritedData.m_position = initialPosition();
     m_nonInheritedData.m_tableLayout = initialTableLayout();
     m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
     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;
@@ skipping 1159 matching lines @@
     return EOverflowAnchor::Auto;
   }
   EOverflowAnchor overflowAnchor() const {
     return static_cast<EOverflowAnchor>(m_nonInheritedData.m_overflowAnchor);
   }
   void setOverflowAnchor(EOverflowAnchor v) {
     m_nonInheritedData.m_overflowAnchor = static_cast<unsigned>(v);
   }
 
   // overflow-x
-  static EOverflow initialOverflowX() { return OverflowVisible; }
+  static EOverflow initialOverflowX() { return EOverflow::Visible; }
   EOverflow overflowX() const {
     return static_cast<EOverflow>(m_nonInheritedData.m_overflowX);
   }
-  void setOverflowX(EOverflow v) { m_nonInheritedData.m_overflowX = v; }
+  void setOverflowX(EOverflow v) {
+    m_nonInheritedData.m_overflowX = static_cast<unsigned>(v);
+  }
 
   // overflow-y
-  static EOverflow initialOverflowY() { return OverflowVisible; }
+  static EOverflow initialOverflowY() { return EOverflow::Visible; }
   EOverflow overflowY() const {
     return static_cast<EOverflow>(m_nonInheritedData.m_overflowY);
   }
-  void setOverflowY(EOverflow v) { m_nonInheritedData.m_overflowY = v; }
+  void setOverflowY(EOverflow v) {
+    m_nonInheritedData.m_overflowY = static_cast<unsigned>(v);
+  }
 
   // Padding properties.
   static Length initialPadding() { return Length(Fixed); }
 
   // padding-bottom
   const Length& paddingBottom() const { return m_surround->padding.bottom(); }
   void setPaddingBottom(const Length& v) {
     SET_VAR(m_surround, padding.m_bottom, v);
   }
 
@@ skipping 1943 matching lines @@
   EOverflow overflowInlineDirection() const {
     return isHorizontalWritingMode() ? overflowX() : overflowY();
   }
   EOverflow overflowBlockDirection() const {
     return isHorizontalWritingMode() ? overflowY() : overflowX();
   }
 
   // It's sufficient to just check one direction, since it's illegal to have
   // visible on only one overflow value.
   bool isOverflowVisible() const {
-    DCHECK(overflowX() != OverflowVisible || overflowX() == overflowY());
-    return overflowX() == OverflowVisible;
+    DCHECK(overflowX() != EOverflow::Visible || overflowX() == overflowY());
+    return overflowX() == EOverflow::Visible;
   }
   bool isOverflowPaged() const {
-    return overflowY() == OverflowPagedX || overflowY() == OverflowPagedY;
+    return overflowY() == EOverflow::PagedX || overflowY() == EOverflow::PagedY;
   }
 
   // Visibility utility functions.
   bool visibleToHitTesting() const {
     return visibility() == EVisibility::Visible &&
            pointerEvents() != EPointerEvents::None;
   }
 
   // Animation utility functions.
   bool shouldCompositeForCurrentAnimations() const {
@@ skipping 179 matching lines @@
 
   // Text direction utility functions.
   bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const {
     return !isLeftToRightDirection() && isHorizontalWritingMode();
   }
   bool hasInlinePaginationAxis() const {
     // If the pagination axis is parallel with the writing mode inline axis,
     // columns may be laid out along the inline axis, just like for regular
     // multicol. Otherwise, we need to lay out along the block axis.
     if (isOverflowPaged())
-      return (overflowY() == OverflowPagedX) == isHorizontalWritingMode();
+      return (overflowY() == EOverflow::PagedX) == isHorizontalWritingMode();
     return false;
   }
 
   // Border utility functions.
   bool borderObscuresBackground() const;
   void getBorderEdgeInfo(BorderEdge edges[],
                          bool includeLogicalLeftEdge = true,
                          bool includeLogicalRightEdge = true) const;
 
   bool hasBoxDecorations() const {
@@ skipping 323 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