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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1459113003: Remove WebViewImpl::m_rootTransformLayer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 6d438f18a223c9e2eea2c189a3230301b42a8d10..93970bcf2568715ff4ad554638446abf373f1a35 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -433,7 +433,6 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_layerTreeView(nullptr)
, m_rootLayer(nullptr)
, m_rootGraphicsLayer(nullptr)
- , m_rootTransformLayer(nullptr)
, m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this)))
, m_matchesHeuristicsForGpuRasterization(false)
, m_recreatingGraphicsContext(false)
@@ -4145,7 +4144,6 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
if (layer) {
m_rootGraphicsLayer = visualViewport.rootGraphicsLayer();
m_rootLayer = m_rootGraphicsLayer->platformLayer();
- m_rootTransformLayer = m_rootGraphicsLayer;
updateRootLayerTransform();
m_layerTreeView->setRootLayer(*m_rootLayer);
// We register viewport layers here since there may not be a layer
@@ -4161,7 +4159,6 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
} else {
m_rootGraphicsLayer = nullptr;
m_rootLayer = nullptr;
- m_rootTransformLayer = nullptr;
// This means that we're transitioning to a new page. Suppress
// commits until Blink generates invalidations so we don't
// attempt to paint too early in the next page load.
@@ -4340,16 +4337,11 @@ void WebViewImpl::updateLayerTreeDeviceScaleFactor()
void WebViewImpl::updateRootLayerTransform()
{
- // If we don't have a root graphics layer, we won't bother trying to find
- // or update the transform layer.
- if (!m_rootGraphicsLayer)
- return;
-
- if (m_rootTransformLayer) {
+ if (m_rootGraphicsLayer) {
TransformationMatrix transform;
transform.translate(m_rootLayerOffset.width, m_rootLayerOffset.height);
transform = transform.scale(m_rootLayerScale);
- m_rootTransformLayer->setTransform(transform);
+ m_rootGraphicsLayer->setTransform(transform);
}
}
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698