Rename classes related to top controls

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 23 matching lines @@
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/IntersectionObserverController.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/events/ErrorEvent.h"
 #include "core/fetch/ResourceFetcher.h"
+#include "core/frame/BrowserControls.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Location.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/Settings.h"
-#include "core/frame/TopControls.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLFrameElement.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLTextFormControlElement.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/input/EventHandler.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutCounter.h"
@@ skipping 98 matching lines @@
               &FrameView::notifyRenderThrottlingObservers)),
       m_isTransparent(false),
       m_baseBackgroundColor(Color::white),
       m_mediaType(MediaTypeNames::screen),
       m_safeToPropagateScrollToParent(true),
       m_scrollCorner(nullptr),
       m_stickyPositionObjectCount(0),
       m_inputEventsScaleFactorForEmulation(1),
       m_layoutSizeFixedToFrameSize(true),
       m_didScrollTimer(this, &FrameView::didScrollTimerFired),
-      m_topControlsViewportAdjustment(0),
+      m_browserControlsViewportAdjustment(0),
       m_needsUpdateWidgetGeometries(false),
       m_needsUpdateViewportIntersection(true),
       m_needsUpdateViewportIntersectionInSubtree(true),
 #if ENABLE(ASSERT)
       m_hasBeenDisposed(false),
 #endif
       m_horizontalScrollbarMode(ScrollbarAuto),
       m_verticalScrollbarMode(ScrollbarAuto),
       m_horizontalScrollbarLock(false),
       m_verticalScrollbarLock(false),
@@ skipping 1050 matching lines @@
     viewportSize.setHeight(layoutViewItem.viewHeight(IncludeScrollbars) / zoom);
     return viewportSize;
   }
 
   FloatSize size(layoutSize(IncludeScrollbars));
 
   // We use the layoutSize rather than frameRect to calculate viewport units
   // so that we get correct results on mobile where the page is laid out into
   // a rect that may be larger than the viewport (e.g. the 980px fallback
   // width for desktop pages). Since the layout height is statically set to
-  // be the viewport with top controls showing, we add the top controls
+  // be the viewport with browser controls showing, we add the browser controls
   // height, compensating for page scale as well, since we want to use the
-  // viewport with top controls hidden for vh (to match Safari).
-  TopControls& topControls = m_frame->host()->topControls();
+  // viewport with browser controls hidden for vh (to match Safari).
+  BrowserControls& browserControls = m_frame->host()->browserControls();
   if (m_frame->isMainFrame() && size.width()) {
     float pageScaleAtLayoutWidth =
         m_frame->host()->visualViewport().size().width() / size.width();
-    size.expand(0, topControls.height() / pageScaleAtLayoutWidth);
+    size.expand(0, browserControls.height() / pageScaleAtLayoutWidth);
   }
 
   size.scale(1 / zoom);
   return size;
 }
 
 DocumentLifecycle& FrameView::lifecycle() const {
   return m_frame->document()->lifecycle();
 }
 
@@ skipping 2127 matching lines @@
 
   m_layoutSize = size;
   contentsResized();
 }
 
 void FrameView::didAddScrollbar(Scrollbar& scrollbar,
                                 ScrollbarOrientation orientation) {
   ScrollableArea::didAddScrollbar(scrollbar, orientation);
 }
 
-void FrameView::setTopControlsViewportAdjustment(float adjustment) {
-  m_topControlsViewportAdjustment = adjustment;
+void FrameView::setBrowserControlsViewportAdjustment(float adjustment) {
+  m_browserControlsViewportAdjustment = adjustment;
 }
 
 IntSize FrameView::maximumScrollOffsetInt() const {
   // Make the same calculation as in CC's LayerImpl::MaxScrollOffset()
   // FIXME: We probably shouldn't be storing the bounds in a float.
   // crbug.com/422331.
   IntSize visibleSize =
-      visibleContentSize(ExcludeScrollbars) + topControlsSize();
+      visibleContentSize(ExcludeScrollbars) + browserControlsSize();
   IntSize contentBounds = contentsSize();
   IntSize maximumOffset =
       toIntSize(-scrollOrigin() + (contentBounds - visibleSize));
   return maximumOffset.expandedTo(minimumScrollOffsetInt());
 }
 
 void FrameView::addChild(Widget* child) {
   ASSERT(child != this && !child->parent());
   child->setParent(this);
   m_children.add(child);
@@ skipping 1092 matching lines @@
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.width();
 }
 
 int FrameView::initialViewportHeight() const {
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.height();
 }
 
 }  // namespace blink