Do not push properties that are animated on impl only.

cc/layer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer.h"
 
 #include "cc/animation.h"
 #include "cc/animation_events.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
@@ skipping 625 matching lines @@
     layer->setDrawsContent(drawsContent());
     layer->setFilters(filters());
     layer->setFilter(filter());
     layer->setBackgroundFilters(backgroundFilters());
     layer->setMasksToBounds(m_masksToBounds);
     layer->setShouldScrollOnMainThread(m_shouldScrollOnMainThread);
     layer->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
     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);
     layer->setMaxScrollOffset(m_maxScrollOffset);
 
     // If the main thread commits multiple times before the impl thread actually draws, then damage tracking
     // will become incorrect if we simply clobber the updateRect here. The LayerImpl's updateRect needs to
     // accumulate (i.e. union) any update changes that have occurred on the main thread.
     m_updateRect.Union(layer->updateRect());
     layer->setUpdateRect(m_updateRect);
@@ skipping 226 matching lines @@
 {
     return 0;
 }
 
 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped_refptr<Layer> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort Layers.
 }
 
 }  // namespace cc