| Index: Source/core/frame/PinchViewport.cpp
|
| diff --git a/Source/core/frame/PinchViewport.cpp b/Source/core/frame/PinchViewport.cpp
|
| index e0d3042aedddc6909200d4e57901596c7c4eb867..8fa102ae4dcbb8f21fb028f1930b80274838ad14 100644
|
| --- a/Source/core/frame/PinchViewport.cpp
|
| +++ b/Source/core/frame/PinchViewport.cpp
|
| @@ -164,11 +164,11 @@ void PinchViewport::setScale(float scale)
|
| // the inner/outer viewport fixed-position model for pinch zoom. When finished,
|
| // the tree will look like this (with * denoting added layers):
|
| //
|
| -// *innerViewportContainerLayer (fixed pos container)
|
| -// +- *pageScaleLayer
|
| -// | +- *innerViewportScrollLayer
|
| -// | +-- overflowControlsHostLayer (root layer)
|
| -// | +-- rootTransformLayer (optional)
|
| +// *rootTransformLayer
|
| +// +- *innerViewportContainerLayer (fixed pos container)
|
| +// +- *pageScaleLayer
|
| +// | +- *innerViewportScrollLayer
|
| +// | +-- overflowControlsHostLayer (root layer)
|
| // | +-- outerViewportContainerLayer (fixed pos container) [frame container layer in RenderLayerCompositor]
|
| // | | +-- outerViewportScrollLayer [frame scroll layer in RenderLayerCompositor]
|
| // | | +-- content layers ...
|
| @@ -195,6 +195,7 @@ void PinchViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot, Graph
|
| && !m_pageScaleLayer
|
| && !m_innerViewportContainerLayer);
|
|
|
| + m_rootTransformLayer = GraphicsLayer::create(graphicsLayerFactory, this);
|
| m_innerViewportContainerLayer = GraphicsLayer::create(graphicsLayerFactory, this);
|
| m_pageScaleLayer = GraphicsLayer::create(graphicsLayerFactory, this);
|
| m_innerViewportScrollLayer = GraphicsLayer::create(graphicsLayerFactory, this);
|
| @@ -214,6 +215,7 @@ void PinchViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot, Graph
|
| m_innerViewportContainerLayer->platformLayer());
|
| m_innerViewportScrollLayer->platformLayer()->setUserScrollable(true, true);
|
|
|
| + m_rootTransformLayer->addChild(m_innerViewportContainerLayer.get());
|
| m_innerViewportContainerLayer->addChild(m_pageScaleLayer.get());
|
| m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get());
|
| m_innerViewportContainerLayer->addChild(m_overlayScrollbarHorizontal.get());
|
|
|