Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Unified Diff: Source/web/WebViewImpl.cpp

Issue 308183002: Made root translation layer the root when using pinch virtual viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 050bd2730cd8252e35298b00cfc689c840c95d8a..e54f2b7c2cd1558f864d17e50ccb18203db7e1b4 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -3638,6 +3638,12 @@ void WebViewImpl::setOverlayLayer(WebCore::GraphicsLayer* layer)
if (!m_rootGraphicsLayer)
return;
+ if (pinchVirtualViewportEnabled()) {
+ m_page->mainFrame()->view()->renderView()->compositor()->setOverlayLayer(layer);
+ return;
+ }
+
+ // FIXME(bokan): This path goes away after virtual viewport pinch is enabled everywhere.
if (!m_rootTransformLayer)
m_rootTransformLayer = m_page->mainFrame()->view()->renderView()->compositor()->ensureRootTransformLayer();
@@ -3692,7 +3698,7 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
if (layer) {
m_rootGraphicsLayer = pinchViewport.rootGraphicsLayer();
m_rootLayer = pinchViewport.rootGraphicsLayer()->platformLayer();
- m_rootTransformLayer = 0;
+ m_rootTransformLayer = pinchViewport.rootTransformLayer();
} else {
m_rootGraphicsLayer = 0;
m_rootLayer = 0;
@@ -3946,6 +3952,8 @@ void WebViewImpl::updateRootLayerTransform()
if (!m_rootGraphicsLayer)
return;
+ // FIXME(bokan): m_rootTransformLayer is always set here in pinch virtual viewport. This can go away once
+ // that's default everywhere.
if (!m_rootTransformLayer)
m_rootTransformLayer = m_page->mainFrame()->view()->renderView()->compositor()->ensureRootTransformLayer();

Powered by Google App Engine
This is Rietveld 408576698