| Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| index 7d0a445d4c49cfe9bc86cec82fa8d93f46933928..e97810144ceb6c3c8cfb51ee00aa82160854dc27 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| @@ -235,7 +235,7 @@ GraphicsLayer* PaintLayerScrollableArea::layerForScrollCorner() const {
|
| bool PaintLayerScrollableArea::shouldUseIntegerScrollOffset() const {
|
| Frame* frame = box().frame();
|
| if (frame->settings() &&
|
| - !frame->settings()->preferCompositingToLCDTextEnabled())
|
| + !frame->settings()->GetPreferCompositingToLCDTextEnabled())
|
| return true;
|
|
|
| return ScrollableArea::shouldUseIntegerScrollOffset();
|
| @@ -551,7 +551,7 @@ IntPoint PaintLayerScrollableArea::lastKnownMousePosition() const {
|
|
|
| bool PaintLayerScrollableArea::scrollAnimatorEnabled() const {
|
| if (Settings* settings = box().frame()->settings())
|
| - return settings->scrollAnimatorEnabled();
|
| + return settings->GetScrollAnimatorEnabled();
|
| return false;
|
| }
|
|
|
| @@ -833,7 +833,7 @@ void PaintLayerScrollableArea::didChangeGlobalRootScroller() {
|
| // that can cause layout but this should only ever apply with overlay
|
| // scrollbars.
|
| if (!box().frame()->settings() ||
|
| - !box().frame()->settings()->viewportEnabled())
|
| + !box().frame()->settings()->GetViewportEnabled())
|
| return;
|
|
|
| bool needsHorizontalScrollbar;
|
| @@ -1084,7 +1084,7 @@ static inline const LayoutObject& layoutObjectForScrollbar(
|
| if (layoutObject.isLayoutView()) {
|
| Document& doc = node->document();
|
| if (Settings* settings = doc.settings()) {
|
| - if (!settings->allowCustomScrollbarInMainFrame() &&
|
| + if (!settings->GetAllowCustomScrollbarInMainFrame() &&
|
| layoutObject.frame() && layoutObject.frame()->isMainFrame())
|
| return layoutObject;
|
| }
|
| @@ -1151,7 +1151,7 @@ void PaintLayerScrollableArea::computeScrollbarExistence(
|
| // Scrollbars may be hidden or provided by visual viewport or frame instead.
|
| DCHECK(box().frame()->settings());
|
| if (visualViewportSuppliesScrollbars() || !canHaveOverflowScrollbars(box()) ||
|
| - box().frame()->settings()->hideScrollbars()) {
|
| + box().frame()->settings()->GetHideScrollbars()) {
|
| needsHorizontalScrollbar = false;
|
| needsVerticalScrollbar = false;
|
| return;
|
| @@ -1782,7 +1782,7 @@ bool PaintLayerScrollableArea::visualViewportSuppliesScrollbars() const {
|
| return false;
|
|
|
| // On desktop, we always use the layout viewport's scrollbars.
|
| - if (!frame->settings()->viewportEnabled())
|
| + if (!frame->settings()->GetViewportEnabled())
|
| return false;
|
|
|
| const TopDocumentRootScrollerController& controller =
|
|
|