Do not push properties that are animated on impl only.

cc/layer_unittest.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.h"
 
 #include "cc/keyframed_animation_curve.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_painter.h"
 #include "cc/layer_tree_host.h"
 #include "cc/math_util.h"
 #include "cc/single_thread_proxy.h"
+#include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/transform.h"
 
 using ::testing::AnyNumber;
@@ skipping 613 matching lines @@
 
     testLayer->SetOpacity(0.5);
 
     EXPECT_FALSE(implLayer->LayerSurfacePropertyChanged());
 
     testLayer->PushPropertiesTo(implLayer.get());
 
     EXPECT_TRUE(implLayer->LayerSurfacePropertyChanged());
 }
 
+TEST_F(LayerTest, verifyPushPropertiesDoesNotCauseSurfacePropertyChangedDuringImplOnlyTransformAnimation)
+{
+    scoped_refptr<Layer> testLayer = Layer::Create();
+    scoped_ptr<LayerImpl> implLayer = LayerImpl::Create(m_hostImpl.activeTree(), 1);
+
+    scoped_ptr<AnimationRegistrar> registrar = AnimationRegistrar::create();
+    implLayer->layer_animation_controller()->SetAnimationRegistrar(registrar.get());
+
+    addAnimatedTransformToController(*implLayer->layer_animation_controller(), 1.0, 0, 100);
+
+    gfx::Transform transform;
+    transform.Rotate(45.0);
+    testLayer->SetTransform(transform);
+
+    EXPECT_FALSE(implLayer->LayerSurfacePropertyChanged());
+    testLayer->PushPropertiesTo(implLayer.get());
+    EXPECT_TRUE(implLayer->LayerSurfacePropertyChanged());
+
+    implLayer->ResetAllChangeTrackingForSubtree();
+    addAnimatedTransformToController(*implLayer->layer_animation_controller(), 1.0, 0, 100);
+    implLayer->layer_animation_controller()->GetAnimation(Animation::Transform)->set_is_impl_only(true);
+    transform.Rotate(45.0);
+    testLayer->SetTransform(transform);
+
+    EXPECT_FALSE(implLayer->LayerSurfacePropertyChanged());
+    testLayer->PushPropertiesTo(implLayer.get());
+    EXPECT_FALSE(implLayer->LayerSurfacePropertyChanged());
+}
+
+TEST_F(LayerTest, verifyPushPropertiesDoesNotCauseSurfacePropertyChangedDuringImplOnlyOpacityAnimation)
+{
+    scoped_refptr<Layer> testLayer = Layer::Create();
+    scoped_ptr<LayerImpl> implLayer = LayerImpl::Create(m_hostImpl.activeTree(), 1);
+
+    scoped_ptr<AnimationRegistrar> registrar = AnimationRegistrar::create();
+    implLayer->layer_animation_controller()->SetAnimationRegistrar(registrar.get());
+
+    addOpacityTransitionToController(*implLayer->layer_animation_controller(), 1.0, 0.3f, 0.7f, false);
+
+    testLayer->SetOpacity(0.5f);
+
+    EXPECT_FALSE(implLayer->LayerSurfacePropertyChanged());
+    testLayer->PushPropertiesTo(implLayer.get());
+    EXPECT_TRUE(implLayer->LayerSurfacePropertyChanged());
+
+    implLayer->ResetAllChangeTrackingForSubtree();
+    addOpacityTransitionToController(*implLayer->layer_animation_controller(), 1.0, 0.3f, 0.7f, false);
+    implLayer->layer_animation_controller()->GetAnimation(Animation::Opacity)->set_is_impl_only(true);
+    testLayer->SetOpacity(0.75f);
+
+    EXPECT_FALSE(implLayer->LayerSurfacePropertyChanged());
+    testLayer->PushPropertiesTo(implLayer.get());
+    EXPECT_FALSE(implLayer->LayerSurfacePropertyChanged());
+}
+
+
 TEST_F(LayerTest, maskAndReplicaHasParent)
 {
     scoped_refptr<Layer> parent = Layer::Create();
     scoped_refptr<Layer> child = Layer::Create();
     scoped_refptr<Layer> mask = Layer::Create();
     scoped_refptr<Layer> replica = Layer::Create();
     scoped_refptr<Layer> replicaMask = Layer::Create();
     scoped_refptr<Layer> maskReplacement = Layer::Create();
     scoped_refptr<Layer> replicaReplacement = Layer::Create();
     scoped_refptr<Layer> replicaMaskReplacement = Layer::Create();
@@ skipping 255 matching lines @@
     layer->SetLayerTreeHost(layerTreeHost.get());
     assertLayerTreeHostMatchesForSubtree(layer.get(), layerTreeHost.get());
 
     // Case 3: with a LayerTreeHost where accelerated animation is disabled, the
     // animation should be rejected.
     EXPECT_FALSE(addTestAnimation(layer.get()));
 }
 
 }  // namespace
 }  // namespace cc