Changed EOverflow to an enum class and renamed its members

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 212 matching lines @@
     // This is necessary to fix a crash where a site tries to position these
     // objects. They also never honor display.
     style.setPosition(StaticPosition);
     style.setDisplay(EDisplay::Block);
     return;
   }
 
   if (isHTMLFrameElementBase(element)) {
     // Frames cannot overflow (they are always the size we ask them to be).
     // Some compositing code paths may try to draw scrollbars anyhow.
-    style.setOverflowX(OverflowVisible);
-    style.setOverflowY(OverflowVisible);
+    style.setOverflowX(EOverflow::Visible);
+    style.setOverflowY(EOverflow::Visible);
     return;
   }
 
   if (isHTMLRTElement(element)) {
     // Ruby text does not support float or position. This might change with
     // evolution of the specification.
     style.setPosition(StaticPosition);
     style.setFloating(EFloat::None);
     return;
   }
 
   if (isHTMLLegendElement(element)) {
     style.setDisplay(EDisplay::Block);
     return;
   }
 
   if (isHTMLMarqueeElement(element)) {
     // For now, <marquee> requires an overflow clip to work properly.
-    style.setOverflowX(OverflowHidden);
-    style.setOverflowY(OverflowHidden);
+    style.setOverflowX(EOverflow::Hidden);
+    style.setOverflowY(EOverflow::Hidden);
     return;
   }
 
   if (isHTMLTextAreaElement(element)) {
     // Textarea considers overflow visible as auto.
-    style.setOverflowX(style.overflowX() == OverflowVisible
-                           ? OverflowAuto
+    style.setOverflowX(style.overflowX() == EOverflow::Visible
+                           ? EOverflow::Auto
                            : style.overflowX());
-    style.setOverflowY(style.overflowY() == OverflowVisible
-                           ? OverflowAuto
+    style.setOverflowY(style.overflowY() == EOverflow::Visible
+                           ? EOverflow::Auto
                            : style.overflowY());
     return;
   }
 
   if (isHTMLPlugInElement(element)) {
     style.setRequiresAcceleratedCompositingForExternalReasons(
         toHTMLPlugInElement(element).shouldAccelerate());
     return;
   }
 }
 
 static void adjustOverflow(ComputedStyle& style) {
-  ASSERT(style.overflowX() != OverflowVisible ||
-         style.overflowY() != OverflowVisible);
+  DCHECK(style.overflowX() != EOverflow::Visible ||
+         style.overflowY() != EOverflow::Visible);
 
   if (style.display() == EDisplay::Table ||
       style.display() == EDisplay::InlineTable) {
     // Tables only support overflow:hidden and overflow:visible and ignore
     // anything else, see http://dev.w3.org/csswg/css2/visufx.html#overflow. As
     // a table is not a block container box the rules for resolving conflicting
     // x and y values in CSS Overflow Module Level 3 do not apply. Arguably
     // overflow-x and overflow-y aren't allowed on tables but all UAs allow it.
-    if (style.overflowX() != OverflowHidden)
-      style.setOverflowX(OverflowVisible);
-    if (style.overflowY() != OverflowHidden)
-      style.setOverflowY(OverflowVisible);
+    if (style.overflowX() != EOverflow::Hidden)
+      style.setOverflowX(EOverflow::Visible);
+    if (style.overflowY() != EOverflow::Hidden)
+      style.setOverflowY(EOverflow::Visible);
     // If we are left with conflicting overflow values for the x and y axes on a
     // table then resolve both to OverflowVisible. This is interoperable
     // behaviour but is not specced anywhere.
-    if (style.overflowX() == OverflowVisible)
-      style.setOverflowY(OverflowVisible);
-    else if (style.overflowY() == OverflowVisible)
-      style.setOverflowX(OverflowVisible);
-  } else if (style.overflowX() == OverflowVisible &&
-             style.overflowY() != OverflowVisible) {
+    if (style.overflowX() == EOverflow::Visible)
+      style.setOverflowY(EOverflow::Visible);
+    else if (style.overflowY() == EOverflow::Visible)
+      style.setOverflowX(EOverflow::Visible);
+  } else if (style.overflowX() == EOverflow::Visible &&
+             style.overflowY() != EOverflow::Visible) {
     // If either overflow value is not visible, change to auto.
     // FIXME: Once we implement pagination controls, overflow-x should default
     // to hidden if overflow-y is set to -webkit-paged-x or -webkit-page-y. For
     // now, we'll let it default to auto so we can at least scroll through the
     // pages.
-    style.setOverflowX(OverflowAuto);
-  } else if (style.overflowY() == OverflowVisible &&
-             style.overflowX() != OverflowVisible) {
-    style.setOverflowY(OverflowAuto);
+    style.setOverflowX(EOverflow::Auto);
+  } else if (style.overflowY() == EOverflow::Visible &&
+             style.overflowX() != EOverflow::Visible) {
+    style.setOverflowY(EOverflow::Auto);
   }
 
   // Menulists should have visible overflow
   if (style.appearance() == MenulistPart) {
-    style.setOverflowX(OverflowVisible);
-    style.setOverflowY(OverflowVisible);
+    style.setOverflowX(EOverflow::Visible);
+    style.setOverflowY(EOverflow::Visible);
   }
 }
 
 static void adjustStyleForDisplay(ComputedStyle& style,
                                   const ComputedStyle& parentStyle,
                                   Document* document) {
   if (style.display() == EDisplay::Block && !style.isFloating())
     return;
 
   // FIXME: Don't support this mutation for pseudo styles like first-letter or
@@ skipping 101 matching lines @@
   if (style.position() == StaticPosition &&
       !parentStyleForcesZIndexToCreateStackingContext(parentStyle)) {
     style.setIsStackingContext(false);
     // TODO(alancutter): Avoid altering z-index here.
     if (!style.hasAutoZIndex())
       style.setZIndex(0);
   } else if (!style.hasAutoZIndex()) {
     style.setIsStackingContext(true);
   }
 
-  if (style.overflowX() != OverflowVisible ||
-      style.overflowY() != OverflowVisible)
+  if (style.overflowX() != EOverflow::Visible ||
+      style.overflowY() != EOverflow::Visible)
     adjustOverflow(style);
 
   if (doesNotInheritTextDecoration(style, element))
     style.clearAppliedTextDecorations();
   else
     style.restoreParentTextDecorations(parentStyle);
   style.applyTextDecorations(
       parentStyle.visitedDependentColor(CSSPropertyTextDecorationColor),
       overridesTextDecorationColors(element));
 
@@ skipping 28 matching lines @@
       style.setDisplay(EDisplay::Block);
 
     // Columns don't apply to svg text elements.
     if (isSVGTextElement(*element))
       style.clearMultiCol();
   }
   adjustStyleForAlignment(style, parentStyle);
 }
 
 }  // namespace blink