| Index: third_party/WebKit/Source/core/frame/FrameView.h
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
|
| index fba3907f684131b3dfda7eb454f571bef5593ffa..e9e51ff26ed9918c1f4388b40b81206f29d880e9 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -767,11 +767,10 @@ class CORE_EXPORT FrameView final
|
| void scrollContentsIfNeeded();
|
|
|
| enum ComputeScrollbarExistenceOption { FirstPass, Incremental };
|
| - void computeScrollbarExistence(
|
| - bool& newHasHorizontalScrollbar,
|
| - bool& newHasVerticalScrollbar,
|
| - const IntSize& docSize,
|
| - ComputeScrollbarExistenceOption = FirstPass) const;
|
| + void computeScrollbarExistence(bool& newHasHorizontalScrollbar,
|
| + bool& newHasVerticalScrollbar,
|
| + const IntSize& docSize,
|
| + ComputeScrollbarExistenceOption = FirstPass);
|
| void updateScrollbarGeometry();
|
|
|
| // Called to update the scrollbars to accurately reflect the state of the
|
| @@ -866,6 +865,8 @@ class CORE_EXPORT FrameView final
|
| IntPoint convertToContainingWidget(const IntPoint&) const override;
|
| IntPoint convertFromContainingWidget(const IntPoint&) const override;
|
|
|
| + void didChangeGlobalRootScroller() override;
|
| +
|
| void updateWidgetGeometriesIfNeeded();
|
|
|
| bool wasViewportResized();
|
| @@ -913,7 +914,7 @@ class CORE_EXPORT FrameView final
|
| bool adjustScrollbarExistence(ComputeScrollbarExistenceOption = FirstPass);
|
| void adjustScrollbarOpacity();
|
| void adjustScrollOffsetFromUpdateScrollbars();
|
| - bool visualViewportSuppliesScrollbars() const;
|
| + bool visualViewportSuppliesScrollbars();
|
|
|
| bool isFrameViewScrollbar(const Widget* child) const {
|
| return horizontalScrollbar() == child || verticalScrollbar() == child;
|
|
|