| Index: third_party/WebKit/Source/core/frame/VisualViewport.cpp | 
| diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.cpp b/third_party/WebKit/Source/core/frame/VisualViewport.cpp | 
| index a107295d05f2a2590d11c08cd009f60af2f26bda..920335898d9efac51395c4cae15c081abb4bad92 100644 | 
| --- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp | 
| +++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp | 
| @@ -270,7 +270,7 @@ bool VisualViewport::didSetScaleOrLocation(float scale, | 
| frameHost().page().scrollingCoordinator()) | 
| coordinator->scrollableAreaScrollLayerDidChange(this); | 
|  | 
| -    if (!frameHost().settings().getInertVisualViewport()) { | 
| +    if (!frameHost().page().settings().getInertVisualViewport()) { | 
| if (Document* document = mainFrame()->document()) | 
| document->enqueueScrollEventForNode(document); | 
| } | 
| @@ -377,7 +377,7 @@ void VisualViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot) { | 
| // Set masks to bounds so the compositor doesn't clobber a manually | 
| // set inner viewport container layer size. | 
| m_innerViewportContainerLayer->setMasksToBounds( | 
| -        frameHost().settings().getMainFrameClipsContent()); | 
| +        frameHost().page().settings().getMainFrameClipsContent()); | 
| m_innerViewportContainerLayer->setSize(FloatSize(m_size)); | 
|  | 
| m_innerViewportScrollLayer->platformLayer()->setScrollClipLayer( | 
| @@ -411,7 +411,7 @@ void VisualViewport::initializeScrollbars() { | 
| return; | 
|  | 
| if (visualViewportSuppliesScrollbars() && | 
| -      !frameHost().settings().getHideScrollbars()) { | 
| +      !frameHost().page().settings().getHideScrollbars()) { | 
| if (!m_overlayScrollbarHorizontal->parent()) | 
| m_innerViewportContainerLayer->addChild( | 
| m_overlayScrollbarHorizontal.get()); | 
| @@ -494,11 +494,11 @@ void VisualViewport::setScrollLayerOnScrollbars(WebLayer* scrollLayer) const { | 
| } | 
|  | 
| bool VisualViewport::visualViewportSuppliesScrollbars() const { | 
| -  return frameHost().settings().getViewportEnabled(); | 
| +  return frameHost().page().settings().getViewportEnabled(); | 
| } | 
|  | 
| bool VisualViewport::scrollAnimatorEnabled() const { | 
| -  return frameHost().settings().getScrollAnimatorEnabled(); | 
| +  return frameHost().page().settings().getScrollAnimatorEnabled(); | 
| } | 
|  | 
| HostWindow* VisualViewport::getHostWindow() const { | 
|  |