| 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);
|
|
|