Index: Source/platform/graphics/GraphicsLayer.cpp |
diff --git a/Source/platform/graphics/GraphicsLayer.cpp b/Source/platform/graphics/GraphicsLayer.cpp |
index d4cfec068531bfc6af789a6234b2ea02cd898210..f7041b472498de111e7915834bf49282a3bba24d 100644 |
--- a/Source/platform/graphics/GraphicsLayer.cpp |
+++ b/Source/platform/graphics/GraphicsLayer.cpp |
@@ -1017,18 +1017,16 @@ void GraphicsLayer::removeLinkHighlight(LinkHighlightClient* linkHighlight) |
updateChildList(); |
} |
-void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, bool isMainFrame) |
+void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, bool isViewport) |
{ |
if (m_scrollableArea == scrollableArea) |
return; |
m_scrollableArea = scrollableArea; |
- // Main frame scrolling may involve pinch zoom and gets routed through |
+ // Viewport scrolling may involve pinch zoom and gets routed through |
// WebViewImpl explicitly rather than via GraphicsLayer::didScroll. |
- // TODO(bokan): With pinch virtual viewport the special case will no |
- // longer be needed, remove once old-style pinch is gone. |
- if (isMainFrame) |
+ if (isViewport) |
m_layer->layer()->setScrollClient(0); |
else |
m_layer->layer()->setScrollClient(this); |