Do not pass scrollPosition to updateScrollbars at every callsite

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 382 matching lines @@
 }
 
 void FrameView::setFrameRect(const IntRect& newRect)
 {
     IntRect oldRect = frameRect();
     if (newRect == oldRect)
         return;
 
     Widget::setFrameRect(newRect);
 
-    updateScrollbars(scrollOffsetDouble());
+    updateScrollbars();
     frameRectsChanged();
 
     updateScrollableAreaSet();
 
     if (LayoutView* layoutView = this->layoutView()) {
         if (layoutView->usesCompositing())
             layoutView->compositor()->frameViewDidChangeSize();
     }
 
     viewportSizeChanged(newRect.width() != oldRect.width(), newRect.height() != oldRect.height());
@@ skipping 87 matching lines @@
     // Nobody set a custom style, so we just use a native scrollbar.
     return Scrollbar::create(this, orientation, RegularScrollbar, &frame().page()->chromeClient());
 }
 
 void FrameView::setContentsSize(const IntSize& size)
 {
     if (size == contentsSize())
         return;
 
     m_contentsSize = size;
-    updateScrollbars(scrollOffsetDouble());
+    updateScrollbars();
     ScrollableArea::contentsResized();
 
     Page* page = frame().page();
     if (!page)
         return;
 
     updateScrollableAreaSet();
 
     page->chromeClient().contentsSizeChanged(m_frame.get(), size);
     frame().loader().restoreScrollPositionAndViewState();
@@ skipping 10 matching lines @@
     const IntRect rect = layoutView->documentRect();
     const IntSize& size = rect.size();
 
     const IntPoint origin(-rect.x(), -rect.y());
     if (scrollOrigin() != origin) {
         ScrollableArea::setScrollOrigin(origin);
         // setContentSize (below) also calls updateScrollbars so we can avoid
         // updating scrollbars twice by skipping the call here when the content
         // size does not change.
         if (!m_frame->document()->printing() && size == contentsSize())
-            updateScrollbars(scrollOffsetDouble());
+            updateScrollbars();
     }
 
     setContentsSize(size);
 }
 
 void FrameView::calculateScrollbarModesFromOverflowStyle(const ComputedStyle* style, ScrollbarMode& hMode, ScrollbarMode& vMode)
 {
     hMode = vMode = ScrollbarAuto;
 
     EOverflow overflowX = style->overflowX();
@@ skipping 451 matching lines @@
                 if (hMode == ScrollbarAuto)
                     setHorizontalScrollbarMode(ScrollbarAlwaysOff); // This causes a horizontal scrollbar to disappear.
 
                 setScrollbarModes(hMode, vMode);
                 setScrollbarsSuppressed(false);
             } else if (hMode != currentHMode || vMode != currentVMode) {
                 setScrollbarModes(hMode, vMode);
             }
 
             if (needsScrollbarReconstruction() || scrollOriginChanged())
-                updateScrollbars(scrollOffsetDouble());
+                updateScrollbars();
 
             LayoutSize oldSize = m_size;
 
             m_size = LayoutSize(layoutSize());
 
             if (oldSize != m_size && !m_firstLayout) {
                 LayoutBox* rootLayoutObject = document->documentElement() ? document->documentElement()->layoutBox() : 0;
                 LayoutBox* bodyLayoutObject = rootLayoutObject && document->body() ? document->body()->layoutBox() : 0;
                 if (bodyLayoutObject && bodyLayoutObject->stretchesToViewport())
                     bodyLayoutObject->setChildNeedsLayout();
@@ skipping 1228 matching lines @@
     return !m_frame->document()->loadEventFinished();
 }
 
 void FrameView::scrollbarStyleChanged()
 {
     // FIXME: Why does this only apply to the main frame?
     if (!m_frame->isMainFrame())
         return;
     adjustScrollbarOpacity();
     contentsResized();
-    updateScrollbars(scrollOffsetDouble());
+    updateScrollbars();
     positionScrollbarLayers();
 }
 
 void FrameView::notifyPageThatContentAreaWillPaint() const
 {
     Page* page = m_frame->page();
     if (!page)
         return;
 
     contentAreaWillPaint();
@@ skipping 882 matching lines @@
 
     if (horizontalLock)
         setHorizontalScrollbarLock();
 
     if (verticalLock)
         setVerticalScrollbarLock();
 
     if (!needsUpdate)
         return;
 
-    updateScrollbars(scrollOffsetDouble());
+    updateScrollbars();
 
     if (!layerForScrolling())
         return;
     WebLayer* layer = layerForScrolling()->platformLayer();
     if (!layer)
         return;
     layer->setUserScrollable(userInputScrollable(HorizontalScrollbar), userInputScrollable(VerticalScrollbar));
 }
 
 IntSize FrameView::visibleContentSize(IncludeScrollbarsInRect scrollbarInclusion) const
@@ skipping 86 matching lines @@
     if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache())
         cache->handleScrollPositionChanged(this);
 
     layoutView()->clearHitTestCache();
     frame().loader().saveScrollState();
     frame().loader().client()->didChangeScrollOffset();
 }
 
 void FrameView::windowResizerRectChanged()
 {
-    updateScrollbars(scrollOffsetDouble());
+    updateScrollbars();
 }
 
 bool FrameView::hasOverlayScrollbars() const
 {
 
     return (m_horizontalScrollbar && m_horizontalScrollbar->isOverlayScrollbar())
         || (m_verticalScrollbar && m_verticalScrollbar->isOverlayScrollbar());
 }
 
 void FrameView::computeScrollbarExistence(bool& newHasHorizontalScrollbar, bool& newHasVerticalScrollbar, const IntSize& docSize, ComputeScrollbarExistenceOption option) const
@@ skipping 150 matching lines @@
         || (m_verticalScrollbar && m_verticalScrollbar->isCustomScrollbar());
 
     return hasAnyScrollbar && (shouldUseCustom != hasCustom);
 }
 
 bool FrameView::shouldIgnoreOverflowHidden() const
 {
     return m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->isMainFrame();
 }
 
-void FrameView::updateScrollbars(const DoubleSize& desiredOffset)
+void FrameView::updateScrollbars()
 {
     if (m_frame->settings() && m_frame->settings()->rootLayerScrolls())
         return;
 
     // Avoid drawing two sets of scrollbars when visual viewport is enabled.
     if (visualViewportSuppliesScrollbars()) {
         setHasHorizontalScrollbar(false);
         setHasVerticalScrollbar(false);
-        setScrollOffsetFromUpdateScrollbars(desiredOffset);
+        setScrollOffsetFromUpdateScrollbars(scrollOffsetDouble());
         return;
     }
 
     if (m_inUpdateScrollbars)
         return;
     InUpdateScrollbarsScope inUpdateScrollbarsScope(this);
 
     bool scrollbarExistenceChanged = false;
 
     if (needsScrollbarReconstruction()) {
@@ skipping 11 matching lines @@
 
     updateScrollbarGeometry();
 
     if (scrollbarExistenceChanged) {
         // FIXME: Is frameRectsChanged really necessary here? Have any frame rects changed?
         frameRectsChanged();
         positionScrollbarLayers();
         updateScrollCorner();
     }
 
-    setScrollOffsetFromUpdateScrollbars(desiredOffset);
+    setScrollOffsetFromUpdateScrollbars(scrollOffsetDouble());
 }
 
 void FrameView::setScrollOffsetFromUpdateScrollbars(const DoubleSize& offset)
 {
     DoublePoint adjustedScrollPosition = clampScrollPosition(DoublePoint(offset));
 
     if (adjustedScrollPosition != scrollPositionDouble() || scrollOriginChanged()) {
         ScrollableArea::setScrollPosition(adjustedScrollPosition, ProgrammaticScroll);
         resetScrollOriginChanged();
     }
@@ skipping 616 matching lines @@
     return m_hiddenForThrottling && m_crossOriginForThrottling;
 }
 
 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
 {
     ASSERT(layoutView());
     return *layoutView();
 }
 
 } // namespace blink