Remove Layer{Impl}::FilterIsAnimating.

cc/trees/layer_tree_host_common_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/trees/layer_tree_host_common.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 8311 matching lines @@
   AddOpacityTransitionToElementWithPlayer(child->element_id(), timeline_impl(),
                                           10.0, 1.f, 0.2f, false);
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(1.f, child->Opacity());
   EXPECT_TRUE(GetRenderSurface(root));
   EXPECT_NE(GetRenderSurface(child), GetRenderSurface(root));
   EXPECT_EQ(GetRenderSurface(grandchild), GetRenderSurface(child));
 }
 
+static bool FilterIsAnimating(LayerImpl* layer) {
+  return layer->GetMutatorHost()->IsAnimatingFilterProperty(
+      layer->element_id(), layer->GetElementTypeForAnimation());
+}
+
 // Verify that having an animated filter (but no current filter, as these
 // are mutually exclusive) correctly creates a render surface.
 TEST_F(LayerTreeHostCommonTest, AnimatedFilterCreatesRenderSurface) {
   LayerImpl* root = root_layer_for_testing();
   LayerImpl* child = AddChild<LayerImpl>(root);
   LayerImpl* grandchild = AddChild<LayerImpl>(child);
 
   root->SetBounds(gfx::Size(50, 50));
   child->SetBounds(gfx::Size(50, 50));
   grandchild->SetBounds(gfx::Size(50, 50));
 
   SetElementIdsForTesting();
   AddAnimatedFilterToElementWithPlayer(child->element_id(), timeline_impl(),
                                        10.0, 0.1f, 0.2f);
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_TRUE(GetRenderSurface(root));
   EXPECT_NE(GetRenderSurface(child), GetRenderSurface(root));
   EXPECT_EQ(GetRenderSurface(grandchild), GetRenderSurface(child));
 
   EXPECT_TRUE(GetRenderSurface(root)->Filters().IsEmpty());
   EXPECT_TRUE(GetRenderSurface(child)->Filters().IsEmpty());
 
-  EXPECT_FALSE(root->FilterIsAnimating());
-  EXPECT_TRUE(child->FilterIsAnimating());
-  EXPECT_FALSE(grandchild->FilterIsAnimating());
+  EXPECT_FALSE(FilterIsAnimating(root));
+  EXPECT_TRUE(FilterIsAnimating(child));
+  EXPECT_FALSE(FilterIsAnimating(grandchild));
 }
 
 // Verify that having a filter animation with a delayed start time creates a
 // render surface.
 TEST_F(LayerTreeHostCommonTest, DelayedFilterAnimationCreatesRenderSurface) {
   LayerImpl* root = root_layer_for_testing();
   LayerImpl* child = AddChild<LayerImpl>(root);
   LayerImpl* grandchild = AddChild<LayerImpl>(child);
 
   root->SetBounds(gfx::Size(50, 50));
@@ skipping 21 matching lines @@
                                   std::move(animation));
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_TRUE(GetRenderSurface(root));
   EXPECT_NE(GetRenderSurface(child), GetRenderSurface(root));
   EXPECT_EQ(GetRenderSurface(grandchild), GetRenderSurface(child));
 
   EXPECT_TRUE(GetRenderSurface(root)->Filters().IsEmpty());
   EXPECT_TRUE(GetRenderSurface(child)->Filters().IsEmpty());
 
-  EXPECT_FALSE(root->FilterIsAnimating());
+  EXPECT_FALSE(FilterIsAnimating(root));
   EXPECT_FALSE(root->HasPotentiallyRunningFilterAnimation());
-  EXPECT_FALSE(child->FilterIsAnimating());
+  EXPECT_FALSE(FilterIsAnimating(child));
   EXPECT_TRUE(child->HasPotentiallyRunningFilterAnimation());
-  EXPECT_FALSE(grandchild->FilterIsAnimating());
+  EXPECT_FALSE(FilterIsAnimating(grandchild));
   EXPECT_FALSE(grandchild->HasPotentiallyRunningFilterAnimation());
 }
 
 // Ensures that the property tree code accounts for offsets between fixed
 // position layers and their respective containers.
 TEST_F(LayerTreeHostCommonTest, PropertyTreesAccountForFixedParentOffset) {
   LayerImpl* root = root_layer_for_testing();
   LayerImpl* child = AddChild<LayerImpl>(root);
   LayerImpl* grandchild = AddChild<LayerImpl>(child);
 
@@ skipping 1700 matching lines @@
 
   // Check child layer draw properties.
   EXPECT_EQ(gfx::Rect(10, 10), child->visible_layer_rect());
   EXPECT_EQ(gfx::Transform(), child->DrawTransform());
   EXPECT_EQ(gfx::Rect(10, 10), child->clip_rect());
   EXPECT_EQ(gfx::Rect(10, 10), child->drawable_content_rect());
 }
 
 }  // namespace
 }  // namespace cc