Index: third_party/WebKit/Source/core/frame/FrameView.cpp |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp |
index 94efad2e1d6b5062f977debda85d335194a68b06..324741952e41e728ffeb091219f0c71155e18780 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -400,7 +400,7 @@ void FrameView::setFrameRect(const IntRect& newRect) |
Widget::setFrameRect(newRect); |
- updateScrollbars(scrollOffsetDouble()); |
+ updateScrollbars(); |
frameRectsChanged(); |
updateScrollableAreaSet(); |
@@ -508,7 +508,7 @@ void FrameView::setContentsSize(const IntSize& size) |
return; |
m_contentsSize = size; |
- updateScrollbars(scrollOffsetDouble()); |
+ updateScrollbars(); |
ScrollableArea::contentsResized(); |
Page* page = frame().page(); |
@@ -539,7 +539,7 @@ void FrameView::adjustViewSize() |
// 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); |
@@ -1011,7 +1011,7 @@ void FrameView::layout() |
} |
if (needsScrollbarReconstruction() || scrollOriginChanged()) |
- updateScrollbars(scrollOffsetDouble()); |
+ updateScrollbars(); |
LayoutSize oldSize = m_size; |
@@ -2260,7 +2260,7 @@ void FrameView::scrollbarStyleChanged() |
return; |
adjustScrollbarOpacity(); |
contentsResized(); |
- updateScrollbars(scrollOffsetDouble()); |
+ updateScrollbars(); |
positionScrollbarLayers(); |
} |
@@ -3163,7 +3163,7 @@ void FrameView::setScrollbarModes(ScrollbarMode horizontalMode, ScrollbarMode ve |
if (!needsUpdate) |
return; |
- updateScrollbars(scrollOffsetDouble()); |
+ updateScrollbars(); |
if (!layerForScrolling()) |
return; |
@@ -3270,7 +3270,7 @@ void FrameView::setScrollOffset(const DoublePoint& offset, ScrollType scrollType |
void FrameView::windowResizerRectChanged() |
{ |
- updateScrollbars(scrollOffsetDouble()); |
+ updateScrollbars(); |
} |
bool FrameView::hasOverlayScrollbars() const |
@@ -3441,7 +3441,7 @@ 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; |
@@ -3450,7 +3450,7 @@ void FrameView::updateScrollbars(const DoubleSize& desiredOffset) |
if (visualViewportSuppliesScrollbars()) { |
setHasHorizontalScrollbar(false); |
setHasVerticalScrollbar(false); |
- setScrollOffsetFromUpdateScrollbars(desiredOffset); |
+ setScrollOffsetFromUpdateScrollbars(scrollOffsetDouble()); |
return; |
} |
@@ -3482,7 +3482,7 @@ void FrameView::updateScrollbars(const DoubleSize& desiredOffset) |
updateScrollCorner(); |
} |
- setScrollOffsetFromUpdateScrollbars(desiredOffset); |
+ setScrollOffsetFromUpdateScrollbars(scrollOffsetDouble()); |
} |
void FrameView::setScrollOffsetFromUpdateScrollbars(const DoubleSize& offset) |