| Index: Source/web/WebViewImpl.cpp
|
| diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
|
| index 640748994f2cc102c31d19601cf721b0828302e2..101cb34ea9d74a4341c2bfeffbbd1bf929426ee3 100644
|
| --- a/Source/web/WebViewImpl.cpp
|
| +++ b/Source/web/WebViewImpl.cpp
|
| @@ -4159,6 +4159,12 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
|
| m_rootLayer = pinchViewport.rootGraphicsLayer()->platformLayer();
|
| m_rootTransformLayer = pinchViewport.rootGraphicsLayer();
|
| updateRootLayerTransform();
|
| + m_layerTreeView->setRootLayer(*m_rootLayer);
|
| + // We register viewport layers here since there may not be a layer
|
| + // tree view prior to this point.
|
| + page()->frameHost().pinchViewport().registerLayersWithTreeView(m_layerTreeView);
|
| + if (m_pageOverlays)
|
| + m_pageOverlays->update();
|
| } else {
|
| m_rootGraphicsLayer = nullptr;
|
| m_rootLayer = nullptr;
|
| @@ -4167,20 +4173,8 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
|
| // commits until Blink generates invalidations so we don't
|
| // attempt to paint too early in the next page load.
|
| m_layerTreeView->setDeferCommits(true);
|
| - }
|
| -
|
| - if (m_layerTreeView) {
|
| - if (m_rootLayer) {
|
| - m_layerTreeView->setRootLayer(*m_rootLayer);
|
| - // We register viewport layers here since there may not be a layer
|
| - // tree view prior to this point.
|
| - page()->frameHost().pinchViewport().registerLayersWithTreeView(m_layerTreeView);
|
| - if (m_pageOverlays)
|
| - m_pageOverlays->update();
|
| - } else {
|
| - m_layerTreeView->clearRootLayer();
|
| - page()->frameHost().pinchViewport().clearLayersForTreeView(m_layerTreeView);
|
| - }
|
| + m_layerTreeView->clearRootLayer();
|
| + page()->frameHost().pinchViewport().clearLayersForTreeView(m_layerTreeView);
|
| }
|
|
|
| suppressInvalidations(false);
|
|
|