Do not push properties that are animated on impl only.

cc/layer_impl.cc

 // Copyright 2011 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_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "cc/animation_registrar.h"
@@ skipping 315 matching lines @@
   layer->SetDrawsContent(DrawsContent());
   layer->SetFilters(filters());
   layer->SetFilter(filter());
   layer->SetBackgroundFilters(background_filters());
   layer->SetMasksToBounds(masks_to_bounds_);
   layer->SetShouldScrollOnMainThread(should_scroll_on_main_thread_);
   layer->SetHaveWheelEventHandlers(have_wheel_event_handlers_);
   layer->SetNonFastScrollableRegion(non_fast_scrollable_region_);
   layer->SetTouchEventHandlerRegion(touch_event_handler_region_);
   layer->SetContentsOpaque(contents_opaque_);
-  if (!OpacityIsAnimating())
-    layer->SetOpacity(opacity_);
+  layer->SetOpacity(opacity_);
   layer->SetPosition(position_);
   layer->SetIsContainerForFixedPositionLayers(
       is_container_for_fixed_position_layers_);
   layer->SetFixedToContainerLayer(fixed_to_container_layer_);
   layer->SetPreserves3d(preserves_3d());
   layer->SetUseParentBackfaceVisibility(use_parent_backface_visibility_);
   layer->SetSublayerTransform(sublayer_transform_);
-  if (!TransformIsAnimating())
-    layer->SetTransform(transform_);
+  layer->SetTransform(transform_);
 
   layer->SetScrollable(scrollable_);
   layer->SetScrollOffset(scroll_offset_);
   layer->SetMaxScrollOffset(max_scroll_offset_);
 
   // 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.
   update_rect_.Union(layer->update_rect());
@@ skipping 353 matching lines @@
     return;
 
   opacity_ = opacity;
   NoteLayerSurfacePropertyChanged();
 }
 
 bool LayerImpl::OpacityIsAnimating() const {
   return layer_animation_controller_->IsAnimatingProperty(Animation::Opacity);
 }
 
+bool LayerImpl::OpacityIsAnimatingOnImplOnly() const {
+  Animation* opacity_animation =
+      layer_animation_controller_->GetAnimation(Animation::Opacity);
+  return opacity_animation && opacity_animation->is_impl_only();
+}
+
 void LayerImpl::SetPosition(gfx::PointF position) {
   if (position_ == position)
     return;
 
   position_ = position;
   NoteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::SetPreserves3d(bool preserves3_d) {
   if (preserves_3d_ == preserves3_d)
@@ skipping 18 matching lines @@
     return;
 
   transform_ = transform;
   NoteLayerSurfacePropertyChanged();
 }
 
 bool LayerImpl::TransformIsAnimating() const {
   return layer_animation_controller_->IsAnimatingProperty(Animation::Transform);
 }
 
+bool LayerImpl::TransformIsAnimatingOnImplOnly() const {
+  Animation* transform_animation =
+      layer_animation_controller_->GetAnimation(Animation::Transform);
+  return transform_animation && transform_animation->is_impl_only();
+}
+
 void LayerImpl::SetContentBounds(gfx::Size content_bounds) {
   if (this->content_bounds() == content_bounds)
     return;
 
   draw_properties_.content_bounds = content_bounds;
   NoteLayerPropertyChanged();
 }
 
 void LayerImpl::SetContentsScale(float contents_scale_x,
                                  float contents_scale_y) {
@@ skipping 174 matching lines @@
 
 }
 
 scoped_ptr<base::Value> LayerImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   AsValueInto(state.get());
   return state.PassAs<base::Value>();
 }
 
 }  // namespace cc