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

third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
@@ skipping 120 matching lines @@
 
 static bool parentStyleForcesZIndexToCreateStackingContext(
     const ComputedStyle& parentStyle) {
   return parentStyle.isDisplayFlexibleOrGridBox();
 }
 
 void StyleAdjuster::adjustStyleForEditing(ComputedStyle& style) {
   if (style.userModify() != READ_WRITE_PLAINTEXT_ONLY)
     return;
   // Collapsing whitespace is harmful in plain-text editing.
-  if (style.whiteSpace() == NORMAL)
-    style.setWhiteSpace(PRE_WRAP);
-  else if (style.whiteSpace() == NOWRAP)
-    style.setWhiteSpace(PRE);
-  else if (style.whiteSpace() == PRE_LINE)
-    style.setWhiteSpace(PRE_WRAP);
+  if (style.whiteSpace() == EWhiteSpace::Normal)
+    style.setWhiteSpace(EWhiteSpace::PreWrap);
+  else if (style.whiteSpace() == EWhiteSpace::Nowrap)
+    style.setWhiteSpace(EWhiteSpace::Pre);
+  else if (style.whiteSpace() == EWhiteSpace::PreLine)
+    style.setWhiteSpace(EWhiteSpace::PreWrap);
 }
 
 static void adjustStyleForFirstLetter(ComputedStyle& style) {
   if (style.styleType() != PseudoIdFirstLetter)
     return;
 
   // Force inline display (except for floating first-letters).
   style.setDisplay(style.isFloating() ? EDisplay::Block : EDisplay::Inline);
 
   // CSS2 says first-letter can't be positioned.
@@ skipping 32 matching lines @@
 }
 
 static void adjustStyleForHTMLElement(ComputedStyle& style,
                                       HTMLElement& element) {
   // <div> and <span> are the most common elements on the web, we skip all the
   // work for them.
   if (isHTMLDivElement(element) || isHTMLSpanElement(element))
     return;
 
   if (isHTMLTableCellElement(element)) {
-    if (style.whiteSpace() == KHTML_NOWRAP) {
+    if (style.whiteSpace() == EWhiteSpace::KhtmlNowrap) {
       // Figure out if we are really nowrapping or if we should just
       // use normal instead. If the width of the cell is fixed, then
       // we don't actually use NOWRAP.
       if (style.width().isFixed())
-        style.setWhiteSpace(NORMAL);
+        style.setWhiteSpace(EWhiteSpace::Normal);
       else
-        style.setWhiteSpace(NOWRAP);
+        style.setWhiteSpace(EWhiteSpace::Nowrap);
     }
     return;
   }
 
   if (isHTMLTableElement(element)) {
     // Tables never support the -webkit-* values for text-align and will reset
     // back to the default.
     if (style.textAlign() == ETextAlign::WebkitLeft ||
         style.textAlign() == ETextAlign::WebkitCenter ||
         style.textAlign() == ETextAlign::WebkitRight)
@@ skipping 259 matching lines @@
       style.setDisplay(EDisplay::Block);
 
     // Columns don't apply to svg text elements.
     if (isSVGTextElement(*element))
       style.clearMultiCol();
   }
   adjustStyleForAlignment(style, parentStyle);
 }
 
 }  // namespace blink