Changed EOverflow to an enum class and renamed its members

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 684 matching lines @@
 void FrameView::calculateScrollbarModesFromOverflowStyle(
     const ComputedStyle* style,
     ScrollbarMode& hMode,
     ScrollbarMode& vMode) {
   hMode = vMode = ScrollbarAuto;
 
   EOverflow overflowX = style->overflowX();
   EOverflow overflowY = style->overflowY();
 
   if (!shouldIgnoreOverflowHidden()) {
-    if (overflowX == OverflowHidden)
+    if (overflowX == EOverflow::Hidden)
       hMode = ScrollbarAlwaysOff;
-    if (overflowY == OverflowHidden)
+    if (overflowY == EOverflow::Hidden)
       vMode = ScrollbarAlwaysOff;
   }
 
-  if (overflowX == OverflowScroll)
+  if (overflowX == EOverflow::Scroll)
     hMode = ScrollbarAlwaysOn;
-  if (overflowY == OverflowScroll)
+  if (overflowY == EOverflow::Scroll)
     vMode = ScrollbarAlwaysOn;
 }
 
 void FrameView::calculateScrollbarModes(
     ScrollbarMode& hMode,
     ScrollbarMode& vMode,
     ScrollbarModesCalculationStrategy strategy) {
 #define RETURN_SCROLLBAR_MODE(mode) \
   {                                 \
     hMode = vMode = mode;           \
@@ skipping 2922 matching lines @@
 void FrameView::setScrollbarModes(ScrollbarMode horizontalMode,
                                   ScrollbarMode verticalMode,
                                   bool horizontalLock,
                                   bool verticalLock) {
   bool needsUpdate = false;
 
   // If the page's overflow setting has disabled scrolling, do not allow
   // anything to override that setting, http://crbug.com/426447
   LayoutObject* viewport = viewportLayoutObject();
   if (viewport && !shouldIgnoreOverflowHidden()) {
-    if (viewport->style()->overflowX() == OverflowHidden)
+    if (viewport->style()->overflowX() == EOverflow::Hidden)
       horizontalMode = ScrollbarAlwaysOff;
-    if (viewport->style()->overflowY() == OverflowHidden)
+    if (viewport->style()->overflowY() == EOverflow::Hidden)
       verticalMode = ScrollbarAlwaysOff;
   }
 
   if (horizontalMode != horizontalScrollbarMode() &&
       !m_horizontalScrollbarLock) {
     m_horizontalScrollbarMode = horizontalMode;
     needsUpdate = true;
   }
 
   if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) {
@@ skipping 1005 matching lines @@
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.width();
 }
 
 int FrameView::initialViewportHeight() const {
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.height();
 }
 
 }  // namespace blink