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

Unified Diff: cc/layer.cc

Issue 12413020: Do not push properties that are animated on impl only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 9 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
« no previous file with comments | « no previous file | cc/layer_impl.h » ('j') | cc/layer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer.cc
diff --git a/cc/layer.cc b/cc/layer.cc
index d1298175b8c8261a1c93ffe9aa83aed1a0d7a728..eca68ffdbb4b0d031cb9fe02c15dc67a73cdb02e 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -643,16 +643,18 @@ void Layer::pushPropertiesTo(LayerImpl* layer)
layer->setNonFastScrollableRegion(m_nonFastScrollableRegion);
layer->setTouchEventHandlerRegion(m_touchEventHandlerRegion);
layer->setContentsOpaque(m_contentsOpaque);
- if (!opacityIsAnimating())
+ if (!layer->opacityIsAnimatingOnImplOnly())
layer->setOpacity(m_opacity);
+ DCHECK(!(opacityIsAnimating() && layer->opacityIsAnimatingOnImplOnly()));
layer->setPosition(m_position);
layer->setIsContainerForFixedPositionLayers(m_isContainerForFixedPositionLayers);
layer->setFixedToContainerLayer(m_fixedToContainerLayer);
layer->setPreserves3D(preserves3D());
layer->setUseParentBackfaceVisibility(m_useParentBackfaceVisibility);
layer->setSublayerTransform(m_sublayerTransform);
- if (!transformIsAnimating())
+ if (!layer->transformIsAnimatingOnImplOnly())
layer->setTransform(m_transform);
+ DCHECK(!(transformIsAnimating() && layer->transformIsAnimatingOnImplOnly()));
layer->setScrollable(m_scrollable);
layer->setScrollOffset(m_scrollOffset);
« no previous file with comments | « no previous file | cc/layer_impl.h » ('j') | cc/layer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698