Changed EWhiteSpace to an enum class and renamed its members to keywords

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 355 matching lines @@
     m_inheritedData.m_captionSide = static_cast<unsigned>(initialCaptionSide());
     m_inheritedData.m_listStyleType =
         static_cast<unsigned>(initialListStyleType());
     m_inheritedData.m_listStylePosition =
         static_cast<unsigned>(initialListStylePosition());
     m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
     m_inheritedData.m_textTransform = initialTextTransform();
     m_inheritedData.m_hasSimpleUnderline = false;
     m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
     m_inheritedData.m_direction = initialDirection();
-    m_inheritedData.m_whiteSpace = initialWhiteSpace();
+    m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace());
     m_inheritedData.m_borderCollapse = initialBorderCollapse();
     m_inheritedData.m_rtlOrdering = initialRTLOrdering();
     m_inheritedData.m_boxDirection = initialBoxDirection();
     m_inheritedData.m_printColorAdjust = 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 1918 matching lines @@
   // text-transform (aka -epub-text-transform)
   static ETextTransform initialTextTransform() { return TTNONE; }
   ETextTransform textTransform() const {
     return static_cast<ETextTransform>(m_inheritedData.m_textTransform);
   }
   void setTextTransform(ETextTransform v) {
     m_inheritedData.m_textTransform = v;
   }
 
   // white-space inherited
-  static EWhiteSpace initialWhiteSpace() { return NORMAL; }
+  static EWhiteSpace initialWhiteSpace() { return EWhiteSpace::Normal; }
   EWhiteSpace whiteSpace() const {
     return static_cast<EWhiteSpace>(m_inheritedData.m_whiteSpace);
   }
-  void setWhiteSpace(EWhiteSpace v) { m_inheritedData.m_whiteSpace = v; }
+  void setWhiteSpace(EWhiteSpace v) {
+    m_inheritedData.m_whiteSpace = static_cast<unsigned>(v);
+  }
 
   // word-break inherited (aka -epub-word-break)
   static EWordBreak initialWordBreak() { return NormalWordBreak; }
   EWordBreak wordBreak() const {
     return static_cast<EWordBreak>(m_rareInheritedData->wordBreak);
   }
   void setWordBreak(EWordBreak b) {
     SET_VAR(m_rareInheritedData, wordBreak, b);
   }
 
@@ skipping 1401 matching lines @@
   bool canContainAbsolutePositionObjects() const {
     return position() != StaticPosition;
   }
   bool canContainFixedPositionObjects() const {
     return hasTransformRelatedProperty() || containsPaint();
   }
 
   // Whitespace utility functions.
   static bool autoWrap(EWhiteSpace ws) {
     // Nowrap and pre don't automatically wrap.
-    return ws != NOWRAP && ws != PRE;
+    return ws != EWhiteSpace::Nowrap && ws != EWhiteSpace::Pre;
   }
 
   bool autoWrap() const { return autoWrap(whiteSpace()); }
 
   static bool preserveNewline(EWhiteSpace ws) {
     // Normal and nowrap do not preserve newlines.
-    return ws != NORMAL && ws != NOWRAP;
+    return ws != EWhiteSpace::Normal && ws != EWhiteSpace::Nowrap;
   }
 
   bool preserveNewline() const { return preserveNewline(whiteSpace()); }
 
   static bool collapseWhiteSpace(EWhiteSpace ws) {
     // Pre and prewrap do not collapse whitespace.
-    return ws != PRE && ws != PRE_WRAP;
+    return ws != EWhiteSpace::Pre && ws != EWhiteSpace::PreWrap;
   }
 
   bool collapseWhiteSpace() const { return collapseWhiteSpace(whiteSpace()); }
 
   bool isCollapsibleWhiteSpace(UChar c) const {
     switch (c) {
       case ' ':
       case '\t':
         return collapseWhiteSpace();
       case '\n':
         return !preserveNewline();
     }
     return false;
   }
   bool breakOnlyAfterWhiteSpace() const {
-    return whiteSpace() == PRE_WRAP ||
+    return whiteSpace() == EWhiteSpace::PreWrap ||
            getLineBreak() == LineBreakAfterWhiteSpace;
   }
 
   bool breakWords() const {
     return (wordBreak() == BreakWordBreak ||
             overflowWrap() == BreakOverflowWrap) &&
-           whiteSpace() != PRE && whiteSpace() != NOWRAP;
+           whiteSpace() != EWhiteSpace::Pre &&
+           whiteSpace() != EWhiteSpace::Nowrap;
   }
 
   // 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.
@@ skipping 322 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