Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
index 45e1736605ae60aca446e877b3929e419dd73f8b..598edd9585a3494897d71226a3ee55f05652fcc6 100644 |
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
@@ -1223,16 +1223,17 @@ void GraphicsLayer::removeLinkHighlight(LinkHighlight* linkHighlight) |
updateChildList(); |
} |
-void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, bool isViewport) |
+void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, bool isVisualViewport) |
{ |
if (m_scrollableArea == scrollableArea) |
return; |
m_scrollableArea = scrollableArea; |
- // Viewport scrolling may involve pinch zoom and gets routed through |
- // WebViewImpl explicitly rather than via GraphicsLayer::didScroll. |
- if (isViewport) |
+ // VisualViewport scrolling may involve pinch zoom and gets routed through |
+ // WebViewImpl explicitly rather than via GraphicsLayer::didScroll since it |
+ // needs to be set in tandem with the page scale delta. |
+ if (isVisualViewport) |
m_layer->layer()->setScrollClient(0); |
else |
m_layer->layer()->setScrollClient(this); |